pypomes-jwt 0.7.9__py3-none-any.whl → 0.8.1__py3-none-any.whl

pypomes_jwt/__init__.py

@@ -8,7 +8,7 @@ from .jwt_constants import (
 from .jwt_pomes import (
     jwt_needed, jwt_verify_request,
     jwt_get_tokens, jwt_get_claims, jwt_validate_token,
-    jwt_assert_access, jwt_set_access, jwt_remove_account, jwt_revoke_token
+    jwt_assert_account, jwt_set_account, jwt_remove_account, jwt_revoke_token
 )
 
 __all__ = [
@@ -21,7 +21,7 @@ __all__ = [
     # jwt_pomes
     "jwt_needed", "jwt_verify_request",
     "jwt_get_tokens", "jwt_get_claims", "jwt_validate_token",
-    "jwt_assert_access", "jwt_set_access", "jwt_remove_account", "jwt_revoke_token"
+    "jwt_assert_account", "jwt_set_account", "jwt_remove_account", "jwt_revoke_token"
 ]
 
 from importlib.metadata import version

pypomes_jwt/jwt_constants.py

@@ -47,7 +47,8 @@ JWT_DB_ENGINE: Final[DbEngine] = DbEngine(__db_engine) if __db_engine else None
 
 # one of HS256, HS512, RSA256, RSA512
 JWT_DEFAULT_ALGORITHM: Final[str] = env_get_str(key=f"{APP_PREFIX}_JWT_DEFAULT_ALGORITHM",
-                                                def_value="HS256")
+                                                def_value="RS256")
+
 # recommended: between 5 min and 1 hour (set to 5 min)
 JWT_ACCESS_MAX_AGE: Final[int] = env_get_int(key=f"{APP_PREFIX}_JWT_ACCESS_MAX_AGE",
                                              def_value=300)

pypomes_jwt/jwt_data.py

@@ -397,8 +397,9 @@ def _jwt_persist_token(errors: list[str],
                 # ruff: noqa: S324
                 hasher = hashlib.new(name="md5",
                                      data=jwt_token.encode())
-                token_hash: str = hasher.digest().decode()
+                token_hash: str = hasher.digest().hex()
                 db_insert(errors=errors,
                           insert_stmt=f"INSERT INTO {JWT_DB_TABLE}",
-                          insert_data={"ds_hash": token_hash,
-                                       "ds_token": jwt_token})
+                          insert_data={JWT_DB_COL_ACCOUNT: account_id,
+                                       JWT_DB_COL_HASH: token_hash,
+                                       JWT_DB_COL_TOKEN: jwt_token})

pypomes_jwt/jwt_pomes.py

@@ -7,7 +7,8 @@ from typing import Any, Literal
 from .jwt_constants import (
     JWT_ACCESS_MAX_AGE, JWT_REFRESH_MAX_AGE,
     JWT_DEFAULT_ALGORITHM, JWT_DECODING_KEY,
-    JWT_DB_ENGINE, JWT_DB_TABLE, JWT_DB_COL_ACCOUNT, JWT_DB_COL_TOKEN
+    JWT_DB_ENGINE, JWT_DB_TABLE,
+    JWT_DB_COL_ACCOUNT, JWT_DB_COL_HASH, JWT_DB_COL_TOKEN
 )
 from .jwt_data import JwtData
 
@@ -77,7 +78,7 @@ def jwt_verify_request(request: Request,
     return result
 
 
-def jwt_assert_access(account_id: str) -> bool:
+def jwt_assert_account(account_id: str) -> bool:
     """
     Determine whether access for *account_id* has been established.
 
@@ -87,17 +88,17 @@ def jwt_assert_access(account_id: str) -> bool:
     return __jwt_data.access_data.get(account_id) is not None
 
 
-def jwt_set_access(account_id: str,
-                   reference_url: str,
-                   claims: dict[str, Any],
-                   access_max_age: int = JWT_ACCESS_MAX_AGE,
-                   refresh_max_age: int = JWT_REFRESH_MAX_AGE,
-                   grace_interval: int = None,
-                   token_audience: str = None,
-                   token_nonce: str = None,
-                   request_timeout: int = None,
-                   remote_provider: bool = True,
-                   logger: Logger = None) -> None:
+def jwt_set_account(account_id: str,
+                    reference_url: str,
+                    claims: dict[str, Any],
+                    access_max_age: int = JWT_ACCESS_MAX_AGE,
+                    refresh_max_age: int = JWT_REFRESH_MAX_AGE,
+                    grace_interval: int = None,
+                    token_audience: str = None,
+                    token_nonce: str = None,
+                    request_timeout: int = None,
+                    remote_provider: bool = True,
+                    logger: Logger = None) -> None:
     """
     Set the data needed to obtain JWT tokens for *account_id*.
 
@@ -226,14 +227,14 @@ def jwt_revoke_token(errors: list[str] | None,
         # ruff: noqa: S324
         hasher = hashlib.new(name="md5",
                              data=refresh_token.encode())
-        token_hash: str = hasher.digest().decode()
+        token_hash: str = hasher.digest().hex()
         if db_exists(errors=op_errors,
                      table=JWT_DB_TABLE,
-                     where_data={"ds_hash": token_hash},
+                     where_data={JWT_DB_COL_HASH: token_hash},
                      logger=logger):
             db_delete(errors=errors,
                       delete_stmt=f"DELETE FROM {JWT_DB_TABLE}",
-                      where_data={"ds_hash": token_hash},
+                      where_data={JWT_DB_COL_HASH: token_hash},
                       logger=logger)
         elif not op_errors:
             op_errors.append("Token was not found")
@@ -336,7 +337,7 @@ def jwt_get_claims(errors: list[str] | None,
     Structure of the returned data:
       {
         "header": {
-          "alg": "HS256",
+          "alg": "RS256",
           "typ": "JWT",
           "kid": "rt466ytRTYH64577uydhDFGHDYJH2341"
         },
@@ -347,10 +348,10 @@ def jwt_get_claims(errors: list[str] | None,
           "iat": 1516239022,
           "iss": "https://my_id_provider/issue",
           "jti": "Uhsdfgr67FGH567qwSDF33er89retert",
-          "gender": "M,
+          "gender": "M",
           "name": "John Doe",
           "nbt": 1516249022
-          "sub": "1234567890",
+          "sub": "11111111111",
           "roles": [
             "administrator",
             "operator"

{pypomes_jwt-0.7.9.dist-info → pypomes_jwt-0.8.1.dist-info}/METADATA

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

@@ -0,0 +1,8 @@
+pypomes_jwt/__init__.py,sha256=06WdwiP2m5jtrFjpPSacg4fRd2Dh6gVo93xJhmu73J4,1134
+pypomes_jwt/jwt_constants.py,sha256=EjdrTP5AptGoOdI0gzsxexmM4lrgm2r0KHX-DyyGhFc,4330
+pypomes_jwt/jwt_data.py,sha256=q4KUVOuLXHA9tVIfuVEPo8uZPulElWM04wqtGVxcV-0,19239
+pypomes_jwt/jwt_pomes.py,sha256=lACMvNHRVpGgOGmQJ67zbURnR6p4kcxU4UomoZYahto,15246
+pypomes_jwt-0.8.1.dist-info/METADATA,sha256=g4cWSIxewY90pfkQ2gLJlLdE_LqHeX2E6mU2CfX0eak,599
+pypomes_jwt-0.8.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pypomes_jwt-0.8.1.dist-info/licenses/LICENSE,sha256=NdakochSXm_H_-DSL_x2JlRCkYikj3snYYvTwgR5d_c,1086
+pypomes_jwt-0.8.1.dist-info/RECORD,,

pypomes_jwt-0.7.9.dist-info/RECORD

@@ -1,8 +0,0 @@
-pypomes_jwt/__init__.py,sha256=xUDd_xphRQFHuTxrvlQxO-mHIXgTqZjHWHMgp5gRrXU,1130
-pypomes_jwt/jwt_constants.py,sha256=6-Jw4ORgf32hRWnaGyVISXMJMtTBk7LdKl3RrDy7Ll0,4328
-pypomes_jwt/jwt_data.py,sha256=gyhGquSQbHevOKIoXmAmjMSwCjXB7pYbI2sY-7sGGO8,19158
-pypomes_jwt/jwt_pomes.py,sha256=xNBlHhvrOH07WP6hKE0PyDl4fKSl0R1Xg7AQO_1b1uo,15201
-pypomes_jwt-0.7.9.dist-info/METADATA,sha256=rXu25F1ufUL_U7frUaV1DMAj27pH8gvPX-TIA0qLlrg,599
-pypomes_jwt-0.7.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pypomes_jwt-0.7.9.dist-info/licenses/LICENSE,sha256=NdakochSXm_H_-DSL_x2JlRCkYikj3snYYvTwgR5d_c,1086
-pypomes_jwt-0.7.9.dist-info/RECORD,,