usso 0.28.13__tar.gz → 0.28.15__tar.gz

{usso-0.28.13/src/usso.egg-info → usso-0.28.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usso
-Version: 0.28.13
+Version: 0.28.15
 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.16
+Requires-Dist: usso-jwt>=0.2.0
 Provides-Extra: fastapi
 Requires-Dist: fastapi>=0.65.0; extra == "fastapi"
 Requires-Dist: uvicorn[standard]>=0.13.0; extra == "fastapi"
@@ -148,7 +148,7 @@ Then configure your app to verify tokens issued by this service, using its publi
 
 ```python
 JWTConfig(
-    jwk_url="http://localhost:8000/.well-known/jwks.json",
+    jwks_url="http://localhost:8000/.well-known/jwks.json",
     ...
 )
 ```

{usso-0.28.13 → usso-0.28.15}/README.md

@@ -96,7 +96,7 @@ Then configure your app to verify tokens issued by this service, using its publi
 
 ```python
 JWTConfig(
-    jwk_url="http://localhost:8000/.well-known/jwks.json",
+    jwks_url="http://localhost:8000/.well-known/jwks.json",
     ...
 )
 ```

{usso-0.28.13 → usso-0.28.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "usso"
-version = "0.28.13"
+version = "0.28.15"
 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"
@@ -30,7 +30,7 @@ dependencies = [
   "singleton_package",
   "json-advanced",
   "httpx",
-  "usso-jwt>=0.1.16",
+  "usso-jwt>=0.2.0",
 ]
 
 [project.optional-dependencies]

{usso-0.28.13 → usso-0.28.15}/src/usso/auth/api_key.py

@@ -20,11 +20,11 @@ def _handle_exception(error_type: str, **kwargs):
 
 
 @cachetools.func.ttl_cache(maxsize=128, ttl=10 * 60)
-def fetch_api_key_data(jwk_url: str, api_key: str):
+def fetch_api_key_data(jwks_url: str, api_key: str):
     """Fetch user data using an API key.
 
     Args:
-        jwk_url: The JWK URL to use for verification
+        jwks_url: The JWK URL to use for verification
         api_key: The API key to verify
 
     Returns:
@@ -34,7 +34,7 @@ def fetch_api_key_data(jwk_url: str, api_key: str):
         USSOException: If the API key is invalid or verification fails
     """
     try:
-        parsed = urlparse(jwk_url)
+        parsed = urlparse(jwks_url)
         url = f"{parsed.scheme}://{parsed.netloc}/api_key/verify"
         response = httpx.post(url, json={"api_key": api_key})
         response.raise_for_status()

{usso-0.28.13 → usso-0.28.15}/src/usso/auth/client.py

@@ -87,4 +87,4 @@ class UssoAuth:
         Raises:
             USSOException: If the API key is invalid
         """
-        return fetch_api_key_data(self.jwt_configs[0].jwk_url, api_key)
+        return fetch_api_key_data(self.jwt_configs[0].jwks_url, api_key)

{usso-0.28.13 → usso-0.28.15}/src/usso/integrations/django/middleware.py

@@ -70,8 +70,8 @@ class USSOAuthenticationMiddleware(MiddlewareMixin):
         Check if a user exists by phone. If not, create a new user
         and return it.
         """
-        if self.jwt_config.jwk_url:
-            domain = urlparse(self.jwt_config.jwk_url).netloc
+        if self.jwt_config.jwks_url:
+            domain = urlparse(self.jwt_config.jwks_url).netloc
         else:
             domain = "example.com"
         phone = user_data.phone

{usso-0.28.13 → usso-0.28.15}/src/usso/integrations/fastapi/dependency.py

@@ -16,12 +16,14 @@ class USSOAuthentication(UssoAuth):
         self,
         jwt_config: AvailableJwtConfigs | None = None,
         raise_exception: bool = True,
+        expected_token_type: str = "access",
     ):
         if jwt_config is None:
             jwt_config = AuthConfig()
 
         super().__init__(jwt_config=jwt_config)
         self.raise_exception = raise_exception
+        self.expected_token_type = expected_token_type
 
     def __call__(self, request: Request) -> UserData:
         return self.usso_access_security(request)
@@ -52,7 +54,9 @@ class USSOAuthentication(UssoAuth):
         token = self.get_request_jwt(request)
         if token:
             return self.user_data_from_token(
-                token, raise_exception=self.raise_exception
+                token,
+                raise_exception=self.raise_exception,
+                expected_token_type=self.expected_token_type,
             )
 
         _handle_exception(
@@ -71,7 +75,9 @@ class USSOAuthentication(UssoAuth):
         token = self.get_request_jwt(websocket)
         if token:
             return self.user_data_from_token(
-                token, raise_exception=self.raise_exception
+                token,
+                raise_exception=self.raise_exception,
+                expected_token_type=self.expected_token_type,
             )
         _handle_exception(
             "Unauthorized",

{usso-0.28.13 → usso-0.28.15}/src/usso/session/async_session.py

@@ -52,11 +52,11 @@ class AsyncUssoSession(httpx.AsyncClient, BaseUssoSession):
         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"),
+            config=JWTConfig(jwks_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"),
+            config=JWTConfig(jwks_url=f"{self.usso_url}/website/jwks.json"),
         )
         if self.access_token:
             self.headers.update({

{usso-0.28.13 → usso-0.28.15}/src/usso/session/base_session.py

@@ -48,7 +48,7 @@ class BaseUssoSession:
         self.usso_refresh_url = f"{usso_url}/auth/refresh"
         self._refresh_token = JWT(
             token=refresh_token,
-            config=JWTConfig(jwk_url=f"{self.usso_url}/website/jwks.json"),
+            config=JWTConfig(jwks_url=f"{self.usso_url}/website/jwks.json"),
         )
 
         self.access_token = None
@@ -67,10 +67,10 @@ class BaseUssoSession:
     def refresh_token(self):
         if (
             self._refresh_token
-            and self._refresh_token.verify(
+            and self._refresh_token.verify(  # noqa: W503
                 expected_token_type="refresh",
             )
-            and self._refresh_token.is_temporally_valid()
+            and self._refresh_token.is_temporally_valid()  # noqa: W503
         ):
             self._refresh_token = None
 

{usso-0.28.13 → usso-0.28.15}/src/usso/session/session.py

@@ -38,7 +38,7 @@ class UssoSession(httpx.Client, BaseUssoSession):
         response.raise_for_status()
         self.access_token = JWT(
             token=response.json().get("access_token"),
-            config=JWTConfig(jwk_url=f"{self.usso_url}/website/jwks.json"),
+            config=JWTConfig(jwks_url=f"{self.usso_url}/website/jwks.json"),
         )
         self.headers.update({"Authorization": f"Bearer {self.access_token}"})
         return response.json()

{usso-0.28.13 → usso-0.28.15/src/usso.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usso
-Version: 0.28.13
+Version: 0.28.15
 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.16
+Requires-Dist: usso-jwt>=0.2.0
 Provides-Extra: fastapi
 Requires-Dist: fastapi>=0.65.0; extra == "fastapi"
 Requires-Dist: uvicorn[standard]>=0.13.0; extra == "fastapi"
@@ -148,7 +148,7 @@ Then configure your app to verify tokens issued by this service, using its publi
 
 ```python
 JWTConfig(
-    jwk_url="http://localhost:8000/.well-known/jwks.json",
+    jwks_url="http://localhost:8000/.well-known/jwks.json",
     ...
 )
 ```

{usso-0.28.13 → usso-0.28.15}/src/usso.egg-info/requires.txt

@@ -4,7 +4,7 @@ cachetools
 singleton_package
 json-advanced
 httpx
-usso-jwt>=0.1.16
+usso-jwt>=0.2.0
 
 [all]
 fastapi>=0.65.0