Use reauth helpers in fibaro (#128567)

This commit is contained in:
epenet
2024-10-18 09:36:57 +02:00
committed by GitHub
parent 5fa6202111
commit 275c86a0a9

View File

@@ -9,7 +9,7 @@ from typing import Any
from slugify import slugify from slugify import slugify
import voluptuous as vol import voluptuous as vol
from homeassistant.config_entries import ConfigEntry, ConfigFlow, ConfigFlowResult from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
@@ -63,10 +63,6 @@ class FibaroConfigFlow(ConfigFlow, domain=DOMAIN):
VERSION = 1 VERSION = 1
def __init__(self) -> None:
"""Initialize."""
self._reauth_entry: ConfigEntry | None = None
async def async_step_user( async def async_step_user(
self, user_input: dict[str, Any] | None = None self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult: ) -> ConfigFlowResult:
@@ -94,9 +90,6 @@ class FibaroConfigFlow(ConfigFlow, domain=DOMAIN):
self, entry_data: Mapping[str, Any] self, entry_data: Mapping[str, Any]
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Handle reauthentication.""" """Handle reauthentication."""
self._reauth_entry = self.hass.config_entries.async_get_entry(
self.context["entry_id"]
)
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(
@@ -105,9 +98,10 @@ class FibaroConfigFlow(ConfigFlow, domain=DOMAIN):
"""Handle a flow initiated by reauthentication.""" """Handle a flow initiated by reauthentication."""
errors = {} errors = {}
assert self._reauth_entry reauth_entry = self._get_reauth_entry()
if user_input is not None: if user_input is not None:
new_data = self._reauth_entry.data | user_input new_data = reauth_entry.data | user_input
try: try:
await _validate_input(self.hass, new_data) await _validate_input(self.hass, new_data)
except FibaroConnectFailed: except FibaroConnectFailed:
@@ -115,19 +109,13 @@ class FibaroConfigFlow(ConfigFlow, domain=DOMAIN):
except FibaroAuthFailed: except FibaroAuthFailed:
errors["base"] = "invalid_auth" errors["base"] = "invalid_auth"
else: else:
self.hass.config_entries.async_update_entry( return self.async_update_reload_and_abort(
self._reauth_entry, data=new_data reauth_entry, data_updates=user_input
) )
self.hass.async_create_task(
self.hass.config_entries.async_reload(self._reauth_entry.entry_id)
)
return self.async_abort(reason="reauth_successful")
return self.async_show_form( return self.async_show_form(
step_id="reauth_confirm", step_id="reauth_confirm",
data_schema=vol.Schema({vol.Required(CONF_PASSWORD): str}), data_schema=vol.Schema({vol.Required(CONF_PASSWORD): str}),
errors=errors, errors=errors,
description_placeholders={ description_placeholders={CONF_USERNAME: reauth_entry.data[CONF_USERNAME]},
CONF_USERNAME: self._reauth_entry.data[CONF_USERNAME]
},
) )