jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-04-23 16:57:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup unnecessary reconfigure_confirm in fritz config flow (#128089)

Browse Source
This commit is contained in:
epenet 2024-10-11 15:54:28 +02:00 committed by GitHub
parent d50758197e
commit 7097315079
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
homeassistant/components/fritz/config_flow.py
View File

@ -334,20 +334,7 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
},
)
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle reconfigure flow ."""
entry_data = self._get_reconfigure_entry().data
self._host = entry_data[CONF_HOST]
self._port = entry_data[CONF_PORT]
self._username = entry_data[CONF_USERNAME]
self._password = entry_data[CONF_PASSWORD]
self._use_tls = entry_data.get(CONF_SSL, DEFAULT_SSL)
return await self.async_step_reconfigure_confirm()
def _show_setup_form_reconfigure_confirm(
def _show_setup_form_reconfigure(
self, user_input: dict[str, Any], errors: dict[str, str] | None = None
) -> ConfigFlowResult:
"""Show the reconfigure form to the user."""
@ -358,7 +345,7 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
}
return self.async_show_form(
step_id="reconfigure_confirm",
step_id="reconfigure",
data_schema=vol.Schema(
{
vol.Required(CONF_HOST, default=user_input[CONF_HOST]): str,
@ -366,20 +353,21 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
vol.Required(CONF_SSL, default=user_input[CONF_SSL]): bool,
}
),
description_placeholders={"host": self._host},
description_placeholders={"host": user_input[CONF_HOST]},
errors=errors or {},
)
async def async_step_reconfigure_confirm(
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle reconfigure flow."""
if user_input is None:
return self._show_setup_form_reconfigure_confirm(
reconfigure_entry_data = self._get_reconfigure_entry().data
return self._show_setup_form_reconfigure(
{
CONF_HOST: self._host,
CONF_PORT: self._port,
CONF_SSL: self._use_tls,
CONF_HOST: reconfigure_entry_data[CONF_HOST],
CONF_PORT: reconfigure_entry_data[CONF_PORT],
CONF_SSL: reconfigure_entry_data.get(CONF_SSL, DEFAULT_SSL),
}
)
@ -387,18 +375,19 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
self._use_tls = user_input[CONF_SSL]
self._port = self._determine_port(user_input)
reconfigure_entry = self._get_reconfigure_entry()
self._username = reconfigure_entry.data[CONF_USERNAME]
self._password = reconfigure_entry.data[CONF_PASSWORD]
if error := await self.async_fritz_tools_init():
return self._show_setup_form_reconfigure_confirm(
return self._show_setup_form_reconfigure(
user_input={**user_input, CONF_PORT: self._port}, errors={"base": error}
)
return self.async_update_reload_and_abort(
self._get_reconfigure_entry(),
data={
reconfigure_entry,
data_updates={
CONF_HOST: self._host,
CONF_PASSWORD: self._password,
CONF_PORT: self._port,
CONF_USERNAME: self._username,
CONF_SSL: self._use_tls,
},
)

2
homeassistant/components/fritz/strings.json
View File

@ -19,7 +19,7 @@
"password": "[%key:common::config_flow::data::password%]"
}
},
"reconfigure_confirm": {
"reconfigure": {
"title": "Updating FRITZ!Box Tools - configuration",
"description": "Update FRITZ!Box Tools configuration for: {host}.",
"data": {

6
tests/components/fritz/test_config_flow.py
View File

@ -458,7 +458,7 @@ async def test_reconfigure_successful(
)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
@ -512,7 +512,7 @@ async def test_reconfigure_not_successful(
result = await mock_config.start_reconfigure_flow(hass)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
result = await hass.config_entries.flow.async_configure(
result["flow_id"],
@ -523,7 +523,7 @@ async def test_reconfigure_not_successful(
)
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "reconfigure_confirm"
assert result["step_id"] == "reconfigure"
assert result["errors"]["base"] == ERROR_CANNOT_CONNECT
result = await hass.config_entries.flow.async_configure(