jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-04-30 12:17:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Store toon flow data in flow handler attributes (#127180)

Browse Source
This commit is contained in:
Erik Montnemery 2024-10-01 11:15:54 +02:00 committed by GitHub
parent eb1fe93a59
commit d9bba25f67
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/components/toon/config_flow.py
View File

@ -23,6 +23,7 @@ class ToonFlowHandler(AbstractOAuth2FlowHandler, domain=DOMAIN):
agreements: list[Agreement] agreements: list[Agreement]
data: dict[str, Any] data: dict[str, Any]
migrate_entry: str | None = None
@property @property
def logger(self) -> logging.Logger: def logger(self) -> logging.Logger:
@ -58,7 +59,7 @@ class ToonFlowHandler(AbstractOAuth2FlowHandler, domain=DOMAIN):
""" """
if import_data is not None and CONF_MIGRATE in import_data: if import_data is not None and CONF_MIGRATE in import_data:
self.context.update({CONF_MIGRATE: import_data[CONF_MIGRATE]}) self.migrate_entry = import_data[CONF_MIGRATE]
else: else:
await self._async_handle_discovery_without_unique_id() await self._async_handle_discovery_without_unique_id()
@ -88,8 +89,8 @@ class ToonFlowHandler(AbstractOAuth2FlowHandler, domain=DOMAIN):
return await self._create_entry(self.agreements[agreement_index]) return await self._create_entry(self.agreements[agreement_index])
async def _create_entry(self, agreement: Agreement) -> ConfigFlowResult: async def _create_entry(self, agreement: Agreement) -> ConfigFlowResult:
if CONF_MIGRATE in self.context: if self.migrate_entry:
await self.hass.config_entries.async_remove(self.context[CONF_MIGRATE]) await self.hass.config_entries.async_remove(self.migrate_entry)
await self.async_set_unique_id(agreement.agreement_id) await self.async_set_unique_id(agreement.agreement_id)
self._abort_if_unique_id_configured() self._abort_if_unique_id_configured()

5
tests/components/toon/test_config_flow.py
View File

@ -6,7 +6,7 @@ from unittest.mock import patch
import pytest import pytest
from toonapi import Agreement, ToonError from toonapi import Agreement, ToonError
from homeassistant.components.toon.const import CONF_AGREEMENT, CONF_MIGRATE, DOMAIN from homeassistant.components.toon.const import CONF_AGREEMENT, DOMAIN
from homeassistant.config import async_process_ha_core_config from homeassistant.config import async_process_ha_core_config
from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER
from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET
@ -324,7 +324,8 @@ async def test_import_migration(
flows = hass.config_entries.flow.async_progress() flows = hass.config_entries.flow.async_progress()
assert len(flows) == 1 assert len(flows) == 1
assert flows[0]["context"][CONF_MIGRATE] == old_entry.entry_id flow = hass.config_entries.flow._progress[flows[0]["flow_id"]]
assert flow.migrate_entry == old_entry.entry_id
state = config_entry_oauth2_flow._encode_jwt( state = config_entry_oauth2_flow._encode_jwt(
hass, hass,