Frontend update to support new login method of keyid / apikey

custom_components/wyzeapi/__init__.py

@@ -16,7 +16,7 @@
 from .const import (
     DOMAIN, CONF_CLIENT, ACCESS_TOKEN, REFRESH_TOKEN,
     REFRESH_TIME, WYZE_NOTIFICATION_TOGGLE, BULB_LOCAL_CONTROL,
-    DEFAULT_LOCAL_CONTROL
+    DEFAULT_LOCAL_CONTROL, KEY_ID, API_KEY
 )
 from .token_manager import TokenManager
 
@@ -73,6 +73,8 @@ async def async_setup(
                     ACCESS_TOKEN: domainconfig[ACCESS_TOKEN],
                     REFRESH_TOKEN: domainconfig[REFRESH_TOKEN],
                     REFRESH_TIME: domainconfig[REFRESH_TIME],
+                    KEY_ID: domainconfig[KEY_ID],
+                    API_KEY: domainconfig[API_KEY]
                 },
             )
         )
@@ -85,6 +87,9 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
 
     hass.data.setdefault(DOMAIN, {})
 
+    key_id = config_entry.data.get(KEY_ID)
+    api_key = config_entry.data.get(API_KEY)
+
     client = await Wyzeapy.create()
     token = None
     if config_entry.data.get(ACCESS_TOKEN):
@@ -101,14 +106,16 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
         await client.login(
             config_entry.data.get(CONF_USERNAME),
             config_entry.data.get(CONF_PASSWORD),
+            key_id,
+            api_key,
             token,
         )
     except Exception as e:
         _LOGGER.error("Wyzeapi: Could not login. Please re-login through integration configuration")
         _LOGGER.error(e)
         raise ConfigEntryAuthFailed("Unable to login, please re-login.") from None
 
-    hass.data[DOMAIN][config_entry.entry_id] = {CONF_CLIENT: client}
+    hass.data[DOMAIN][config_entry.entry_id] = {CONF_CLIENT: client, "key_id": KEY_ID, "api_key": API_KEY}
 
     options_dict = {BULB_LOCAL_CONTROL: config_entry.options.get(BULB_LOCAL_CONTROL, DEFAULT_LOCAL_CONTROL)}
     hass.config_entries.async_update_entry(config_entry, options=options_dict)

custom_components/wyzeapi/config_flow.py

@@ -13,17 +13,17 @@
 from wyzeapy import Wyzeapy, exceptions
 
 from .const import (
-    DOMAIN, ACCESS_TOKEN, REFRESH_TOKEN,
-    REFRESH_TIME, BULB_LOCAL_CONTROL, 
-    DEFAULT_LOCAL_CONTROL
+    DOMAIN, ACCESS_TOKEN, REFRESH_TOKEN, 
+    REFRESH_TIME, BULB_LOCAL_CONTROL,
+    DEFAULT_LOCAL_CONTROL,
+    KEY_ID, API_KEY
 )
 
 _LOGGER = logging.getLogger(__name__)
 
-STEP_USER_DATA_SCHEMA = vol.Schema({CONF_USERNAME: str, CONF_PASSWORD: str})
+STEP_USER_DATA_SCHEMA = vol.Schema({CONF_USERNAME: str, CONF_PASSWORD: str, KEY_ID: str, API_KEY: str})
 STEP_2FA_DATA_SCHEMA = vol.Schema({CONF_ACCESS_TOKEN: str})
 
-
 class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Wyze Home Assistant Integration."""
 
@@ -36,6 +36,8 @@ def __init__(self):
         """Initialize."""
         self.email = None
         self.password = None
+        self.key_id = None
+        self.api_key = None
 
     async def get_client(self):
         if not self.client:
@@ -57,7 +59,10 @@ async def async_step_user(
         # noinspection PyBroadException
         try:
             await self.client.login(
-                user_input[CONF_USERNAME], user_input[CONF_PASSWORD]
+                user_input[CONF_USERNAME],
+                user_input[CONF_PASSWORD],
+                user_input[KEY_ID],
+                user_input[API_KEY],
             )
         except CannotConnect:
             errors["base"] = "cannot_connect"
@@ -66,6 +71,8 @@ async def async_step_user(
         except exceptions.TwoFactorAuthenticationEnabled:
             self.user_params[CONF_USERNAME] = user_input[CONF_USERNAME]
             self.user_params[CONF_PASSWORD] = user_input[CONF_PASSWORD]
+            self.user_params[KEY_ID] = user_input[KEY_ID]
+            self.user_params[API_KEY] = user_input[API_KEY]
             return await self.async_step_2fa()
         else:
             if self.hass.config_entries.async_entries(DOMAIN):

custom_components/wyzeapi/const.py

@@ -6,6 +6,8 @@
 ACCESS_TOKEN = "access_token"
 REFRESH_TOKEN = "refresh_token"
 REFRESH_TIME = "refresh_time"
+KEY_ID = "key_id"
+API_KEY = "api_key"
 
 WYZE_NOTIFICATION_TOGGLE = f"{DOMAIN}.wyze.notification.toggle"
 

custom_components/wyzeapi/manifest.json

@@ -9,7 +9,7 @@
   "iot_class": "cloud_polling",
   "issue_tracker": "https://github.com/JoshuaMulliken/ha-wyzeapi/issues",
   "requirements": [
-    "wyzeapy==0.5.19"
+    "wyzeapy==0.5.20"
   ],
-  "version": "0.1.19"
+  "version": "0.1.20"
 }

custom_components/wyzeapi/strings.json

@@ -6,7 +6,9 @@
         "title": "[%key:common::config_flow::data::title%]",
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
-          "password": "[%key:common::config_flow::data::password%]"
+          "password": "[%key:common::config_flow::data::password%]",
+          "keyid": "[%key:common::config_flow::data::key_id%]",
+          "apikey": "[%key:common::config_flow::data::api_key%]"
         }
       },
       "2fa": {
@@ -36,7 +38,9 @@
         "title": "[%key:common::config_flow::data::title%]",
         "data": {
           "username": "[%key:common::config_flow::data::username%]",
-          "password": "[%key:common::config_flow::data::password%]"
+          "password": "[%key:common::config_flow::data::password%]",
+          "keyid": "[%key:common::config_flow::data::key_id%]",
+          "apikey": "[%key:common::config_flow::data::api_key%]"
         }
       },
       "2fa": {

custom_components/wyzeapi/token_manager.py

@@ -50,3 +50,4 @@ async def inner_function(*args, **kwargs):
             raise ConfigEntryAuthFailed("Unable to login, please re-login.") from err
 
     return inner_function
+

custom_components/wyzeapi/translations/en.json

@@ -14,8 +14,10 @@
             "user": {
                 "title": "Enter Wyze Login Credentials",
                 "data": {
+                    "username": "Email",
                     "password": "Password",
-                    "username": "Username"
+                    "key_id": "Keyid",
+                    "api_key": "Apikey"
                 }
             },
             "2fa": {
@@ -27,25 +29,19 @@
         }
     },
     "options": {
-        "abort": {
-            "already_configured": "Device is already configured"
-        },
-        "error": {
-            "cannot_connect": "Failed to connect",
-            "invalid_auth": "Invalid authentication",
-            "unknown": "Unexpected error"
-        },
         "step": {
-            "init":{
-                "data":{
-                  "bulb_local_control": "Use Local Control for Color Bulbs and Light Strips"
+            "init": {
+                "data": {
+                    "bulb_local_control": "Use Local Control for Color Bulbs and Light Strips"
                 }
-              },
+            },
             "user": {
                 "title": "Enter Wyze Login Credentials",
                 "data": {
+                    "username": "Email",
                     "password": "Password",
-                    "username": "Username"
+                    "key_id": "Keyid",
+                    "api_key": "Apikey"
                 }
             },
             "2fa": {
@@ -54,6 +50,15 @@
                     "verification_code": "2FA Verification Code"
                 }
             }
+        },
+        "error": {
+            "cannot_connect": "Failed to connect",
+            "invalid_auth": "Invalid authentication",
+            "unknown": "Unexpected error"
+        },
+        "abort": {
+            "already_configured": "Device is already configured",
+            "reauth_successful": "Reauthentication Successful"
         }
     }
-}
+}