Throw requests.exceptions.HTTPError if the UserAgent is being blocked by the Growatt WAF

Throw GrowattApiLoginException if the username / password is incorrect

Author: andrew-blake

growattServer/__init__.py

@@ -23,6 +23,11 @@ class Timespan(IntEnum):
     day = 1
     month = 2
 
+
+class GrowattApiLoginException(Exception):
+    pass
+
+
 class GrowattApi:
     server_url = 'https://server-api.growatt.com/'
     agent_identifier = "Dalvik/2.1.0 (Linux; U; Android 12; https://github.com/indykoning/PyPi_GrowattServer)"
@@ -130,20 +135,22 @@ def login(self, username, password, is_password_hashed=False):
             'password': password
         })
 
-        if response.status_code == 200:
-            json_data = response.content.decode('utf-8')
-            data = json.loads(json_data)['back']
-            if data['success']:
+        # throw requests.exceptions.HTTPError if appropriate - occurs if the UserAgent is being blocked by the Growatt WAF
+        response.raise_for_status()
+
+        json_doc = response.content.decode('utf-8')
+        json_dict = json.loads(json_doc)
+        
+        if 'back' in json_dict:
+            data = json_dict['back']
+            if 'success' in data and data['success']:
                 data.update({
                     'userId': data['user']['id'],
                     'userLevel': data['user']['rightlevel']
                 })
-            return data
+                return data
 
-        elif response.status_code == 403:
-            raise RuntimeError("Login failed")
-        else:
-            raise RuntimeError("Unknown login error")
+        raise GrowattApiLoginException() 
 
     def plant_list(self, user_id):
         """