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

This reverts commit f37c756.

Author: emontnemery

homeassistant/config_entries.py

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