sumo-wrapper-python 1.0.17__tar.gz → 1.0.19__tar.gz

{sumo_wrapper_python-1.0.17 → sumo_wrapper_python-1.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sumo-wrapper-python
-Version: 1.0.17
+Version: 1.0.19
 Summary: Python wrapper for the Sumo API
 Author: Equinor
 License:                                  Apache License

{sumo_wrapper_python-1.0.17 → sumo_wrapper_python-1.0.19}/src/sumo/wrapper/_auth_provider.py

@@ -29,6 +29,23 @@ def _maybe_nfs_exception(exception):
     )
 
 
+def get_token_dir():
+    return os.path.join(os.path.expanduser("~"), ".sumo")
+
+
+def get_token_path(resource_id, suffix, case_uuid=None):
+    if case_uuid is not None:
+        return os.path.join(
+            os.path.expanduser("~"),
+            ".sumo",
+            str(resource_id) + "+" + str(case_uuid) + suffix,
+        )
+    else:
+        return os.path.join(
+            os.path.expanduser("~"), ".sumo", str(resource_id) + suffix
+        )
+
+
 class AuthProvider:
     def __init__(self, resource_id):
         self._resource_id = resource_id
@@ -67,11 +84,13 @@ class AuthProvider:
         return {"Authorization": "Bearer " + token}
 
     def store_shared_access_key_for_case(self, case_uuid, token):
+        os.makedirs(get_token_dir(), mode=0o700, exist_ok=True)
         with open(
-            get_token_path(self._resource_id + "+" + case_uuid, ".sharedkey"),
+            get_token_path(self._resource_id, ".sharedkey", case_uuid),
             "w",
         ) as f:
             f.write(token)
+        protect_token_cache(self._resource_id, ".sharedkey", case_uuid)
 
     pass
 
@@ -93,6 +112,7 @@ class AuthProviderAccessToken(AuthProvider):
         self._access_token = access_token
         payload = jwt.decode(access_token, options={"verify_signature": False})
         self._expires = payload["exp"]
+        self._resource_id = payload["aud"]
         return
 
     def get_token(self):
@@ -117,12 +137,6 @@ class AuthProviderRefreshToken(AuthProvider):
     pass
 
 
-def get_token_path(resource_id, suffix):
-    return os.path.join(
-        os.path.expanduser("~"), ".sumo", str(resource_id) + suffix
-    )
-
-
 @tn.retry(
     retry=tn.retry_if_exception(_maybe_nfs_exception),
     stop=tn.stop_after_attempt(6),
@@ -176,8 +190,8 @@ def get_token_cache(resource_id, suffix):
     retry_error_callback=_return_last_value,
     before_sleep=_log_retry_info,
 )
-def protect_token_cache(resource_id, suffix):
-    token_path = get_token_path(resource_id, suffix)
+def protect_token_cache(resource_id, suffix, case_uuid=None):
+    token_path = get_token_path(resource_id, suffix, case_uuid)
 
     if sys.platform.startswith("linux") or sys.platform == "darwin":
         filemode = stat.filemode(os.stat(token_path).st_mode)
@@ -369,9 +383,9 @@ class AuthProviderSumoToken(AuthProvider):
         retry_error_callback=_return_last_value,
         before_sleep=_log_retry_info,
     )
-    def __init__(self, resource_id):
-        protect_token_cache(resource_id, ".sharedkey")
-        token_path = get_token_path(resource_id, ".sharedkey")
+    def __init__(self, resource_id, case_uuid=None):
+        protect_token_cache(resource_id, ".sharedkey", case_uuid)
+        token_path = get_token_path(resource_id, ".sharedkey", case_uuid)
         with open(token_path, "r") as f:
             self._token = f.readline().strip()
         return
@@ -411,13 +425,8 @@ def get_auth_provider(
     if access_token:
         return AuthProviderAccessToken(access_token)
     # ELSE
-    if case_uuid is not None and os.path.exists(
-        get_token_path(resource_id + "+" + case_uuid, ".sharedkey")
-    ):
-        return AuthProviderSumoToken(resource_id + "+" + case_uuid)
-    # ELSE
-    if os.path.exists(get_token_path(resource_id, ".sharedkey")):
-        return AuthProviderSumoToken(resource_id)
+    if os.path.exists(get_token_path(resource_id, ".sharedkey", case_uuid)):
+        return AuthProviderSumoToken(resource_id, case_uuid)
     # ELSE
     if os.path.exists(get_token_path(resource_id, ".token")):
         auth_silent = AuthProviderSilent(client_id, authority, resource_id)

{sumo_wrapper_python-1.0.17 → sumo_wrapper_python-1.0.19}/src/sumo/wrapper/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0.17'
-__version_tuple__ = version_tuple = (1, 0, 17)
+__version__ = version = '1.0.19'
+__version_tuple__ = version_tuple = (1, 0, 19)

{sumo_wrapper_python-1.0.17 → sumo_wrapper_python-1.0.19}/src/sumo_wrapper_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sumo-wrapper-python
-Version: 1.0.17
+Version: 1.0.19
 Summary: Python wrapper for the Sumo API
 Author: Equinor
 License:                                  Apache License