Use new reauth helpers in vicare (#128779)

This commit is contained in:
epenet 2024-10-20 10:07:42 +02:00 committed by GitHub
parent 2bc642ae6f
commit 7fa359764d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -13,7 +13,7 @@ from PyViCare.PyViCareUtils import (
import voluptuous as vol import voluptuous as vol
from homeassistant.components import dhcp from homeassistant.components import dhcp
from homeassistant.config_entries import ConfigEntry, ConfigFlow, ConfigFlowResult from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
from homeassistant.const import CONF_CLIENT_ID, CONF_PASSWORD, CONF_USERNAME from homeassistant.const import CONF_CLIENT_ID, CONF_PASSWORD, CONF_USERNAME
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.device_registry import format_mac from homeassistant.helpers.device_registry import format_mac
@ -50,7 +50,6 @@ class ViCareConfigFlow(ConfigFlow, domain=DOMAIN):
"""Handle a config flow for ViCare.""" """Handle a config flow for ViCare."""
VERSION = 1 VERSION = 1
entry: ConfigEntry | 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
@ -81,7 +80,6 @@ class ViCareConfigFlow(ConfigFlow, domain=DOMAIN):
self, entry_data: Mapping[str, Any] self, entry_data: Mapping[str, Any]
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Handle re-authentication with ViCare.""" """Handle re-authentication with ViCare."""
self.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(
@ -89,11 +87,11 @@ class ViCareConfigFlow(ConfigFlow, domain=DOMAIN):
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Confirm re-authentication with ViCare.""" """Confirm re-authentication with ViCare."""
errors: dict[str, str] = {} errors: dict[str, str] = {}
assert self.entry is not None
reauth_entry = self._get_reauth_entry()
if user_input: if user_input:
data = { data = {
**self.entry.data, **reauth_entry.data,
**user_input, **user_input,
} }
@ -102,17 +100,12 @@ class ViCareConfigFlow(ConfigFlow, domain=DOMAIN):
except (PyViCareInvalidConfigurationError, PyViCareInvalidCredentialsError): except (PyViCareInvalidConfigurationError, PyViCareInvalidCredentialsError):
errors["base"] = "invalid_auth" errors["base"] = "invalid_auth"
else: else:
self.hass.config_entries.async_update_entry( return self.async_update_reload_and_abort(reauth_entry, data=data)
self.entry,
data=data,
)
await self.hass.config_entries.async_reload(self.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=self.add_suggested_values_to_schema( data_schema=self.add_suggested_values_to_schema(
REAUTH_SCHEMA, self.entry.data REAUTH_SCHEMA, reauth_entry.data
), ),
errors=errors, errors=errors,
) )