jamlib 3.2.0b1__tar.gz → 3.2.0b2__tar.gz

{jamlib-3.2.0b1/src/jamlib.egg-info → jamlib-3.2.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jamlib
-Version: 3.2.0b1
+Version: 3.2.0b2
 Summary: Simple and universal library for authorization.
 Author-email: Makridenko Adrian <adrianmakridenko@duck.com>, Ksenia Travnikova <kseniatravnikova@duck.com>
 License: Apache-2.0

{jamlib-3.2.0b1 → jamlib-3.2.0b2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "jamlib"
-version = "3.2.0b1"
+version = "3.2.0b2"
 description = "Simple and universal library for authorization."
 authors = [
     {name = "Makridenko Adrian",email = "adrianmakridenko@duck.com"},

{jamlib-3.2.0b1 → jamlib-3.2.0b2}/src/jam/__init__.py

@@ -12,5 +12,5 @@ from jam.encoders import JsonEncoder
 from jam.instance import Jam
 
 
-__version__ = "3.2.0b1"
+__version__ = "3.2.0b2"
 __all__ = ["Jam", "JsonEncoder", "BaseJam", "BaseEncoder"]

{jamlib-3.2.0b1 → jamlib-3.2.0b2}/src/jam/ext/flask/extensions.py

@@ -5,7 +5,7 @@ from typing import Any
 import flask
 
 from jam.exceptions import JamFlaskPluginConfigError
-from jam.jwt import create_instance as create_jwt
+from jam.jose import create_instance as create_jwt
 from jam.oauth2 import create_instance as create_oauth2
 from jam.paseto import create_instance as create_paseto
 from jam.sessions import create_instance as create_session
@@ -170,7 +170,8 @@ class JWTExtension(BaseAuthExtension):
         if not token:
             return None
         try:
-            payload = self._auth.decode(token)
+            result = self._auth.decode(token)
+            payload = result.get("payload", result)
             flask.g.payload = payload
             return payload
         except Exception:

{jamlib-3.2.0b1 → jamlib-3.2.0b2}/src/jam/ext/litestar/middleware.py

@@ -11,7 +11,7 @@ from litestar.middleware import (
 from jam.aio.sessions.__base__ import BaseAsyncSessionModule
 from jam.exceptions import JamLitestarPluginConfigError, JamLitestarPluginError
 from jam.ext.litestar.objects import BaseUser, Token
-from jam.jwt import JWT
+from jam.jose.__base__ import BaseJWT as JWTClass
 from jam.paseto import BasePASETO
 
 
@@ -46,7 +46,7 @@ class BaseMiddleware(AbstractAuthenticationMiddleware):
 class JWTMiddleware(BaseMiddleware):
     """JWT Middleware for litestar."""
 
-    AUTH_MODULE: JWT
+    AUTH_MODULE: JWTClass
     LIST: bool = False
 
     async def authenticate_request(  # noqa
@@ -57,7 +57,8 @@ class JWTMiddleware(BaseMiddleware):
         if not token:
             return AuthenticationResult(user=None, auth=token_model)
         try:
-            data = self.AUTH_MODULE.decode(token)
+            result = self.AUTH_MODULE.decode(token)
+            data = result.get("payload", result)
             if self.AUTH_MODULE.list and self.LIST:
                 match self.AUTH_MODULE.list.__list_type__:
                     case "white":

{jamlib-3.2.0b1 → jamlib-3.2.0b2}/src/jam/ext/litestar/plugins.py

@@ -16,7 +16,7 @@ from jam.ext.litestar.middleware import (
     SessionMiddleware,
 )
 from jam.ext.litestar.objects import BaseUser
-from jam.jwt import create_instance as create_jwt
+from jam.jose import create_instance as create_jwt
 from jam.oauth2 import create_instance as create_oauth2
 from jam.paseto import create_instance as create_paseto
 from jam.utils.config_maker import GENERIC_POINTER, __config_maker__

{jamlib-3.2.0b1 → jamlib-3.2.0b2}/src/jam/ext/starlette/backends.py

@@ -14,7 +14,7 @@ from starlette.requests import HTTPConnection
 from jam.aio.sessions import create_instance as create_session
 from jam.exceptions import JamStarlettePluginConfigError
 from jam.ext.starlette.objects import BaseUser, SimpleUser
-from jam.jwt import create_instance as create_jwt
+from jam.jose import create_instance as create_jwt
 from jam.paseto import create_instance as create_paseto
 from jam.utils.config_maker import GENERIC_POINTER, __config_maker__
 
@@ -141,7 +141,8 @@ class JWTBackend(BaseBackend):
                         if self._auth.list.check(token):
                             return AuthCredentials(None), UnauthenticatedUser()
             data = self._auth.decode(token)
-            user = self._user.from_payload(data)
+            payload = data.get("payload", data)
+            user = self._user.from_payload(payload)
             return AuthCredentials(["authenticated"]), user
 
         return AuthCredentials(None), UnauthenticatedUser()

jamlib-3.2.0b2/src/jam/jose/__init__.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+
+"""JOSE tools."""
+
+from typing import Any
+
+from jam.jose.jwk import JWK, JWKOct, JWKSet, JWKRSA, JWKEC
+from jam.jose.jws import JWS
+from jam.jose.jwe import JWE
+from jam.jose.jwt import JWT
+from jam.logger import BaseLogger, logger
+from jam.encoders import BaseEncoder, JsonEncoder
+
+
+def create_instance(
+    alg: str,
+    secret: Any = None,
+    secret_key: Any = None,
+    password: str | bytes | None = None,
+    list: dict[str, Any] | None = None,
+    logger: BaseLogger = logger,
+    serializer: BaseEncoder | type[BaseEncoder] = JsonEncoder,
+    **kwargs: Any,
+) -> JWT:
+    """Create JWT instance."""
+    if secret is None and secret_key is not None:
+        secret = secret_key
+    elif secret is None:
+        raise ValueError("Either 'secret' or 'secret_key' must be provided")
+
+    key = secret
+    if isinstance(secret, JWK):
+        key = secret._to_keylike()
+
+    return JWT(
+        alg=alg,
+        secret_key=key,
+        password=password,
+        list=list,
+        serializer=serializer,
+        logger=logger,
+    )
+
+
+__all__ = [
+    "JWK",
+    "JWKSet",
+    "JWS",
+    "JWE",
+    "JWT",
+    "JWKRSA",
+    "JWKEC",
+    "JWKOct",
+    "create_instance",
+]

{jamlib-3.2.0b1 → jamlib-3.2.0b2}/src/jam/jwt/__init__.py

@@ -62,4 +62,4 @@ def create_instance(
     )
 
 
-__all__ = ["JWT", "BaseJWT", "create_instance"]
+__all__ = ["JWT", "BaseJWT", "create_instance"]

{jamlib-3.2.0b1 → jamlib-3.2.0b2}/src/jam/tests/clients.py

@@ -7,7 +7,7 @@ import uuid
 
 from jam.aio import Jam as AioJam
 from jam.instance import Jam
-from jam.jwt.utils import base64url_decode
+from jam.jose.utils import __base64url_decode__ as base64url_decode
 from jam.tests.fakers import (
     fake_jwt_token,
     fake_oauth2_token,

{jamlib-3.2.0b1 → jamlib-3.2.0b2}/src/jam/tests/fakers.py

@@ -5,7 +5,7 @@ from secrets import token_urlsafe
 from typing import Any
 import uuid
 
-from jam.jwt.utils import base64url_encode
+from jam.jose.utils import __base64url_encode__ as base64url_encode
 from jam.utils import xor_my_data
 
 

{jamlib-3.2.0b1 → jamlib-3.2.0b2/src/jamlib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jamlib
-Version: 3.2.0b1
+Version: 3.2.0b2
 Summary: Simple and universal library for authorization.
 Author-email: Makridenko Adrian <adrianmakridenko@duck.com>, Ksenia Travnikova <kseniatravnikova@duck.com>
 License: Apache-2.0

jamlib-3.2.0b1/src/jam/jose/__init__.py

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""JOSE tools."""
-
-from jam.jose.jwk import JWK, JWKOct, JWKSet, JWKRSA, JWKEC
-from jam.jose.jws import JWS
-from jam.jose.jwe import JWE
-from jam.jose.jwt import JWT
-
-__all__ = [
-    "JWK",
-    "JWKSet",
-    "JWS",
-    "JWE",
-    "JWT",
-    "JWKRSA",
-    "JWKEC",
-    "JWKOct",
-]