Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use new reauth helpers in withings (#128826)

pull/128785/head^2
epenet 2024-10-20 15:54:04 +02:00 committed by GitHub
parent eed842fff1
commit 11d9a71e5d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
homeassistant/components/withings/config_flow.py
View File

@ -9,7 +9,7 @@ from typing import Any
from aiowithings import AuthScope from aiowithings import AuthScope
from homeassistant.components.webhook import async_generate_id from homeassistant.components.webhook import async_generate_id
from homeassistant.config_entries import ConfigEntry, ConfigFlowResult from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
from homeassistant.const import CONF_NAME, CONF_TOKEN, CONF_WEBHOOK_ID from homeassistant.const import CONF_NAME, CONF_TOKEN, CONF_WEBHOOK_ID
from homeassistant.helpers import config_entry_oauth2_flow from homeassistant.helpers import config_entry_oauth2_flow
@ -23,8 +23,6 @@ class WithingsFlowHandler(
DOMAIN = DOMAIN DOMAIN = DOMAIN
reauth_entry: ConfigEntry | None = None
@property @property
def logger(self) -> logging.Logger: def logger(self) -> logging.Logger:
"""Return logger.""" """Return logger."""
@ -42,9 +40,6 @@ class WithingsFlowHandler(
self, entry_data: Mapping[str, Any] self, entry_data: Mapping[str, Any]
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Perform reauth upon an API authentication error.""" """Perform 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(
@ -52,18 +47,17 @@ class WithingsFlowHandler(
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Confirm reauth dialog.""" """Confirm reauth dialog."""
if user_input is None: if user_input is None:
assert self.reauth_entry
return self.async_show_form( return self.async_show_form(
step_id="reauth_confirm", step_id="reauth_confirm",
description_placeholders={CONF_NAME: self.reauth_entry.title}, description_placeholders={CONF_NAME: self._get_reauth_entry().title},
) )
return await self.async_step_user() return await self.async_step_user()
async def async_oauth_create_entry(self, data: dict[str, Any]) -> ConfigFlowResult: async def async_oauth_create_entry(self, data: dict[str, Any]) -> ConfigFlowResult:
"""Create an entry for the flow, or update existing entry.""" """Create an entry for the flow, or update existing entry."""
user_id = str(data[CONF_TOKEN]["userid"]) user_id = str(data[CONF_TOKEN]["userid"])
if not self.reauth_entry: await self.async_set_unique_id(user_id)
await self.async_set_unique_id(user_id) if self.source != SOURCE_REAUTH:
self._abort_if_unique_id_configured() self._abort_if_unique_id_configured()
return self.async_create_entry( return self.async_create_entry(
@ -71,9 +65,7 @@ class WithingsFlowHandler(
data={**data, CONF_WEBHOOK_ID: async_generate_id()}, data={**data, CONF_WEBHOOK_ID: async_generate_id()},
) )
if self.reauth_entry.unique_id == user_id: self._abort_if_unique_id_mismatch(reason="wrong_account")
return self.async_update_reload_and_abort( return self.async_update_reload_and_abort(
self.reauth_entry, data={**self.reauth_entry.data, **data} self._get_reauth_entry(), data_updates=data
) )
return self.async_abort(reason="wrong_account")