usso 0.21.0__tar.gz → 0.21.2__tar.gz

{usso-0.21.0/src/usso.egg-info → usso-0.21.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.21.0
+Version: 0.21.2
 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.21.0 → usso-0.21.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "usso"
-version = "0.21.0"
+version = "0.21.2"
 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.21.0 → usso-0.21.2}/src/usso/api.py

@@ -2,7 +2,6 @@ import logging
 
 import requests
 from singleton import Singleton
-
 from usso.core import UserData, Usso
 
 

{usso-0.21.0 → usso-0.21.2}/src/usso/core.py

@@ -79,40 +79,40 @@ class Usso(metaclass=Singleton):
             decoded["token"] = token
             return UserData(**decoded)
         except jwt.exceptions.ExpiredSignatureError:
-            if kwargs.get("raise_exception"):
+            if kwargs.get("raise_exception", True):
                 raise USSOException(status_code=401, error="expired_signature")
         except jwt.exceptions.InvalidSignatureError:
-            if kwargs.get("raise_exception"):
+            if kwargs.get("raise_exception", True):
                 raise USSOException(status_code=401, error="invalid_signature")
         except jwt.exceptions.InvalidAlgorithmError:
-            if kwargs.get("raise_exception"):
+            if kwargs.get("raise_exception", True):
                 raise USSOException(
                     status_code=401,
                     error="invalid_algorithm",
                 )
         except jwt.exceptions.InvalidIssuedAtError:
-            if kwargs.get("raise_exception"):
+            if kwargs.get("raise_exception", True):
                 raise USSOException(
                     status_code=401,
                     error="invalid_issued_at",
                 )
         except jwt.exceptions.InvalidTokenError:
-            if kwargs.get("raise_exception"):
+            if kwargs.get("raise_exception", True):
                 raise USSOException(
                     status_code=401,
                     error="invalid_token",
                 )
         except jwt.exceptions.InvalidKeyError:
-            if kwargs.get("raise_exception"):
+            if kwargs.get("raise_exception", True):
                 raise USSOException(
                     status_code=401,
                     error="invalid_key",
                 )
         except USSOException as e:
-            if kwargs.get("raise_exception"):
+            if kwargs.get("raise_exception", True):
                 raise e
         except Exception as e:
-            if kwargs.get("raise_exception"):
+            if kwargs.get("raise_exception", True):
                 raise USSOException(
                     status_code=401,
                     error="error",

{usso-0.21.0 → usso-0.21.2}/src/usso/fastapi/integration.py

@@ -2,7 +2,6 @@ import logging
 
 from fastapi import Request, WebSocket
 from starlette.status import HTTP_401_UNAUTHORIZED
-
 from usso.core import UserData, Usso
 from usso.exceptions import USSOException
 

{usso-0.21.0 → usso-0.21.2}/src/usso/session.py

@@ -1,3 +1,6 @@
+from datetime import datetime
+
+import jwt
 import requests
 
 
@@ -20,6 +23,13 @@ class UssoSession:
         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(

{usso-0.21.0 → usso-0.21.2/src/usso.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.21.0
+Version: 0.21.2
 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.21.0 → usso-0.21.2}/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.21.0 → usso-0.21.2}/tests/test_simple.py

@@ -10,7 +10,7 @@ class TestSimple(unittest.TestCase):
         import usso
 
         usso.Usso()
-        usso.UserData()
+        usso.UserData(user_id="123")
 
 
 if __name__ == "__main__":