From be3a883c512158d07f1ddad3c277b8118fa48303 Mon Sep 17 00:00:00 2001
From: Erik Montnemery <erik@montnemery.com>
Date: Thu, 3 Oct 2024 09:13:41 +0200
Subject: [PATCH] Store awair flow data in flow handler attributes (#127381)

---
 homeassistant/components/awair/config_flow.py | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/awair/config_flow.py b/homeassistant/components/awair/config_flow.py
index a6efc3640f9..8b40eacbafc 100644
--- a/homeassistant/components/awair/config_flow.py
+++ b/homeassistant/components/awair/config_flow.py
@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
-from typing import Any
+from typing import Any, Self, cast
 
 from aiohttp.client_exceptions import ClientError
 from python_awair import Awair, AwairLocal, AwairLocalDevice
@@ -26,16 +26,17 @@ class AwairFlowHandler(ConfigFlow, domain=DOMAIN):
     VERSION = 1
 
     _device: AwairLocalDevice
+    host: str
 
     async def async_step_zeroconf(
         self, discovery_info: zeroconf.ZeroconfServiceInfo
     ) -> ConfigFlowResult:
         """Handle zeroconf discovery."""
 
-        host = discovery_info.host
-        LOGGER.debug("Discovered device: %s", host)
+        self.host = discovery_info.host
+        LOGGER.debug("Discovered device: %s", self.host)
 
-        self._device, _ = await self._check_local_connection(host)
+        self._device, _ = await self._check_local_connection(self.host)
 
         if self._device is not None:
             await self.async_set_unique_id(self._device.mac_address)
@@ -45,7 +46,6 @@ class AwairFlowHandler(ConfigFlow, domain=DOMAIN):
             )
             self.context.update(
                 {
-                    "host": host,
                     "title_placeholders": {
                         "model": self._device.model,
                         "device_id": self._device.device_id,
@@ -119,12 +119,16 @@ class AwairFlowHandler(ConfigFlow, domain=DOMAIN):
     def _get_discovered_entries(self) -> dict[str, str]:
         """Get discovered entries."""
         entries: dict[str, str] = {}
-        for flow in self._async_in_progress():
-            if flow["context"]["source"] == SOURCE_ZEROCONF:
-                info = flow["context"]["title_placeholders"]
-                entries[flow["context"]["host"]] = (
-                    f"{info['model']} ({info['device_id']})"
-                )
+
+        flows = cast(
+            set[Self],
+            self.hass.config_entries.flow._handler_progress_index.get(DOMAIN) or set(),  # noqa: SLF001
+        )
+        for flow in flows:
+            if flow.source != SOURCE_ZEROCONF:
+                continue
+            info = flow.context["title_placeholders"]
+            entries[flow.host] = f"{info['model']} ({info['device_id']})"
         return entries
 
     async def async_step_local(