pypomes-jwt 1.0.1__py3-none-any.whl → 1.0.3__py3-none-any.whl

pypomes_jwt/jwt_pomes.py

@@ -436,11 +436,11 @@ def jwt_refresh_tokens(errors: list[str] | None,
     # assert the refresh token
     if refresh_token:
         # is the refresh token valid ?
-        account_claims = jwt_validate_token(errors=op_errors,
-                                            token=refresh_token,
-                                            nature="R",
-                                            account_id=account_id,
-                                            logger=logger)
+        account_claims = (jwt_validate_token(errors=op_errors,
+                                             token=refresh_token,
+                                             nature="R",
+                                             account_id=account_id,
+                                             logger=logger) or {}).get("payload")
         # if it is, revoke current refresh token
         if account_claims and jwt_revoke_token(errors=op_errors,
                                                account_id=account_id,

pypomes_jwt/jwt_registry.py

@@ -5,7 +5,9 @@ from base64 import urlsafe_b64encode
 from datetime import datetime, timezone
 from logging import Logger
 from pypomes_core import str_random
-from pypomes_db import db_connect, db_commit, db_update, db_delete
+from pypomes_db import (
+    db_connect, db_commit, db_select, db_insert, db_update, db_delete
+)
 from threading import Lock
 from typing import Any
 
@@ -275,12 +277,11 @@ class JwtRegistry:
                                             key=JWT_ENCODING_KEY,
                                             algorithm=JWT_DEFAULT_ALGORITHM,
                                             headers={"kid": "R0"})
-            # obtain a DB connection (may raise an exception)
+            # obtain a DB connection
             db_conn: Any = db_connect(errors=errors,
                                       logger=logger)
             # persist the candidate token (may raise an exception)
-            token_id: int = _jwt_persist_token(errors=errors,
-                                               account_id=account_id,
+            token_id: int = _jwt_persist_token(account_id=account_id,
                                                jwt_token=refresh_token,
                                                db_conn=db_conn,
                                                logger=logger)
@@ -297,9 +298,10 @@ class JwtRegistry:
                       connection=db_conn,
                       logger=logger)
             # commit the transaction
-            db_commit(errors=errors,
-                      connection=db_conn,
-                      logger=logger)
+            if not errors:
+                db_commit(errors=errors,
+                          connection=db_conn,
+                          logger=logger)
             if errors:
                 raise RuntimeError("; ".join(errors))
 
@@ -339,8 +341,7 @@ class JwtRegistry:
         return result
 
 
-def _jwt_persist_token(errors: list[str],
-                       account_id: str,
+def _jwt_persist_token(account_id: str,
                        jwt_token: str,
                        db_conn: Any = None,
                        logger: Logger = None) -> int:
@@ -354,7 +355,6 @@ def _jwt_persist_token(errors: list[str],
 
     If *db_conn* is provided, then all DB operations will be carried out in the scope of a single transaction.
 
-    :param errors: incidental errors
     :param account_id: the account identification
     :param jwt_token: the JWT token to persist
     :param db_conn: the database connection to use
@@ -362,17 +362,19 @@ def _jwt_persist_token(errors: list[str],
     :return: the storage id of the inserted token
     :raises RuntimeError: error accessing the token database
     """
-    from pypomes_db import db_select, db_insert, db_delete
     from .jwt_pomes import jwt_get_claims
 
     # retrieve the account's tokens
+    errors: list[str] = []
     # noinspection PyTypeChecker
     recs: list[tuple[int, str, str, str]] = \
         db_select(errors=errors,
                   sel_stmt=f"SELECT {JWT_DB_COL_KID}, {JWT_DB_COL_TOKEN} "
                            f"FROM {JWT_DB_TABLE}",
                   where_data={JWT_DB_COL_ACCOUNT: account_id},
-                  connection=db_conn)
+                  connection=db_conn,
+                  committable=False,
+                  logger=logger)
     if errors:
         raise RuntimeError("; ".join(errors))
 
@@ -386,21 +388,21 @@ def _jwt_persist_token(errors: list[str],
     for rec in recs:
         token: str = rec[1]
         token_id: int = rec[0]
-        token_claims: dict[str, Any] = jwt_get_claims(errors=errors,
-                                                      token=token,
-                                                      logger=logger)
+        token_payload: dict[str, Any] = (jwt_get_claims(errors=errors,
+                                                        token=token,
+                                                        logger=logger) or {}).get("payload")
         if errors:
             raise RuntimeError("; ".join(errors))
 
         # find expired tokens
-        exp: int = token_claims["payload"].get("exp", sys.maxsize)
+        exp: int = token_payload.get("exp", sys.maxsize)
         if exp < just_now:
             expired.append(token_id)
 
         # find oldest token
-        iat: int = token_claims["payload"].get("iat", sys.maxsize)
+        iat: int = token_payload.get("iat", sys.maxsize)
         if iat < oldest_ts:
-            oldest_ts = exp
+            oldest_ts = iat
             oldest_id = token_id
 
     # remove expired tokens from persistence
@@ -409,6 +411,7 @@ def _jwt_persist_token(errors: list[str],
                   delete_stmt=f"DELETE FROM {JWT_DB_TABLE}",
                   where_data={JWT_DB_COL_KID: expired},
                   connection=db_conn,
+                  committable=False,
                   logger=logger)
         if errors:
             raise RuntimeError("; ".join(errors))
@@ -422,6 +425,7 @@ def _jwt_persist_token(errors: list[str],
                   delete_stmt=f"DELETE FROM {JWT_DB_TABLE}",
                   where_data={JWT_DB_COL_KID: oldest_id},
                   connection=db_conn,
+                  committable=False,
                   logger=logger)
         if errors:
             raise RuntimeError("; ".join(errors))
@@ -436,6 +440,7 @@ def _jwt_persist_token(errors: list[str],
                            JWT_DB_COL_ALGORITHM: JWT_DEFAULT_ALGORITHM,
                            JWT_DB_COL_DECODER: urlsafe_b64encode(JWT_DECODING_KEY).decode()},
               connection=db_conn,
+              committable=False,
               logger=logger)
     if errors:
         raise RuntimeError("; ".join(errors))
@@ -446,6 +451,7 @@ def _jwt_persist_token(errors: list[str],
                                                  f"FROM {JWT_DB_TABLE}",
                                         where_data={JWT_DB_COL_TOKEN: jwt_token},
                                         connection=db_conn,
+                                        committable=False,
                                         logger=logger)
     if errors:
         raise RuntimeError("; ".join(errors))

{pypomes_jwt-1.0.1.dist-info → pypomes_jwt-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypomes_jwt
-Version: 1.0.1
+Version: 1.0.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
@@ -12,5 +12,5 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.12
 Requires-Dist: cryptography>=44.0.2
 Requires-Dist: pyjwt>=2.10.1
-Requires-Dist: pypomes-core>=1.8.6
-Requires-Dist: pypomes-db>=1.9.8
+Requires-Dist: pypomes-core>=1.8.7
+Requires-Dist: pypomes-db>=2.0.0

pypomes_jwt-1.0.3.dist-info/RECORD

@@ -0,0 +1,8 @@
+pypomes_jwt/__init__.py,sha256=fLr_M8yXlcmSTNPMdJOJQlMmtaiK5YKh0vKjOp3z2E4,1446
+pypomes_jwt/jwt_constants.py,sha256=IQV39AiZKGuU8XxZBgJ-KJZQZ_mmnxyOnRZeuxlqDRk,4045
+pypomes_jwt/jwt_pomes.py,sha256=0JvWQaVgGXMfvvck_ZI6EW5diech7DabBFYskPU7jmE,21215
+pypomes_jwt/jwt_registry.py,sha256=t2adiHGg04RRwrLvX2XUgRwOtwtH8p2Ir2uAbsc2CoQ,21593
+pypomes_jwt-1.0.3.dist-info/METADATA,sha256=ayr8d8ZmUyAHGDHKMeXNW0-zbhyU62HBZwdIj69nlM0,632
+pypomes_jwt-1.0.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pypomes_jwt-1.0.3.dist-info/licenses/LICENSE,sha256=NdakochSXm_H_-DSL_x2JlRCkYikj3snYYvTwgR5d_c,1086
+pypomes_jwt-1.0.3.dist-info/RECORD,,

pypomes_jwt-1.0.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-pypomes_jwt/__init__.py,sha256=fLr_M8yXlcmSTNPMdJOJQlMmtaiK5YKh0vKjOp3z2E4,1446
-pypomes_jwt/jwt_constants.py,sha256=IQV39AiZKGuU8XxZBgJ-KJZQZ_mmnxyOnRZeuxlqDRk,4045
-pypomes_jwt/jwt_pomes.py,sha256=UHDmdgmo_1XmHfLvrcxLNRrib6En_XlNEXElDiHlwlI,21188
-pypomes_jwt/jwt_registry.py,sha256=5L6n4ue7YEkGT60U69WvoobKR9ziHkqdIgeOmYEn2gU,21472
-pypomes_jwt-1.0.1.dist-info/METADATA,sha256=VgxvMpAJrWmoW5713vx2od7bYwvEyfaEjlGXTWjv-Vo,632
-pypomes_jwt-1.0.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pypomes_jwt-1.0.1.dist-info/licenses/LICENSE,sha256=NdakochSXm_H_-DSL_x2JlRCkYikj3snYYvTwgR5d_c,1086
-pypomes_jwt-1.0.1.dist-info/RECORD,,