pypomes-jwt 0.8.3__py3-none-any.whl → 0.8.4__py3-none-any.whl

pypomes_jwt/jwt_data.py

@@ -400,15 +400,18 @@ def _jwt_persist_token(errors: list[str],
         if errors:
             raise RuntimeError("; ".join(errors))
 
-        exp: int = token_claims["payload"].get("exp")
+        # find expired tokens
+        exp: int = token_claims["payload"].get("exp", sys.maxsize)
         if exp < datetime.now(tz=timezone.utc).timestamp():
             expired.append(token_kid)
-        elif exp < oldest:
+
+        # find oldest token
+        iat: int = token_claims["payload"].get("iat", sys.maxsize)
+        if iat < oldest:
             oldest = exp
             surplus = token_kid
 
     # remove expired tokens from persistence
-    # ruff: noqa: SIM102
     if expired:
         db_delete(errors=errors,
                   delete_stmt=f"DELETE FROM {JWT_DB_TABLE}",
@@ -422,7 +425,7 @@ def _jwt_persist_token(errors: list[str],
                              f"'{account_id}' removed from storage")
 
     if 0 < JWT_ACCOUNT_LIMIT <= len(recs) - len(expired):
-        # delete the oldest persisted token to make way for the new one
+        # delete the oldest token to make way for the new one
         db_delete(errors=errors,
                   delete_stmt=f"DELETE FROM {JWT_DB_TABLE}",
                   where_data={JWT_DB_COL_KID: surplus},

pypomes_jwt/jwt_pomes.py

@@ -57,7 +57,7 @@ def jwt_verify_request(request: Request,
         # yes, extract and validate the JWT access token
         token: str = auth_header.split(" ")[1]
         if logger:
-            logger.debug(msg=f"Token is '{token}'")
+            logger.debug(msg="Token was found")
         errors: list[str] = []
         jwt_validate_token(errors=errors,
                            nature="A",
@@ -174,7 +174,7 @@ def jwt_validate_token(errors: list[str] | None,
     # initialize the return variable
     result: dict[str, Any] | None = None
     if logger:
-        logger.debug(msg=f"Validate JWT token '{token}'")
+        logger.debug(msg="Validate JWT token")
 
     # extract needed data from token header
     token_header: dict[str, Any] = jwt.get_unverified_header(jwt=token)
@@ -245,7 +245,7 @@ def jwt_validate_token(errors: list[str] | None,
         if isinstance(errors, list):
             errors.extend(op_errors)
     elif logger:
-        logger.debug(msg=f"Token '{token}' is valid")
+        logger.debug(msg="Token is valid")
 
     return result
 
@@ -409,7 +409,7 @@ def jwt_get_claims(errors: list[str] | None,
     result: dict[str, Any] | None = None
 
     if logger:
-        logger.debug(msg=f"Retrieve claims for token '{token}'")
+        logger.debug(msg="Retrieve claims for token")
 
     try:
         # retrieve the token's claims

{pypomes_jwt-0.8.3.dist-info → pypomes_jwt-0.8.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypomes_jwt
-Version: 0.8.3
+Version: 0.8.4
 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
@@ -13,4 +13,4 @@ Requires-Python: >=3.12
 Requires-Dist: cryptography>=44.0.2
 Requires-Dist: pyjwt>=2.10.1
 Requires-Dist: pypomes-core>=1.8.3
-Requires-Dist: pypomes-db>=1.9.5
+Requires-Dist: pypomes-db>=1.9.6

pypomes_jwt-0.8.4.dist-info/RECORD

@@ -0,0 +1,8 @@
+pypomes_jwt/__init__.py,sha256=P7rT6ZVE2BzU3ntYOr83H5iOf5JcCmjDUYakNbrRAP0,1266
+pypomes_jwt/jwt_constants.py,sha256=FA50jKQ3D09MxXkUpVkXW5IQqm_UX6qm3bU5gHvkU-4,3980
+pypomes_jwt/jwt_data.py,sha256=VTMPJz9CqzaxNyKdDa9cRcUbhGf8U9S6ms9XSuO-7Qg,21639
+pypomes_jwt/jwt_pomes.py,sha256=4S-kKc-lLZg_9jMXk6T1IrBJXiUBAuC_nxhKsv6xzVk,17119
+pypomes_jwt-0.8.4.dist-info/METADATA,sha256=ADSxeO2kePBxf5faJtwfl_zgDaDumeYjySyPVHJnM1E,632
+pypomes_jwt-0.8.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pypomes_jwt-0.8.4.dist-info/licenses/LICENSE,sha256=NdakochSXm_H_-DSL_x2JlRCkYikj3snYYvTwgR5d_c,1086
+pypomes_jwt-0.8.4.dist-info/RECORD,,

pypomes_jwt-0.8.3.dist-info/RECORD

@@ -1,8 +0,0 @@
-pypomes_jwt/__init__.py,sha256=P7rT6ZVE2BzU3ntYOr83H5iOf5JcCmjDUYakNbrRAP0,1266
-pypomes_jwt/jwt_constants.py,sha256=FA50jKQ3D09MxXkUpVkXW5IQqm_UX6qm3bU5gHvkU-4,3980
-pypomes_jwt/jwt_data.py,sha256=4WT19eHowrMyXJIRt3nLv8FLxEorgP2k-fgKgYY0Vgk,21534
-pypomes_jwt/jwt_pomes.py,sha256=m-seMYrQLgTrdxR7bH-RMdlY7Jc9QtmAKmkdyEAhQGY,17156
-pypomes_jwt-0.8.3.dist-info/METADATA,sha256=kagRg42MtBTc2zewA2douDPWBYBmeOCsSwSuciJZnNA,632
-pypomes_jwt-0.8.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pypomes_jwt-0.8.3.dist-info/licenses/LICENSE,sha256=NdakochSXm_H_-DSL_x2JlRCkYikj3snYYvTwgR5d_c,1086
-pypomes_jwt-0.8.3.dist-info/RECORD,,