usso 0.28.5__py3-none-any.whl → 0.28.7__py3-none-any.whl

usso/session/async_session.py

@@ -1,8 +1,8 @@
 import os
 
 import httpx
+from usso_jwt.schemas import JWT, JWTConfig
 
-from ..core import is_expired
 from .base_session import BaseUssoSession
 
 
@@ -49,9 +49,15 @@ class AsyncUssoSession(httpx.AsyncClient, BaseUssoSession):
         Helper function to process the response from refresh requests.
         """
         response.raise_for_status()
-        data = response.json()
-        self.access_token = data.get("access_token")
-        self._refresh_token = data.get("token", {}).get("refresh_token")
+        data: dict[str, str | dict[str, str]] = response.json()
+        self.access_token = JWT(
+            token=data.get("access_token"),
+            config=JWTConfig(jwk_url=f"{self.usso_url}/website/jwks.json"),
+        )
+        self._refresh_token = JWT(
+            token=data.get("token", {}).get("refresh_token"),
+            config=JWTConfig(jwk_url=f"{self.usso_url}/website/jwks.json"),
+        )
         if self.access_token:
             self.headers.update({
                 "Authorization": f"Bearer {self.access_token}"
@@ -98,7 +104,7 @@ class AsyncUssoSession(httpx.AsyncClient, BaseUssoSession):
         if hasattr(self, "api_key") and self.api_key:
             return self
 
-        if not self.access_token or is_expired(self.access_token):
+        if not self.access_token or self.access_token.is_temporally_valid():
             await self._refresh()
         return self
 

usso/session/session.py

@@ -1,8 +1,7 @@
 import os
 
 import httpx
-
-from usso.core import is_expired
+from usso_jwt.schemas import JWT, JWTConfig
 
 from .base_session import BaseUssoSession
 
@@ -37,7 +36,10 @@ class UssoSession(httpx.Client, BaseUssoSession):
             json={"refresh_token": f"{self.refresh_token}"},
         )
         response.raise_for_status()
-        self.access_token = response.json().get("access_token")
+        self.access_token = JWT(
+            token=response.json().get("access_token"),
+            config=JWTConfig(jwk_url=f"{self.usso_url}/website/jwks.json"),
+        )
         self.headers.update({"Authorization": f"Bearer {self.access_token}"})
         return response.json()
 
@@ -45,7 +47,7 @@ class UssoSession(httpx.Client, BaseUssoSession):
         if self.api_key:
             return self
 
-        if not self.access_token or is_expired(self.access_token):
+        if not self.access_token or self.access_token.is_temporally_valid():
             self._refresh()
         return self
 

{usso-0.28.5.dist-info → usso-0.28.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usso
-Version: 0.28.5
+Version: 0.28.7
 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>
@@ -28,7 +28,7 @@ Requires-Dist: cachetools
 Requires-Dist: singleton_package
 Requires-Dist: json-advanced
 Requires-Dist: httpx
-Requires-Dist: usso-jwt>=0.1.13
+Requires-Dist: usso-jwt>=0.1.16
 Provides-Extra: fastapi
 Requires-Dist: fastapi>=0.65.0; extra == "fastapi"
 Requires-Dist: uvicorn[standard]>=0.13.0; extra == "fastapi"

{usso-0.28.5.dist-info → usso-0.28.7.dist-info}/RECORD

@@ -11,15 +11,15 @@ usso/integrations/fastapi/dependency.py,sha256=9CaRSvCNbrSQr7EQd6SEs7HhxULWvXLkE
 usso/integrations/fastapi/handler.py,sha256=MNDoBYdySumFsBgVw-xir3jXXH63KehFXKCh-pNnNZQ,386
 usso/models/user.py,sha256=P9UOIuv0wMFJ-AGeMT0enEiYkGHW5Pmg8Adc8DZPH7U,3668
 usso/session/__init__.py,sha256=tE4qWUdSI7iN_pywm47Mg8NKOTBa2nCNwCy3wCZWRmU,124
-usso/session/async_session.py,sha256=7OKvFnJQaHnLjeQKSW6bltl0KcQGzOvUje-bJKbxFZY,3692
+usso/session/async_session.py,sha256=QQamIOZZD0eXXkIt8LZVUgjKFTFYnsxWI_HGj2VOMM8,3969
 usso/session/base_session.py,sha256=Z-Uwcwb0xX6Uo7OVd6ejYz7aMiDWrj5KGein7WWJCo0,2530
-usso/session/session.py,sha256=B29Srxoq7webDvmfmfTeeh5JjtLSHvJijM2WCEZOh-8,1506
+usso/session/session.py,sha256=a8iy7lI3cvi7NKi6V1PKfCZ2nLrGTS5sM6Kbu30tN7k,1636
 usso/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 usso/utils/method_utils.py,sha256=1NMN4le04PWXDSJZK-nf7q2IFqOMkwYcCnslFXAzlH8,355
 usso/utils/string_utils.py,sha256=7tziAa2Cwa7xhwM_NF4DSY3BHoqVaWgJ21VuV8LvhrY,253
-usso-0.28.5.dist-info/licenses/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
-usso-0.28.5.dist-info/METADATA,sha256=OWk_eQPsFsX4Z1LikDAWt7X7kjiOJs7uF6LcxrGBD2A,4846
-usso-0.28.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-usso-0.28.5.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
-usso-0.28.5.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
-usso-0.28.5.dist-info/RECORD,,
+usso-0.28.7.dist-info/licenses/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
+usso-0.28.7.dist-info/METADATA,sha256=WNUccObeMC2zgkCCc4gTUeN0WizQINqKj9SBaxXSWy8,4846
+usso-0.28.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+usso-0.28.7.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
+usso-0.28.7.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
+usso-0.28.7.dist-info/RECORD,,