Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use reconfigure helpers in mealie config flow (#128013)

pull/128038/head
epenet 2024-10-09 17:29:01 +02:00 committed by GitHub
parent 8dfb8ebe5c
commit fa717699f5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
homeassistant/components/mealie/config_flow.py
View File

@ -6,7 +6,7 @@ from typing import Any
from aiomealie import MealieAuthenticationError, MealieClient, MealieConnectionError from aiomealie import MealieAuthenticationError, MealieClient, MealieConnectionError
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_TOKEN, CONF_HOST, CONF_VERIFY_SSL from homeassistant.const import CONF_API_TOKEN, CONF_HOST, CONF_VERIFY_SSL
from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.aiohttp_client import async_get_clientsession
@ -32,7 +32,6 @@ class MealieConfigFlow(ConfigFlow, domain=DOMAIN):
host: str | None = None host: str | None = None
verify_ssl: bool = True verify_ssl: bool = True
entry: ConfigEntry
async def check_connection( async def check_connection(
self, api_token: str self, api_token: str
@ -89,7 +88,6 @@ class MealieConfigFlow(ConfigFlow, domain=DOMAIN):
"""Perform reauth upon an API authentication error.""" """Perform reauth upon an API authentication error."""
self.host = entry_data[CONF_HOST] self.host = entry_data[CONF_HOST]
self.verify_ssl = entry_data.get(CONF_VERIFY_SSL, True) self.verify_ssl = entry_data.get(CONF_VERIFY_SSL, True)
self.entry = self._get_reauth_entry()
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(
@ -102,15 +100,12 @@ class MealieConfigFlow(ConfigFlow, domain=DOMAIN):
user_input[CONF_API_TOKEN], user_input[CONF_API_TOKEN],
) )
if not errors: if not errors:
if self.entry.unique_id == user_id: await self.async_set_unique_id(user_id)
self._abort_if_unique_id_mismatch(reason="wrong_account")
return self.async_update_reload_and_abort( return self.async_update_reload_and_abort(
self.entry, self._get_reauth_entry(),
data={ data_updates={CONF_API_TOKEN: user_input[CONF_API_TOKEN]},
**self.entry.data,
CONF_API_TOKEN: user_input[CONF_API_TOKEN],
},
) )
return self.async_abort(reason="wrong_account")
return self.async_show_form( return self.async_show_form(
step_id="reauth_confirm", step_id="reauth_confirm",
data_schema=REAUTH_SCHEMA, data_schema=REAUTH_SCHEMA,
@ -121,7 +116,6 @@ class MealieConfigFlow(ConfigFlow, domain=DOMAIN):
self, user_input: dict[str, Any] | None = None self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult: ) -> ConfigFlowResult:
"""Handle reconfiguration of the integration.""" """Handle reconfiguration of the integration."""
self.entry = self._get_reconfigure_entry()
return await self.async_step_reconfigure_confirm() return await self.async_step_reconfigure_confirm()
async def async_step_reconfigure_confirm( async def async_step_reconfigure_confirm(
@ -136,18 +130,16 @@ class MealieConfigFlow(ConfigFlow, domain=DOMAIN):
user_input[CONF_API_TOKEN], user_input[CONF_API_TOKEN],
) )
if not errors: if not errors:
if self.entry.unique_id == user_id: await self.async_set_unique_id(user_id)
self._abort_if_unique_id_mismatch(reason="wrong_account")
return self.async_update_reload_and_abort( return self.async_update_reload_and_abort(
self.entry, self._get_reconfigure_entry(),
data={ data_updates={
**self.entry.data,
CONF_VERIFY_SSL: user_input[CONF_VERIFY_SSL], CONF_VERIFY_SSL: user_input[CONF_VERIFY_SSL],
CONF_HOST: user_input[CONF_HOST], CONF_HOST: user_input[CONF_HOST],
CONF_API_TOKEN: user_input[CONF_API_TOKEN], CONF_API_TOKEN: user_input[CONF_API_TOKEN],
}, },
reason="reconfigure_successful",
) )
return self.async_abort(reason="wrong_account")
return self.async_show_form( return self.async_show_form(
step_id="reconfigure_confirm", step_id="reconfigure_confirm",
data_schema=USER_SCHEMA, data_schema=USER_SCHEMA,