Added debug info to authentication

Author: oihaa

.gitignore

@@ -1,3 +1,6 @@
+__pycache__/
+*.py[cod]
+.DS_Store
 _venv
 venv
 dist

conftest.py

@@ -25,10 +25,21 @@ def __init__(self, client_id, resource_id, authority=AUTHORITY_URI, client_crede
         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()
-        self._oauth_get_token_silent() if self._cache_available() else self._oauth_device_code()
 
+        if self._cache_available():
+            if not self.accounts:
+                print("Token cache found but have no accounts")
+            else:
+                print("Get token and maybe refresh")
+                self._oauth_get_token_silent()
+        else:
+            print("No token cache found, reauthenticate")
+            self._oauth_device_code()
+
+        
     def get_token(self):
         if self.is_token_expired():
+            print("Token expired, get new token")
             self._oauth_get_token_silent()
 
         return self.result["access_token"]
@@ -41,12 +52,21 @@ def is_token_expired(self):
 
     def _oauth_get_token_silent(self):
         if not self.accounts:
+            print("Get accounts")
             self.accounts = self.app.get_accounts()
 
         if not self._check_token_security():
             raise SystemError('The token is not stored safely.')
 
-        self.result = self.app.acquire_token_silent([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._write_cache()
 

src/sumo/wrapper/_auth.py

@@ -1,4 +1,4 @@
-from .config import CLIENT_ID, RESOURCE_ID
+from .config import APP_REGISTRATION
 from ._call_azure_api import CallAzureApi
 
 
@@ -16,8 +16,8 @@ def __init__(self, env='dev', resource_id=None, client_id=None, outside_token=Fa
         else:
             self.base_url = f'https://main-sumo-{env}.radix.equinor.com/api/v1'
 
-        resource_id = resource_id if resource_id else RESOURCE_ID
-        client_id = client_id if client_id else CLIENT_ID
+        resource_id = resource_id if resource_id else APP_REGISTRATION[env]["RESOURCE_ID"]
+        client_id = client_id if client_id else APP_REGISTRATION[env]["CLIENT_ID"]
 
         self.callAzureApi = CallAzureApi(resource_id, client_id, outside_token)
 

src/sumo/wrapper/_call_sumo_api.py

@@ -1,2 +1,15 @@
-CLIENT_ID = '1826bd7c-582f-4838-880d-5b4da5c3eea2'
-RESOURCE_ID = '88d2b022-3539-4dda-9e66-853801334a86'
+APP_REGISTRATION = {
+    "prod" : {
+        "CLIENT_ID" : '1826bd7c-582f-4838-880d-5b4da5c3eea2',
+        "RESOURCE_ID" : '88d2b022-3539-4dda-9e66-853801334a86'
+        },
+    "test" : {
+        "CLIENT_ID" : 'd57a8f87-4e28-4391-84d6-34356d5876a2',
+        "RESOURCE_ID" : '9e5443dd-3431-4690-9617-31eed61cb55a'
+        },
+    "dev" : {
+        "CLIENT_ID" : '1826bd7c-582f-4838-880d-5b4da5c3eea2',
+        "RESOURCE_ID" : '88d2b022-3539-4dda-9e66-853801334a86'
+        }
+    }
+