jamlib 2.6.0b0.dev5__tar.gz → 3.0.0a4__tar.gz

{jamlib-2.6.0b0.dev5 → jamlib-3.0.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jamlib
-Version: 2.6.0b0.dev5
+Version: 3.0.0a4
 Summary: Simple and universal library for authorization.
 Author-email: Makridenko Adrian <adrianmakridenko@duck.com>, Ksenia Travnikova <kseniatravnikova@duck.com>
 License: MIT License
@@ -55,7 +55,7 @@ Dynamic: license-file
 
 ![logo](https://github.com/lyaguxafrog/jam/blob/master/docs/assets/h_logo_n_title.png?raw=true)
 
-![Static Badge](https://img.shields.io/badge/Python-3.9%2B-blue?logo=python&logoColor=white)
+![Python Version](https://img.shields.io/badge/Python-3.9.*%20--%203.14.*-blue?logo=python&logoColor=white)
 [![PyPI - Version](https://img.shields.io/pypi/v/jamlib)](https://pypi.org/project/jamlib/)
 [![PyPI Downloads](https://static.pepy.tech/personalized-badge/jamlib?period=total&units=INTERNATIONAL_SYSTEM&left_color=GRAY&right_color=RED&left_text=Downloads)](https://pypi.org/project/jamlib/)
 ![tests](https://github.com/lyaguxafrog/jam/actions/workflows/run-tests.yml/badge.svg)
@@ -76,7 +76,7 @@ from jam import Jam
 jam = Jam()
 
 jwt = jam.jwt_create_token({"user": 1})
-decoded_payload = jam.jwt_verify_token(jwt)
+session_id = jam.session_create(session_key="username", data={"user": 1})
 ```
 
 ## Why Jam?
@@ -115,4 +115,3 @@ Here is a comparison with other libraries:
 | PASETO               | ✅       | ❌                               | ❌                                     | ❌                                   | ❌                                    |
 | Flexible config      | ✅       | ❌                               | ❌                                     | ❌                                   | ❌                                    |
 | Modularity           | ✅       | ❌                               | ❌                                     | ❌                                   | ❌                                    |
-

{jamlib-2.6.0b0.dev5 → jamlib-3.0.0a4}/README.md

@@ -2,7 +2,7 @@
 
 ![logo](https://github.com/lyaguxafrog/jam/blob/master/docs/assets/h_logo_n_title.png?raw=true)
 
-![Static Badge](https://img.shields.io/badge/Python-3.9%2B-blue?logo=python&logoColor=white)
+![Python Version](https://img.shields.io/badge/Python-3.9.*%20--%203.14.*-blue?logo=python&logoColor=white)
 [![PyPI - Version](https://img.shields.io/pypi/v/jamlib)](https://pypi.org/project/jamlib/)
 [![PyPI Downloads](https://static.pepy.tech/personalized-badge/jamlib?period=total&units=INTERNATIONAL_SYSTEM&left_color=GRAY&right_color=RED&left_text=Downloads)](https://pypi.org/project/jamlib/)
 ![tests](https://github.com/lyaguxafrog/jam/actions/workflows/run-tests.yml/badge.svg)
@@ -23,7 +23,7 @@ from jam import Jam
 jam = Jam()
 
 jwt = jam.jwt_create_token({"user": 1})
-decoded_payload = jam.jwt_verify_token(jwt)
+session_id = jam.session_create(session_key="username", data={"user": 1})
 ```
 
 ## Why Jam?
@@ -62,4 +62,3 @@ Here is a comparison with other libraries:
 | PASETO               | ✅       | ❌                               | ❌                                     | ❌                                   | ❌                                    |
 | Flexible config      | ✅       | ❌                               | ❌                                     | ❌                                   | ❌                                    |
 | Modularity           | ✅       | ❌                               | ❌                                     | ❌                                   | ❌                                    |
-

{jamlib-2.6.0b0.dev5 → jamlib-3.0.0a4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "jamlib"
-version = "2.6.0b0.dev5"
+version = "3.0.0a4"
 description = "Simple and universal library for authorization."
 authors = [
     {name = "Makridenko Adrian",email = "adrianmakridenko@duck.com"},
@@ -101,33 +101,28 @@ tests = [
 [tool.ruff]
 target-version = "py39"
 line-length = 80
-ignore = ["UP009", "D100"]
-exclude = ["*__init__.py", "tests/", "*exceptions/"]
+ignore = ["UP009", "D100", "UP007"]
+exclude = ["*__init__.py", "tests/", "*exceptions/", "env", ".env", ".env.example", "migrations/", ".venv/"]
 
 [tool.ruff.lint]
-extend-select = ["UP", "D"]
+extend-select = ["UP", "D", "I"]
 
 [tool.ruff.lint.pydocstyle]
 convention = "google"
 
-[tool.isort]
-profile = "black"
-default_section = "THIRDPARTY"
-balanced_wrapping = true
-known_first_party = "src"
-line_length = 80
-lines_after_imports = 2
-lines_between_sections = 1
-multi_line_output = 3
-sections = ["FUTURE", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"]
-skip = ["env", ".env", ".env.example", "migrations/", ".venv/"]
-
-[tool.black]
-line-length = 80
-skip-string-normalization = false
+[tool.ruff.lint.isort]
+known-first-party = ["jam"]
+split-on-trailing-comma = true
+force-wrap-aliases = true
+force-sort-within-sections = true
+lines-after-imports = 2
+lines-between-types = 1
+
+[tool.ruff.format]
+quote-style = "double"
+skip-magic-trailing-comma = false
+line-ending = "auto"
 
-[tool.mypy]
-disable_error_code = ["no-redef", "import-not-found", "import-untyped", "attr-defined"]
 
 [tool.pytest]
 python_files = ["test*.py"]

{jamlib-2.6.0b0.dev5 → jamlib-3.0.0a4}/src/jam/__abc_instances__.py

@@ -216,80 +216,6 @@ class BaseJam(ABC):
         """
         raise NotImplementedError
 
-    @abstractmethod
-    def gen_jwt_token(self, payload) -> str:
-        """Generate new JWT token."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def verify_jwt_token(
-        self, token: str, check_exp: bool, check_list: bool
-    ) -> dict[str, Any]:
-        """Verify JWT token."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def make_payload(self, **payload) -> dict[str, Any]:
-        """Generate new template."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def create_session(self, session_key: str, data: dict) -> str:
-        """Create new session."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def get_session(self, session_id: str) -> Optional[dict]:
-        """Retrieve session data by session ID."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def delete_session(self, session_id: str) -> None:
-        """Delete a session by its ID."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def update_session(self, session_id: str, data: dict) -> None:
-        """Update session data by session ID."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def clear_sessions(self, session_key: str) -> None:
-        """Clear all sessions associated with a specific session key."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def rework_session(self, old_session_key: str) -> str:
-        """Rework an existing session key to a new one."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def get_otp_uri(
-        self,
-        secret: str,
-        name: Optional[str] = None,
-        issuer: Optional[str] = None,
-        counter: Optional[int] = None,
-    ) -> str:
-        """Generates an otpauth:// URI for Google Authenticator."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def get_otp_code(self, secret: str, factor: Optional[int] = None) -> str:
-        """Generates a OTP code."""
-        raise NotImplementedError
-
-    @abstractmethod
-    def verify_otp_code(
-        self,
-        secret: str,
-        code: str,
-        factor: Optional[int] = None,
-        look_ahead: Optional[int] = None,
-    ) -> bool:
-        """Verify TOTP code."""
-        raise NotImplementedError
-
     @abstractmethod
     def oauth2_get_authorized_url(
         self, provider: str, scope: list[str], **extra_params: Any

{jamlib-2.6.0b0.dev5 → jamlib-3.0.0a4}/src/jam/__init__.py

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

{jamlib-2.6.0b0.dev5 → jamlib-3.0.0a4}/src/jam/aio/instance.py

@@ -1,22 +1,24 @@
 # -*- coding: utf-8 -*-
 
-import gc
 from collections.abc import Callable
+from datetime import datetime
+import gc
 from typing import Any, Optional, Union
+import uuid
 
 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.aio.modules import OAuth2Module, SessionModule
+from jam.jwt import JWT
 from jam.paseto import BasePASETO
-from jam.utils.config_maker import __config_maker__, __module_loader__
+from jam.utils.config_maker import __config_maker__
 
 
 class Jam(BaseJam):
     """Main instance for aio."""
 
     _JAM_MODULES: dict[str, str] = {
-        "jwt": "jam.aio.modules.JWTModule",
+        "jwt": "jam.jwt.module.JWT",
         "session": "jam.aio.modules.SessionModule",
         "oauth2": "jam.aio.modules.OAuth2Module",
         "paseto": "jam.paseto.utils.init_paseto_instance",
@@ -33,7 +35,7 @@ class Jam(BaseJam):
             config (dict[str, Any] | str): dict or path to config file
             pointer (str): Config read point
         """
-        self.jwt: Optional[JWTModule] = None
+        self.jwt: Optional[JWT] = None
         self.session: Optional[SessionModule] = None
         self.oauth2: Optional[OAuth2Module] = None
         self.paseto: Optional[BasePASETO] = None
@@ -49,30 +51,18 @@ class Jam(BaseJam):
             self._otp_module = self._otp_module_setup()
             logger.debug("OTP module initialized")
 
-        # Other modules
-        if config.get("auth_type", None):
-            logger.warning(
-                "This configuration type is deprecated, see: https://jam.makridenko.ru/config"
-            )
-            name = config.pop("auth_type")
-            module = __module_loader__(self._JAM_MODULES[name])
-            self.module = module
-            setattr(self, name, module(**config))
-        else:
-            _jam_modules = self._JAM_MODULES
-            for name, cfg in config.items():
-                try:
-                    module = self.build_module(name, cfg, _jam_modules)
-                    if name == "jwt":
-                        self.module = module
-                    setattr(self, name, module)
-                    logger.debug(
-                        f"Auth module '{name}' successfully initialized"
-                    )
-                except Exception as e:
-                    logger.exception(
-                        f"Failed to initialize auth module '{name}': {e}"
-                    )
+        # config build
+        for name, cfg in config.items():
+            try:
+                module = self.build_module(name, cfg, self._JAM_MODULES)
+                if name == "jwt":
+                    self.module = module
+                setattr(self, name, module)
+                logger.debug(f"Auth module '{name}' successfully initialized")
+            except Exception as e:
+                logger.exception(
+                    f"Failed to initialize auth module '{name}': {e}"
+                )
         gc.collect()
 
     def _otp_module_setup(self) -> Callable:
@@ -106,7 +96,13 @@ class Jam(BaseJam):
         Returns:
             dict[str, Any]: Payload
         """
-        return await self.jwt.make_payload(exp=exp, **data)
+        payload = {
+            "iat": datetime.datetime.now().timestamp(),
+            "exp": (datetime.datetime.now().timestamp() + exp) if exp else None,
+            "jti": str(uuid.uuid4()),
+        }
+        payload = payload | data
+        return payload
 
     async def jwt_create_token(self, payload: dict[str, Any]) -> str:
         """Create JWT token.
@@ -275,243 +271,6 @@ class Jam(BaseJam):
             secret=secret, digits=self._otp.digits, digest=self._otp.digest
         ).verify(code=code, factor=factor, look_ahead=look_ahead)
 
-    @deprecated("This method is deprecated, use: Jam.jwt_create_token")
-    async def gen_jwt_token(self, payload: dict[str, Any]) -> str:
-        """Creating a new token.
-
-        Args:
-            payload (dict[str, Any]): Payload with information
-
-        Deprecated:
-            Use: `Jam.jwt_create_token`
-
-        Raises:
-            EmptySecretKey: If the HMAC algorithm is selected, but the secret key is None
-            EmtpyPrivateKey: If RSA algorithm is selected, but private key None
-
-        Returns:
-            (str): Generated token
-        """
-        return await self.jwt.gen_token(**payload)
-
-    @deprecated("This method is deprecated, use: Jam.jwt_verify_token")
-    async def verify_jwt_token(
-        self, token: str, check_exp: bool = True, check_list: bool = True
-    ) -> dict[str, Any]:
-        """A method for verifying a token.
-
-        Args:
-            token (str): The token to check
-            check_exp (bool): Check for expiration?
-            check_list (bool): Check if there is a black/white list
-
-        Deprecated:
-            Use: `Jam.jwt_verify_token`
-
-        Raises:
-            ValueError: If the token is invalid.
-            EmptySecretKey: If the HMAC algorithm is selected, but the secret key is None.
-            EmtpyPublicKey: If RSA algorithm is selected, but public key None.
-            NotFoundSomeInPayload: If 'exp' not found in payload.
-            TokenLifeTimeExpired: If token has expired.
-            TokenNotInWhiteList: If the list type is white, but the token is  not there
-            TokenInBlackList: If the list type is black and the token is there
-
-        Returns:
-            (dict[str, Any]): Payload from token
-        """
-        return await self.jwt.validate_payload(
-            token=token, check_exp=check_exp, check_list=check_list
-        )
-
-    @deprecated("This method is deprecated, use: Jam.jwt_make_payload")
-    async def make_payload(
-        self, exp: Optional[int] = None, **data: Any
-    ) -> dict[str, Any]:
-        """Payload maker tool.
-
-        Args:
-            exp (int | None): If none exp = JWTModule.exp
-            **data: Custom data
-
-        Deprecated:
-            Use: `Jam.jwt_make_payload`
-        """
-        return await self.jwt.make_payload(exp=exp, **data)
-
-    @deprecated("This method is deprecated, use: `Jam.session_create`")
-    async def create_session(
-        self, session_key: str, data: dict[str, Any]
-    ) -> str:
-        """Create new session.
-
-        Args:
-            session_key (str): Key for sessions
-            data (dict[str, Any]): Session payload
-
-        Deprecated:
-            Use: `Jam.session_create`
-
-        Returns:
-            str: New session ID
-        """
-        return await self.session.create(session_key, data)
-
-    @deprecated("This method is deprecates, use: Jam.session_get")
-    async def get_session(self, session_id: str) -> Optional[dict[str, Any]]:
-        """Retrieve session data by session ID.
-
-        Args:
-            session_id (str): Session ID
-
-        Deprecated:
-            Use: `Jam.session_get`
-
-        Returns:
-            dict | None: Session payload if exists
-        """
-        return await self.session.get(session_id)
-
-    @deprecated("This method is deprecated, use: Jam.session_delete")
-    async def delete_session(self, session_id: str) -> None:
-        """Delete a session by its ID.
-
-        Args:
-            session_id (str): Session ID
-
-        Deprecated:
-            Use: `Jam.session_delete`
-
-        Returns:
-            None
-        """
-        return await self.session.delete(session_id)
-
-    @deprecated("This method is deprecated, use: Jam.session_update")
-    async def update_session(
-        self, session_id: str, data: dict[str, Any]
-    ) -> None:
-        """Update session data by session ID.
-
-        Args:
-            session_id (str): Session ID
-            data (dict[str, Any]): Data for update
-
-        Deprecated:
-            Use: `Jam.session_update`
-
-        Returns:
-            None
-        """
-        return await self.session.update(session_id, data)
-
-    @deprecated("This method is deprecated, use: Jam.session_clear")
-    async def clear_sessions(self, session_key: str) -> None:
-        """Clear all sessions associated with a specific session key.
-
-        Args:
-            session_key (str): Key for session scope
-
-        Deprecated:
-            Use: `Jam.session_clear`
-
-        Returns:
-            None
-        """
-        return await self.session.clear(session_key)
-
-    @deprecated("This method is deprecated, use: Jam.session_rework")
-    async def rework_session(self, old_session_key: str) -> str:
-        """Rework an existing session key to a new one.
-
-        Args:
-            old_session_key (str): Rework session
-
-        Deprecated:
-            Use: `Jam.session_rework`
-
-        Returns:
-            str: New session ID
-        """
-        return await self.session.rework(old_session_key)
-
-    @deprecated("This method is deprecated, use: Jam.otp_code")
-    async def get_otp_code(
-        self, secret: Union[str, bytes], factor: Optional[int] = None
-    ) -> str:
-        """Generates an OTP.
-
-        Args:
-            secret (str | bytes): User secret key.
-            factor (int | None, optional): Unixtime for TOTP(if none, use now time) / Counter for HOTP.
-
-        Deprecated:
-            Use: `Jam.otp_code`
-
-        Returns:
-            str: OTP code (fixed-length string).
-        """
-        self._otp_checker()
-        return self._otp_module(
-            secret=secret, digits=self._otp.digits, digest=self._otp.digest
-        ).at(factor)
-
-    @deprecated("This method os deprecated, use: Jam.otp_uri")
-    async def get_otp_uri(
-        self,
-        secret: str,
-        name: Optional[str] = None,
-        issuer: Optional[str] = None,
-        counter: Optional[int] = None,
-    ) -> str:
-        """Generates an otpauth:// URI for Google Authenticator.
-
-        Args:
-            secret (str): User secret key.
-            name (str): Account name (e.g., email).
-            issuer (str): Service name (e.g., "GitHub").
-            counter (int | None, optional): Counter (for HOTP). Default is None.
-
-        Deprecated:
-            Use: `Jam.otp_uri`
-
-        Returns:
-            str: A string of the form "otpauth://..."
-        """
-        self._otp_checker()
-        return self._otp_module(
-            secret=secret, digits=self._otp.digits, digest=self._otp.digest
-        ).provisioning_uri(
-            name=name, issuer=issuer, type_=self._otp.type, counter=counter
-        )
-
-    @deprecated("This method is deprecated, use: Jam.otp_verify_code")
-    async def verify_otp_code(
-        self,
-        secret: Union[str, bytes],
-        code: str,
-        factor: Optional[int] = None,
-        look_ahead: Optional[int] = 1,
-    ) -> bool:
-        """Checks the OTP code, taking into account the acceptable window.
-
-        Args:
-            secret (str | bytes): User secret key.
-            code (str): The code entered.
-            factor (int | None, optional): Unixtime for TOTP(if none, use now time) / Counter for HOTP.
-            look_ahead (int, optional): Acceptable deviation in intervals (±window(totp) / ±look ahead(hotp)). Default is 1.
-
-        Deprecated:
-            Use: `Jam.otp_verify_code`
-
-        Returns:
-            bool: True if the code matches, otherwise False.
-        """
-        self._otp_checker()
-        return self._otp_module(
-            secret=secret, digits=self._otp.digits, digest=self._otp.digest
-        ).verify(code=code, factor=factor, look_ahead=look_ahead)
-
     async def oauth2_get_authorized_url(
         self, provider: str, scope: list[str], **extra_params: Any
     ) -> str: