jamlib 2.6.0b0.dev1__tar.gz → 2.6.0b0.dev3__tar.gz

{jamlib-2.6.0b0.dev1 → jamlib-2.6.0b0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jamlib
-Version: 2.6.0b0.dev1
+Version: 2.6.0b0.dev3
 Summary: Simple and universal library for authorization.
 Author-email: Makridenko Adrian <adrianmakridenko@duck.com>, Ksenia Travnikova <kseniatravnikova@duck.com>
 License: MIT License

{jamlib-2.6.0b0.dev1 → jamlib-2.6.0b0.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "jamlib"
-version = "2.6.0b0.dev1"
+version = "2.6.0b0.dev3"
 description = "Simple and universal library for authorization."
 authors = [
     {name = "Makridenko Adrian",email = "adrianmakridenko@duck.com"},
@@ -81,6 +81,7 @@ dev = [
     "icecream>=2.1.4",
     "isort>=6.0.1",
     "pre-commit>=4.2.0",
+    "pyrefly>=0.39.1",
     "ruff>=0.11.2",
     "uvicorn>=0.37.0",
 ]

{jamlib-2.6.0b0.dev1 → jamlib-2.6.0b0.dev3}/src/jam/__init__.py

@@ -13,5 +13,5 @@ from jam.encoders import JsonEncoder
 from jam.instance import Jam
 
 
-__version__ = "2.6.0b0.dev1"
+__version__ = "2.6.0b0.dev3"
 __all__ = ["Jam", "JsonEncoder", "BaseJam", "BaseEncoder"]

{jamlib-2.6.0b0.dev1 → jamlib-2.6.0b0.dev3}/src/jam/aio/instance.py

@@ -8,6 +8,7 @@ from jam.__abc_instances__ import BaseJam
 from jam.__deprecated__ import deprecated
 from jam.__logger__ import logger
 from jam.aio.modules import JWTModule, OAuth2Module, SessionModule
+from jam.paseto import BasePASETO
 from jam.utils.config_maker import __config_maker__, __module_loader__
 
 
@@ -18,6 +19,7 @@ class Jam(BaseJam):
         "jwt": "jam.aio.modules.JWTModule",
         "session": "jam.aio.modules.SessionModule",
         "oauth2": "jam.aio.modules.OAuth2Module",
+        "paseto": "jam.paseto.utils.init_paseto_instance",
     }
 
     def __init__(
@@ -34,6 +36,7 @@ class Jam(BaseJam):
         self.jwt: Optional[JWTModule] = None
         self.session: Optional[SessionModule] = None
         self.oauth2: Optional[OAuth2Module] = None
+        self.paseto: Optional[BasePASETO] = None
 
         config = __config_maker__(config, pointer)
 
@@ -589,3 +592,51 @@ class Jam(BaseJam):
         return await self.oauth2.client_credentials_flow(
             provider, scope, **extra_params
         )
+
+    async def paseto_make_payload(
+        self, exp: Optional[int] = None, **data: dict[str, Any]
+    ) -> dict[str, Any]:
+        """Generate payload for PASETO.
+
+        Args:
+            exp (int | None): Token expire
+            data (dict[str, Any]): Custom data
+
+        Returns:
+            dict: Payload
+        """
+        from jam.paseto.utils import payload_maker
+
+        return payload_maker(expire=exp, data=data)
+
+    async def paseto_create(
+        self,
+        payload: dict[str, Any],
+        footer: Optional[Union[dict[str, Any], str]],
+    ) -> str:
+        """Create new PASETO.
+
+        Args:
+            payload (dict[str, Any]): Payload
+            footer (dict | str  | None): Footer
+
+        Returns:
+            str: New token
+        """
+        return self.paseto.encode(payload=payload, footer=footer)
+
+    async def paseto_decode(
+        self, token: str, check_exp: bool = True, check_list: bool = True
+    ) -> dict[str, Union[dict, Union[str, dict, None]]]:
+        """Decode PASETO.
+
+        Args:
+            token (str): Token
+            check_exp (bool): Check exp in payload
+            check_list (bool): Check token in list
+
+        Returns:
+            dict: {'payload' PAYLOAD, 'footer': FOOTER}
+        """
+        payload, footer = self.paseto.decode(token)
+        return {"payload": payload, "footer": footer}

{jamlib-2.6.0b0.dev1 → jamlib-2.6.0b0.dev3}/src/jam/instance.py

@@ -602,6 +602,15 @@ class Jam(BaseJam):
     def paseto_make_payload(
         self, exp: Optional[int] = None, **data: dict[str, Any]
     ) -> dict[str, Any]:
+        """Generate payload for PASETO.
+
+        Args:
+            exp (int | None): Token expire
+            data (dict[str, Any]): Custom data
+
+        Returns:
+            dict: Payload
+        """
         from jam.paseto.utils import payload_maker
 
         return payload_maker(expire=exp, data=data)
@@ -611,10 +620,29 @@ class Jam(BaseJam):
         payload: dict[str, Any],
         footer: Optional[Union[dict[str, Any], str]],
     ) -> str:
+        """Create new PASETO.
+
+        Args:
+            payload (dict[str, Any]): Payload
+            footer (dict | str  | None): Footer
+
+        Returns:
+            str: New token
+        """
         return self.paseto.encode(payload=payload, footer=footer)
 
     def paseto_decode(
-        self, token: str
+        self, token: str, check_exp: bool = True, check_list: bool = True
     ) -> dict[str, Union[dict, Union[str, dict, None]]]:
+        """Decode PASETO.
+
+        Args:
+            token (str): Token
+            check_exp (bool): Check exp in payload
+            check_list (bool): Check token in list
+
+        Returns:
+            dict: {'payload' PAYLOAD, 'footer': FOOTER}
+        """
         payload, footer = self.paseto.decode(token)
         return {"payload": payload, "footer": footer}

{jamlib-2.6.0b0.dev1 → jamlib-2.6.0b0.dev3}/src/jam/paseto/utils.py

@@ -3,8 +3,9 @@
 import base64
 import hashlib
 import hmac
+import os.path
 from datetime import datetime
-from typing import Any, Literal, Union
+from typing import Any, Literal, Optional, Union
 from uuid import uuid4
 
 from jam.paseto import PASETO
@@ -67,7 +68,7 @@ def base64url_encode(data: Union[bytes, str]) -> bytes:
 def init_paseto_instance(
     version: Literal["v1", "v2", "v3", "v4"],
     purpose: Literal["public", "local"],
-    key: Union[str, bytes, Any],  # TODO: path to keys
+    key: Union[str, bytes, Any],
     **kwargs,
 ) -> PASETO:
     """Init paseto instance.
@@ -83,6 +84,11 @@ def init_paseto_instance(
     """
     from jam.utils.config_maker import __module_loader__
 
+    if os.path.isfile(key):
+        with open(key) as file:
+            key = file.read()
+        key = key
+
     # FIXME: Fix custom module init
     if kwargs.get("module", None):
         _paseto: type[PASETO] = __module_loader__(kwargs["module"])
@@ -95,7 +101,9 @@ def init_paseto_instance(
     return _paseto.key(purpose, key)
 
 
-def payload_maker(expire: int, data: dict[str, Any]) -> dict[str, Any]:
+def payload_maker(
+    expire: Optional[int], data: dict[str, Any]
+) -> dict[str, Any]:
     """Generate PASETO payload.
 
     ```json
@@ -110,13 +118,17 @@ def payload_maker(expire: int, data: dict[str, Any]) -> dict[str, Any]:
     ```
 
     Args:
-        expire (int): Token lifetime
+        expire (int | None): Token lifetime
         data (dict[str, Any]): Custom data
 
     Returns:
         dict: Payload
     """
     now = datetime.now().timestamp()
-    _payload = {"iat": now, "exp": expire + now, "pit": str(uuid4())}
+    _payload = {
+        "iat": now,
+        "exp": (expire + now) if expire else None,
+        "pit": str(uuid4()),
+    }
 
     return _payload | data

{jamlib-2.6.0b0.dev1 → jamlib-2.6.0b0.dev3}/src/jamlib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jamlib
-Version: 2.6.0b0.dev1
+Version: 2.6.0b0.dev3
 Summary: Simple and universal library for authorization.
 Author-email: Makridenko Adrian <adrianmakridenko@duck.com>, Ksenia Travnikova <kseniatravnikova@duck.com>
 License: MIT License