pypomes-jwt 0.6.6__tar.gz → 0.6.8__tar.gz

{pypomes_jwt-0.6.6 → pypomes_jwt-0.6.8}/PKG-INFO

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

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

{pypomes_jwt-0.6.6 → pypomes_jwt-0.6.8}/src/pypomes_jwt/jwt_data.py

@@ -199,17 +199,17 @@ class JwtData:
         result: dict[str, Any]
 
         # obtain the item in storage
-        item_data: dict[str, Any] = self.get_access_data(account_id=account_id,
-                                                         logger=logger)
+        access_data: dict[str, Any] = self.get_access_data(account_id=account_id,
+                                                           logger=logger)
         # was the JWT data obtained ?
-        if item_data:
+        if access_data:
             # yes, proceed
-            control_data: dict[str, Any] = item_data.get("control-data")
-            reserved_claims: dict[str, Any] = item_data.get("reserved-claims")
-            custom_claims: dict[str, Any] = item_data.get("custom-claims")
+            control_data: dict[str, Any] = access_data.get("control-data")
+            reserved_claims: dict[str, Any] = access_data.get("reserved-claims")
+            custom_claims: dict[str, Any] = access_data.get("custom-claims")
             if superceding_claims:
                 custom_claims = custom_claims.copy()
-                custom_claims.update(m=superceding_claims)
+                custom_claims.update(superceding_claims)
 
             # obtain a new token, if the current token has expired
             just_now: int = int(datetime.now(tz=timezone.utc).timestamp())
@@ -240,9 +240,9 @@ class JwtData:
                         raise RuntimeError(" - ".join(errors))
                 else:
                     # JWT service is being provided locally
-                    claims: dict[str, Any] = item_data.get("public-claims").copy()
-                    claims.update(m=reserved_claims)
-                    claims.update(m=custom_claims)
+                    claims: dict[str, Any] = access_data.get("public-claims").copy()
+                    claims.update(reserved_claims)
+                    claims.update(custom_claims)
                     # may raise an exception
                     token: str = jwt.encode(payload=claims,
                                             key=(control_data.get("hs-secret-key") or
@@ -280,6 +280,7 @@ class JwtData:
         :return: the token's claimset, or *None* if error
         :raises InvalidTokenError: token is not valid
         :raises ExpiredSignatureError: token has expired
+        :raises InvalidAlgorithmError: the specified algorithm is not recognized
         """
         # declare the return variable
         result: dict[str, Any]
@@ -287,14 +288,15 @@ class JwtData:
         if logger:
             logger.debug(msg=f"Retrieve claims for JWT token '{token}'")
 
-        control_data: dict[str, Any] = self.get_access_data(access_token=token,
-                                                            logger=logger)
-        if control_data:
+        access_data: dict[str, Any] = self.get_access_data(access_token=token,
+                                                           logger=logger)
+        if access_data:
+            control_data: dict[str, Any] = access_data.get("control-data")
             if control_data.get("remote-provider"):
                 # provider is remote
                 result = control_data.get("custom-claims")
             else:
-                # may raise InvalidTokenError or ExpiredSignatureError
+                # may raise an exception
                 result = jwt.decode(jwt=token,
                                     key=(control_data.get("hs-secret-key") or
                                          control_data.get("rsa-public-key")),

{pypomes_jwt-0.6.6 → pypomes_jwt-0.6.8}/src/pypomes_jwt/jwt_pomes.py

@@ -19,7 +19,6 @@ JWT_REFRESH_MAX_AGE: Final[int] = env_get_int(key=f"{APP_PREFIX}_JWT_REFRESH_MAX
                                               def_value=43200)
 JWT_HS_SECRET_KEY: Final[bytes] = env_get_bytes(key=f"{APP_PREFIX}_JWT_HS_SECRET_KEY",
                                                 def_value=token_bytes(nbytes=32))
-# the endpoint must invoke 'jwt_service()' below
 JWT_ENDPOINT_URL: Final[str] = env_get_str(key=f"{APP_PREFIX}_JWT_ENDPOINT_URL")
 
 # obtain a RSA private/public key pair
@@ -49,7 +48,7 @@ def jwt_needed(func: callable) -> callable:
     """
     # ruff: noqa: ANN003
     def wrapper(*args, **kwargs) -> Response:
-        response: Response = jwt_verify_request(request=request) if JWT_ENDPOINT_URL else None
+        response: Response = jwt_verify_request(request=request)
         return response if response else func(*args, **kwargs)
 
     # prevent a rogue error ("View function mapping is overwriting an existing endpoint function")
@@ -185,7 +184,7 @@ def jwt_get_token_claims(errors: list[str],
     :param errors: incidental error messages
     :param token: the token to be inspected for claims
     :param logger: optional logger
-    :return: the token's claimset, or 'None' if error
+    :return: the token's claimset, or *None* if error
     """
     # initialize the return variable
     result: dict[str, Any] | None = None