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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypomes_jwt
-Version: 0.6.8
+Version: 0.7.0
 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.9
+Requires-Dist: pypomes-core>=1.8.3

{pypomes_jwt-0.6.8 → pypomes_jwt-0.7.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pypomes_jwt"
-version = "0.6.8"
+version = "0.7.0"
 authors = [
   { name="GT Nunes", email="wisecoder01@gmail.com" }
 ]
@@ -21,7 +21,7 @@ classifiers = [
 dependencies = [
     "PyJWT>=2.10.1",
     "cryptography>=44.0.1",
-    "pypomes_core>=1.7.9"
+    "pypomes_core>=1.8.3"
 ]
 
 [project.urls]

{pypomes_jwt-0.6.8 → pypomes_jwt-0.7.0}/src/pypomes_jwt/__init__.py

@@ -2,7 +2,6 @@ from .jwt_data import (
     jwt_request_token, jwt_validate_token
 )
 from .jwt_pomes import (
-    JWT_ENDPOINT_URL,
     JWT_ACCESS_MAX_AGE, JWT_REFRESH_MAX_AGE,
     JWT_HS_SECRET_KEY, JWT_RSA_PRIVATE_KEY, JWT_RSA_PUBLIC_KEY,
     jwt_needed, jwt_verify_request, jwt_claims, jwt_token,
@@ -14,7 +13,6 @@ __all__ = [
     # jwt_data
     "jwt_request_token", "jwt_validate_token",
     # jwt_pomes
-    "JWT_ENDPOINT_URL",
     "JWT_ACCESS_MAX_AGE", "JWT_REFRESH_MAX_AGE",
     "JWT_HS_SECRET_KEY", "JWT_RSA_PRIVATE_KEY", "JWT_RSA_PUBLIC_KEY",
     "jwt_needed", "jwt_verify_request", "jwt_claims", "jwt_token",

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

@@ -1,5 +1,6 @@
 import jwt
 import requests
+import string
 from datetime import datetime, timezone
 from jwt.exceptions import InvalidTokenError
 from logging import Logger
@@ -214,6 +215,8 @@ class JwtData:
             # 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=32,
+                                            chars=string.ascii_letters + string.digits)
                 # where is the JWT service provider ?
                 if control_data.get("remote-provider"):
                     # JWT service is being provided by a remote server
@@ -233,28 +236,33 @@ 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(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
+            # return the token data
             result = {
                 "access_token": control_data.get("access-token"),
                 "created_in": reserved_claims.get("iat"),
@@ -328,7 +336,7 @@ class JwtData:
         """
         # initialize the return variable
         result: dict[str, dict[str, Any]] | None = None
-    
+
         if logger:
             target: str = f"account id '{account_id}'" if account_id else f"token '{access_token}'"
             logger.debug(f"Retrieve access data for {target}")

{pypomes_jwt-0.6.8 → pypomes_jwt-0.7.0}/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))
-JWT_ENDPOINT_URL: Final[str] = env_get_str(key=f"{APP_PREFIX}_JWT_ENDPOINT_URL")
 
 # obtain a RSA private/public key pair
 __priv_bytes: bytes = env_get_bytes(key=f"{APP_PREFIX}_JWT_RSA_PRIVATE_KEY")