pypomes-jwt 1.3.2__tar.gz → 1.3.4__tar.gz

{pypomes_jwt-1.3.2 → pypomes_jwt-1.3.4}/PKG-INFO

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

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

{pypomes_jwt-1.3.2 → pypomes_jwt-1.3.4}/src/pypomes_jwt/jwt_config.py

@@ -21,8 +21,9 @@ class JwtAlgorithm(StrEnum):
 
 # recommended: allow the encode and decode keys to be generated anew when app starts
 _encoding_key: bytes = env_get_bytes(key=f"{APP_PREFIX}_JWT_ENCODING_KEY",
-                                     encoding="base64url")
-_decoding_key: bytes
+                                     encoding="base64")
+_decoding_key: bytes = env_get_bytes(key=f"{APP_PREFIX}_JWT_DECODING_KEY")
+# default algorithm may cause encode and decode keys to be overriden
 _default_algorithm: JwtAlgorithm = env_get_enum(key=f"{APP_PREFIX}_JWT_DEFAULT_ALGORITHM",
                                                 enum_class=JwtAlgorithm,
                                                 def_value=JwtAlgorithm.RS256)
@@ -30,17 +31,16 @@ if _default_algorithm in [JwtAlgorithm.HS256, JwtAlgorithm.HS512]:
     if not _encoding_key:
         _encoding_key = token_bytes(nbytes=32)
     _decoding_key = _encoding_key
-else:
-    _decoding_key: bytes = env_get_bytes(key=f"{APP_PREFIX}_JWT_DECODING_KEY")
-    if not _encoding_key or not _decoding_key:
-        __priv_key: RSAPrivateKey = rsa.generate_private_key(public_exponent=65537,
-                                                             key_size=2048)
-        _encoding_key = __priv_key.private_bytes(encoding=serialization.Encoding.PEM,
-                                                 format=serialization.PrivateFormat.PKCS8,
-                                                 encryption_algorithm=serialization.NoEncryption())
-        __pub_key: RSAPublicKey = __priv_key.public_key()
-        _decoding_key = __pub_key.public_bytes(encoding=serialization.Encoding.PEM,
-                                               format=serialization.PublicFormat.SubjectPublicKeyInfo)
+elif not _encoding_key or not _decoding_key:
+    __priv_key: RSAPrivateKey = rsa.generate_private_key(public_exponent=65537,
+                                                         key_size=2048
+                                                         if _default_algorithm == JwtAlgorithm.RS256 else 4096)
+    _encoding_key = __priv_key.private_bytes(encoding=serialization.Encoding.PEM,
+                                             format=serialization.PrivateFormat.PKCS8,
+                                             encryption_algorithm=serialization.NoEncryption())
+    __pub_key: RSAPublicKey = __priv_key.public_key()
+    _decoding_key = __pub_key.public_bytes(encoding=serialization.Encoding.PEM,
+                                           format=serialization.PublicFormat.SubjectPublicKeyInfo)
 
 
 class JwtConfig(Enum):

{pypomes_jwt-1.3.2 → pypomes_jwt-1.3.4}/src/pypomes_jwt/jwt_registry.py

@@ -203,8 +203,8 @@ class JwtRegistry:
 
         # may raise an exception
         return jwt.encode(payload=current_claims,
-                          key=JwtConfig.ENCODING_KEY.value,
-                          algorithm=JwtConfig.DEFAULT_ALGORITHM.value,
+                          key=JwtConfig.ENCODING_KEY,
+                          algorithm=JwtConfig.DEFAULT_ALGORITHM,
                           headers={"kid": nature})
 
     def issue_tokens(self,
@@ -258,8 +258,8 @@ class JwtRegistry:
             current_claims["exp"] = just_now + account_data.get("refresh-max-age")
             # may raise an exception
             refresh_token: str = jwt.encode(payload=current_claims,
-                                            key=JwtConfig.ENCODING_KEY.value,
-                                            algorithm=JwtConfig.DEFAULT_ALGORITHM.value,
+                                            key=JwtConfig.ENCODING_KEY,
+                                            algorithm=JwtConfig.DEFAULT_ALGORITHM,
                                             headers={"kid": "R0"})
 
             # make sure to have a database connection
@@ -275,8 +275,8 @@ class JwtRegistry:
                                                               logger=logger)
                 # issue the definitive refresh token
                 refresh_token = jwt.encode(payload=current_claims,
-                                           key=JwtConfig.ENCODING_KEY.value,
-                                           algorithm=JwtConfig.DEFAULT_ALGORITHM.value,
+                                           key=JwtConfig.ENCODING_KEY,
+                                           algorithm=JwtConfig.DEFAULT_ALGORITHM,
                                            headers={"kid": f"R{token_id}"})
                 # persist it
                 db_update(update_stmt=f"UPDATE {JwtDbConfig.TABLE}",
@@ -305,8 +305,8 @@ class JwtRegistry:
             current_claims["exp"] = just_now + account_data.get("access-max-age")
             # may raise an exception
             access_token: str = jwt.encode(payload=current_claims,
-                                           key=JwtConfig.ENCODING_KEY.value,
-                                           algorithm=JwtConfig.DEFAULT_ALGORITHM.value,
+                                           key=JwtConfig.ENCODING_KEY,
+                                           algorithm=JwtConfig.DEFAULT_ALGORITHM,
                                            headers={"kid": f"A{token_id}"})
             # return the token data
             return {
@@ -438,7 +438,7 @@ class JwtRegistry:
                                                       JwtDbConfig.COL_ACCOUNT: account_id,
                                                       JwtDbConfig.COL_TOKEN: jwt_token,
                                                       JwtDbConfig.COL_ALGORITHM:
-                                                          JwtConfig.DEFAULT_ALGORITHM.value,
+                                                          JwtConfig.DEFAULT_ALGORITHM,
                                                       JwtDbConfig.COL_DECODER:
                                                           b64encode(s=JwtConfig.DECODING_KEY.value).decode()
                                                   },