Use reauth helpers in renault (#131147)

homeassistant/components/renault/config_flow.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
-from typing import TYPE_CHECKING, Any
+from typing import Any
 
 from renault_api.const import AVAILABLE_LOCALES
 import voluptuous as vol
@@ -14,6 +14,15 @@ from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from .const import CONF_KAMEREON_ACCOUNT_ID, CONF_LOCALE, DOMAIN
 from .renault_hub import RenaultHub
 
+USER_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_LOCALE): vol.In(AVAILABLE_LOCALES.keys()),
+        vol.Required(CONF_USERNAME): str,
+        vol.Required(CONF_PASSWORD): str,
+    }
+)
+REAUTH_SCHEMA = vol.Schema({vol.Required(CONF_PASSWORD): str})
+
 
 class RenaultFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a Renault config flow."""
@@ -22,7 +31,6 @@ class RenaultFlowHandler(ConfigFlow, domain=DOMAIN):
 
     def __init__(self) -> None:
         """Initialize the Renault config flow."""
-        self._original_data: Mapping[str, Any] | None = None
         self.renault_config: dict[str, Any] = {}
         self.renault_hub: RenaultHub | None = None
 
@@ -49,13 +57,7 @@ class RenaultFlowHandler(ConfigFlow, domain=DOMAIN):
         """Show the API keys form."""
         return self.async_show_form(
             step_id="user",
-            data_schema=vol.Schema(
-                {
-                    vol.Required(CONF_LOCALE): vol.In(AVAILABLE_LOCALES.keys()),
-                    vol.Required(CONF_USERNAME): str,
-                    vol.Required(CONF_PASSWORD): str,
-                }
-            ),
+            data_schema=USER_SCHEMA,
             errors=errors or {},
         )
 
@@ -97,48 +99,29 @@ class RenaultFlowHandler(ConfigFlow, domain=DOMAIN):
         self, entry_data: Mapping[str, Any]
     ) -> ConfigFlowResult:
         """Perform reauth upon an API authentication error."""
-        self._original_data = entry_data
         return await self.async_step_reauth_confirm()
 
     async def async_step_reauth_confirm(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Dialog that informs the user that reauth is required."""
-        if not user_input:
-            return self._show_reauth_confirm_form()
+        errors: dict[str, str] = {}
+        reauth_entry = self._get_reauth_entry()
+        if user_input:
+            # Check credentials
+            self.renault_hub = RenaultHub(self.hass, reauth_entry.data[CONF_LOCALE])
+            if await self.renault_hub.attempt_login(
+                reauth_entry.data[CONF_USERNAME], user_input[CONF_PASSWORD]
+            ):
+                return self.async_update_reload_and_abort(
+                    reauth_entry,
+                    data_updates={CONF_PASSWORD: user_input[CONF_PASSWORD]},
+                )
+            errors = {"base": "invalid_credentials"}
 
-        if TYPE_CHECKING:
-            assert self._original_data
-
-        # Check credentials
-        self.renault_hub = RenaultHub(self.hass, self._original_data[CONF_LOCALE])
-        if not await self.renault_hub.attempt_login(
-            self._original_data[CONF_USERNAME], user_input[CONF_PASSWORD]
-        ):
-            return self._show_reauth_confirm_form({"base": "invalid_credentials"})
-
-        # Update existing entry
-        data = {**self._original_data, CONF_PASSWORD: user_input[CONF_PASSWORD]}
-        existing_entry = await self.async_set_unique_id(
-            self._original_data[CONF_KAMEREON_ACCOUNT_ID]
-        )
-        if TYPE_CHECKING:
-            assert existing_entry
-        self.hass.config_entries.async_update_entry(existing_entry, data=data)
-        await self.hass.config_entries.async_reload(existing_entry.entry_id)
-        return self.async_abort(reason="reauth_successful")
-
-    def _show_reauth_confirm_form(
-        self, errors: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Show the API keys form."""
-        if TYPE_CHECKING:
-            assert self._original_data
         return self.async_show_form(
             step_id="reauth_confirm",
-            data_schema=vol.Schema({vol.Required(CONF_PASSWORD): str}),
+            data_schema=REAUTH_SCHEMA,
             errors=errors or {},
-            description_placeholders={
-                CONF_USERNAME: self._original_data[CONF_USERNAME]
-            },
+            description_placeholders={CONF_USERNAME: reauth_entry.data[CONF_USERNAME]},
         )

tests/components/renault/test_config_flow.py

@@ -256,3 +256,6 @@ async def test_reauth(hass: HomeAssistant, config_entry: MockConfigEntry) -> Non
 
     assert result3["type"] is FlowResultType.ABORT
     assert result3["reason"] == "reauth_successful"
+
+    assert config_entry.data[CONF_USERNAME] == "email@test.com"
+    assert config_entry.data[CONF_PASSWORD] == "any"