pypomes-jwt 1.2.1__tar.gz → 1.2.3__tar.gz

{pypomes_jwt-1.2.1 → pypomes_jwt-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypomes_jwt
-Version: 1.2.1
+Version: 1.2.3
 Summary: A collection of Python pomes, penyeach (JWT module)
 Project-URL: Homepage, https://github.com/TheWiseCoder/PyPomes-JWT
 Project-URL: Bug Tracker, https://github.com/TheWiseCoder/PyPomes-JWT/issues
@@ -10,8 +10,8 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.12
-Requires-Dist: cryptography>=45.0.0
+Requires-Dist: cryptography>=45.0.4
 Requires-Dist: flask>=3.1.1
 Requires-Dist: pyjwt>=2.10.1
-Requires-Dist: pypomes-core>=2.2.9
-Requires-Dist: pypomes-db>=2.2.1
+Requires-Dist: pypomes-core>=2.4.1
+Requires-Dist: pypomes-db>=2.2.9

{pypomes_jwt-1.2.1 → pypomes_jwt-1.2.3}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pypomes_jwt"
-version = "1.2.1"
+version = "1.2.3"
 authors = [
   { name="GT Nunes", email="wisecoder01@gmail.com" }
 ]
@@ -19,11 +19,11 @@ classifiers = [
     "Operating System :: OS Independent"
 ]
 dependencies = [
-    "cryptography>=45.0.0",
+    "cryptography>=45.0.4",
     "Flask>=3.1.1",
     "PyJWT>=2.10.1",
-    "pypomes_core>=2.2.9",
-    "pypomes_db>=2.2.1"
+    "pypomes_core>=2.4.1",
+    "pypomes_db>=2.2.9"
 ]
 
 [project.urls]

{pypomes_jwt-1.2.1 → pypomes_jwt-1.2.3}/src/pypomes_jwt/jwt_pomes.py

@@ -1,6 +1,6 @@
 import jwt
 import sys
-from base64 import urlsafe_b64decode
+from base64 import b64decode
 from flask import Request, Response, request
 from logging import Logger
 from pypomes_core import exc_format
@@ -23,7 +23,7 @@ def jwt_needed(func: callable) -> callable:
 
     :param func: the function being decorated
     """
-    # ruff: noqa: ANN003
+    # ruff: noqa: ANN003 - Missing type annotation for *{name}
     def wrapper(*args, **kwargs) -> Response:
         response: Response = jwt_verify_request(request=request)
         return response if response else func(*args, **kwargs)
@@ -197,7 +197,7 @@ def jwt_validate_token(errors: list[str] | None,
                                                logger=logger)
             if recs:
                 token_alg = recs[0][0]
-                token_decoder = urlsafe_b64decode(recs[0][1])
+                token_decoder = b64decode(recs[0][1])
             elif op_errors:
                 if logger:
                     logger.error(msg=f"Error retrieving the token's decoder: {'; '.join(op_errors)}")

{pypomes_jwt-1.2.1 → pypomes_jwt-1.2.3}/src/pypomes_jwt/jwt_registry.py

@@ -2,7 +2,7 @@ import jwt
 import string
 import sys
 from base64 import b64encode
-from datetime import datetime, timezone
+from datetime import datetime, UTC
 from logging import Logger
 from pypomes_core import str_random
 from pypomes_db import (
@@ -196,7 +196,7 @@ class JwtRegistry:
         current_claims["jti"] = str_random(size=32,
                                            chars=string.ascii_letters + string.digits)
         current_claims["sub"] = account_id
-        just_now: int = int(datetime.now(tz=timezone.utc).timestamp())
+        just_now: int = int(datetime.now(tz=UTC).timestamp())
         current_claims["iat"] = just_now
         if lead_interval:
             current_claims["nbf"] = just_now + lead_interval
@@ -249,7 +249,7 @@ class JwtRegistry:
             current_claims["sub"] = account_id
             errors: list[str] = []
 
-            just_now: int = int(datetime.now(tz=timezone.utc).timestamp())
+            just_now: int = int(datetime.now(tz=UTC).timestamp())
             current_claims["iat"] = just_now
             lead_interval = account_data.get("lead-interval")
             if lead_interval:
@@ -378,10 +378,9 @@ class JwtRegistry:
         if logger:
             logger.debug(msg=f"Read {len(recs)} token from storage for account '{account_id}'")
         # remove the expired tokens
-        just_now: int = int(datetime.now(tz=timezone.utc).timestamp())
+        just_now: int = int(datetime.now(tz=UTC).timestamp())
         oldest_ts: int = sys.maxsize
         oldest_id: int | None = None
-        existing_ids: list[int] = []
         expired: list[int] = []
         for rec in recs:
             token: str = rec[1]
@@ -403,9 +402,6 @@ class JwtRegistry:
                 oldest_ts = iat
                 oldest_id = token_id
 
-            # save token id
-            existing_ids.append(token_id)
-
         # remove expired tokens from persistence
         if expired:
             db_delete(errors=errors,
@@ -436,32 +432,27 @@ class JwtRegistry:
                 logger.debug(msg="Oldest active token of account "
                                  f"'{account_id}' removed from storage")
         # persist token
-        db_insert(errors=errors,
-                  insert_stmt=f"INSERT INTO {JwtDbConfig.TABLE}",
-                  insert_data={
-                      JwtDbConfig.COL_ACCOUNT: account_id,
-                      JwtDbConfig.COL_TOKEN: jwt_token,
-                      JwtDbConfig.COL_ALGORITHM: JwtConfig.DEFAULT_ALGORITHM.value,
-                      JwtDbConfig.COL_DECODER: b64encode(s=JwtConfig.DECODING_KEY.value).decode()
-                  },
-                  engine=DbEngine(JwtDbConfig.ENGINE),
-                  connection=db_conn,
-                  committable=False,
-                  logger=logger)
+        col_kid: int = db_insert(errors=errors,
+                                 insert_stmt=f"INSERT INTO {JwtDbConfig.TABLE}",
+                                 insert_data={
+                                     JwtDbConfig.COL_ACCOUNT: account_id,
+                                     JwtDbConfig.COL_TOKEN: jwt_token,
+                                     JwtDbConfig.COL_ALGORITHM: JwtConfig.DEFAULT_ALGORITHM.value,
+                                     JwtDbConfig.COL_DECODER: b64encode(s=JwtConfig.DECODING_KEY.value).decode()
+                                 },
+                                 return_cols={JwtDbConfig.COL_KID: int},
+                                 engine=DbEngine(JwtDbConfig.ENGINE),
+                                 connection=db_conn,
+                                 committable=False,
+                                 logger=logger)
         if errors:
             raise RuntimeError("; ".join(errors))
 
         # obtain and return the token's storage id
-        # HAZARD: JWT_DB_COL_TOKEN's column type might prevent it for being used in a WHERE clause
-        where_clause: str | None = None
-        if existing_ids:
-            where_clause = f"{JwtDbConfig.COL_KID} NOT IN {existing_ids}"
-            where_clause = where_clause.replace("[", "(", 1).replace("]", ")", 1)
         reply: list[tuple[int]] = db_select(errors=errors,
                                             sel_stmt=f"SELECT {JwtDbConfig.COL_KID} "
                                                      f"FROM {JwtDbConfig.TABLE}",
-                                            where_clause=where_clause,
-                                            where_data={JwtDbConfig.COL_ACCOUNT: account_id},
+                                            where_data={JwtDbConfig.COL_KID: col_kid},
                                             min_count=1,
                                             max_count=1,
                                             engine=DbEngine(JwtDbConfig.ENGINE),