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

Use reauth/reconfigure helpers in trafikverket_camera config flow (#128026)

Browse Source
This commit is contained in:
epenet 2024-10-09 16:08:45 +02:00 committed by GitHub
parent 168d0f11ab
commit acd32b500c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
homeassistant/components/trafikverket_camera/config_flow.py
View File

@ -10,7 +10,11 @@ from pytrafikverket.models import CameraInfoModel
from pytrafikverket.trafikverket_camera import TrafikverketCamera from pytrafikverket.trafikverket_camera import TrafikverketCamera
import voluptuous as vol import voluptuous as vol
from homeassistant.config_entries import ConfigEntry, ConfigFlow, ConfigFlowResult from homeassistant.config_entries import (
SOURCE_RECONFIGURE,
ConfigFlow,
ConfigFlowResult,
)
from homeassistant.const import CONF_API_KEY, CONF_ID, CONF_LOCATION from homeassistant.const import CONF_API_KEY, CONF_ID, CONF_LOCATION
from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.aiohttp_client import async_get_clientsession
from homeassistant.helpers.selector import ( from homeassistant.helpers.selector import (
@ -29,7 +33,6 @@ class TVCameraConfigFlow(ConfigFlow, domain=DOMAIN):
VERSION = 3 VERSION = 3
entry: ConfigEntry
cameras: list[CameraInfoModel] cameras: list[CameraInfoModel]
api_key: str api_key: str
@ -58,7 +61,6 @@ class TVCameraConfigFlow(ConfigFlow, domain=DOMAIN):
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Handle re-authentication with Trafikverket.""" """Handle re-authentication with Trafikverket."""
self.entry = self._get_reauth_entry()
return await self.async_step_reauth_confirm() return await self.async_step_reauth_confirm()
async def async_step_reauth_confirm( async def async_step_reauth_confirm(
@ -70,16 +72,12 @@ class TVCameraConfigFlow(ConfigFlow, domain=DOMAIN):
if user_input: if user_input:
api_key = user_input[CONF_API_KEY] api_key = user_input[CONF_API_KEY]
assert self.entry is not None reauth_entry = self._get_reauth_entry()
errors, _ = await self.validate_input(api_key, self.entry.data[CONF_ID]) errors, _ = await self.validate_input(api_key, reauth_entry.data[CONF_ID])
if not errors: if not errors:
return self.async_update_reload_and_abort( return self.async_update_reload_and_abort(
self.entry, reauth_entry, data_updates={CONF_API_KEY: api_key}
data={
**self.entry.data,
CONF_API_KEY: api_key,
},
) )
return self.async_show_form( return self.async_show_form(
@ -96,8 +94,6 @@ class TVCameraConfigFlow(ConfigFlow, domain=DOMAIN):
self, user_input: dict[str, Any] | None = None self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Handle re-configuration with Trafikverket.""" """Handle re-configuration with Trafikverket."""
self.entry = self._get_reconfigure_entry()
return await self.async_step_reconfigure_confirm() return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm( async def async_step_reconfigure_confirm(
@ -105,6 +101,7 @@ class TVCameraConfigFlow(ConfigFlow, domain=DOMAIN):
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Confirm re-configuration with Trafikverket.""" """Confirm re-configuration with Trafikverket."""
errors: dict[str, str] = {} errors: dict[str, str] = {}
reconfigure_entry = self._get_reconfigure_entry()
if user_input: if user_input:
api_key = user_input[CONF_API_KEY] api_key = user_input[CONF_API_KEY]
@ -120,11 +117,10 @@ class TVCameraConfigFlow(ConfigFlow, domain=DOMAIN):
await self.async_set_unique_id(f"{DOMAIN}-{cameras[0].camera_id}") await self.async_set_unique_id(f"{DOMAIN}-{cameras[0].camera_id}")
self._abort_if_unique_id_configured() self._abort_if_unique_id_configured()
return self.async_update_reload_and_abort( return self.async_update_reload_and_abort(
self.entry, reconfigure_entry,
unique_id=f"{DOMAIN}-{cameras[0].camera_id}", unique_id=f"{DOMAIN}-{cameras[0].camera_id}",
title=cameras[0].camera_name or "Trafikverket Camera", title=cameras[0].camera_name or "Trafikverket Camera",
data={CONF_API_KEY: api_key, CONF_ID: cameras[0].camera_id}, data={CONF_API_KEY: api_key, CONF_ID: cameras[0].camera_id},
reason="reconfigure_successful",
) )
schema = self.add_suggested_values_to_schema( schema = self.add_suggested_values_to_schema(
@ -134,7 +130,7 @@ class TVCameraConfigFlow(ConfigFlow, domain=DOMAIN):
vol.Required(CONF_LOCATION): TextSelector(), vol.Required(CONF_LOCATION): TextSelector(),
} }
), ),
{**self.entry.data, **(user_input or {})}, {**reconfigure_entry.data, **(user_input or {})},
) )
return self.async_show_form( return self.async_show_form(
@ -189,16 +185,15 @@ class TVCameraConfigFlow(ConfigFlow, domain=DOMAIN):
) )
if not errors and cameras: if not errors and cameras:
if hasattr(self, "entry") and self.entry: if self.source == SOURCE_RECONFIGURE:
return self.async_update_reload_and_abort( return self.async_update_reload_and_abort(
self.entry, self._get_reconfigure_entry(),
unique_id=f"{DOMAIN}-{cameras[0].camera_id}", unique_id=f"{DOMAIN}-{cameras[0].camera_id}",
title=cameras[0].camera_name or "Trafikverket Camera", title=cameras[0].camera_name or "Trafikverket Camera",
data={ data={
CONF_API_KEY: self.api_key, CONF_API_KEY: self.api_key,
CONF_ID: cameras[0].camera_id, CONF_ID: cameras[0].camera_id,
}, },
reason="reconfigure_successful",
) )
await self.async_set_unique_id(f"{DOMAIN}-{cameras[0].camera_id}") await self.async_set_unique_id(f"{DOMAIN}-{cameras[0].camera_id}")
self._abort_if_unique_id_configured() self._abort_if_unique_id_configured()