sumo-wrapper-python 1.0.18__tar.gz → 1.0.20__tar.gz

{sumo_wrapper_python-1.0.18 → sumo_wrapper_python-1.0.20}/PKG-INFO

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

{sumo_wrapper_python-1.0.18 → sumo_wrapper_python-1.0.20}/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,18 @@ 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, ".sharedkey", case_uuid),
             "w",
         ) as f:
             f.write(token)
+        protect_token_cache(self._resource_id, ".sharedkey", case_uuid)
+
+    def has_case_token(self, case_uuid):
+        return os.path.exists(
+            get_token_path(self._resource_id, ".sharedkey", case_uuid)
+        )
 
     pass
 
@@ -118,19 +142,6 @@ class AuthProviderRefreshToken(AuthProvider):
     pass
 
 
-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
-        )
-
-
 @tn.retry(
     retry=tn.retry_if_exception(_maybe_nfs_exception),
     stop=tn.stop_after_attempt(6),

{sumo_wrapper_python-1.0.18 → sumo_wrapper_python-1.0.20}/src/sumo/wrapper/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0.18'
-__version_tuple__ = version_tuple = (1, 0, 18)
+__version__ = version = '1.0.20'
+__version_tuple__ = version_tuple = (1, 0, 20)

{sumo_wrapper_python-1.0.18 → sumo_wrapper_python-1.0.20}/src/sumo/wrapper/sumo_client.py

@@ -424,13 +424,16 @@ class SumoClient:
     def client_for_case(self, case_uuid):
         """Instantiate and return new SumoClient for accessing the
         case identified by *case_uuid*."""
-        return SumoClient(
-            env=self.env,
-            verbosity=self._verbosity,
-            retry_strategy=self._retry_strategy,
-            timeout=self._timeout,
-            case_uuid=case_uuid,
-        )
+        if self.auth.has_case_token(case_uuid):
+            return SumoClient(
+                env=self.env,
+                verbosity=self._verbosity,
+                retry_strategy=self._retry_strategy,
+                timeout=self._timeout,
+                case_uuid=case_uuid,
+            )
+        else:
+            return self
 
     @raise_for_status_async
     async def get_async(self, path: str, params: dict = None):

{sumo_wrapper_python-1.0.18 → sumo_wrapper_python-1.0.20}/src/sumo_wrapper_python.egg-info/PKG-INFO

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