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

Use reauth/reconfigure helpers in fritzbox config flow (#127993)

Browse Source
This commit is contained in:
epenet 2024-10-09 17:31:49 +02:00 committed by GitHub
parent fa717699f5
commit e8bc07d40f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
homeassistant/components/fritzbox/config_flow.py
View File

@ -12,7 +12,7 @@ from requests.exceptions import HTTPError
import voluptuous as vol import voluptuous as vol
from homeassistant.components import ssdp from homeassistant.components import ssdp
from homeassistant.config_entries import ConfigEntry, ConfigFlow, ConfigFlowResult from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
from .const import DEFAULT_HOST, DEFAULT_USERNAME, DOMAIN from .const import DEFAULT_HOST, DEFAULT_USERNAME, DOMAIN
@ -43,8 +43,6 @@ class FritzboxConfigFlow(ConfigFlow, domain=DOMAIN):
VERSION = 1 VERSION = 1
_entry: ConfigEntry
def __init__(self) -> None: def __init__(self) -> None:
"""Initialize flow.""" """Initialize flow."""
self._host: str | None = None self._host: str | None = None
@ -62,16 +60,9 @@ class FritzboxConfigFlow(ConfigFlow, domain=DOMAIN):
}, },
) )
async def _update_entry(self) -> None: async def async_try_connect(self) -> str:
self.hass.config_entries.async_update_entry( """Try to connect and check auth."""
self._entry, return await self.hass.async_add_executor_job(self._try_connect)
data={
CONF_HOST: self._host,
CONF_PASSWORD: self._password,
CONF_USERNAME: self._username,
},
)
await self.hass.config_entries.async_reload(self._entry.entry_id)
def _try_connect(self) -> str: def _try_connect(self) -> str:
"""Try to connect and check auth.""" """Try to connect and check auth."""
@ -104,7 +95,7 @@ class FritzboxConfigFlow(ConfigFlow, domain=DOMAIN):
self._password = user_input[CONF_PASSWORD] self._password = user_input[CONF_PASSWORD]
self._username = user_input[CONF_USERNAME] self._username = user_input[CONF_USERNAME]
result = await self.hass.async_add_executor_job(self._try_connect) result = await self.async_try_connect()
if result == RESULT_SUCCESS: if result == RESULT_SUCCESS:
return self._get_entry(self._name) return self._get_entry(self._name)
@ -164,7 +155,7 @@ class FritzboxConfigFlow(ConfigFlow, domain=DOMAIN):
if user_input is not None: if user_input is not None:
self._password = user_input[CONF_PASSWORD] self._password = user_input[CONF_PASSWORD]
self._username = user_input[CONF_USERNAME] self._username = user_input[CONF_USERNAME]
result = await self.hass.async_add_executor_job(self._try_connect) result = await self.async_try_connect()
if result == RESULT_SUCCESS: if result == RESULT_SUCCESS:
assert self._name is not None assert self._name is not None
@ -184,7 +175,6 @@ class FritzboxConfigFlow(ConfigFlow, domain=DOMAIN):
self, entry_data: Mapping[str, Any] self, entry_data: Mapping[str, Any]
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Trigger a reauthentication flow.""" """Trigger a reauthentication flow."""
self._entry = self._get_reauth_entry()
self._host = entry_data[CONF_HOST] self._host = entry_data[CONF_HOST]
self._name = str(entry_data[CONF_HOST]) self._name = str(entry_data[CONF_HOST])
self._username = entry_data[CONF_USERNAME] self._username = entry_data[CONF_USERNAME]
@ -201,11 +191,17 @@ class FritzboxConfigFlow(ConfigFlow, domain=DOMAIN):
self._password = user_input[CONF_PASSWORD] self._password = user_input[CONF_PASSWORD]
self._username = user_input[CONF_USERNAME] self._username = user_input[CONF_USERNAME]
result = await self.hass.async_add_executor_job(self._try_connect) result = await self.async_try_connect()
if result == RESULT_SUCCESS: if result == RESULT_SUCCESS:
await self._update_entry() return self.async_update_reload_and_abort(
return self.async_abort(reason="reauth_successful") self._get_reauth_entry(),
data={
CONF_HOST: self._host,
CONF_PASSWORD: self._password,
CONF_USERNAME: self._username,
},
)
if result != RESULT_INVALID_AUTH: if result != RESULT_INVALID_AUTH:
return self.async_abort(reason=result) return self.async_abort(reason=result)
errors["base"] = result errors["base"] = result
@ -226,11 +222,11 @@ class FritzboxConfigFlow(ConfigFlow, domain=DOMAIN):
self, user_input: dict[str, Any] | None = None self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Handle a reconfiguration flow initialized by the user.""" """Handle a reconfiguration flow initialized by the user."""
self._entry = self._get_reconfigure_entry() entry_data = self._get_reconfigure_entry().data
self._name = self._entry.data[CONF_HOST] self._name = entry_data[CONF_HOST]
self._host = self._entry.data[CONF_HOST] self._host = entry_data[CONF_HOST]
self._username = self._entry.data[CONF_USERNAME] self._username = entry_data[CONF_USERNAME]
self._password = self._entry.data[CONF_PASSWORD] self._password = entry_data[CONF_PASSWORD]
return await self.async_step_reconfigure_confirm() return await self.async_step_reconfigure_confirm()
@ -243,11 +239,17 @@ class FritzboxConfigFlow(ConfigFlow, domain=DOMAIN):
if user_input is not None: if user_input is not None:
self._host = user_input[CONF_HOST] self._host = user_input[CONF_HOST]
result = await self.hass.async_add_executor_job(self._try_connect) result = await self.async_try_connect()
if result == RESULT_SUCCESS: if result == RESULT_SUCCESS:
await self._update_entry() return self.async_update_reload_and_abort(
return self.async_abort(reason="reconfigure_successful") self._get_reconfigure_entry(),
data={
CONF_HOST: self._host,
CONF_PASSWORD: self._password,
CONF_USERNAME: self._username,
},
)
errors["base"] = result errors["base"] = result
return self.async_show_form( return self.async_show_form(