Upgraded login endpoint, fixed uid generation

.github/workflows/lint.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.9]
 
     steps:
     - uses: actions/checkout@v2

blinkpy/auth.py

@@ -129,11 +129,11 @@ class Auth:
 
     def extract_login_info(self):
         """Extract login info from login response."""
-        self.region_id = self.login_response["region"]["tier"]
+        self.region_id = self.login_response["account"]["tier"]
         self.host = f"{self.region_id}.{BLINK_URL}"
-        self.token = self.login_response["authtoken"]["authtoken"]
+        self.token = self.login_response["auth"]["token"]
-        self.client_id = self.login_response["client"]["id"]
+        self.client_id = self.login_response["account"]["client_id"]
-        self.account_id = self.login_response["account"]["id"]
+        self.account_id = self.login_response["account"]["account_id"]
 
     def startup(self):
         """Initialize tokens for communication."""
@@ -242,7 +242,7 @@ class Auth:
     def check_key_required(self):
         """Check if 2FA key is required."""
         try:
-            if self.login_response["client"]["verification_required"]:
+            if self.login_response["account"]["client_verification_required"]:
                 return True
         except (KeyError, TypeError):
             pass

blinkpy/helpers/constants.py

@@ -4,7 +4,7 @@ import os
 
 MAJOR_VERSION = 0
 MINOR_VERSION = 16
-PATCH_VERSION = "5.rc0"
+PATCH_VERSION = "5.rc1"
 
 __version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}.{PATCH_VERSION}"
 
@@ -49,7 +49,7 @@ URLS
 BLINK_URL = "immedia-semi.com"
 DEFAULT_URL = f"rest-prod.{BLINK_URL}"
 BASE_URL = f"https://{DEFAULT_URL}"
-LOGIN_ENDPOINT = f"{BASE_URL}/api/v4/account/login"
+LOGIN_ENDPOINT = f"{BASE_URL}/api/v5/account/login"
 
 """
 Dictionaries

blinkpy/helpers/util.py

@@ -33,10 +33,13 @@ def json_save(data, file_name):
         json.dump(data, json_file, indent=4)
 
 
-def gen_uid(size):
+def gen_uid(size, uid_format=False):
     """Create a random sring."""
-    full_token = secrets.token_hex(size)
+    if uid_format:
-    return full_token[0:size]
+        token = f"{secrets.token_hex(8)}-{secrets.token_hex(4)}-{secrets.token_hex(4)}-{secrets.token_hex(4)}-{secrets.token_hex(12)}"
+    else:
+        token = secrets.token_hex(size)
+    return token
 
 
 def time_to_seconds(timestamp):
@@ -79,7 +82,7 @@ def prompt_login_data(data):
 
 def validate_login_data(data):
     """Check for missing keys."""
-    data["uid"] = data.get("uid", gen_uid(const.SIZE_UID))
+    data["uid"] = data.get("uid", gen_uid(const.SIZE_UID, uid_format=True))
     data["notification_key"] = data.get(
         "notification_key", gen_uid(const.SIZE_NOTIFICATION_KEY)
     )

tests/test_auth.py

@@ -165,10 +165,8 @@ class TestAuth(unittest.TestCase):
     def test_refresh_token(self, mock_login):
         """Test refresh token method."""
         mock_login.return_value = {
-            "region": {"tier": "test"},
+            "account": {"account_id": 5678, "client_id": 1234, "tier": "test"},
-            "authtoken": {"authtoken": "foobar"},
+            "auth": {"token": "foobar"},
-            "client": {"id": 1234},
-            "account": {"id": 5678},
         }
         self.assertTrue(self.auth.refresh_token())
         self.assertEqual(self.auth.region_id, "test")
@@ -190,10 +188,10 @@ class TestAuth(unittest.TestCase):
         self.auth.login_response = {}
         self.assertFalse(self.auth.check_key_required())
 
-        self.auth.login_response = {"client": {"verification_required": False}}
+        self.auth.login_response = {"account": {"client_verification_required": False}}
         self.assertFalse(self.auth.check_key_required())
 
-        self.auth.login_response = {"client": {"verification_required": True}}
+        self.auth.login_response = {"account": {"client_verification_required": True}}
         self.assertTrue(self.auth.check_key_required())
 
     @mock.patch("blinkpy.auth.api.request_verify")

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = build, py36, py37, py38, lint
+envlist = build, py36, py37, py38, py39, lint
 skip_missing_interpreters = True
 skipsdist = True