Merge pull request #881 from bdraco/fix_login

Fix login failures
AlexxIT · Jul 7, 2022 · e77f71f · e77f71f
2 parents abc4999 + 8182a15
commit e77f71f
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/custom_components/sonoff/core/ewelink/cloud.py b/custom_components/sonoff/core/ewelink/cloud.py
@@ -110,21 +110,23 @@ async def login(self, username: str, password: str, app=0) -> bool:
             return await self.login_token(token, 1)
 
         # https://coolkit-technologies.github.io/eWeLink-API/#/en/DeveloperGuideV2
-        payload = {
-            "password": password,
-            "countryCode": "+86",
-        }
+        payload = {}
         if "@" in username:
             payload["email"] = username
         elif username.startswith("+"):
             payload["phoneNumber"] = username
         else:
             payload["phoneNumber"] = "+" + username
+        payload.update({
+            "password": password,
+            "countryCode": "+86",
+        })
 
         appid, appsecret = APP[app]
 
+        json_payload = json.dumps(payload, separators=(',',':')).encode()
         hex_dig = hmac.new(
-            appsecret.encode(), json.dumps(payload).encode(), hashlib.sha256
+            appsecret.encode(), json_payload, hashlib.sha256
         ).digest()
 
         headers = {