pypomes-jwt 0.7.2__tar.gz → 0.7.3__tar.gz

{pypomes_jwt-0.7.2 → pypomes_jwt-0.7.3}/PKG-INFO

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

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

{pypomes_jwt-0.7.2 → pypomes_jwt-0.7.3}/src/pypomes_jwt/__init__.py

@@ -1,6 +1,7 @@
 from .jwt_constants import (
     JWT_DB_ENGINE, JWT_DB_HOST, JWT_DB_NAME,
     JWT_DB_PORT, JWT_DB_USER, JWT_DB_PWD,
+    JWT_DB_TABLE, JWT_DB_COL_ACCOUNT, JWT_DB_COL_TOKEN,
     JWT_ACCESS_MAX_AGE, JWT_REFRESH_MAX_AGE,
     JWT_ENCODING_KEY, JWT_DECODING_KEY
 )
@@ -14,6 +15,7 @@ __all__ = [
     # jwt_constants
     "JWT_DB_ENGINE", "JWT_DB_HOST", "JWT_DB_NAME",
     "JWT_DB_PORT", "JWT_DB_USER", "JWT_DB_PWD",
+    "JWT_DB_TABLE", "JWT_DB_COL_ACCOUNT", "JWT_DB_COL_TOKEN",
     "JWT_ACCESS_MAX_AGE", "JWT_REFRESH_MAX_AGE",
     "JWT_ENCODING_KEY", "JWT_DECODING_KEY",
     # jwt_pomes

{pypomes_jwt-0.7.2 → pypomes_jwt-0.7.3}/src/pypomes_jwt/jwt_constants.py

@@ -16,12 +16,14 @@ JWT_DB_USER: Final[str] = env_get_str(key=f"{APP_PREFIX}_JWT_DB_USER")
 JWT_DB_PWD: Final[str] = env_get_str(key=f"{APP_PREFIX}_JWT_DB_PWD")
 JWT_DB_CLIENT: Final[str] = env_get_str(key=f"{APP_PREFIX}_JWT_DB_CLIENT")  # for Oracle, only
 JWT_DB_DRIVER: Final[str] = env_get_str(key=f"{APP_PREFIX}_JWT_DB_DRIVER")  # for SQLServer, only
-JWT_DB_TABLE: Final[str] = env_get_str(key=f"{APP_PREFIX}_JWT_DB_TABLE")
-JWT_ROTATE_TOKENS: Final[bool] = env_get_bool(key=f"{APP_PREFIX}_JWT_ROTATE_TOKENS",
-                                              def_value=True)
-
+JWT_DB_TABLE: Final[str] = env_get_str(key=f"{APP_PREFIX}_JWT_DB_TABLE",
+                                       def_value="jwt_token")
+JWT_DB_COL_ACCOUNT: Final[str] = env_get_str(key=f"{APP_PREFIX}_JWT_DB_COL_ACCOUNT",
+                                             def_value="account_id")
+JWT_DB_COL_TOKEN: Final[str] = env_get_str(key=f"{APP_PREFIX}_JWT_DB_COL_TOKEN",
+                                           def_value="token")
+# define the database engine
 __db_engine: str | None = env_get_str(key=f"{APP_PREFIX}_JWT_DB_ENGINE")
-__rotate_tokens: bool = False
 if __db_engine:
     from pypomes_db import DbEngine, db_setup, db_assert_access, db_delete
     from sys import stderr
@@ -42,6 +44,7 @@ if __db_engine:
     else:
         stderr.write("Invalid database parameters\n")
         __db_engine = None
+# if set to 'None', no further attempt will be made to access the database
 JWT_DB_ENGINE: Final[DbEngine] = DbEngine(__db_engine) if __db_engine else None
 
 # one of HS256, HS512, RSA256, RSA512
@@ -53,6 +56,8 @@ JWT_ACCESS_MAX_AGE: Final[int] = env_get_int(key=f"{APP_PREFIX}_JWT_ACCESS_MAX_A
 # recommended: at least 2 hours (set to 24 hours)
 JWT_REFRESH_MAX_AGE: Final[int] = env_get_int(key=f"{APP_PREFIX}_JWT_REFRESH_MAX_AGE",
                                               def_value=86400)
+JWT_ROTATE_TOKENS: Final[bool] = env_get_bool(key=f"{APP_PREFIX}_JWT_ROTATE_TOKENS",
+                                              def_value=True)
 
 # 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_ENCODE_KEY")

{pypomes_jwt-0.7.2 → pypomes_jwt-0.7.3}/src/pypomes_jwt/jwt_data.py

@@ -9,8 +9,8 @@ from threading import Lock
 from typing import Any
 
 from .jwt_constants import (
-    JWT_DEFAULT_ALGORITHM, JWT_ENCODING_KEY,
-    JWT_ROTATE_TOKENS, JWT_DB_ENGINE, JWT_DB_TABLE
+    JWT_DEFAULT_ALGORITHM, JWT_ENCODING_KEY, JWT_ROTATE_TOKENS,
+    JWT_DB_ENGINE, JWT_DB_TABLE, JWT_DB_COL_ACCOUNT, JWT_DB_COL_TOKEN
 )
 
 
@@ -232,14 +232,15 @@ class JwtData:
                         if JWT_ROTATE_TOKENS:
                             db_delete(errors=errors,
                                       delete_stmt=f"DELETE FROM {JWT_DB_TABLE} "
-                                                  f"WHERE account_id = '{account_id}'",
+                                                  f"WHERE {JWT_DB_COL_ACCOUNT} = '{account_id}'",
                                       logger=logger)
                         else:
-                            recs: list[tuple[str]] = db_select(errors=errors,
-                                                               sel_stmt=f"SELECT jwt_token FROM {JWT_DB_TABLE} "
-                                                                        f"WHERE account_id = '{account_id}'",
-                                                               max_count=1,
-                                                               logger=logger)
+                            recs: list[tuple[str]] = \
+                                db_select(errors=errors,
+                                          sel_stmt=f"SELECT token FROM {JWT_DB_TABLE} "
+                                                   f"WHERE {JWT_DB_COL_ACCOUNT} = '{account_id}'",
+                                          max_count=1,
+                                          logger=logger)
                             if recs:
                                 refresh_token = recs[0][0]
                         if errors:
@@ -259,8 +260,8 @@ class JwtData:
                             from pypomes_db import db_insert
                             db_insert(errors=errors,
                                       insert_stmt=f"INSERT INTO {JWT_DB_TABLE}",
-                                      insert_data={"account_id": account_id,
-                                                   "jwt_token": refresh_token},
+                                      insert_data={JWT_DB_COL_ACCOUNT: account_id,
+                                                   JWT_DB_COL_TOKEN: refresh_token},
                                       logger=logger)
                             if errors:
                                 raise RuntimeError(" - ".join(errors))

{pypomes_jwt-0.7.2 → pypomes_jwt-0.7.3}/src/pypomes_jwt/jwt_pomes.py

@@ -6,7 +6,7 @@ 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_ENGINE, JWT_DB_TABLE, JWT_DB_COL_ACCOUNT
 )
 from .jwt_data import JwtData
 
@@ -176,7 +176,7 @@ def jwt_revoke_tokens(errors: list[str] | None,
     if JWT_DB_ENGINE:
         from pypomes_db import db_delete
         delete_stmt: str = (f"DELETE FROM {JWT_DB_TABLE} "
-                            f"WHERE account_id = '{account_id}'")
+                            f"WHERE {JWT_DB_COL_ACCOUNT} = '{account_id}'")
         db_delete(errors=op_errors,
                   delete_stmt=delete_stmt,
                   logger=logger)