pypomes-jwt 1.0.0__tar.gz → 1.0.2__tar.gz

{pypomes_jwt-1.0.0 → pypomes_jwt-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypomes_jwt
-Version: 1.0.0
+Version: 1.0.2
 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

{pypomes_jwt-1.0.0 → pypomes_jwt-1.0.2}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pypomes_jwt"
-version = "1.0.0"
+version = "1.0.2"
 authors = [
   { name="GT Nunes", email="wisecoder01@gmail.com" }
 ]

{pypomes_jwt-1.0.0 → pypomes_jwt-1.0.2}/src/pypomes_jwt/jwt_pomes.py

@@ -36,45 +36,33 @@ def jwt_needed(func: callable) -> callable:
     return wrapper
 
 
-def jwt_verify_request(request: Request,
-                       logger: Logger = None) -> Response:
+def jwt_verify_request(request: Request) -> Response:
     """
-    Verify wheher the HTTP *request* has the proper authorization, as per the JWT standard.
+    Verify whether the HTTP *request* has the proper authorization, as per the JWT standard.
 
     :param request: the request to be verified
-    :param logger: optional logger
     :return: *None* if the request is valid, otherwise a *Response* object reporting the error
     """
     # initialize the return variable
     result: Response | None = None
 
-    if logger:
-        logger.debug(msg="Validate a JWT token")
-    err_msg: str | None = None
-
     # retrieve the authorization from the request header
     auth_header: str = request.headers.get("Authorization")
 
     # was a 'Bearer' authorization obtained ?
+    bad_token: bool = False
     if auth_header and auth_header.startswith("Bearer "):
         # yes, extract and validate the JWT access token
         token: str = auth_header.split(" ")[1]
-        if logger:
-            logger.debug(msg="Bearer token was retrieved")
         errors: list[str] = []
         jwt_validate_token(errors=errors,
                            nature="A",
                            token=token)
         if errors:
-            err_msg = "; ".join(errors)
-    else:
-        # no 'Bearer' found, report the error
-        err_msg = "Request header has no 'Bearer' data"
+            bad_token = True
 
-    # log the error and deny the authorization
-    if err_msg:
-        if logger:
-            logger.error(msg=err_msg)
+    # deny the authorization
+    if bad_token:
         result = Response(response="Authorization failed",
                           status=401)
     return result
@@ -448,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-1.0.0 → pypomes_jwt-1.0.2}/src/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))
 
@@ -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))