usso 0.20.7__tar.gz → 0.21.1__tar.gz

{usso-0.20.7/src/usso.egg-info → usso-0.21.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.20.7
+Version: 0.21.1
 Summary: A plug-and-play client for integrating universal single sign-on (SSO) with Python frameworks, enabling secure and seamless authentication across microservices.
 Author-email: Mahdi Kiani <mahdikiany@gmail.com>
 Maintainer-email: Mahdi Kiani <mahdikiany@gmail.com>

{usso-0.20.7 → usso-0.21.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "usso"
-version = "0.20.7"
+version = "0.21.1"
 description = "A plug-and-play client for integrating universal single sign-on (SSO) with Python frameworks, enabling secure and seamless authentication across microservices."
 readme = "README.md"
 requires-python = ">=3.9"

{usso-0.20.7 → usso-0.21.1}/src/usso/api.py

@@ -88,7 +88,9 @@ class UssoAPI(metaclass=Singleton):
     def get_users(self, **kwargs) -> list[UserData]:
         users_dict = self._request(endpoint="website/users", **kwargs)
 
-        return [UserData(user_id=user.get("uid"), **user) for user in users_dict]
+        return [
+            UserData(user_id=user.get("uid"), **user) for user in users_dict
+        ]
 
     def get_user(self, user_id: str, **kwargs) -> UserData:
         user_dict = self._request(
@@ -144,7 +146,9 @@ class UssoAPI(metaclass=Singleton):
         return UserData(user_id=user_dict.get("uid"), **user_dict)
 
     def get_user_payload(self, user_id: str, **kwargs) -> dict:
-        return self._request(endpoint=f"website/users/{user_id}/payload", **kwargs)
+        return self._request(
+            endpoint=f"website/users/{user_id}/payload", **kwargs
+        )
 
     def update_user_payload(
         self,

{usso-0.20.7 → usso-0.21.1}/src/usso/b64tools.py

@@ -2,8 +2,11 @@ import base64
 import uuid
 
 
-def b64_encode_uuid(uuid_str):
-    uuid_bytes = uuid.UUID(uuid_str).bytes
+def b64_encode_uuid(uuid_str: uuid.UUID | str):
+    uuid_UUID = (
+        uuid_str if isinstance(uuid_str, uuid.UUID) else uuid.UUID(uuid_str)
+    )
+    uuid_bytes = uuid_UUID.bytes
     encoded_uuid = base64.urlsafe_b64encode(uuid_bytes).decode()
     return encoded_uuid
 

{usso-0.20.7 → usso-0.21.1}/src/usso/core.py

@@ -71,23 +71,46 @@ class Usso(metaclass=Singleton):
                 signing_key.key,
                 algorithms=["RS256"],
             )
+            if decoded["token_type"] != "access":
+                raise USSOException(
+                    status_code=401,
+                    error="invalid_token_type",
+                )
             decoded["token"] = token
-
+            return UserData(**decoded)
         except jwt.exceptions.ExpiredSignatureError:
             if kwargs.get("raise_exception"):
                 raise USSOException(status_code=401, error="expired_signature")
-            return None
         except jwt.exceptions.InvalidSignatureError:
             if kwargs.get("raise_exception"):
                 raise USSOException(status_code=401, error="invalid_signature")
-            return None
+        except jwt.exceptions.InvalidAlgorithmError:
+            if kwargs.get("raise_exception"):
+                raise USSOException(
+                    status_code=401,
+                    error="invalid_algorithm",
+                )
+        except jwt.exceptions.InvalidIssuedAtError:
+            if kwargs.get("raise_exception"):
+                raise USSOException(
+                    status_code=401,
+                    error="invalid_issued_at",
+                )
         except jwt.exceptions.InvalidTokenError:
             if kwargs.get("raise_exception"):
                 raise USSOException(
                     status_code=401,
                     error="invalid_token",
                 )
-            return None
+        except jwt.exceptions.InvalidKeyError:
+            if kwargs.get("raise_exception"):
+                raise USSOException(
+                    status_code=401,
+                    error="invalid_key",
+                )
+        except USSOException as e:
+            if kwargs.get("raise_exception"):
+                raise e
         except Exception as e:
             if kwargs.get("raise_exception"):
                 raise USSOException(
@@ -96,6 +119,3 @@ class Usso(metaclass=Singleton):
                     message=str(e),
                 )
             logger.error(e)
-            return None
-
-        return UserData(**decoded)

usso-0.21.1/src/usso/session.py

@@ -0,0 +1,35 @@
+from datetime import datetime
+import requests
+import jwt
+
+
+class UssoSession:
+    def __init__(self, sso_refresh_url: str, refresh_token: str | None = None):
+        self.sso_refresh_url = sso_refresh_url
+        self.refresh_token = refresh_token
+        self.session = requests.Session()
+        self.access_token = None
+
+    def _refresh(self):
+        if not self.refresh_token:
+            return
+
+        response = requests.post(
+            self.sso_refresh_url,
+            json={"refresh_token": f"{self.refresh_token}"},
+        )
+        response.raise_for_status()
+        return response.json()
+
+    def get_session(self):
+        if self.access_token:
+            decoded_token = jwt.decode(self.access_token, options={"verify_signature": False})
+            exp = datetime.fromtimestamp(decoded_token.get("exp"))
+            if exp < datetime.now():
+                self.access_token = None
+        if not self.access_token:
+            self.access_token = self._refresh()["access_token"]
+            self.session.headers.update(
+                {"Authorization": f"Bearer {self.access_token}"}
+            )
+        return self.session

{usso-0.20.7 → usso-0.21.1/src/usso.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.20.7
+Version: 0.21.1
 Summary: A plug-and-play client for integrating universal single sign-on (SSO) with Python frameworks, enabling secure and seamless authentication across microservices.
 Author-email: Mahdi Kiani <mahdikiany@gmail.com>
 Maintainer-email: Mahdi Kiani <mahdikiany@gmail.com>

{usso-0.20.7 → usso-0.21.1}/src/usso.egg-info/SOURCES.txt

@@ -7,6 +7,7 @@ src/usso/b64tools.py
 src/usso/core.py
 src/usso/exceptions.py
 src/usso/package_data.dat
+src/usso/session.py
 src/usso.egg-info/PKG-INFO
 src/usso.egg-info/SOURCES.txt
 src/usso.egg-info/dependency_links.txt

{usso-0.20.7 → usso-0.21.1}/tests/test_api.py

@@ -18,17 +18,16 @@ class TestAPI(unittest.TestCase):
         self.assertIsInstance(users, list)
         for user in users:
             self.assertIsInstance(user, UserData)
-        return users
 
     def test_get_user(self):
-        users = self.test_get_users()
+        usso_api = self.get_usso()
+        users = usso_api.get_users()
         if len(users) == 0:
             self.skipTest("No users found")
         user = users[0]
         usso_api = self.get_usso()
-        user = usso_api.get_user(user["user_id"])
+        user = usso_api.get_user(user.user_id)
         self.assertIsInstance(user, UserData)
-        return user
 
     def test_get_user_by_credentials(self):
         usso_api = self.get_usso()
@@ -43,13 +42,19 @@ class TestAPI(unittest.TestCase):
                 }
                 user = usso_api.get_user_by_credentials(cred)
                 self.assertIsInstance(user, UserData)
-                return user
 
     def test_create_user_by_credentials(self):
+        import requests
+
         usso_api = self.get_usso()
         telegram_id = os.getenv("TELEGRAM_ID")
         cred = {"auth_method": "telegram", "representor": telegram_id}
-        usso_api.create_user_by_credentials(credentials=cred)
+        try:
+            usso_api.create_user_by_credentials(credentials=cred)
+        except requests.HTTPError as e:
+            if e.response.status_code == 400:
+                if e.response.json().get("error") == "already_exists":
+                    self.skipTest("Credential already exists")
 
 
 if __name__ == "__main__":

{usso-0.20.7 → usso-0.21.1}/tests/test_simple.py

@@ -8,9 +8,9 @@ import unittest
 class TestSimple(unittest.TestCase):
     def test_import(self):
         import usso
-
+        
         usso.Usso()
-        usso.UserData()
+        usso.UserData(user_id='123')
 
 
 if __name__ == "__main__":