pypomes-jwt 0.6.7__py3-none-any.whl → 0.6.9__py3-none-any.whl

pypomes_jwt/jwt_data.py

@@ -209,11 +209,12 @@ class JwtData:
             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())
             if just_now > reserved_claims.get("exp"):
+                token_jti: str = str_random(size=16)
                 # where is the JWT service provider ?
                 if control_data.get("remote-provider"):
                     # JWT service is being provided by a remote server
@@ -233,25 +234,30 @@ class JwtData:
                     if reply:
                         with self.access_lock:
                             control_data["access-token"] = reply.get("access_token")
-                            reserved_claims["jti"] = str_random(size=16)
+                            reserved_claims["jti"] = token_jti
                             reserved_claims["iat"] = reply.get("created_in")
                             reserved_claims["exp"] = reply.get("created_in") + reply.get("expires_in")
                     else:
                         raise RuntimeError(" - ".join(errors))
                 else:
                     # JWT service is being provided locally
+                    token_iat: int = just_now
+                    token_exp: int = just_now + control_data.get("access-max-age")
                     claims: dict[str, Any] = access_data.get("public-claims").copy()
-                    claims.update(m=reserved_claims)
-                    claims.update(m=custom_claims)
+                    claims.update(reserved_claims)
+                    claims.update(custom_claims)
+                    claims["jti"] = token_jti
+                    claims["iat"] = token_iat
+                    claims["exp"] = token_exp
                     # may raise an exception
                     token: str = jwt.encode(payload=claims,
                                             key=(control_data.get("hs-secret-key") or
                                                  control_data.get("rsa-private-key")),
                                             algorithm=control_data.get("algorithm"))
                     with self.access_lock:
-                        reserved_claims["jti"] = str_random(size=16)
-                        reserved_claims["iat"] = just_now
-                        reserved_claims["exp"] = just_now + control_data.get("access-max-age")
+                        reserved_claims["jti"] = token_jti
+                        reserved_claims["iat"] = token_iat
+                        reserved_claims["exp"] = token_exp
                         control_data["access-token"] = token
 
             # return the token

{pypomes_jwt-0.6.7.dist-info → pypomes_jwt-0.6.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypomes_jwt
-Version: 0.6.7
+Version: 0.6.9
 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.9.dist-info/RECORD

@@ -0,0 +1,7 @@
+pypomes_jwt/__init__.py,sha256=CwpFtZEi1Yo1i4ulyR65yvo_fJpSRMJsXwzV75E3K0A,988
+pypomes_jwt/jwt_data.py,sha256=o89rMzaUp3-GpX3zei2UkFzYacyjmMvi2QPq1vBaNGY,19945
+pypomes_jwt/jwt_pomes.py,sha256=rhYoqD57yXayJoePdjbB3RfPAIg23o6YQKkdnD4tz0c,14222
+pypomes_jwt-0.6.9.dist-info/METADATA,sha256=penqUj2BH3vbm9Br2kOv15Gcj5fkBj6Jx6tug_bbYxY,599
+pypomes_jwt-0.6.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pypomes_jwt-0.6.9.dist-info/licenses/LICENSE,sha256=NdakochSXm_H_-DSL_x2JlRCkYikj3snYYvTwgR5d_c,1086
+pypomes_jwt-0.6.9.dist-info/RECORD,,

pypomes_jwt-0.6.7.dist-info/RECORD

@@ -1,7 +0,0 @@
-pypomes_jwt/__init__.py,sha256=CwpFtZEi1Yo1i4ulyR65yvo_fJpSRMJsXwzV75E3K0A,988
-pypomes_jwt/jwt_data.py,sha256=icnNzfCBPN94z3saT_fhDSEpj_GGBeSW59ychNfkxA8,19680
-pypomes_jwt/jwt_pomes.py,sha256=rhYoqD57yXayJoePdjbB3RfPAIg23o6YQKkdnD4tz0c,14222
-pypomes_jwt-0.6.7.dist-info/METADATA,sha256=8j6R2ZgQXHbw7Wyziiv7BfGAQdlld2bGHcDL14ijpn4,599
-pypomes_jwt-0.6.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pypomes_jwt-0.6.7.dist-info/licenses/LICENSE,sha256=NdakochSXm_H_-DSL_x2JlRCkYikj3snYYvTwgR5d_c,1086
-pypomes_jwt-0.6.7.dist-info/RECORD,,