evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use new reauth helpers in yolink (#128834)

Browse source
This commit is contained in:
epenet 2024-10-20 15:36:13 +02:00 • committed by GitHub
parent f9ce8fa368
commit dd714cc95e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
homeassistant/components/yolink/config_flow.py
View file

@ -6,7 +6,7 @@ from collections.abc import Mapping
import logging import logging
from typing import Any from typing import Any
from homeassistant.config_entries import ConfigEntry, ConfigFlowResult from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
from homeassistant.helpers import config_entry_oauth2_flow from homeassistant.helpers import config_entry_oauth2_flow
from .const import DOMAIN from .const import DOMAIN
@ -18,7 +18,6 @@ class OAuth2FlowHandler(
"""Config flow to handle yolink OAuth2 authentication.""" """Config flow to handle yolink OAuth2 authentication."""
DOMAIN = DOMAIN DOMAIN = DOMAIN
_reauth_entry: ConfigEntry | None = None
@property @property
def logger(self) -> logging.Logger: def logger(self) -> logging.Logger:
@ -35,9 +34,6 @@ class OAuth2FlowHandler(
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(self, user_input=None) -> ConfigFlowResult: async def async_step_reauth_confirm(self, user_input=None) -> ConfigFlowResult:
@ -48,12 +44,10 @@ class OAuth2FlowHandler(
async def async_oauth_create_entry(self, data: dict) -> ConfigFlowResult: async def async_oauth_create_entry(self, data: dict) -> ConfigFlowResult:
"""Create an oauth config entry or update existing entry for reauth.""" """Create an oauth config entry or update existing entry for reauth."""
if existing_entry := self._reauth_entry: if self.source == SOURCE_REAUTH:
self.hass.config_entries.async_update_entry( return self.async_update_reload_and_abort(
existing_entry, data=existing_entry.data | data self._get_reauth_entry(), data_updates=data
) )
await self.hass.config_entries.async_reload(existing_entry.entry_id)
return self.async_abort(reason="reauth_successful")
return self.async_create_entry(title="YoLink", data=data) return self.async_create_entry(title="YoLink", data=data)
async def async_step_user( async def async_step_user(
@ -61,6 +55,6 @@ class OAuth2FlowHandler(
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Handle a flow start.""" """Handle a flow start."""
existing_entry = await self.async_set_unique_id(DOMAIN) existing_entry = await self.async_set_unique_id(DOMAIN)
if existing_entry and not self._reauth_entry: if existing_entry and self.source != SOURCE_REAUTH:
return self.async_abort(reason="already_configured") return self.async_abort(reason="already_configured")
return await super().async_step_user(user_input) return await super().async_step_user(user_input)