home-assistant/core
1
0
Fork 1
mirror of https://github.com/home-assistant/core.git synced 2025-08-02 12:15:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't cancel reauth when reload is triggered by a reauth flow

Browse Source
This commit is contained in:
Erik
2025-03-20 16:24:03 +01:00
parent ac07102ec3
commit f37c75621e
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
homeassistant/config_entries.py
View File

@@ -2233,16 +2233,18 @@ class ConfigEntries:
return await entry.async_unload(self.hass) return await entry.async_unload(self.hass)
@callback @callback
def async_schedule_reload(self, entry_id: str) -> None: def async_schedule_reload(
self, entry_id: str, *, cancel_reauth: bool = True
) -> None:
"""Schedule a config entry to be reloaded.""" """Schedule a config entry to be reloaded."""
entry = self.async_get_known_entry(entry_id) entry = self.async_get_known_entry(entry_id)
entry.async_cancel_retry_setup() entry.async_cancel_retry_setup()
self.hass.async_create_task( self.hass.async_create_task(
self.async_reload(entry_id), self.async_reload(entry_id, cancel_reauth=cancel_reauth),
f"config entry reload {entry.title} {entry.domain} {entry.entry_id}", f"config entry reload {entry.title} {entry.domain} {entry.entry_id}",
) )
async def async_reload(self, entry_id: str) -> bool: async def async_reload(self, entry_id: str, *, cancel_reauth: bool = True) -> bool:
"""Reload an entry. """Reload an entry.
When reloading from an integration is is preferable to When reloading from an integration is is preferable to
@@ -2261,6 +2263,7 @@ class ConfigEntries:
entry.async_cancel_retry_setup() entry.async_cancel_retry_setup()
# Abort any in-progress reauth flow and linked issues # Abort any in-progress reauth flow and linked issues
if cancel_reauth:
_abort_reauth_flows(self.hass, entry.domain, entry_id) _abort_reauth_flows(self.hass, entry.domain, entry_id)
_remove_reauth_issue(self.hass, entry.domain, entry_id) _remove_reauth_issue(self.hass, entry.domain, entry_id)
@@ -3263,7 +3266,9 @@ class ConfigFlow(ConfigEntryBaseFlow):
options=options, options=options,
) )
if reload_even_if_entry_is_unchanged or result: if reload_even_if_entry_is_unchanged or result:
self.hass.config_entries.async_schedule_reload(entry.entry_id) self.hass.config_entries.async_schedule_reload(
entry.entry_id, cancel_reauth=self.source != SOURCE_REAUTH
)
if reason is UNDEFINED: if reason is UNDEFINED:
reason = "reauth_successful" reason = "reauth_successful"
if self.source == SOURCE_RECONFIGURE: if self.source == SOURCE_RECONFIGURE: