homeassistant 2025.8.0b3__py3-none-any.whl → 2025.8.0b4__py3-none-any.whl

homeassistant/components/opower/config_flow.py

@@ -9,6 +9,8 @@ from typing import Any
 from opower import (
     CannotConnect,
     InvalidAuth,
+    MfaChallenge,
+    MfaHandlerBase,
     Opower,
     create_cookie_jar,
     get_supported_utility_names,
@@ -16,49 +18,34 @@ from opower import (
 )
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
 from homeassistant.helpers.typing import VolDictType
 
-from .const import CONF_TOTP_SECRET, CONF_UTILITY, DOMAIN
+from .const import CONF_LOGIN_DATA, CONF_TOTP_SECRET, CONF_UTILITY, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
-
-STEP_USER_DATA_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_UTILITY): vol.In(get_supported_utility_names()),
-        vol.Required(CONF_USERNAME): str,
-        vol.Required(CONF_PASSWORD): str,
-    }
-)
+CONF_MFA_CODE = "mfa_code"
+CONF_MFA_METHOD = "mfa_method"
 
 
 async def _validate_login(
-    hass: HomeAssistant, login_data: dict[str, str]
-) -> dict[str, str]:
-    """Validate login data and return any errors."""
+    hass: HomeAssistant,
+    data: Mapping[str, Any],
+) -> None:
+    """Validate login data and raise exceptions on failure."""
     api = Opower(
         async_create_clientsession(hass, cookie_jar=create_cookie_jar()),
-        login_data[CONF_UTILITY],
-        login_data[CONF_USERNAME],
-        login_data[CONF_PASSWORD],
-        login_data.get(CONF_TOTP_SECRET),
+        data[CONF_UTILITY],
+        data[CONF_USERNAME],
+        data[CONF_PASSWORD],
+        data.get(CONF_TOTP_SECRET),
+        data.get(CONF_LOGIN_DATA),
     )
-    errors: dict[str, str] = {}
-    try:
-        await api.async_login()
-    except InvalidAuth:
-        _LOGGER.exception(
-            "Invalid auth when connecting to %s", login_data[CONF_UTILITY]
-        )
-        errors["base"] = "invalid_auth"
-    except CannotConnect:
-        _LOGGER.exception("Could not connect to %s", login_data[CONF_UTILITY])
-        errors["base"] = "cannot_connect"
-    return errors
+    await api.async_login()
 
 
 class OpowerConfigFlow(ConfigFlow, domain=DOMAIN):
@@ -68,81 +55,147 @@ class OpowerConfigFlow(ConfigFlow, domain=DOMAIN):
 
     def __init__(self) -> None:
         """Initialize a new OpowerConfigFlow."""
-        self.utility_info: dict[str, Any] | None = None
+        self._data: dict[str, Any] = {}
+        self.mfa_handler: MfaHandlerBase | None = None
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Handle the initial step."""
+        """Handle the initial step (select utility)."""
+        if user_input is not None:
+            self._data[CONF_UTILITY] = user_input[CONF_UTILITY]
+            return await self.async_step_credentials()
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=vol.Schema(
+                {vol.Required(CONF_UTILITY): vol.In(get_supported_utility_names())}
+            ),
+        )
+
+    async def async_step_credentials(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle credentials step."""
         errors: dict[str, str] = {}
+        utility = select_utility(self._data[CONF_UTILITY])
+
         if user_input is not None:
+            self._data.update(user_input)
+
             self._async_abort_entries_match(
                 {
-                    CONF_UTILITY: user_input[CONF_UTILITY],
-                    CONF_USERNAME: user_input[CONF_USERNAME],
+                    CONF_UTILITY: self._data[CONF_UTILITY],
+                    CONF_USERNAME: self._data[CONF_USERNAME],
                 }
             )
-            if select_utility(user_input[CONF_UTILITY]).accepts_mfa():
-                self.utility_info = user_input
-                return await self.async_step_mfa()
 
-            errors = await _validate_login(self.hass, user_input)
-            if not errors:
-                return self._async_create_opower_entry(user_input)
-        else:
-            user_input = {}
-        user_input.pop(CONF_PASSWORD, None)
+            try:
+                await _validate_login(self.hass, self._data)
+            except MfaChallenge as exc:
+                self.mfa_handler = exc.handler
+                return await self.async_step_mfa_options()
+            except InvalidAuth:
+                errors["base"] = "invalid_auth"
+            except CannotConnect:
+                errors["base"] = "cannot_connect"
+            else:
+                return self._async_create_opower_entry(self._data)
+
+        schema_dict: VolDictType = {
+            vol.Required(CONF_USERNAME): str,
+            vol.Required(CONF_PASSWORD): str,
+        }
+        if utility.accepts_totp_secret():
+            schema_dict[vol.Optional(CONF_TOTP_SECRET)] = str
+
         return self.async_show_form(
-            step_id="user",
+            step_id="credentials",
             data_schema=self.add_suggested_values_to_schema(
-                STEP_USER_DATA_SCHEMA, user_input
+                vol.Schema(schema_dict), user_input
             ),
             errors=errors,
         )
 
-    async def async_step_mfa(
+    async def async_step_mfa_options(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Handle MFA step."""
-        assert self.utility_info is not None
+        """Handle MFA options step."""
         errors: dict[str, str] = {}
+        assert self.mfa_handler is not None
+
         if user_input is not None:
-            data = {**self.utility_info, **user_input}
-            errors = await _validate_login(self.hass, data)
-            if not errors:
-                return self._async_create_opower_entry(data)
-
-        if errors:
-            schema = {
-                vol.Required(
-                    CONF_USERNAME, default=self.utility_info[CONF_USERNAME]
-                ): str,
-                vol.Required(CONF_PASSWORD): str,
-            }
-        else:
-            schema = {}
+            method = user_input[CONF_MFA_METHOD]
+            try:
+                await self.mfa_handler.async_select_mfa_option(method)
+            except CannotConnect:
+                errors["base"] = "cannot_connect"
+            else:
+                return await self.async_step_mfa_code()
+
+        mfa_options = await self.mfa_handler.async_get_mfa_options()
+        if not mfa_options:
+            return await self.async_step_mfa_code()
+        return self.async_show_form(
+            step_id="mfa_options",
+            data_schema=self.add_suggested_values_to_schema(
+                vol.Schema({vol.Required(CONF_MFA_METHOD): vol.In(mfa_options)}),
+                user_input,
+            ),
+            errors=errors,
+        )
 
-        schema[vol.Required(CONF_TOTP_SECRET)] = str
+    async def async_step_mfa_code(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle MFA code submission step."""
+        assert self.mfa_handler is not None
+        errors: dict[str, str] = {}
+        if user_input is not None:
+            code = user_input[CONF_MFA_CODE]
+            try:
+                login_data = await self.mfa_handler.async_submit_mfa_code(code)
+            except InvalidAuth:
+                errors["base"] = "invalid_mfa_code"
+            except CannotConnect:
+                errors["base"] = "cannot_connect"
+            else:
+                self._data[CONF_LOGIN_DATA] = login_data
+                if self.source == SOURCE_REAUTH:
+                    return self.async_update_reload_and_abort(
+                        self._get_reauth_entry(), data=self._data
+                    )
+                return self._async_create_opower_entry(self._data)
 
         return self.async_show_form(
-            step_id="mfa",
-            data_schema=vol.Schema(schema),
+            step_id="mfa_code",
+            data_schema=self.add_suggested_values_to_schema(
+                vol.Schema({vol.Required(CONF_MFA_CODE): str}), user_input
+            ),
             errors=errors,
         )
 
     @callback
-    def _async_create_opower_entry(self, data: dict[str, Any]) -> ConfigFlowResult:
+    def _async_create_opower_entry(
+        self, data: dict[str, Any], **kwargs: Any
+    ) -> ConfigFlowResult:
         """Create the config entry."""
         return self.async_create_entry(
             title=f"{data[CONF_UTILITY]} ({data[CONF_USERNAME]})",
             data=data,
+            **kwargs,
         )
 
     async def async_step_reauth(
         self, entry_data: Mapping[str, Any]
     ) -> ConfigFlowResult:
         """Handle configuration by re-auth."""
-        return await self.async_step_reauth_confirm()
+        reauth_entry = self._get_reauth_entry()
+        self._data = dict(reauth_entry.data)
+        return self.async_show_form(
+            step_id="reauth_confirm",
+            description_placeholders={CONF_NAME: reauth_entry.title},
+        )
 
     async def async_step_reauth_confirm(
         self, user_input: dict[str, Any] | None = None
@@ -150,21 +203,34 @@ class OpowerConfigFlow(ConfigFlow, domain=DOMAIN):
         """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:
-            data = {**reauth_entry.data, **user_input}
-            errors = await _validate_login(self.hass, data)
-            if not errors:
-                return self.async_update_reload_and_abort(reauth_entry, data=data)
+            self._data.update(user_input)
+        try:
+            await _validate_login(self.hass, self._data)
+        except MfaChallenge as exc:
+            self.mfa_handler = exc.handler
+            return await self.async_step_mfa_options()
+        except InvalidAuth:
+            errors["base"] = "invalid_auth"
+        except CannotConnect:
+            errors["base"] = "cannot_connect"
+        else:
+            return self.async_update_reload_and_abort(reauth_entry, data=self._data)
 
-        schema: VolDictType = {
-            vol.Required(CONF_USERNAME): reauth_entry.data[CONF_USERNAME],
+        utility = select_utility(self._data[CONF_UTILITY])
+        schema_dict: VolDictType = {
+            vol.Required(CONF_USERNAME): str,
             vol.Required(CONF_PASSWORD): str,
         }
-        if select_utility(reauth_entry.data[CONF_UTILITY]).accepts_mfa():
-            schema[vol.Optional(CONF_TOTP_SECRET)] = str
+        if utility.accepts_totp_secret():
+            schema_dict[vol.Optional(CONF_TOTP_SECRET)] = str
+
         return self.async_show_form(
             step_id="reauth_confirm",
-            data_schema=vol.Schema(schema),
+            data_schema=self.add_suggested_values_to_schema(
+                vol.Schema(schema_dict), self._data
+            ),
             errors=errors,
             description_placeholders={CONF_NAME: reauth_entry.title},
         )

homeassistant/components/opower/const.py

@@ -4,3 +4,4 @@ DOMAIN = "opower"
 
 CONF_UTILITY = "utility"
 CONF_TOTP_SECRET = "totp_secret"
+CONF_LOGIN_DATA = "login_data"

homeassistant/components/opower/coordinator.py

@@ -14,7 +14,7 @@ from opower import (
     ReadResolution,
     create_cookie_jar,
 )
-from opower.exceptions import ApiException, CannotConnect, InvalidAuth
+from opower.exceptions import ApiException, CannotConnect, InvalidAuth, MfaChallenge
 
 from homeassistant.components.recorder import get_instance
 from homeassistant.components.recorder.models import (
@@ -36,7 +36,7 @@ from homeassistant.helpers.aiohttp_client import async_create_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util import dt as dt_util
 
-from .const import CONF_TOTP_SECRET, CONF_UTILITY, DOMAIN
+from .const import CONF_LOGIN_DATA, CONF_TOTP_SECRET, CONF_UTILITY, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -69,6 +69,7 @@ class OpowerCoordinator(DataUpdateCoordinator[dict[str, Forecast]]):
             config_entry.data[CONF_USERNAME],
             config_entry.data[CONF_PASSWORD],
             config_entry.data.get(CONF_TOTP_SECRET),
+            config_entry.data.get(CONF_LOGIN_DATA),
         )
 
         @callback
@@ -90,7 +91,7 @@ class OpowerCoordinator(DataUpdateCoordinator[dict[str, Forecast]]):
             # Given the infrequent updating (every 12h)
             # assume previous session has expired and re-login.
             await self.api.async_login()
-        except InvalidAuth as err:
+        except (InvalidAuth, MfaChallenge) as err:
             _LOGGER.error("Error during login: %s", err)
             raise ConfigEntryAuthFailed from err
         except CannotConnect as err:

homeassistant/components/opower/manifest.json

@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/opower",
   "iot_class": "cloud_polling",
   "loggers": ["opower"],
-  "requirements": ["opower==0.12.4"]
+  "requirements": ["opower==0.15.1"]
 }

homeassistant/components/opower/strings.json

@@ -3,27 +3,43 @@
     "step": {
       "user": {
         "data": {
-          "utility": "Utility name",
-          "username": "[%key:common::config_flow::data::username%]",
-          "password": "[%key:common::config_flow::data::password%]"
+          "utility": "Utility name"
         },
         "data_description": {
-          "utility": "The name of your utility provider",
-          "username": "The username for your utility account",
-          "password": "The password for your utility account"
+          "utility": "The name of your utility provider"
         }
       },
-      "mfa": {
-        "description": "The TOTP secret below is not one of the 6-digit time-based numeric codes. It is a string of around 16 characters containing the shared secret that enables your authenticator app to generate the correct time-based code at the appropriate time. See the documentation.",
+      "credentials": {
+        "title": "Enter Credentials",
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
           "totp_secret": "TOTP secret"
         },
         "data_description": {
-          "username": "[%key:component::opower::config::step::user::data_description::username%]",
-          "password": "[%key:component::opower::config::step::user::data_description::password%]",
-          "totp_secret": "The TOTP secret for your utility account, used for multi-factor authentication (MFA)."
+          "username": "The username for your utility account",
+          "password": "The password for your utility account",
+          "totp_secret": "This is not a 6-digit code. It is a string of around 16 characters containing the shared secret that enables your authenticator app to generate the correct time-based code at the appropriate time. See the documentation."
+        }
+      },
+      "mfa_options": {
+        "title": "Multi-factor authentication",
+        "description": "Your account requires multi-factor authentication (MFA). Select a method to receive your security code.",
+        "data": {
+          "mfa_method": "MFA method"
+        },
+        "data_description": {
+          "mfa_method": "How to receive your security code"
+        }
+      },
+      "mfa_code": {
+        "title": "Enter security code",
+        "description": "A security code has been sent via your selected method. Please enter it below to complete login.",
+        "data": {
+          "mfa_code": "Security code"
+        },
+        "data_description": {
+          "mfa_code": "Typically a 6-digit code"
         }
       },
       "reauth_confirm": {
@@ -31,18 +47,19 @@
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "totp_secret": "[%key:component::opower::config::step::mfa::data::totp_secret%]"
+          "totp_secret": "[%key:component::opower::config::step::credentials::data::totp_secret%]"
         },
         "data_description": {
-          "username": "[%key:component::opower::config::step::user::data_description::username%]",
-          "password": "[%key:component::opower::config::step::user::data_description::password%]",
-          "totp_secret": "The TOTP secret for your utility account, used for multi-factor authentication (MFA)."
+          "username": "[%key:component::opower::config::step::credentials::data_description::username%]",
+          "password": "[%key:component::opower::config::step::credentials::data_description::password%]",
+          "totp_secret": "[%key:component::opower::config::step::credentials::data_description::totp_secret%]"
         }
       }
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "invalid_mfa_code": "The security code is incorrect. Please try again."
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",

homeassistant/components/opower/translations/bg.json

@@ -9,12 +9,6 @@
             "invalid_auth": "\u041d\u0435\u0432\u0430\u043b\u0438\u0434\u043d\u0430 \u0430\u0432\u0442\u0435\u043d\u0442\u0438\u043a\u0430\u0446\u0438\u044f"
         },
         "step": {
-            "mfa": {
-                "data": {
-                    "password": "\u041f\u0430\u0440\u043e\u043b\u0430",
-                    "username": "\u041f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b\u0441\u043a\u043e \u0438\u043c\u0435"
-                }
-            },
             "reauth_confirm": {
                 "data": {
                     "password": "\u041f\u0430\u0440\u043e\u043b\u0430",
@@ -23,10 +17,6 @@
                 "title": "\u0410\u0432\u0442\u0435\u043d\u0442\u0438\u043a\u0430\u0446\u0438\u044f\u0442\u0430 \u0437\u0430 {name} \u0435 \u0438\u0437\u0442\u0435\u043a\u043b\u0430"
             },
             "user": {
-                "data": {
-                    "password": "\u041f\u0430\u0440\u043e\u043b\u0430",
-                    "username": "\u041f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b\u0441\u043a\u043e \u0438\u043c\u0435"
-                },
                 "data_description": {
                     "utility": "The name of your utility provider"
                 }

homeassistant/components/opower/translations/ca.json

@@ -9,12 +9,6 @@
             "invalid_auth": "Autenticaci\u00f3 inv\u00e0lida"
         },
         "step": {
-            "mfa": {
-                "data": {
-                    "password": "Contrasenya",
-                    "username": "Nom d'usuari"
-                }
-            },
             "reauth_confirm": {
                 "data": {
                     "password": "Contrasenya",
@@ -24,8 +18,6 @@
             },
             "user": {
                 "data": {
-                    "password": "Contrasenya",
-                    "username": "Nom d'usuari",
                     "utility": "Nom de la xarxa"
                 }
             }

homeassistant/components/opower/translations/cs.json

@@ -6,10 +6,11 @@
         },
         "error": {
             "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit",
-            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed"
+            "invalid_auth": "Neplatn\u00e9 ov\u011b\u0159en\u00ed",
+            "invalid_mfa_code": "Bezpe\u010dnostn\u00ed k\u00f3d je nespr\u00e1vn\u00fd. Zkuste to znovu."
         },
         "step": {
-            "mfa": {
+            "credentials": {
                 "data": {
                     "password": "Heslo",
                     "totp_secret": "Tajn\u00fd kl\u00ed\u010d TOTP",
@@ -17,10 +18,30 @@
                 },
                 "data_description": {
                     "password": "Heslo k va\u0161emu \u00fa\u010dtu pro energie",
-                    "totp_secret": "Tajn\u00fd kl\u00ed\u010d TOTP pro v\u00e1\u0161 \u00fa\u010det pro energie, pou\u017e\u00edvan\u00fd pro v\u00edcefaktorov\u00e9 ov\u011b\u0159ov\u00e1n\u00ed (MFA).",
+                    "totp_secret": "Toto nen\u00ed 6m\u00edstn\u00fd k\u00f3d. Je to \u0159et\u011bzec o d\u00e9lce p\u0159ibli\u017en\u011b 16 znak\u016f obsahuj\u00edc\u00ed sd\u00edlen\u00fd tajn\u00fd kl\u00ed\u010d, kter\u00fd umo\u017e\u0148uje va\u0161\u00ed ov\u011b\u0159ovac\u00ed aplikaci vygenerovat spr\u00e1vn\u00fd k\u00f3d zalo\u017een\u00fd na \u010dase ve spr\u00e1vn\u00fd \u010das. Viz dokumentace.",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no k va\u0161emu \u00fa\u010dtu pro energie"
                 },
-                "description": "N\u00ed\u017ee uveden\u00fd tajn\u00fd kl\u00ed\u010d TOTP nen\u00ed jedn\u00edm z 6m\u00edstn\u00fdch \u010d\u00edseln\u00fdch k\u00f3d\u016f zalo\u017een\u00fdch na \u010dase. Jedn\u00e1 se o \u0159et\u011bzec p\u0159ibli\u017en\u011b 16 znak\u016f obsahuj\u00edc\u00ed sd\u00edlen\u00fd tajn\u00fd kl\u00ed\u010d, kter\u00fd va\u0161\u00ed ov\u011b\u0159ovac\u00ed aplikaci umo\u017e\u0148uje vygenerovat spr\u00e1vn\u00fd \u010dasov\u00fd k\u00f3d ve vhodnou dobu. Pod\u00edvejte se do dokumentace."
+                "title": "Zadejte p\u0159ihla\u0161ovac\u00ed \u00fadaje"
+            },
+            "mfa_code": {
+                "data": {
+                    "mfa_code": "Bezpe\u010dnostn\u00ed k\u00f3d"
+                },
+                "data_description": {
+                    "mfa_code": "Obvykle \u0161estim\u00edstn\u00fd k\u00f3d"
+                },
+                "description": "Bezpe\u010dnostn\u00ed k\u00f3d byl odesl\u00e1n zvolenou metodou. Zadejte jej n\u00ed\u017ee pro dokon\u010den\u00ed p\u0159ihl\u00e1\u0161en\u00ed.",
+                "title": "Zadat bezpe\u010dnostn\u00ed k\u00f3d"
+            },
+            "mfa_options": {
+                "data": {
+                    "mfa_method": "Metoda MFA"
+                },
+                "data_description": {
+                    "mfa_method": "Jak z\u00edskat bezpe\u010dnostn\u00ed k\u00f3d"
+                },
+                "description": "V\u00e1\u0161 \u00fa\u010det vy\u017eaduje v\u00edcefaktorov\u00e9 ov\u011b\u0159ov\u00e1n\u00ed (MFA). Vyberte metodu, jak chcete, abyste obdr\u017eeli bezpe\u010dnostn\u00ed k\u00f3d.",
+                "title": "V\u00edcefaktorov\u00e9 ov\u011b\u0159ov\u00e1n\u00ed"
             },
             "reauth_confirm": {
                 "data": {
@@ -30,20 +51,16 @@
                 },
                 "data_description": {
                     "password": "Heslo k va\u0161emu \u00fa\u010dtu pro energie",
-                    "totp_secret": "Tajn\u00fd kl\u00ed\u010d TOTP pro v\u00e1\u0161 \u00fa\u010det pro energie, pou\u017e\u00edvan\u00fd pro v\u00edcefaktorov\u00e9 ov\u011b\u0159ov\u00e1n\u00ed (MFA).",
+                    "totp_secret": "Toto nen\u00ed 6m\u00edstn\u00fd k\u00f3d. Je to \u0159et\u011bzec o d\u00e9lce p\u0159ibli\u017en\u011b 16 znak\u016f obsahuj\u00edc\u00ed sd\u00edlen\u00fd tajn\u00fd kl\u00ed\u010d, kter\u00fd umo\u017e\u0148uje va\u0161\u00ed ov\u011b\u0159ovac\u00ed aplikaci vygenerovat spr\u00e1vn\u00fd k\u00f3d zalo\u017een\u00fd na \u010dase ve spr\u00e1vn\u00fd \u010das. Viz dokumentace.",
                     "username": "U\u017eivatelsk\u00e9 jm\u00e9no k va\u0161emu \u00fa\u010dtu pro energie"
                 },
                 "title": "Platnost ov\u011b\u0159en\u00ed pro {name} vypr\u0161ela"
             },
             "user": {
                 "data": {
-                    "password": "Heslo",
-                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no",
                     "utility": "N\u00e1zev utility"
                 },
                 "data_description": {
-                    "password": "Heslo k va\u0161emu \u00fa\u010dtu pro energie",
-                    "username": "U\u017eivatelsk\u00e9 jm\u00e9no k va\u0161emu \u00fa\u010dtu pro energie",
                     "utility": "N\u00e1zev va\u0161eho poskytovatele energi\u00ed"
                 }
             }

homeassistant/components/opower/translations/de.json

@@ -6,10 +6,11 @@
         },
         "error": {
             "cannot_connect": "Verbindung fehlgeschlagen",
-            "invalid_auth": "Ung\u00fcltige Authentifizierung"
+            "invalid_auth": "Ung\u00fcltige Authentifizierung",
+            "invalid_mfa_code": "Der Sicherheitscode ist falsch. Bitte versuche es erneut."
         },
         "step": {
-            "mfa": {
+            "credentials": {
                 "data": {
                     "password": "Passwort",
                     "totp_secret": "TOTP-Geheimnis",
@@ -17,10 +18,30 @@
                 },
                 "data_description": {
                     "password": "Das Passwort f\u00fcr dein Versorgerkonto",
-                    "totp_secret": "Das TOTP-Geheimnis f\u00fcr dein Versorgerkonto, das f\u00fcr die Multi-Faktor-Authentifizierung (MFA) verwendet wird.",
+                    "totp_secret": "Dies ist kein 6-stelliger Code. Es handelt sich um eine Folge von etwa 16 Zeichen, die das gemeinsame Geheimnis enth\u00e4lt, das es deiner Authentifizierungs-App erm\u00f6glicht, zum richtigen Zeitpunkt den richtigen zeitbasierten Code zu generieren. Weitere Informationen finden sich in der Dokumentation.",
                     "username": "Der Benutzername f\u00fcr dein Versorgerkonto"
                 },
-                "description": "Das unten stehende TOTP-Geheimnis ist keiner der 6-stelligen zeitbasierten numerischen Codes. Dabei handelt es sich um eine etwa 16 Zeichen lange Zeichenfolge, die das gemeinsame Geheimnis enth\u00e4lt, das es deiner Authentifizierungs-App erm\u00f6glicht, zum richtigen Zeitpunkt den richtigen zeitbasierten Code zu generieren. Siehe Dokumentation."
+                "title": "Anmeldedaten eingeben"
+            },
+            "mfa_code": {
+                "data": {
+                    "mfa_code": "Sicherheitscode"
+                },
+                "data_description": {
+                    "mfa_code": "In der Regel ein 6-stelliger Code"
+                },
+                "description": "Ein Sicherheitscode wurde \u00fcber die von dir gew\u00e4hlte Methode gesendet. Bitte gib ihn unten ein, um die Anmeldung abzuschlie\u00dfen.",
+                "title": "Sicherheitscode eingeben"
+            },
+            "mfa_options": {
+                "data": {
+                    "mfa_method": "MFA-Methode"
+                },
+                "data_description": {
+                    "mfa_method": "Wie du deinen Sicherheitscode erh\u00e4ltst"
+                },
+                "description": "F\u00fcr dein Konto ist eine Multi-Faktor-Authentifizierung (MFA) erforderlich. W\u00e4hle eine Methode zum Erhalt deines Sicherheitscodes.",
+                "title": "Multi-Faktor-Authentifizierung"
             },
             "reauth_confirm": {
                 "data": {
@@ -30,20 +51,16 @@
                 },
                 "data_description": {
                     "password": "Das Passwort f\u00fcr dein Versorgerkonto",
-                    "totp_secret": "Das TOTP-Geheimnis f\u00fcr dein Versorgerkonto, das f\u00fcr die Multi-Faktor-Authentifizierung (MFA) verwendet wird.",
+                    "totp_secret": "Dies ist kein 6-stelliger Code. Es handelt sich um eine Folge von etwa 16 Zeichen, die das gemeinsame Geheimnis enth\u00e4lt, das es deiner Authentifizierungs-App erm\u00f6glicht, zum richtigen Zeitpunkt den richtigen zeitbasierten Code zu generieren. Weitere Informationen finden sich in der Dokumentation.",
                     "username": "Der Benutzername f\u00fcr dein Versorgerkonto"
                 },
                 "title": "Authentifizierung f\u00fcr {name} abgelaufen"
             },
             "user": {
                 "data": {
-                    "password": "Passwort",
-                    "username": "Benutzername",
                     "utility": "Name des Versorgers"
                 },
                 "data_description": {
-                    "password": "Das Passwort f\u00fcr dein Versorgerkonto",
-                    "username": "Der Benutzername f\u00fcr dein Versorgerkonto",
                     "utility": "Der Name deines Versorgungsunternehmens"
                 }
             }