From de1905a5297b856506dbcae6411f740bc057b8b7 Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Fri, 15 Nov 2024 12:33:03 +0100
Subject: [PATCH] Use reauth helpers in system_bridge (#130422)

---
 .../components/system_bridge/config_flow.py      | 16 ++++++----------
 .../components/system_bridge/strings.json        |  1 +
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/homeassistant/components/system_bridge/config_flow.py b/homeassistant/components/system_bridge/config_flow.py
index dc1736ea337..590891fa3f2 100644
--- a/homeassistant/components/system_bridge/config_flow.py
+++ b/homeassistant/components/system_bridge/config_flow.py
@@ -17,7 +17,7 @@ from systembridgemodels.modules import GetData, Module
 import voluptuous as vol
 
 from homeassistant.components import zeroconf
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PORT, CONF_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
@@ -124,7 +124,6 @@ class SystemBridgeConfigFlow(
         """Initialize flow."""
         self._name: str | None = None
         self._input: dict[str, Any] = {}
-        self._reauth = False
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
@@ -157,15 +156,13 @@ class SystemBridgeConfigFlow(
             user_input = {**self._input, **user_input}
             errors, info = await _async_get_info(self.hass, user_input)
             if not errors and info is not None:
-                # Check if already configured
-                existing_entry = await self.async_set_unique_id(info["uuid"])
+                await self.async_set_unique_id(info["uuid"])
 
-                if self._reauth and existing_entry:
-                    self.hass.config_entries.async_update_entry(
-                        existing_entry, data=user_input
+                if self.source == SOURCE_REAUTH:
+                    self._abort_if_unique_id_mismatch()
+                    return self.async_update_reload_and_abort(
+                        self._get_reauth_entry(), data=user_input
                     )
-                    await self.hass.config_entries.async_reload(existing_entry.entry_id)
-                    return self.async_abort(reason="reauth_successful")
 
                 self._abort_if_unique_id_configured(
                     updates={CONF_HOST: info["hostname"]}
@@ -212,7 +209,6 @@ class SystemBridgeConfigFlow(
             CONF_HOST: entry_data[CONF_HOST],
             CONF_PORT: entry_data[CONF_PORT],
         }
-        self._reauth = True
         return await self.async_step_authenticate()
 
 
diff --git a/homeassistant/components/system_bridge/strings.json b/homeassistant/components/system_bridge/strings.json
index b5ceba9bd84..ef7495ef74f 100644
--- a/homeassistant/components/system_bridge/strings.json
+++ b/homeassistant/components/system_bridge/strings.json
@@ -3,6 +3,7 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
+      "unique_id_mismatch": "The identifier does not match the previous identifier",
       "unsupported_version": "Your version of System Bridge is not supported. Please upgrade to the latest version.",
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },