python3-commons 0.8.30__py3-none-any.whl → 0.8.32__py3-none-any.whl

python3_commons/auth.py

@@ -1,6 +1,6 @@
 import logging
 from http import HTTPStatus
-from typing import Annotated, Sequence
+from typing import Annotated, Any, Callable, Coroutine, Sequence, Type, TypeVar
 
 import aiohttp
 from fastapi import Depends, HTTPException
@@ -20,6 +20,9 @@ class TokenData(BaseModel):
     iss: str
 
 
+T = TypeVar('T', bound=TokenData)
+
+
 OIDC_CONFIG_URL = f'{oidc_settings.authority_url}/.well-known/openid-configuration'
 _JWKS: dict | None = None
 
@@ -52,31 +55,36 @@ async def fetch_jwks(jwks_uri: str) -> dict:
             return await response.json()
 
 
-async def get_verified_token(
-    authorization: Annotated[HTTPAuthorizationCredentials, Depends(bearer_security)],
-) -> TokenData | None:
-    """
-    Verify the JWT access token using OIDC authority JWKS.
-    """
-    global _JWKS
+def get_token_verifier(token_cls: Type[T]) -> Callable[[HTTPAuthorizationCredentials], Coroutine[Any, Any, T | None]]:
+    async def get_verified_token(
+        authorization: Annotated[HTTPAuthorizationCredentials, Depends(bearer_security)],
+    ) -> T | None:
+        """
+        Verify the JWT access token using OIDC authority JWKS.
+        """
+        global _JWKS
+
+        if not oidc_settings.enabled:
+            return None
 
-    if not oidc_settings.enabled:
-        return None
+        token = authorization.credentials
 
-    token = authorization.credentials
+        try:
+            if not _JWKS:
+                openid_config = await fetch_openid_config()
+                _JWKS = await fetch_jwks(openid_config['jwks_uri'])
 
-    try:
-        if not _JWKS:
-            openid_config = await fetch_openid_config()
-            _JWKS = await fetch_jwks(openid_config['jwks_uri'])
+            if oidc_settings.client_id:
+                payload = jwt.decode(token, _JWKS, algorithms=['RS256'], audience=oidc_settings.client_id)
+            else:
+                payload = jwt.decode(token, _JWKS, algorithms=['RS256'])
 
-        if oidc_settings.client_id:
-            payload = jwt.decode(token, _JWKS, algorithms=['RS256'], audience=oidc_settings.client_id)
-        else:
-            payload = jwt.decode(token, _JWKS, algorithms=['RS256'])
+            token_data = token_cls(**payload)
 
-        token_data = TokenData(**payload)
+            return token_data
+        except jwt.ExpiredSignatureError:
+            raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED, detail='Token has expired')
+        except JWTError as e:
+            raise HTTPException(status_code=HTTPStatus.UNAUTHORIZED, detail=f'Token is invalid: {str(e)}')
 
-        return token_data
-    except JWTError as e:
-        raise HTTPException(status_code=HTTPStatus.FORBIDDEN, detail=f'Token is invalid: {str(e)}')
+    return get_verified_token

python3_commons/db/models/common.py

@@ -1,3 +1,5 @@
+import uuid
+
 from pydantic import AwareDatetime
 from sqlalchemy import BIGINT, DateTime
 from sqlalchemy.dialects.postgresql import UUID
@@ -32,7 +34,7 @@ class BaseDBModel:
 
 
 class BaseDBUUIDModel:
-    uid: Mapped[UUID] = mapped_column(UUID, primary_key=True, sort_order=-3)
+    uid: Mapped[uuid.UUID] = mapped_column(UUID, primary_key=True, sort_order=-3)
     created_at: Mapped[AwareDatetime] = mapped_column(
         DateTime(timezone=True), nullable=False, server_default=UTCNow(), sort_order=-2
     )

{python3_commons-0.8.30.dist-info → python3_commons-0.8.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-commons
-Version: 0.8.30
+Version: 0.8.32
 Summary: Re-usable Python3 code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0

{python3_commons-0.8.30.dist-info → python3_commons-0.8.32.dist-info}/RECORD

@@ -1,7 +1,7 @@
 python3_commons/__init__.py,sha256=0KgaYU46H_IMKn-BuasoRN3C4Hi45KlkHHoPbU9cwiA,189
 python3_commons/api_client.py,sha256=LT7_YmnYVHK2ucKxIhUJCZrmxgfy-lfOxx08-R0WvW0,4505
 python3_commons/audit.py,sha256=osx2ywZXf-V0zOkrhlNgSyzCBvojXQwSYBQ4-ze1xiM,6249
-python3_commons/auth.py,sha256=Fw2pudSkMAploLV2iOh_1LQalnijrO5kNCJfvA9cQfg,2485
+python3_commons/auth.py,sha256=vVaiJ5MHUMSbiLF6TIxe4dqVPhBlLttf940jjODL3a4,2934
 python3_commons/cache.py,sha256=lf27LTD4Z9Iqi5GaK8jH8UC0cL9sHH8wicZ88YDp6Mg,7725
 python3_commons/conf.py,sha256=JenspXyTqTlYeEb8X9Njfje1AiLCee23nm0k8zhYLfs,2283
 python3_commons/fs.py,sha256=wfLjybXndwLqNlOxTpm_HRJnuTcC4wbrHEOaEeCo9Wc,337
@@ -12,7 +12,7 @@ python3_commons/db/__init__.py,sha256=5nArsGm17e-pelpOwAeBKy2n_Py20XqklZsNgkcJ-D
 python3_commons/db/helpers.py,sha256=PY0h08aLiGx-J54wmP3GHPCgGCcLd60rayAUnR3aWdI,1742
 python3_commons/db/models/__init__.py,sha256=Utr5AJf1FwcrxNtdesgjq92WMK4zpK4VL_8z1JEkJw0,185
 python3_commons/db/models/auth.py,sha256=dmyD3BX7LVBgKiepPN-bxlY6J3PhcmUfVdQwhNR45fU,1187
-python3_commons/db/models/common.py,sha256=fVc-q0UKp3HqYPd99KNKlfMlQwMel1g81167UUx5Ils,1519
+python3_commons/db/models/common.py,sha256=IwrVfMQhAkPqrPmPRkG9CAB0KRa6YG_0Mogs1aafAoA,1537
 python3_commons/db/models/rbac.py,sha256=7NNTUbS8whuPUHpm4oba_UWDdNiJlHrm8HBO7oGtk64,3185
 python3_commons/log/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python3_commons/log/filters.py,sha256=fuyjXZAUm-i2MNrxvFYag8F8Rr27x8W8MdV3ke6miSs,175
@@ -21,9 +21,9 @@ python3_commons/serializers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 python3_commons/serializers/json.py,sha256=91UaXLGKGj0yPyrnuMeNrkG2GuPUgcgAsmIokUgEwpU,808
 python3_commons/serializers/msgpack.py,sha256=WrvaPE187shSK8zkH4UHHMimEZNMv9RaDSwsBE2HlCw,1269
 python3_commons/serializers/msgspec.py,sha256=5SS_wQXcrThPmCWjI7k1a_cHWLz46Jzn3pit89SYJGY,2038
-python3_commons-0.8.30.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
-python3_commons-0.8.30.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
-python3_commons-0.8.30.dist-info/METADATA,sha256=wkDWtG3uM8iLKMbCVxLmdTWHD3iUnW3wAHbQvO_Jl1Q,1126
-python3_commons-0.8.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python3_commons-0.8.30.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
-python3_commons-0.8.30.dist-info/RECORD,,
+python3_commons-0.8.32.dist-info/licenses/AUTHORS.rst,sha256=3R9JnfjfjH5RoPWOeqKFJgxVShSSfzQPIrEr1nxIo9Q,90
+python3_commons-0.8.32.dist-info/licenses/LICENSE,sha256=xxILuojHm4fKQOrMHPSslbyy6WuKAN2RiG74HbrYfzM,34575
+python3_commons-0.8.32.dist-info/METADATA,sha256=Rb556zpK-HLmuPCZ7uBMz5t1XU2ADUVUGcVcmzhZHY8,1126
+python3_commons-0.8.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python3_commons-0.8.32.dist-info/top_level.txt,sha256=lJI6sCBf68eUHzupCnn2dzG10lH3jJKTWM_hrN1cQ7M,16
+python3_commons-0.8.32.dist-info/RECORD,,