From 6bfed5c98cc9ea71c376fc58f2e9d544217ed7a8 Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Sun, 20 Oct 2024 23:52:37 +0200
Subject: [PATCH] Use new reauth helpers in yale_smart_alarm (#128836)

---
 .../yale_smart_alarm/config_flow.py           | 23 +++++--------------
 .../components/yale_smart_alarm/strings.json  |  5 +---
 .../yale_smart_alarm/test_config_flow.py      |  3 ---
 3 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/homeassistant/components/yale_smart_alarm/config_flow.py b/homeassistant/components/yale_smart_alarm/config_flow.py
index 644160a8d93e67..7b68a1f5dab9b2 100644
--- a/homeassistant/components/yale_smart_alarm/config_flow.py
+++ b/homeassistant/components/yale_smart_alarm/config_flow.py
@@ -40,7 +40,6 @@
 
 DATA_SCHEMA_AUTH = vol.Schema(
     {
-        vol.Required(CONF_USERNAME): cv.string,
         vol.Required(CONF_PASSWORD): cv.string,
     }
 )
@@ -51,8 +50,6 @@ class YaleConfigFlow(ConfigFlow, domain=DOMAIN):
 
     VERSION = 2
 
-    entry: ConfigEntry | None
-
     @staticmethod
     @callback
     def async_get_options_flow(config_entry: ConfigEntry) -> YaleOptionsFlowHandler:
@@ -63,7 +60,6 @@ async def async_step_reauth(
         self, entry_data: Mapping[str, Any]
     ) -> ConfigFlowResult:
         """Handle initiation of re-authentication with Yale."""
-        self.entry = self.hass.config_entries.async_get_entry(self.context["entry_id"])
         return await self.async_step_reauth_confirm()
 
     async def async_step_reauth_confirm(
@@ -73,7 +69,8 @@ async def async_step_reauth_confirm(
         errors = {}
 
         if user_input is not None:
-            username = user_input[CONF_USERNAME]
+            reauth_entry = self._get_reauth_entry()
+            username = reauth_entry.data[CONF_USERNAME]
             password = user_input[CONF_PASSWORD]
 
             try:
@@ -88,18 +85,10 @@ async def async_step_reauth_confirm(
                 errors = {"base": "cannot_connect"}
 
             if not errors:
-                existing_entry = await self.async_set_unique_id(username)
-                if existing_entry and self.entry:
-                    self.hass.config_entries.async_update_entry(
-                        existing_entry,
-                        data={
-                            **self.entry.data,
-                            CONF_USERNAME: username,
-                            CONF_PASSWORD: password,
-                        },
-                    )
-                    await self.hass.config_entries.async_reload(existing_entry.entry_id)
-                    return self.async_abort(reason="reauth_successful")
+                return self.async_update_reload_and_abort(
+                    reauth_entry,
+                    data_updates={CONF_PASSWORD: password},
+                )
 
         return self.async_show_form(
             step_id="reauth_confirm",
diff --git a/homeassistant/components/yale_smart_alarm/strings.json b/homeassistant/components/yale_smart_alarm/strings.json
index 8bade77f5f6bea..cc837d7b7d7443 100644
--- a/homeassistant/components/yale_smart_alarm/strings.json
+++ b/homeassistant/components/yale_smart_alarm/strings.json
@@ -19,10 +19,7 @@
       },
       "reauth_confirm": {
         "data": {
-          "username": "[%key:common::config_flow::data::username%]",
-          "password": "[%key:common::config_flow::data::password%]",
-          "name": "[%key:common::config_flow::data::name%]",
-          "area_id": "[%key:component::yale_smart_alarm::config::step::user::data::area_id%]"
+          "password": "[%key:common::config_flow::data::password%]"
         }
       }
     }
diff --git a/tests/components/yale_smart_alarm/test_config_flow.py b/tests/components/yale_smart_alarm/test_config_flow.py
index d5651503768583..e325e259806f78 100644
--- a/tests/components/yale_smart_alarm/test_config_flow.py
+++ b/tests/components/yale_smart_alarm/test_config_flow.py
@@ -149,7 +149,6 @@ async def test_reauth_flow(hass: HomeAssistant) -> None:
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             {
-                "username": "test-username",
                 "password": "new-test-password",
             },
         )
@@ -203,7 +202,6 @@ async def test_reauth_flow_error(
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             {
-                "username": "test-username",
                 "password": "wrong-password",
             },
         )
@@ -226,7 +224,6 @@ async def test_reauth_flow_error(
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],
             {
-                "username": "test-username",
                 "password": "new-test-password",
             },
         )