Use reauth helpers in jvc_projector (#128650)

This commit is contained in:
epenet 2024-10-18 13:12:01 +02:00 committed by GitHub
parent 49d534e779
commit 080842e44c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -9,7 +9,7 @@ from jvcprojector import JvcProjector, JvcProjectorAuthError, JvcProjectorConnec
from jvcprojector.projector import DEFAULT_PORT from jvcprojector.projector import DEFAULT_PORT
import voluptuous as vol import voluptuous as vol
from homeassistant.config_entries import ConfigEntry, ConfigFlow, ConfigFlowResult from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT
from homeassistant.helpers.device_registry import format_mac from homeassistant.helpers.device_registry import format_mac
from homeassistant.util.network import is_host_valid from homeassistant.util.network import is_host_valid
@ -22,8 +22,6 @@ class JvcProjectorConfigFlow(ConfigFlow, domain=DOMAIN):
VERSION = 1 VERSION = 1
_reauth_entry: ConfigEntry | None = None
async def async_step_user( async def async_step_user(
self, user_input: dict[str, Any] | None = None self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult: ) -> ConfigFlowResult:
@ -77,22 +75,18 @@ class JvcProjectorConfigFlow(ConfigFlow, domain=DOMAIN):
self, entry_data: Mapping[str, Any] self, entry_data: Mapping[str, Any]
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Perform reauth on password authentication error.""" """Perform reauth on password 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(
self, user_input: Mapping[str, Any] | None = None self, user_input: Mapping[str, Any] | None = None
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Dialog that informs the user that reauth is required.""" """Dialog that informs the user that reauth is required."""
assert self._reauth_entry
errors = {} errors = {}
if user_input is not None: if user_input is not None:
host = self._reauth_entry.data[CONF_HOST] reauth_entry = self._get_reauth_entry()
port = self._reauth_entry.data[CONF_PORT] host = reauth_entry.data[CONF_HOST]
port = reauth_entry.data[CONF_PORT]
password = user_input[CONF_PASSWORD] password = user_input[CONF_PASSWORD]
try: try:
@ -102,12 +96,9 @@ class JvcProjectorConfigFlow(ConfigFlow, domain=DOMAIN):
except JvcProjectorAuthError: except JvcProjectorAuthError:
errors["base"] = "invalid_auth" errors["base"] = "invalid_auth"
else: else:
self.hass.config_entries.async_update_entry( return self.async_update_reload_and_abort(
self._reauth_entry, reauth_entry, data_updates=user_input
data={CONF_HOST: host, CONF_PORT: port, CONF_PASSWORD: password},
) )
await self.hass.config_entries.async_reload(self._reauth_entry.entry_id)
return self.async_abort(reason="reauth_successful")
return self.async_show_form( return self.async_show_form(
step_id="reauth_confirm", step_id="reauth_confirm",