pypomes-jwt 0.6.3__py3-none-any.whl → 0.6.5__py3-none-any.whl

pypomes_jwt/jwt_data.py

@@ -39,14 +39,14 @@ class JwtData:
                # "aud": <string>         # audience
                # "nbt": <timestamp>      # not before time
              },
-             "public-claims": {
+             "public-claims": {          # public claims (may be empty)
                "birthdate": <string>,    # subject's birth date
                "email": <string>,        # subject's email
                "gender": <string>,       # subject's gender
                "name": <string>,         # subject's name
                "roles": <List[str]>      # subject roles
              },
-             "custom-claims": {          # custom claims
+             "custom-claims": {          # custom claims (may be empty)
                "<custom-claim-key-1>": "<custom-claim-value-1>",
                ...
                "<custom-claim-key-n>": "<custom-claim-value-n>"
@@ -107,7 +107,7 @@ class JwtData:
                 "access-max-age": access_max_age,
                 "request-timeout": request_timeout,
                 "remote-provider": remote_provider,
-                "refresh-exp": datetime.now(tz=timezone.utc).timestamp() + refresh_max_age
+                "refresh-exp": int(datetime.now(tz=timezone.utc).timestamp()) + refresh_max_age
             }
             if algorithm in ["HS256", "HS512"]:
                 control_data["hs-secret-key"] = hs_secret_key
@@ -119,8 +119,8 @@ class JwtData:
             reserved_claims: dict[str, Any] = {
                 "sub": account_id,
                 "iss": reference_url,
-                "exp": "<numeric-UTC-datetime>",
-                "iat": "<numeric-UTC-datetime>",
+                "exp": 0,
+                "iat": 0,
                 "jti": "<jwt-id>",
             }
             custom_claims: dict[str, Any] = {}
@@ -166,6 +166,7 @@ class JwtData:
 
     def get_token_data(self,
                        account_id: str,
+                       superceding_claims: dict[str, Any] = None,
                        logger: Logger = None) -> dict[str, Any]:
         """
         Obtain and return the JWT token for *account_id*, along with its duration.
@@ -178,6 +179,7 @@ class JwtData:
         }
 
         :param account_id: the account identification
+        :param superceding_claims: if provided, may supercede registered custom claims
         :param logger: optional logger
         :return: the JWT token data, or *None* if error
         :raises InvalidTokenError: token is invalid
@@ -205,9 +207,12 @@ class JwtData:
             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")
-            just_now: int = int(datetime.now(tz=timezone.utc).timestamp())
+            if superceding_claims:
+                custom_claims = custom_claims.copy()
+                custom_claims.update(m=superceding_claims)
 
             # obtain a new token, if the current token has expired
+            just_now: int = int(datetime.now(tz=timezone.utc).timestamp())
             if just_now > reserved_claims.get("exp"):
                 # where is the JWT service provider ?
                 if control_data.get("remote-provider"):

pypomes_jwt/jwt_pomes.py

@@ -296,14 +296,15 @@ def jwt_service(account_id: str = None,
     """
     Entry point for obtaining JWT tokens.
 
-    In order to be serviced, the invoker must send, as parameter *service_params* or in the body of the request:
+    Access might be through direct invocation, or through a REST request. In either case,
+    the invoker must send, as parameter *service_params* or in the body of the request:
     {
       "account-id": "<string>"                              - required account identification
-      "<custom-claim-key-1>": "<custom-claim-value-1>",     - optional custom claims
+      "<custom-claim-key-1>": "<custom-claim-value-1>",     - optional superceding custom claims
       ...
       "<custom-claim-key-n>": "<custom-claim-value-n>"
     }
-    If provided, the additional custom claims will be sent to the remote provider, if applicable
+    If provided, the superceding custom claims will be sent to the remote provider, if applicable
     (custom claims currently registered for the account may be overridden).
 
 
@@ -323,10 +324,7 @@ def jwt_service(account_id: str = None,
     result: Response
 
     if logger:
-        msg: str = "Service a JWT request"
-        if request:
-            msg += f" from '{request.base_url}'"
-        logger.debug(msg=msg)
+        logger.debug(msg="Service a JWT request")
 
     # retrieve the parameters
     # noinspection PyUnusedLocal
@@ -335,22 +333,18 @@ def jwt_service(account_id: str = None,
         with contextlib.suppress(Exception):
             params = request.get_json()
     if not account_id:
-        account_id = params.get("account-id")
+        account_id = params.pop("account-id", None)
 
     # has the account been identified ?
     if account_id:
         # yes, proceed
         if logger:
             logger.debug(msg=f"Account identification is '{account_id}'")
-        item_data: dict[str, dict[str, Any]] = __jwt_data.get_access_data(account_id=account_id,
-                                                                          logger=logger) or {}
-        custom_claims: dict[str, Any] = item_data.get("custom-claims").copy()
-        for key, value in params.items():
-            custom_claims[key] = value
 
         # obtain the token data
         try:
             token_data: dict[str, Any] = __jwt_data.get_token_data(account_id=account_id,
+                                                                   superceding_claims=params,
                                                                    logger=logger)
             result = jsonify(token_data)
         except Exception as e:

{pypomes_jwt-0.6.3.dist-info → pypomes_jwt-0.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypomes_jwt
-Version: 0.6.3
+Version: 0.6.5
 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,4 +12,4 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.12
 Requires-Dist: cryptography>=44.0.1
 Requires-Dist: pyjwt>=2.10.1
-Requires-Dist: pypomes-core>=1.7.8
+Requires-Dist: pypomes-core>=1.7.9

pypomes_jwt-0.6.5.dist-info/RECORD

@@ -0,0 +1,7 @@
+pypomes_jwt/__init__.py,sha256=m0USOMlGVUfofwukykKf6DAPq7CRn4SiY6CeNOOiqJ8,998
+pypomes_jwt/jwt_data.py,sha256=skSwtbBemyanuWyngu0lq2Yw3-hONytt1AwXZpSlILg,19541
+pypomes_jwt/jwt_pomes.py,sha256=pWYjCRKIcaG-yN64IgJ54L-YHw3Jhhnmsvb6xMipQsY,14515
+pypomes_jwt-0.6.5.dist-info/METADATA,sha256=KZBLb8BEdIDaFQMoCxvkQ-ZBzIN97RaVXV49uAizNvo,599
+pypomes_jwt-0.6.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pypomes_jwt-0.6.5.dist-info/licenses/LICENSE,sha256=NdakochSXm_H_-DSL_x2JlRCkYikj3snYYvTwgR5d_c,1086
+pypomes_jwt-0.6.5.dist-info/RECORD,,

pypomes_jwt-0.6.3.dist-info/RECORD

@@ -1,7 +0,0 @@
-pypomes_jwt/__init__.py,sha256=m0USOMlGVUfofwukykKf6DAPq7CRn4SiY6CeNOOiqJ8,998
-pypomes_jwt/jwt_data.py,sha256=5GB5NgmVeTJinlfIAO7BaWO0aPCETqG3dxm-aP99pCk,19222
-pypomes_jwt/jwt_pomes.py,sha256=U8Vc0IOlW5-XmRR_Px2xLlVit5oAHVnfBcNwDzwh_8I,14786
-pypomes_jwt-0.6.3.dist-info/METADATA,sha256=WaVMfTzEO-cnKmP7XDm-p8owJxmIhzua6yk61s0l86E,599
-pypomes_jwt-0.6.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pypomes_jwt-0.6.3.dist-info/licenses/LICENSE,sha256=NdakochSXm_H_-DSL_x2JlRCkYikj3snYYvTwgR5d_c,1086
-pypomes_jwt-0.6.3.dist-info/RECORD,,