usso 0.26.1__py3-none-any.whl → 0.27.0__py3-none-any.whl

usso/core.py

@@ -2,10 +2,12 @@ import json
 import logging
 import os
 import uuid
-from functools import lru_cache
+from urllib.parse import urlparse
 
 import cachetools.func
 import jwt
+import requests
+from cachetools import TTLCache, cached
 from pydantic import BaseModel, model_validator
 
 from . import b64tools
@@ -90,7 +92,7 @@ def decode_token(key, token: str, algorithms=["RS256"], **kwargs) -> dict:
         logger.error(e)
 
 
-@lru_cache
+@cached(TTLCache(maxsize=128, ttl=10 * 60))
 def get_jwk_keys(jwk_url: str) -> jwt.PyJWKClient:
     return jwt.PyJWKClient(jwk_url, headers={"User-Agent": "usso-python"})
 
@@ -115,6 +117,15 @@ def decode_token_jwk(jwk_url: str, token: str, **kwargs) -> UserData | None:
         logger.error(e)
 
 
+@cached(TTLCache(maxsize=128, ttl=10 * 60))
+def get_api_key_data(jwk_url: str, api_key: str):
+    parsed = urlparse(jwk_url)
+    url = f"{parsed.scheme}://{parsed.netloc}/api_key/verify"
+    response = requests.post(url, json={"api_key": api_key})
+    response.raise_for_status()
+    return UserData(**response.json())
+
+
 class JWTConfig(BaseModel):
     jwk_url: str | None = None
     secret: str | None = None
@@ -147,7 +158,9 @@ class Usso:
     def __init__(
         self,
         *,
-        jwt_config: str | dict | JWTConfig | list[str] | list[dict] | list[JWTConfig] | None = None,
+        jwt_config: (
+            str | dict | JWTConfig | list[str] | list[dict] | list[JWTConfig] | None
+        ) = None,
         jwk_url: str | None = None,
         secret: str | None = None,
     ):
@@ -160,7 +173,7 @@ class Usso:
             if jwk_url:
                 self.jwt_configs = [JWTConfig(jwk_url=jwk_url)]
                 return
-            
+
             if not secret:
                 secret = os.getenv("USSO_SECRET")
             if secret:
@@ -216,3 +229,31 @@ class Usso:
                 status_code=401,
                 error="unauthorized",
             )
+
+    def user_data_api_key(self, api_key: str, **kwargs) -> UserData | None:
+        """get user data from auth server by api_key."""
+        for jwk_config in self.jwt_configs:
+            try:
+                user_data = jwk_config.decode(api_key)
+                if user_data.token_type.lower() != kwargs.get("token_type", "access"):
+                    raise USSOException(
+                        status_code=401,
+                        error="invalid_token_type",
+                        message="Token type must be 'access'",
+                    )
+
+                return user_data
+
+            except USSOException as e:
+                exp = e
+
+        if kwargs.get("raise_exception", True):
+            if exp:
+                raise exp
+            raise USSOException(
+                status_code=401,
+                error="unauthorized",
+            )
+
+    def user_data_from_api_key(self, api_key: str):
+        return get_api_key_data(self.jwt_configs[0].jwk_url, api_key)

usso/fastapi/integration.py

@@ -27,16 +27,26 @@ def get_request_token(request: Request | WebSocket) -> UserData | None:
     return token
 
 
-def jwt_access_security_None(request: Request, jwt_config = None) -> UserData | None:
+def jwt_access_security_None(request: Request, jwt_config=None) -> UserData | None:
     """Return the user associated with a token value."""
+    api_key = request.headers.get("x-api-key")
+    if api_key:
+        return Usso(jwt_config=jwt_config).user_data_from_api_key(api_key)
+
     token = get_request_token(request)
     if not token:
         return None
-    return Usso(jwt_config=jwt_config).user_data_from_token(token, raise_exception=False)
+    return Usso(jwt_config=jwt_config).user_data_from_token(
+        token, raise_exception=False
+    )
 
 
 def jwt_access_security(request: Request, jwt_config=None) -> UserData | None:
     """Return the user associated with a token value."""
+    api_key = request.headers.get("x-api-key")
+    if api_key:
+        return Usso(jwt_config=jwt_config).user_data_from_api_key(api_key)
+
     token = get_request_token(request)
     if not token:
         raise USSOException(
@@ -50,6 +60,10 @@ def jwt_access_security(request: Request, jwt_config=None) -> UserData | None:
 
 def jwt_access_security_ws(websocket: WebSocket, jwt_config=None) -> UserData | None:
     """Return the user associated with a token value."""
+    api_key = websocket.headers.get("x-api-key")
+    if api_key:
+        return Usso(jwt_config=jwt_config).user_data_from_api_key(api_key)
+
     token = get_request_token(websocket)
     if not token:
         raise USSOException(

{usso-0.26.1.dist-info → usso-0.27.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: usso
-Version: 0.26.1
+Version: 0.27.0
 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>
@@ -42,28 +42,28 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: pydantic >=2
-Requires-Dist: requests >=2.26.0
+Requires-Dist: pydantic>=2
+Requires-Dist: requests>=2.26.0
 Requires-Dist: pyjwt[crypto]
 Requires-Dist: cachetools
-Provides-Extra: all
-Requires-Dist: fastapi ; extra == 'all'
-Requires-Dist: uvicorn ; extra == 'all'
-Requires-Dist: django ; extra == 'all'
-Requires-Dist: httpx ; extra == 'all'
-Requires-Dist: dev ; extra == 'all'
-Requires-Dist: test ; extra == 'all'
-Provides-Extra: dev
-Requires-Dist: check-manifest ; extra == 'dev'
-Provides-Extra: django
-Requires-Dist: Django >=3.2 ; extra == 'django'
 Provides-Extra: fastapi
-Requires-Dist: fastapi >=0.65.0 ; extra == 'fastapi'
-Requires-Dist: uvicorn[standard] >=0.13.0 ; extra == 'fastapi'
+Requires-Dist: fastapi>=0.65.0; extra == "fastapi"
+Requires-Dist: uvicorn[standard]>=0.13.0; extra == "fastapi"
+Provides-Extra: django
+Requires-Dist: Django>=3.2; extra == "django"
 Provides-Extra: httpx
-Requires-Dist: httpx ; extra == 'httpx'
+Requires-Dist: httpx; extra == "httpx"
+Provides-Extra: dev
+Requires-Dist: check-manifest; extra == "dev"
 Provides-Extra: test
-Requires-Dist: coverage ; extra == 'test'
+Requires-Dist: coverage; extra == "test"
+Provides-Extra: all
+Requires-Dist: fastapi; extra == "all"
+Requires-Dist: uvicorn; extra == "all"
+Requires-Dist: django; extra == "all"
+Requires-Dist: httpx; extra == "all"
+Requires-Dist: dev; extra == "all"
+Requires-Dist: test; extra == "all"
 
 # USSO-Client
 

{usso-0.26.1.dist-info → usso-0.27.0.dist-info}/RECORD

@@ -3,17 +3,17 @@ usso/api.py,sha256=xlDq2nZNpq3mhAvqIbGEfANHNjJpPquSeULBfS7iMJw,5094
 usso/async_api.py,sha256=rb-Xh5oudmZrPYM_iH_B75b5Z0Fvi1V1uurdcKE51w0,5551
 usso/async_session.py,sha256=nFIrtV3Tp0H-s2ZkMLU9_fVSeVGq1EtY1bGT_XOS5Vw,4336
 usso/b64tools.py,sha256=HGQ0E59vzjrQo2-4jrcY03ebtTaYwTtCZ7KgJaEmxO0,610
-usso/core.py,sha256=tZzoh_t7HYr-HIual4hN7K1ZVk_nGZdKpaItq5VvkJQ,7087
+usso/core.py,sha256=n5Ffb4vASS6kTOyGCj9AVE4zXf9NNO0X0UbM6VjLUvg,8501
 usso/exceptions.py,sha256=hawOAuVbvQtjgRfwp1KFZ4SmV7fh720y5Gom9JVA8W8,504
 usso/httpx_session.py,sha256=jp52thSbve4gpJuVVxnKEgH5o7LbYIZ5owf3Y-7ZDbY,3067
 usso/session.py,sha256=E8qx96IWfLWp0CTo1qwb6VUWn0giUnKQIQo-ZRnneEY,2508
 usso/django/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 usso/django/middleware.py,sha256=EEEpHvMQ6QiWw2HY8zQ2Aec0RCATcLWsCKeyiPWJKio,3245
 usso/fastapi/__init__.py,sha256=0EcdOzb4f3yu9nILIdGWnlyUz-0VaVX2az1e3f2BusI,201
-usso/fastapi/integration.py,sha256=-8MTeqGokvmUO0lxZpEWXdTMYg6n065qtnaJHOwCrzQ,1890
-usso-0.26.1.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
-usso-0.26.1.dist-info/METADATA,sha256=GOWjHISSSaoWSO_Y5iVVrcNovcqxexM7CSpViujFz_0,4506
-usso-0.26.1.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-usso-0.26.1.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
-usso-0.26.1.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
-usso-0.26.1.dist-info/RECORD,,
+usso/fastapi/integration.py,sha256=O788Pkvyv3ncTs4ObUwL_iDvzvL83MT2qnp4Al0sxXo,2321
+usso-0.27.0.dist-info/LICENSE.txt,sha256=ceC9ZJOV9H6CtQDcYmHOS46NA3dHJ_WD4J9blH513pc,1081
+usso-0.27.0.dist-info/METADATA,sha256=O9uJ0SPMSnFn_AXy53gDhCQ_2rOkMf_JQR3r0qr9yAY,4489
+usso-0.27.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+usso-0.27.0.dist-info/entry_points.txt,sha256=4Zgpm5ELaAWPf0jPGJFz1_X69H7un8ycT3WdGoJ0Vvk,35
+usso-0.27.0.dist-info/top_level.txt,sha256=g9Jf6h1Oyidh0vPiFni7UHInTJjSvu6cUalpLTIvthg,5
+usso-0.27.0.dist-info/RECORD,,

{usso-0.26.1.dist-info → usso-0.27.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any