From 07bc9f64778ced18c6b2cd074ad991c9d78c4f65 Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Thu, 3 Oct 2024 19:44:44 +0200
Subject: [PATCH] Use reauth helpers in dormakaba_dkey config flow (#127446)

---
 .../components/dormakaba_dkey/config_flow.py   | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/homeassistant/components/dormakaba_dkey/config_flow.py b/homeassistant/components/dormakaba_dkey/config_flow.py
index 21efc090573..0d23b822231 100644
--- a/homeassistant/components/dormakaba_dkey/config_flow.py
+++ b/homeassistant/components/dormakaba_dkey/config_flow.py
@@ -15,12 +15,7 @@ from homeassistant.components.bluetooth import (
     async_discovered_service_info,
     async_last_service_info,
 )
-from homeassistant.config_entries import (
-    SOURCE_REAUTH,
-    ConfigEntry,
-    ConfigFlow,
-    ConfigFlowResult,
-)
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_ADDRESS
 
 from .const import CONF_ASSOCIATION_DATA, DOMAIN
@@ -39,8 +34,6 @@ class DormkabaConfigFlow(ConfigFlow, domain=DOMAIN):
 
     VERSION = 1
 
-    _reauth_entry: ConfigEntry
-
     def __init__(self) -> None:
         """Initialize the config flow."""
         self._lock: DKEYLock | None = None
@@ -126,7 +119,6 @@ class DormkabaConfigFlow(ConfigFlow, domain=DOMAIN):
         self, entry_data: Mapping[str, Any]
     ) -> ConfigFlowResult:
         """Handle reauthorization request."""
-        self._reauth_entry = self._get_reauth_entry()
         return await self.async_step_reauth_confirm()
 
     async def async_step_reauth_confirm(
@@ -138,7 +130,7 @@ class DormkabaConfigFlow(ConfigFlow, domain=DOMAIN):
         if user_input is not None:
             if (
                 discovery_info := async_last_service_info(
-                    self.hass, self._reauth_entry.data[CONF_ADDRESS], True
+                    self.hass, self._get_reauth_entry().data[CONF_ADDRESS], True
                 )
             ) is None:
                 errors = {"base": "no_longer_in_range"}
@@ -185,11 +177,9 @@ class DormkabaConfigFlow(ConfigFlow, domain=DOMAIN):
                 CONF_ASSOCIATION_DATA: association_data.to_json(),
             }
             if self.source == SOURCE_REAUTH:
-                self.hass.config_entries.async_update_entry(
-                    self._reauth_entry, data=data
+                return self.async_update_reload_and_abort(
+                    self._get_reauth_entry(), data=data
                 )
-                await self.hass.config_entries.async_reload(self._reauth_entry.entry_id)
-                return self.async_abort(reason="reauth_successful")
 
             return self.async_create_entry(
                 title=lock.device_info.device_name