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 motioneye (#128695)

pull/128789/head
epenet 2024-10-19 10:14:36 +02:00 committed by GitHub
parent 43038564fe
commit 81b918c392
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
homeassistant/components/motioneye/config_flow.py
View File

@ -3,7 +3,7 @@
from __future__ import annotations from __future__ import annotations
from collections.abc import Mapping from collections.abc import Mapping
from typing import Any, cast from typing import Any
from motioneye_client.client import ( from motioneye_client.client import (
MotionEyeClientConnectionError, MotionEyeClientConnectionError,
@ -20,7 +20,7 @@ from homeassistant.config_entries import (
ConfigFlowResult, ConfigFlowResult,
OptionsFlow, OptionsFlow,
) )
from homeassistant.const import CONF_SOURCE, CONF_URL, CONF_WEBHOOK_ID from homeassistant.const import CONF_URL, CONF_WEBHOOK_ID
from homeassistant.core import callback from homeassistant.core import callback
from homeassistant.helpers import config_validation as cv from homeassistant.helpers import config_validation as cv
from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.aiohttp_client import async_get_clientsession
@ -53,7 +53,7 @@ class MotionEyeConfigFlow(ConfigFlow, domain=DOMAIN):
"""Handle the initial step.""" """Handle the initial step."""
def _get_form( def _get_form(
user_input: dict[str, Any], errors: dict[str, str] | None = None user_input: Mapping[str, Any], errors: dict[str, str] | None = None
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Show the form to the user.""" """Show the form to the user."""
url_schema: VolDictType = {} url_schema: VolDictType = {}
@ -89,16 +89,10 @@ class MotionEyeConfigFlow(ConfigFlow, domain=DOMAIN):
errors=errors, errors=errors,
) )
reauth_entry = None
if self.context.get("entry_id"):
reauth_entry = self.hass.config_entries.async_get_entry(
self.context["entry_id"]
)
if user_input is None: if user_input is None:
return _get_form( if self.source == SOURCE_REAUTH:
cast(dict[str, Any], reauth_entry.data) if reauth_entry else {} return _get_form(self._get_reauth_entry().data)
) return _get_form({})
if self._hassio_discovery: if self._hassio_discovery:
# In case of Supervisor discovery, use pushed URL # In case of Supervisor discovery, use pushed URL
@ -135,16 +129,13 @@ class MotionEyeConfigFlow(ConfigFlow, domain=DOMAIN):
if errors: if errors:
return _get_form(user_input, errors) return _get_form(user_input, errors)
if self.context.get(CONF_SOURCE) == SOURCE_REAUTH and reauth_entry is not None: if self.source == SOURCE_REAUTH:
reauth_entry = self._get_reauth_entry()
# Persist the same webhook id across reauths. # Persist the same webhook id across reauths.
if CONF_WEBHOOK_ID in reauth_entry.data: if CONF_WEBHOOK_ID in reauth_entry.data:
user_input[CONF_WEBHOOK_ID] = reauth_entry.data[CONF_WEBHOOK_ID] user_input[CONF_WEBHOOK_ID] = reauth_entry.data[CONF_WEBHOOK_ID]
self.hass.config_entries.async_update_entry(reauth_entry, data=user_input)
# Need to manually reload, as the listener won't have been return self.async_update_reload_and_abort(reauth_entry, data=user_input)
# installed because the initial load did not succeed (the reauth
# flow will not be initiated if the load succeeds).
await self.hass.config_entries.async_reload(reauth_entry.entry_id)
return self.async_abort(reason="reauth_successful")
# Search for duplicates: there isn't a useful unique_id, but # Search for duplicates: there isn't a useful unique_id, but
# at least prevent entries with the same motionEye URL. # at least prevent entries with the same motionEye URL.