evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prompt user to remove application credentials when deleting config entries (#74825)

Browse source 
* Prompt user to remove application credentials when deleting config entries

* Adjust assertions on intermediate state in config entry tests

* Add a callback hook to modify config entry remove result

* Improve test coverage and simplify implementation

* Register remove callback per domain

* Update homeassistant/components/application_credentials/__init__.py

Co-authored-by: Martin Hjelmare <marhje52@gmail.com>

* Fix tests to use new variable name including domain

* Add websocket command to return application credentials for an integration

* Remove unnecessary diff

* Apply suggestions from code review

Co-authored-by: Martin Hjelmare <marhje52@gmail.com>

Co-authored-by: Martin Hjelmare <marhje52@gmail.com>
This commit is contained in:
Allen Porter 2022-09-21 21:02:40 -07:00 • committed by GitHub
parent 56e5774e26
commit d034fd2629
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 104 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

60
tests/components/application_credentials/test_init.py
View file

@ -30,7 +30,7 @@ from homeassistant.core import HomeAssistant
from homeassistant.helpers import config_entry_oauth2_flow
from homeassistant.setup import async_setup_component
from tests.common import mock_platform
from tests.common import MockConfigEntry, mock_platform
CLIENT_ID = "some-client-id"
CLIENT_SECRET = "some-client-secret"
@ -90,10 +90,12 @@ async def mock_application_credentials_integration(
authorization_server: AuthorizationServer,
):
"""Mock a application_credentials integration."""
assert await async_setup_component(hass, "application_credentials", {})
await setup_application_credentials_integration(
hass, TEST_DOMAIN, authorization_server
)
with patch("homeassistant.loader.APPLICATION_CREDENTIALS", [TEST_DOMAIN]):
assert await async_setup_component(hass, "application_credentials", {})
await setup_application_credentials_integration(
hass, TEST_DOMAIN, authorization_server
)
yield
class FakeConfigFlow(config_entry_oauth2_flow.AbstractOAuth2FlowHandler, domain=DOMAIN):
@ -418,7 +420,7 @@ async def test_config_flow_no_credentials(hass):
TEST_DOMAIN, context={"source": config_entries.SOURCE_USER}
)
assert result.get("type") == data_entry_flow.FlowResultType.ABORT
assert result.get("reason") == "missing_configuration"
assert result.get("reason") == "missing_credentials"
async def test_config_flow_other_domain(
@ -445,7 +447,7 @@ async def test_config_flow_other_domain(
TEST_DOMAIN, context={"source": config_entries.SOURCE_USER}
)
assert result.get("type") == data_entry_flow.FlowResultType.ABORT
assert result.get("reason") == "missing_configuration"
assert result.get("reason") == "missing_credentials"
async def test_config_flow(
@ -483,6 +485,27 @@ async def test_config_flow(
== "Cannot delete credential in use by integration fake_integration"
)
# Return information about the in use config entry
entries = hass.config_entries.async_entries(TEST_DOMAIN)
assert len(entries) == 1
client = await ws_client()
result = await client.cmd_result(
"config_entry", {"config_entry_id": entries[0].entry_id}
)
assert result.get("application_credentials_id") == ID
# Delete the config entry
await hass.config_entries.async_remove(entries[0].entry_id)
# Application credential can now be removed
resp = await client.cmd("delete", {"application_credentials_id": ID})
assert resp.get("success")
# Config entry information no longer found
result = await client.cmd("config_entry", {"config_entry_id": entries[0].entry_id})
assert "error" in result
assert result["error"].get("code") == "invalid_config_entry_id"
async def test_config_flow_multiple_entries(
hass: HomeAssistant,
@ -549,7 +572,7 @@ async def test_config_flow_create_delete_credential(
TEST_DOMAIN, context={"source": config_entries.SOURCE_USER}
)
assert result.get("type") == data_entry_flow.FlowResultType.ABORT
assert result.get("reason") == "missing_configuration"
assert result.get("reason") == "missing_credentials"
@pytest.mark.parametrize("config_credential", [DEVELOPER_CREDENTIAL])
@ -751,3 +774,24 @@ async def test_name(
assert (
result["data"].get("auth_implementation") == "fake_integration_some_client_id"
)
async def test_remove_config_entry_without_app_credentials(
hass: HomeAssistant,
ws_client: ClientFixture,
authorization_server: AuthorizationServer,
):
"""Test config entry removal for non-app credentials integration."""
hass.config.components.add("other_domain")
config_entry = MockConfigEntry(domain="other_domain")
config_entry.add_to_hass(hass)
assert await async_setup_component(hass, "other_domain", {})
entries = hass.config_entries.async_entries("other_domain")
assert len(entries) == 1
client = await ws_client()
result = await client.cmd_result(
"config_entry", {"config_entry_id": entries[0].entry_id}
)
assert "application_credential_id" not in result