Skip to content

Commit

Permalink
Use new reauth helpers in withings (#128826)
Browse files Browse the repository at this point in the history
  • Loading branch information
epenet authored Oct 20, 2024
1 parent eed842f commit 11d9a71
Showing 1 changed file with 8 additions and 16 deletions.
24 changes: 8 additions & 16 deletions homeassistant/components/withings/config_flow.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from aiowithings import AuthScope

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.helpers import config_entry_oauth2_flow

Expand All @@ -23,8 +23,6 @@ class WithingsFlowHandler(

DOMAIN = DOMAIN

reauth_entry: ConfigEntry | None = None

@property
def logger(self) -> logging.Logger:
"""Return logger."""
Expand All @@ -42,38 +40,32 @@ async def async_step_reauth(
self, entry_data: Mapping[str, Any]
) -> ConfigFlowResult:
"""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()

async def async_step_reauth_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Confirm reauth dialog."""
if user_input is None:
assert self.reauth_entry
return self.async_show_form(
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()

async def async_oauth_create_entry(self, data: dict[str, Any]) -> ConfigFlowResult:
"""Create an entry for the flow, or update existing entry."""
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()

return self.async_create_entry(
title=DEFAULT_TITLE,
data={**data, CONF_WEBHOOK_ID: async_generate_id()},
)

if self.reauth_entry.unique_id == user_id:
return self.async_update_reload_and_abort(
self.reauth_entry, data={**self.reauth_entry.data, **data}
)

return self.async_abort(reason="wrong_account")
self._abort_if_unique_id_mismatch(reason="wrong_account")
return self.async_update_reload_and_abort(
self._get_reauth_entry(), data_updates=data
)

0 comments on commit 11d9a71

Please sign in to comment.