Use new reauth helpers in schlage (#128736)

This commit is contained in:
epenet 2024-10-19 14:34:44 +02:00 committed by GitHub
parent ecf167e889
commit 6ccb4b726a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -9,7 +9,7 @@ import pyschlage
from pyschlage.exceptions import NotAuthorizedError from pyschlage.exceptions import NotAuthorizedError
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_USERNAME from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
from .const import DOMAIN, LOGGER from .const import DOMAIN, LOGGER
@ -25,8 +25,6 @@ class SchlageConfigFlow(ConfigFlow, domain=DOMAIN):
VERSION = 1 VERSION = 1
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:
@ -54,20 +52,17 @@ class SchlageConfigFlow(ConfigFlow, domain=DOMAIN):
self, entry_data: Mapping[str, Any] self, entry_data: Mapping[str, Any]
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Handle reauth upon an API authentication error.""" """Handle reauth upon an API authentication error."""
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(
self, user_input: dict[str, Any] | None = None self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Dialog that informs the user that reauth is required.""" """Dialog that informs the user that reauth is required."""
assert self.reauth_entry is not None
if user_input is None: if user_input is None:
return self._show_reauth_form({}) return self._show_reauth_form({})
username = self.reauth_entry.data[CONF_USERNAME] reauth_entry = self._get_reauth_entry()
username = reauth_entry.data[CONF_USERNAME]
password = user_input[CONF_PASSWORD] password = user_input[CONF_PASSWORD]
user_id, errors = await self.hass.async_add_executor_job( user_id, errors = await self.hass.async_add_executor_job(
_authenticate, username, password _authenticate, username, password
@ -75,16 +70,14 @@ class SchlageConfigFlow(ConfigFlow, domain=DOMAIN):
if user_id is None: if user_id is None:
return self._show_reauth_form(errors) return self._show_reauth_form(errors)
if self.reauth_entry.unique_id != user_id: await self.async_set_unique_id(user_id)
return self.async_abort(reason="wrong_account") self._abort_if_unique_id_mismatch(reason="wrong_account")
data = { data = {
CONF_USERNAME: username, CONF_USERNAME: username,
CONF_PASSWORD: user_input[CONF_PASSWORD], CONF_PASSWORD: user_input[CONF_PASSWORD],
} }
self.hass.config_entries.async_update_entry(self.reauth_entry, data=data) return self.async_update_reload_and_abort(reauth_entry, data=data)
await self.hass.config_entries.async_reload(self.reauth_entry.entry_id)
return self.async_abort(reason="reauth_successful")
def _show_reauth_form(self, errors: dict[str, str]) -> ConfigFlowResult: def _show_reauth_form(self, errors: dict[str, str]) -> ConfigFlowResult:
"""Show the reauth form.""" """Show the reauth form."""