pypomes-jwt 1.0.9__tar.gz → 1.1.0__tar.gz

{pypomes_jwt-1.0.9 → pypomes_jwt-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypomes_jwt
-Version: 1.0.9
+Version: 1.1.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,5 +12,5 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.12
 Requires-Dist: cryptography>=44.0.2
 Requires-Dist: pyjwt>=2.10.1
-Requires-Dist: pypomes-core>=1.9.4
-Requires-Dist: pypomes-db>=2.0.8
+Requires-Dist: pypomes-core>=1.9.6
+Requires-Dist: pypomes-db>=2.0.9

{pypomes_jwt-1.0.9 → pypomes_jwt-1.1.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pypomes_jwt"
-version = "1.0.9"
+version = "1.1.0"
 authors = [
   { name="GT Nunes", email="wisecoder01@gmail.com" }
 ]
@@ -21,8 +21,8 @@ classifiers = [
 dependencies = [
     "PyJWT>=2.10.1",
     "cryptography>=44.0.2",
-    "pypomes_core>=1.9.4",
-    "pypomes_db>=2.0.8"
+    "pypomes_core>=1.9.6",
+    "pypomes_db>=2.0.9"
 ]
 
 [project.urls]

{pypomes_jwt-1.0.9 → pypomes_jwt-1.1.0}/src/pypomes_jwt/jwt_constants.py

@@ -23,10 +23,6 @@ class JwtParam(StrEnum):
     ENCODING_KEY = "encoding-key"
     REFRESH_MAX_AGE = "refresh-max-age"
 
-    def __str__(self) -> str:  # noqa: D105
-        # noinspection PyTypeChecker
-        return self.value
-
 
 class JwtDbParam(StrEnum):
     """
@@ -47,10 +43,6 @@ class JwtDbParam(StrEnum):
     COL_KID = "col-kid"
     COL_TOKEN = "col-token"
 
-    def __str__(self) -> str:  # noqa: D105
-        # noinspection PyTypeChecker
-        return self.value
-
 
 # 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",
@@ -87,7 +79,7 @@ _JWT_CONFIG: Final[dict[JwtParam, Any]] = {
     JwtParam.REFRESH_MAX_AGE: env_get_int(key=f"{APP_PREFIX}_JWT_REFRESH_MAX_AGE",
                                           def_value=86400)
 }
-_JWT_DATABASE: Final[JwtDbParam, Any] = {
+_JWT_DB: Final[JwtDbParam, Any] = {
     JwtDbParam.ENGINE: DbEngine(env_get_str(key=f"{APP_PREFIX}_JWT_DB_ENGINE")),
     JwtDbParam.CLIENT: env_get_str(key=f"{APP_PREFIX}_JWT_DB_CLIENT"),  # for Oracle, only
     JwtDbParam.DRIVER: env_get_str(key=f"{APP_PREFIX}_JWT_DB_DRIVER"),  # for SQLServer, only
@@ -105,12 +97,12 @@ _JWT_DATABASE: Final[JwtDbParam, Any] = {
 }
 
 # define and validate the database engine
-if not db_setup(engine=_JWT_DATABASE[JwtDbParam.ENGINE],
-                db_name=_JWT_DATABASE[JwtDbParam.NAME],
-                db_user=_JWT_DATABASE[JwtDbParam.USER],
-                db_pwd=_JWT_DATABASE[JwtDbParam.PWD],
-                db_host=_JWT_DATABASE[JwtDbParam.HOST],
-                db_port=_JWT_DATABASE[JwtDbParam.PORT],
-                db_client=_JWT_DATABASE[JwtDbParam.CLIENT],
-                db_driver=_JWT_DATABASE[JwtDbParam.DRIVER]):
+if not db_setup(engine=_JWT_DB[JwtDbParam.ENGINE],
+                db_name=_JWT_DB[JwtDbParam.NAME],
+                db_user=_JWT_DB[JwtDbParam.USER],
+                db_pwd=_JWT_DB[JwtDbParam.PWD],
+                db_host=_JWT_DB[JwtDbParam.HOST],
+                db_port=_JWT_DB[JwtDbParam.PORT],
+                db_client=_JWT_DB[JwtDbParam.CLIENT],
+                db_driver=_JWT_DB[JwtDbParam.DRIVER]):
     stderr.write("Invalid database parameters\n")

{pypomes_jwt-1.0.9 → pypomes_jwt-1.1.0}/src/pypomes_jwt/jwt_pomes.py

@@ -10,7 +10,7 @@ from pypomes_db import (
 from typing import Any
 
 from .jwt_constants import (
-    JwtParam, JwtDbParam, _JWT_CONFIG, _JWT_DATABASE
+    JwtParam, JwtDbParam, _JWT_CONFIG, _JWT_DB
 )
 from .jwt_registry import JwtRegistry
 
@@ -180,14 +180,14 @@ def jwt_validate_token(errors: list[str] | None,
                 token_kid[0:1] in ["A", "R"] and token_kid[1:].isdigit():
             # token was likely issued locally
             where_data: dict[str, Any] = {
-                _JWT_DATABASE[JwtDbParam.COL_KID]: int(token_kid[1:])
+                _JWT_DB[JwtDbParam.COL_KID]: int(token_kid[1:])
             }
             if account_id:
-                where_data[_JWT_DATABASE[JwtDbParam.COL_ACCOUNT]] = account_id
+                where_data[_JWT_DB[JwtDbParam.COL_ACCOUNT]] = account_id
             recs: list[tuple[str]] = db_select(errors=op_errors,
-                                               sel_stmt=f"SELECT {_JWT_DATABASE[JwtDbParam.COL_ALGORITHM]}, "
-                                                        f"{_JWT_DATABASE[JwtDbParam.COL_DECODER]} "
-                                                        f"FROM {_JWT_DATABASE[JwtDbParam.TABLE]}",
+                                               sel_stmt=f"SELECT {_JWT_DB[JwtDbParam.COL_ALGORITHM]}, "
+                                                        f"{_JWT_DB[JwtDbParam.COL_DECODER]} "
+                                                        f"FROM {_JWT_DB[JwtDbParam.TABLE]}",
                                                where_data=where_data,
                                                logger=logger)
             if recs:
@@ -282,10 +282,10 @@ def jwt_revoke_token(errors: list[str] | None,
             op_errors.append("Invalid token")
         else:
             db_delete(errors=op_errors,
-                      delete_stmt=f"DELETE FROM {_JWT_DATABASE[JwtDbParam.TABLE]}",
+                      delete_stmt=f"DELETE FROM {_JWT_DB[JwtDbParam.TABLE]}",
                       where_data={
-                          _JWT_DATABASE[JwtDbParam.COL_KID]: int(token_kid[1:]),
-                          _JWT_DATABASE[JwtDbParam.COL_ACCOUNT]: account_id
+                          _JWT_DB[JwtDbParam.COL_KID]: int(token_kid[1:]),
+                          _JWT_DB[JwtDbParam.COL_ACCOUNT]: account_id
                       },
                       logger=logger)
     if op_errors:
@@ -456,10 +456,10 @@ def jwt_refresh_tokens(errors: list[str] | None,
             if db_conn:
                 # delete current refresh token
                 db_delete(errors=op_errors,
-                          delete_stmt=f"DELETE FROM {_JWT_DATABASE[JwtDbParam.TABLE]}",
+                          delete_stmt=f"DELETE FROM {_JWT_DB[JwtDbParam.TABLE]}",
                           where_data={
-                              _JWT_DATABASE[JwtDbParam.COL_KID]: int(token_kid[1:]),
-                              _JWT_DATABASE[JwtDbParam.COL_ACCOUNT]: account_id
+                              _JWT_DB[JwtDbParam.COL_KID]: int(token_kid[1:]),
+                              _JWT_DB[JwtDbParam.COL_ACCOUNT]: account_id
                           },
                           connection=db_conn,
                           committable=False,

{pypomes_jwt-1.0.9 → pypomes_jwt-1.1.0}/src/pypomes_jwt/jwt_registry.py

@@ -13,7 +13,7 @@ from threading import Lock
 from typing import Any
 
 from .jwt_constants import (
-    JwtParam, JwtDbParam, _JWT_CONFIG, _JWT_DATABASE
+    JwtParam, JwtDbParam, _JWT_CONFIG, _JWT_DB
 )
 
 
@@ -141,8 +141,8 @@ class JwtRegistry:
 
         # remove from database
         db_delete(errors=None,
-                  delete_stmt=f"DELETE FROM {_JWT_DATABASE[JwtDbParam.TABLE]}",
-                  where_data={_JWT_DATABASE[JwtDbParam.COL_ACCOUNT]: account_id},
+                  delete_stmt=f"DELETE FROM {_JWT_DB[JwtDbParam.TABLE]}",
+                  where_data={_JWT_DB[JwtDbParam.COL_ACCOUNT]: account_id},
                   logger=logger)
         if logger:
             if account_data:
@@ -298,9 +298,9 @@ class JwtRegistry:
                                            headers={"kid": f"R{token_id}"})
                 # persist it
                 db_update(errors=errors,
-                          update_stmt=f"UPDATE {_JWT_DATABASE[JwtDbParam.TABLE]}",
-                          update_data={_JWT_DATABASE[JwtDbParam.COL_TOKEN]: refresh_token},
-                          where_data={_JWT_DATABASE[JwtDbParam.COL_KID]: token_id},
+                          update_stmt=f"UPDATE {_JWT_DB[JwtDbParam.TABLE]}",
+                          update_data={_JWT_DB[JwtDbParam.COL_TOKEN]: refresh_token},
+                          where_data={_JWT_DB[JwtDbParam.COL_KID]: token_id},
                           connection=curr_conn,
                           committable=False,
                           logger=logger)
@@ -381,9 +381,9 @@ def _jwt_persist_token(account_id: str,
     # noinspection PyTypeChecker
     recs: list[tuple[int, str, str, str]] = \
         db_select(errors=errors,
-                  sel_stmt=f"SELECT {_JWT_DATABASE[JwtDbParam.COL_KID]}, {_JWT_DATABASE[JwtDbParam.COL_TOKEN]} "
-                           f"FROM {_JWT_DATABASE[JwtDbParam.TABLE]}",
-                  where_data={_JWT_DATABASE[JwtDbParam.COL_ACCOUNT]: account_id},
+                  sel_stmt=f"SELECT {_JWT_DB[JwtDbParam.COL_KID]}, {_JWT_DB[JwtDbParam.COL_TOKEN]} "
+                           f"FROM {_JWT_DB[JwtDbParam.TABLE]}",
+                  where_data={_JWT_DB[JwtDbParam.COL_ACCOUNT]: account_id},
                   connection=db_conn,
                   committable=False,
                   logger=logger)
@@ -424,8 +424,8 @@ def _jwt_persist_token(account_id: str,
     # remove expired tokens from persistence
     if expired:
         db_delete(errors=errors,
-                  delete_stmt=f"DELETE FROM {_JWT_DATABASE[JwtDbParam.TABLE]}",
-                  where_data={_JWT_DATABASE[JwtDbParam.COL_KID]: expired},
+                  delete_stmt=f"DELETE FROM {_JWT_DB[JwtDbParam.TABLE]}",
+                  where_data={_JWT_DB[JwtDbParam.COL_KID]: expired},
                   connection=db_conn,
                   committable=False,
                   logger=logger)
@@ -438,8 +438,8 @@ def _jwt_persist_token(account_id: str,
     if 0 < _JWT_CONFIG[JwtParam.ACCOUNT_LIMIT] <= len(recs) - len(expired):
         # delete the oldest token to make way for the new one
         db_delete(errors=errors,
-                  delete_stmt=f"DELETE FROM {_JWT_DATABASE[JwtDbParam.TABLE]}",
-                  where_data={_JWT_DATABASE[JwtDbParam.COL_KID]: oldest_id},
+                  delete_stmt=f"DELETE FROM {_JWT_DB[JwtDbParam.TABLE]}",
+                  where_data={_JWT_DB[JwtDbParam.COL_KID]: oldest_id},
                   connection=db_conn,
                   committable=False,
                   logger=logger)
@@ -450,12 +450,12 @@ def _jwt_persist_token(account_id: str,
                              f"'{account_id}' removed from storage")
     # persist token
     db_insert(errors=errors,
-              insert_stmt=f"INSERT INTO {_JWT_DATABASE[JwtDbParam.TABLE]}",
+              insert_stmt=f"INSERT INTO {_JWT_DB[JwtDbParam.TABLE]}",
               insert_data={
-                  _JWT_DATABASE[JwtDbParam.COL_ACCOUNT]: account_id,
-                  _JWT_DATABASE[JwtDbParam.COL_TOKEN]: jwt_token,
-                  _JWT_DATABASE[JwtDbParam.COL_ALGORITHM]: _JWT_CONFIG[JwtParam.DEFAULT_ALGORITHM],
-                  _JWT_DATABASE[JwtDbParam.COL_DECODER]: urlsafe_b64encode(_JWT_CONFIG[JwtParam.DECODING_KEY]).decode()
+                  _JWT_DB[JwtDbParam.COL_ACCOUNT]: account_id,
+                  _JWT_DB[JwtDbParam.COL_TOKEN]: jwt_token,
+                  _JWT_DB[JwtDbParam.COL_ALGORITHM]: _JWT_CONFIG[JwtParam.DEFAULT_ALGORITHM],
+                  _JWT_DB[JwtDbParam.COL_DECODER]: urlsafe_b64encode(_JWT_CONFIG[JwtParam.DECODING_KEY]).decode()
               },
               connection=db_conn,
               committable=False,
@@ -467,13 +467,13 @@ def _jwt_persist_token(account_id: str,
     # HAZARD: JWT_DB_COL_TOKEN's column type might prevent it for being used in a WHERE clause
     where_clause: str | None = None
     if existing_ids:
-        where_clause = f"{_JWT_DATABASE[JwtDbParam.COL_KID]} NOT IN {existing_ids}"
+        where_clause = f"{_JWT_DB[JwtDbParam.COL_KID]} NOT IN {existing_ids}"
         where_clause = where_clause.replace("[", "(", 1).replace("]", ")", 1)
     reply: list[tuple[int]] = db_select(errors=errors,
-                                        sel_stmt=f"SELECT {_JWT_DATABASE[JwtDbParam.COL_KID]} "
-                                                 f"FROM {_JWT_DATABASE[JwtDbParam.TABLE]}",
+                                        sel_stmt=f"SELECT {_JWT_DB[JwtDbParam.COL_KID]} "
+                                                 f"FROM {_JWT_DB[JwtDbParam.TABLE]}",
                                         where_clause=where_clause,
-                                        where_data={_JWT_DATABASE[JwtDbParam.COL_ACCOUNT]: account_id},
+                                        where_data={_JWT_DB[JwtDbParam.COL_ACCOUNT]: account_id},
                                         require_count=1,
                                         connection=db_conn,
                                         committable=False,