pypomes-jwt 1.0.4__tar.gz → 1.0.6__tar.gz

{pypomes_jwt-1.0.4 → pypomes_jwt-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypomes_jwt
-Version: 1.0.4
+Version: 1.0.6
 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.4 → pypomes_jwt-1.0.6}/pyproject.toml

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

{pypomes_jwt-1.0.4 → pypomes_jwt-1.0.6}/src/pypomes_jwt/jwt_pomes.py

@@ -52,16 +52,15 @@ def jwt_verify_request(request: Request) -> Response:
     auth_header: str = request.headers.get("Authorization")
 
     # was a 'Bearer' authorization obtained ?
-    bad_token: bool = False
+    bad_token: bool = True
     if auth_header and auth_header.startswith("Bearer "):
         # yes, extract and validate the JWT access token
         token: str = auth_header.split(" ")[1]
         errors: list[str] = []
-        jwt_validate_token(errors=errors,
-                           nature="A",
-                           token=token)
-        if errors:
-            bad_token = True
+        if jwt_validate_token(errors=errors,
+                              nature="A",
+                              token=token):
+            bad_token = False
 
     # deny the authorization
     if bad_token:
@@ -480,7 +479,7 @@ def jwt_refresh_tokens(errors: list[str] | None,
                             logger.error(msg=f"Error refreshing the token pair: {exc_err}")
                         op_errors.append(exc_err)
 
-                # conclude the transaction
+                # wrap-up the transaction
                 if op_errors:
                     db_rollback(errors=op_errors,
                                 connection=db_conn,

{pypomes_jwt-1.0.4 → pypomes_jwt-1.0.6}/src/pypomes_jwt/jwt_registry.py

@@ -308,7 +308,7 @@ class JwtRegistry:
                           committable=False,
                           logger=logger)
 
-                # conclude the transaction
+                # wrap-up the transaction
                 if not db_conn:
                     if errors:
                         db_rollback(errors=errors,
@@ -362,7 +362,7 @@ def _jwt_persist_token(account_id: str,
                        db_conn: Any,
                        logger: Logger = None) -> int:
     """
-    Persist the given token, making sure that the account limit is adhered to.
+    Persist the given token, making sure that the account limit is complied with.
 
     The tokens in storage, associated with *account_id*, are examined for their expiration timestamp.
     If a token's expiration timestamp is in the past, it is removed from storage. If the maximum number
@@ -399,6 +399,7 @@ def _jwt_persist_token(account_id: str,
     just_now: int = int(datetime.now(tz=timezone.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]
@@ -420,6 +421,9 @@ def _jwt_persist_token(account_id: str,
             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,
@@ -460,11 +464,18 @@ def _jwt_persist_token(account_id: str,
     if errors:
         raise RuntimeError("; ".join(errors))
 
-    # obtain the token's storage id
+    # 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"{JWT_DB_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 {JWT_DB_COL_KID} "
                                                  f"FROM {JWT_DB_TABLE}",
-                                        where_data={JWT_DB_COL_TOKEN: jwt_token},
+                                        where_clause=where_clause,
+                                        where_data={JWT_DB_COL_ACCOUNT: account_id},
+                                        require_count=1,
                                         connection=db_conn,
                                         committable=False,
                                         logger=logger)