Use new reauth helpers in pvoutput (#128720)

This commit is contained in:
epenet 2024-10-19 10:12:22 +02:00 committed by GitHub
parent 0d90d6586e
commit bcd77de328
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -8,7 +8,7 @@ from typing import Any
from pvo import PVOutput, PVOutputAuthenticationError, PVOutputError from pvo import PVOutput, PVOutputAuthenticationError, PVOutputError
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_API_KEY from homeassistant.const import CONF_API_KEY
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.aiohttp_client import async_get_clientsession
@ -33,7 +33,6 @@ class PVOutputFlowHandler(ConfigFlow, domain=DOMAIN):
VERSION = 1 VERSION = 1
imported_name: str | None = None imported_name: str | None = None
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
@ -88,9 +87,6 @@ class PVOutputFlowHandler(ConfigFlow, domain=DOMAIN):
self, entry_data: Mapping[str, Any] self, entry_data: Mapping[str, Any]
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Handle initiation of re-authentication with PVOutput.""" """Handle initiation of re-authentication with PVOutput."""
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(
@ -99,29 +95,22 @@ class PVOutputFlowHandler(ConfigFlow, domain=DOMAIN):
"""Handle re-authentication with PVOutput.""" """Handle re-authentication with PVOutput."""
errors = {} errors = {}
if user_input is not None and self.reauth_entry: if user_input is not None:
reauth_entry = self._get_reauth_entry()
try: try:
await validate_input( await validate_input(
self.hass, self.hass,
api_key=user_input[CONF_API_KEY], api_key=user_input[CONF_API_KEY],
system_id=self.reauth_entry.data[CONF_SYSTEM_ID], system_id=reauth_entry.data[CONF_SYSTEM_ID],
) )
except PVOutputAuthenticationError: except PVOutputAuthenticationError:
errors["base"] = "invalid_auth" errors["base"] = "invalid_auth"
except PVOutputError: except PVOutputError:
errors["base"] = "cannot_connect" errors["base"] = "cannot_connect"
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={
**self.reauth_entry.data,
CONF_API_KEY: user_input[CONF_API_KEY],
},
) )
self.hass.async_create_task(
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",