Catch proxyerror and be verbose when encounter KeyError (#59)

* catch proxyerror and be verbose when encounter KeyError

Author: perolavsvendsen

setup.py

@@ -14,9 +14,8 @@
         'Programming Language :: Python :: 3.7'
         'Programming Language :: Python :: 3.8'
         ],
-    version='0.1.3',
+    version='0.1.4',
     author='Equinor ASA',
-    author_email='llag@equinor.com',
     install_requires=[
                     'requests',
                     'msal',

src/sumo/wrapper/_auth.py

@@ -7,23 +7,30 @@
 
 TENANT = "3aa4a235-b6e2-48d5-9195-7fcf05b459b0"
 
-AUTHORITY_HOST_URI = 'https://login.microsoftonline.com'
-AUTHORITY_URI = AUTHORITY_HOST_URI + '/' + TENANT
-HOME_DIR = os.path.expanduser('~')
+AUTHORITY_HOST_URI = "https://login.microsoftonline.com"
+AUTHORITY_URI = AUTHORITY_HOST_URI + "/" + TENANT
+HOME_DIR = os.path.expanduser("~")
 
 
 class Auth:
-
-    def __init__(self, client_id, resource_id, authority=AUTHORITY_URI, client_credentials=None):
+    def __init__(
+        self, client_id, resource_id, authority=AUTHORITY_URI, client_credentials=None
+    ):
         self.client_id = client_id
         self.resource_id = resource_id
         self.scope = self.resource_id + "/.default"
         self.authority = authority
         self.client_credentials = client_credentials
-        self.token_path = os.path.join(HOME_DIR, ".sumo", str(self.resource_id) + ".token")
+        self.token_path = os.path.join(
+            HOME_DIR, ".sumo", str(self.resource_id) + ".token"
+        )
         self._get_cache()
-        self.app = msal.PublicClientApplication(self.client_id, authority=AUTHORITY_URI,
-                                                client_credential=self.client_credentials, token_cache=self.cache)
+        self.app = msal.PublicClientApplication(
+            self.client_id,
+            authority=AUTHORITY_URI,
+            client_credential=self.client_credentials,
+            token_cache=self.cache,
+        )
         self.accounts = self.app.get_accounts()
 
         if self._cache_available():
@@ -36,7 +43,6 @@ def __init__(self, client_id, resource_id, authority=AUTHORITY_URI, client_crede
             print("No token cache found, reauthenticate")
             self._oauth_device_code()
 
-        
     def get_token(self):
         if self.is_token_expired():
             self._oauth_get_token_silent()
@@ -45,7 +51,7 @@ def get_token(self):
 
     def is_token_expired(self):
         """
-            Check if token is expired or about to expire.
+        Check if token is expired or about to expire.
         """
         return datetime.datetime.now() > self.expiring_date
 
@@ -55,37 +61,41 @@ def _oauth_get_token_silent(self):
             self.accounts = self.app.get_accounts()
 
         if not self._check_token_security():
-            raise SystemError('The token is not stored safely.')
+            raise SystemError("The token is not stored safely.")
 
-        self.result = self.app.acquire_token_silent_with_error([self.scope], account=self.accounts[0])
+        self.result = self.app.acquire_token_silent_with_error(
+            [self.scope], account=self.accounts[0]
+        )
 
         if "access_token" in self.result:
             print("Token found")
         elif "error" in self.result:
             print("Error getting access token" + self.result["error"])
         else:
             print("Acuire token failed")
-                  
-        self._set_expiring_date(int(self.result['expires_in']))
+
+        self._set_expiring_date(int(self.result["expires_in"]))
         self._write_cache()
 
     def _set_expiring_date(self, time_left, threshold=60):
         """
-            Defines the access token expiring date. Sets a threshold to update the token before it expires
+        Defines the access token expiring date. Sets a threshold to update the token before it expires
 
-            Parameter
-                time_left: time, in seconds, until the token expires.
-                threshold: how many seconds before expiration the token is allowed to be updated.
+        Parameter
+            time_left: time, in seconds, until the token expires.
+            threshold: how many seconds before expiration the token is allowed to be updated.
         """
-        self.expiring_date = datetime.datetime.now() + datetime.timedelta(seconds=time_left - threshold)
+        self.expiring_date = datetime.datetime.now() + datetime.timedelta(
+            seconds=time_left - threshold
+        )
 
     def _cache_available(self):
         if os.path.isfile(self.token_path):
             return True
         return False
 
     def _check_token_security(self):
-        if sys.platform.lower().startswith('win'):
+        if sys.platform.lower().startswith("win"):
             return True
 
         access_stats = os.stat(self.token_path)
@@ -97,12 +107,16 @@ def _oauth_device_code(self):
 
         if "user_code" not in flow:
             raise ValueError(
-                "Fail to create device flow. Err: %s" % json.dumps(flow, indent=4))
+                "Fail to create device flow. Err: %s" % json.dumps(flow, indent=4)
+            )
         else:
-            print(flow['message'])
+            print(flow["message"])
 
         self.result = self.app.acquire_token_by_device_flow(flow)
-        self._set_expiring_date(int(self.result['expires_in']))
+        try:
+            self._set_expiring_date(int(self.result["expires_in"]))
+        except KeyError:
+            print(self.result)
         self._write_cache()
 
     def _write_cache(self):
@@ -114,7 +128,7 @@ def _write_cache(self):
         with open(self.token_path, "w") as file:
             file.write(self.cache.serialize())
 
-        if not sys.platform.lower().startswith('win'):
+        if not sys.platform.lower().startswith("win"):
             os.chmod(self.token_path, 0o600)
             os.chmod(dir_path, 0o700)
 
@@ -131,6 +145,8 @@ def _get_cache(self):
             self._read_cache()
 
 
-if __name__ == '__main__':
-    auth = Auth("1826bd7c-582f-4838-880d-5b4da5c3eea2", "88d2b022-3539-4dda-9e66-853801334a86")
+if __name__ == "__main__":
+    auth = Auth(
+        "1826bd7c-582f-4838-880d-5b4da5c3eea2", "88d2b022-3539-4dda-9e66-853801334a86"
+    )
     print(auth.get_token())