Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new reauth helpers in unifi #128837

Merged
merged 3 commits into from
Oct 21, 2024
Merged

Use new reauth helpers in unifi #128837

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a119be1
Use new reauth helpers in unifi
epenet Oct 20, 2024
a1788ec
Apply suggestions from code review
epenet Oct 20, 2024
126c345
Update config_flow.py
epenet Oct 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 17 additions & 20 deletions homeassistant/components/unifi/config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

from homeassistant.components import ssdp
from homeassistant.config_entries import (
SOURCE_REAUTH,
ConfigEntry,
ConfigEntryState,
ConfigFlow,
Expand Down Expand Up @@ -86,7 +87,6 @@ def async_get_options_flow(
def __init__(self) -> None:
"""Initialize the UniFi Network flow."""
self.config: dict[str, Any] = {}
self.reauth_config_entry: ConfigEntry | None = None
self.reauth_schema: dict[vol.Marker, Any] = {}

async def async_step_user(
Expand Down Expand Up @@ -118,13 +118,14 @@ async def async_step_user(

else:
if (
self.reauth_config_entry
and self.reauth_config_entry.unique_id is not None
and self.reauth_config_entry.unique_id in self.sites
):
return await self.async_step_site(
{CONF_SITE_ID: self.reauth_config_entry.unique_id}
self.source == SOURCE_REAUTH
and (
(reauth_unique_id := self._get_reauth_entry().unique_id)
is not None
)
and reauth_unique_id in self.sites
):
return await self.async_step_site({CONF_SITE_ID: reauth_unique_id})

return await self.async_step_site()

Expand Down Expand Up @@ -160,8 +161,8 @@ async def async_step_site(
config_entry = await self.async_set_unique_id(unique_id)
abort_reason = "configuration_updated"

if self.reauth_config_entry:
config_entry = self.reauth_config_entry
if self.source == SOURCE_REAUTH:
config_entry = self._get_reauth_entry()
abort_reason = "reauth_successful"

if config_entry:
Expand Down Expand Up @@ -192,24 +193,20 @@ async def async_step_reauth(
self, entry_data: Mapping[str, Any]
) -> ConfigFlowResult:
"""Trigger a reauthentication flow."""
config_entry = self.hass.config_entries.async_get_entry(
self.context["entry_id"]
)
assert config_entry
self.reauth_config_entry = config_entry
reauth_entry = self._get_reauth_entry()

self.context["title_placeholders"] = {
CONF_HOST: config_entry.data[CONF_HOST],
CONF_SITE_ID: config_entry.title,
CONF_HOST: reauth_entry.data[CONF_HOST],
CONF_SITE_ID: reauth_entry.title,
}

self.reauth_schema = {
vol.Required(CONF_HOST, default=config_entry.data[CONF_HOST]): str,
vol.Required(CONF_USERNAME, default=config_entry.data[CONF_USERNAME]): str,
vol.Required(CONF_HOST, default=reauth_entry.data[CONF_HOST]): str,
vol.Required(CONF_USERNAME, default=reauth_entry.data[CONF_USERNAME]): str,
vol.Required(CONF_PASSWORD): str,
vol.Required(CONF_PORT, default=config_entry.data[CONF_PORT]): int,
vol.Required(CONF_PORT, default=reauth_entry.data[CONF_PORT]): int,
vol.Required(
CONF_VERIFY_SSL, default=config_entry.data[CONF_VERIFY_SSL]
CONF_VERIFY_SSL, default=reauth_entry.data[CONF_VERIFY_SSL]
): bool,
}

Expand Down