Fix reauth config flow title

homeassistant/components/aosmith/config_flow.py

@@ -10,7 +10,7 @@
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
+from homeassistant.const import CONF_EMAIL, CONF_NAME, CONF_PASSWORD
 from homeassistant.helpers import aiohttp_client
 
 from .const import DOMAIN
@@ -99,6 +99,9 @@ async def async_step_reauth_confirm(
         return self.async_show_form(
             step_id="reauth_confirm",
             data_schema=vol.Schema({vol.Required(CONF_PASSWORD): str}),
-            description_placeholders={CONF_EMAIL: self._reauth_email},
+            description_placeholders={
+                CONF_EMAIL: self._reauth_email,
+                CONF_NAME: self._get_reauth_entry().title,
+            },
             errors=errors,
         )

homeassistant/components/aussie_broadband/config_flow.py

@@ -11,7 +11,7 @@
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import CONF_SERVICES, DOMAIN
@@ -105,7 +105,10 @@ async def async_step_reauth_confirm(
 
         return self.async_show_form(
             step_id="reauth_confirm",
-            description_placeholders={"username": self._reauth_username},
+            description_placeholders={
+                CONF_NAME: self._get_reauth_entry().title,
+                CONF_USERNAME: self._reauth_username,
+            },
             data_schema=vol.Schema(
                 {
                     vol.Required(CONF_PASSWORD): str,

homeassistant/components/bosch_shc/config_flow.py

@@ -18,7 +18,7 @@
 
 from homeassistant.components import zeroconf
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_TOKEN
+from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_TOKEN
 from homeassistant.core import HomeAssistant
 
 from .const import (
@@ -108,6 +108,7 @@ async def async_step_reauth_confirm(
             return self.async_show_form(
                 step_id="reauth_confirm",
                 data_schema=HOST_SCHEMA,
+                description_placeholders={CONF_NAME: self._get_reauth_entry().title},
             )
         self.host = user_input[CONF_HOST]
         self.info = await self._get_info(self.host)

homeassistant/components/caldav/config_flow.py

@@ -10,7 +10,13 @@
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME, CONF_VERIFY_SSL
+from homeassistant.const import (
+    CONF_NAME,
+    CONF_PASSWORD,
+    CONF_URL,
+    CONF_USERNAME,
+    CONF_VERIFY_SSL,
+)
 from homeassistant.helpers import config_validation as cv
 
 from .const import DOMAIN
@@ -107,14 +113,15 @@ async def async_step_reauth_confirm(
                 return self.async_update_reload_and_abort(reauth_entry, data=user_input)
 
         return self.async_show_form(
-            description_placeholders={
-                CONF_USERNAME: reauth_entry.data[CONF_USERNAME],
-            },
             step_id="reauth_confirm",
             data_schema=vol.Schema(
                 {
                     vol.Required(CONF_PASSWORD): str,
                 }
             ),
+            description_placeholders={
+                CONF_NAME: reauth_entry.title,
+                CONF_USERNAME: reauth_entry.data[CONF_USERNAME],
+            },
             errors=errors,
         )

homeassistant/components/electric_kiwi/config_flow.py

@@ -7,6 +7,7 @@
 from typing import Any
 
 from homeassistant.config_entries import ConfigFlowResult
+from homeassistant.const import CONF_NAME
 from homeassistant.helpers import config_entry_oauth2_flow
 
 from .const import DOMAIN, SCOPE_VALUES
@@ -40,7 +41,10 @@ async def async_step_reauth_confirm(
     ) -> ConfigFlowResult:
         """Dialog that informs the user that reauth is required."""
         if user_input is None:
-            return self.async_show_form(step_id="reauth_confirm")
+            return self.async_show_form(
+                step_id="reauth_confirm",
+                description_placeholders={CONF_NAME: self._get_reauth_entry().title},
+            )
         return await self.async_step_user()
 
     async def async_oauth_create_entry(self, data: dict) -> ConfigFlowResult:

homeassistant/components/ezviz/config_flow.py

@@ -26,6 +26,7 @@
 from homeassistant.const import (
     CONF_CUSTOMIZE,
     CONF_IP_ADDRESS,
+    CONF_NAME,
     CONF_PASSWORD,
     CONF_TIMEOUT,
     CONF_TYPE,
@@ -384,6 +385,7 @@ async def async_step_reauth_confirm(
         return self.async_show_form(
             step_id="reauth_confirm",
             data_schema=data_schema,
+            description_placeholders={CONF_NAME: self._get_reauth_entry().title},
             errors=errors,
         )
 

homeassistant/components/fitbit/config_flow.py

@@ -5,7 +5,7 @@
 from typing import Any
 
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
-from homeassistant.const import CONF_TOKEN
+from homeassistant.const import CONF_NAME, CONF_TOKEN
 from homeassistant.helpers import config_entry_oauth2_flow
 
 from . import api
@@ -46,7 +46,10 @@ async def async_step_reauth_confirm(
     ) -> ConfigFlowResult:
         """Confirm reauth dialog."""
         if user_input is None:
-            return self.async_show_form(step_id="reauth_confirm")
+            return self.async_show_form(
+                step_id="reauth_confirm",
+                description_placeholders={CONF_NAME: self._get_reauth_entry().title},
+            )
         return await self.async_step_user()
 
     async def async_step_creation(

homeassistant/components/geocaching/config_flow.py

@@ -9,6 +9,7 @@
 from geocachingapi.geocachingapi import GeocachingApi
 
 from homeassistant.config_entries import ConfigFlowResult
+from homeassistant.const import CONF_NAME
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.config_entry_oauth2_flow import AbstractOAuth2FlowHandler
 
@@ -37,7 +38,10 @@ async def async_step_reauth_confirm(
     ) -> ConfigFlowResult:
         """Dialog that informs the user that reauth is required."""
         if user_input is None:
-            return self.async_show_form(step_id="reauth_confirm")
+            return self.async_show_form(
+                step_id="reauth_confirm",
+                description_placeholders={CONF_NAME: self._get_reauth_entry().title},
+            )
         return await self.async_step_user()
 
     async def async_oauth_create_entry(self, data: dict[str, Any]) -> ConfigFlowResult:

homeassistant/components/google/config_flow.py

@@ -17,6 +17,7 @@
     ConfigFlowResult,
     OptionsFlow,
 )
+from homeassistant.const import CONF_NAME
 from homeassistant.core import callback
 from homeassistant.helpers import config_entry_oauth2_flow
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -229,7 +230,10 @@ async def async_step_reauth_confirm(
     ) -> ConfigFlowResult:
         """Confirm reauth dialog."""
         if user_input is None:
-            return self.async_show_form(step_id="reauth_confirm")
+            return self.async_show_form(
+                step_id="reauth_confirm",
+                description_placeholders={CONF_NAME: self._get_reauth_entry().title},
+            )
         return await self.async_step_user()
 
     @staticmethod

homeassistant/components/google_assistant_sdk/config_flow.py

@@ -14,6 +14,7 @@
     ConfigFlowResult,
     OptionsFlow,
 )
+from homeassistant.const import CONF_NAME
 from homeassistant.core import callback
 from homeassistant.helpers import config_entry_oauth2_flow
 
@@ -56,7 +57,10 @@ async def async_step_reauth_confirm(
     ) -> ConfigFlowResult:
         """Confirm reauth dialog."""
         if user_input is None:
-            return self.async_show_form(step_id="reauth_confirm")
+            return self.async_show_form(
+                step_id="reauth_confirm",
+                description_placeholders={CONF_NAME: self._get_reauth_entry().title},
+            )
         return await self.async_step_user()
 
     async def async_oauth_create_entry(self, data: dict[str, Any]) -> ConfigFlowResult:

homeassistant/components/google_mail/config_flow.py

@@ -10,7 +10,7 @@
 from googleapiclient.discovery import build
 
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
+from homeassistant.const import CONF_ACCESS_TOKEN, CONF_NAME, CONF_TOKEN
 from homeassistant.helpers import config_entry_oauth2_flow
 
 from .const import DEFAULT_ACCESS, DOMAIN
@@ -49,7 +49,10 @@ async def async_step_reauth_confirm(
     ) -> ConfigFlowResult:
         """Confirm reauth dialog."""
         if user_input is None:
-            return self.async_show_form(step_id="reauth_confirm")
+            return self.async_show_form(
+                step_id="reauth_confirm",
+                description_placeholders={CONF_NAME: self._get_reauth_entry().title},
+            )
         return await self.async_step_user()
 
     async def async_oauth_create_entry(self, data: dict[str, Any]) -> ConfigFlowResult:

homeassistant/components/google_sheets/config_flow.py

@@ -10,7 +10,7 @@
 from gspread import Client, GSpreadException
 
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
+from homeassistant.const import CONF_ACCESS_TOKEN, CONF_NAME, CONF_TOKEN
 from homeassistant.helpers import config_entry_oauth2_flow
 
 from .const import DEFAULT_ACCESS, DEFAULT_NAME, DOMAIN
@@ -51,7 +51,10 @@ async def async_step_reauth_confirm(
     ) -> ConfigFlowResult:
         """Confirm reauth dialog."""
         if user_input is None:
-            return self.async_show_form(step_id="reauth_confirm")
+            return self.async_show_form(
+                step_id="reauth_confirm",
+                description_placeholders={CONF_NAME: self._get_reauth_entry().title},
+            )
         return await self.async_step_user()
 
     async def async_oauth_create_entry(self, data: dict[str, Any]) -> ConfigFlowResult:

homeassistant/components/huawei_lte/config_flow.py

@@ -121,6 +121,7 @@ async def _async_show_reauth_form(
                     ): str,
                 }
             ),
+            description_placeholders={CONF_NAME: self._get_reauth_entry().title},
             errors=errors or {},
         )
 

homeassistant/components/icloud/config_flow.py

@@ -17,7 +17,7 @@
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers.storage import Store
 
 from .const import (
@@ -196,7 +196,10 @@ async def async_step_reauth_confirm(
     ) -> ConfigFlowResult:
         """Update password for a config entry that can't authenticate."""
         if user_input is None:
-            return self._show_setup_form(step_id="reauth_confirm")
+            return self.async_show_form(
+                step_id="reauth_confirm",
+                description_placeholders={CONF_NAME: self._get_reauth_entry().title},
+            )
 
         return await self._validate_and_create_entry(user_input, "reauth_confirm")
 

homeassistant/components/jellyfin/config_flow.py

@@ -13,7 +13,7 @@
     ConfigFlowResult,
     OptionsFlowWithConfigEntry,
 )
-from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME
+from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_URL, CONF_USERNAME
 from homeassistant.core import callback
 from homeassistant.util.uuid import random_uuid_hex
 
@@ -115,8 +115,8 @@ async def async_step_reauth_confirm(
         """Dialog that informs the user that reauth is required."""
         errors: dict[str, str] = {}
 
+        reauth_entry = self._get_reauth_entry()
         if user_input is not None:
-            reauth_entry = self._get_reauth_entry()
             new_input = reauth_entry.data | user_input
 
             if self.client_device_id is None:
@@ -136,7 +136,10 @@ async def async_step_reauth_confirm(
                 return self.async_update_reload_and_abort(reauth_entry, data=new_input)
 
         return self.async_show_form(
-            step_id="reauth_confirm", data_schema=REAUTH_DATA_SCHEMA, errors=errors
+            step_id="reauth_confirm",
+            data_schema=REAUTH_DATA_SCHEMA,
+            description_placeholders={CONF_NAME: reauth_entry.title},
+            errors=errors,
         )
 
     @staticmethod

homeassistant/components/jvc_projector/config_flow.py

@@ -10,7 +10,7 @@
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT
+from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_PORT
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.util.network import is_host_valid
 
@@ -83,8 +83,8 @@ async def async_step_reauth_confirm(
         """Dialog that informs the user that reauth is required."""
         errors = {}
 
+        reauth_entry = self._get_reauth_entry()
         if user_input is not None:
-            reauth_entry = self._get_reauth_entry()
             host = reauth_entry.data[CONF_HOST]
             port = reauth_entry.data[CONF_PORT]
             password = user_input[CONF_PASSWORD]
@@ -103,6 +103,7 @@ async def async_step_reauth_confirm(
         return self.async_show_form(
             step_id="reauth_confirm",
             data_schema=vol.Schema({vol.Optional(CONF_PASSWORD): str}),
+            description_placeholders={CONF_NAME: reauth_entry.title},
             errors=errors,
         )
 

homeassistant/components/laundrify/config_flow.py

@@ -15,7 +15,7 @@
 from voluptuous import Required, Schema
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_CODE
+from homeassistant.const import CONF_ACCESS_TOKEN, CONF_CODE, CONF_NAME
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN
@@ -92,5 +92,6 @@ async def async_step_reauth_confirm(
             return self.async_show_form(
                 step_id="reauth_confirm",
                 data_schema=Schema({}),
+                description_placeholders={CONF_NAME: self._get_reauth_entry().title},
             )
         return await self.async_step_init()

homeassistant/components/lidarr/config_flow.py

@@ -11,7 +11,7 @@
 import voluptuous as vol
 
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_API_KEY, CONF_URL, CONF_VERIFY_SSL
+from homeassistant.const import CONF_API_KEY, CONF_NAME, CONF_URL, CONF_VERIFY_SSL
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
@@ -37,7 +37,10 @@ async def async_step_reauth_confirm(
             return await self.async_step_user()
 
         self._set_confirm_only()
-        return self.async_show_form(step_id="reauth_confirm")
+        return self.async_show_form(
+            step_id="reauth_confirm",
+            description_placeholders={CONF_NAME: self._get_reauth_entry().title},
+        )
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None

homeassistant/components/litterrobot/config_flow.py

@@ -11,7 +11,7 @@
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN
@@ -53,7 +53,10 @@ async def async_step_reauth_confirm(
         return self.async_show_form(
             step_id="reauth_confirm",
             data_schema=vol.Schema({vol.Required(CONF_PASSWORD): str}),
-            description_placeholders={CONF_USERNAME: self.username},
+            description_placeholders={
+                CONF_NAME: self._get_reauth_entry().title,
+                CONF_USERNAME: self.username,
+            },
             errors=errors,
         )