pypomes-jwt 1.1.2__py3-none-any.whl → 1.1.3__py3-none-any.whl

pypomes_jwt/jwt_configuration.py

@@ -6,9 +6,8 @@ from pypomes_core import (
     APP_PREFIX,
     env_get_str, env_get_bytes, env_get_int
 )
-from pypomes_db import DbEngine, db_setup
+from pypomes_db import DbEngine
 from secrets import token_bytes
-from sys import stderr
 
 
 # recommended: allow the encode and decode keys to be generated anew when app starts
@@ -57,29 +56,9 @@ class JwtDbConfig(Enum):
     Parameters for JWT databse connection.
     """
     ENGINE: str = DbEngine(env_get_str(key=f"{APP_PREFIX}_JWT_DB_ENGINE"))
-    CLIENT: str = env_get_str(key=f"{APP_PREFIX}_JWT_DB_CLIENT")  # for Oracle, only
-    DRIVER: str = env_get_str(key=f"{APP_PREFIX}_JWT_DB_DRIVER")  # for SQLServer, only
-    NAME: str = env_get_str(key=f"{APP_PREFIX}_JWT_DB_NAME")
-    HOST: str = env_get_str(key=f"{APP_PREFIX}_JWT_DB_HOST")
-    PORT: int = env_get_int(key=f"{APP_PREFIX}_JWT_DB_PORT")
-    USER: str = env_get_str(key=f"{APP_PREFIX}_JWT_DB_USER")
-    PWD: str = env_get_str(key=f"{APP_PREFIX}_JWT_DB_PWD")
     TABLE: str = env_get_str(key=f"{APP_PREFIX}_JWT_DB_TABLE")
     COL_ACCOUNT: str = env_get_str(key=f"{APP_PREFIX}_JWT_DB_COL_ACCOUNT")
     COL_ALGORITHM: str = env_get_str(key=f"{APP_PREFIX}_JWT_DB_COL_ALGORITHM")
     COL_DECODER: str = env_get_str(key=f"{APP_PREFIX}_JWT_DB_COL_DECODER")
     COL_KID: str = env_get_str(key=f"{APP_PREFIX}_JWT_DB_COL_KID")
     COL_TOKEN: str = env_get_str(key=f"{APP_PREFIX}_JWT_DB_COL_TOKEN")
-
-
-# define and validate the database engine
-# noinspection PyTypeChecker
-if not db_setup(engine=JwtDbConfig.ENGINE.value,
-                db_name=JwtDbConfig.NAME.value,
-                db_user=JwtDbConfig.USER.value,
-                db_pwd=JwtDbConfig.PWD.value,
-                db_host=JwtDbConfig.HOST.value,
-                db_port=JwtDbConfig.PORT.value,
-                db_client=JwtDbConfig.CLIENT.value,
-                db_driver=JwtDbConfig.DRIVER.value):
-    stderr.write("Invalid database parameters\n")

pypomes_jwt/jwt_pomes.py

@@ -185,6 +185,7 @@ def jwt_validate_token(errors: list[str] | None,
                                                         f"{JwtDbConfig.COL_DECODER.value} "
                                                         f"FROM {JwtDbConfig.TABLE.value}",
                                                where_data=where_data,
+                                               engine=JwtDbConfig.ENGINE.value,
                                                logger=logger)
             if recs:
                 token_alg = recs[0][0]
@@ -283,6 +284,7 @@ def jwt_revoke_token(errors: list[str] | None,
                           JwtDbConfig.COL_KID.value: int(token_kid[1:]),
                           JwtDbConfig.COL_ACCOUNT.value: account_id
                       },
+                      engine=JwtDbConfig.ENGINE.value,
                       logger=logger)
     if op_errors:
         if logger:
@@ -448,6 +450,7 @@ def jwt_refresh_tokens(errors: list[str] | None,
             # start the database transaction
             db_conn: Any = db_connect(errors=op_errors,
                                       autocommit=False,
+                                      engine=JwtDbConfig.ENGINE.value,
                                       logger=logger)
             if db_conn:
                 # delete current refresh token
@@ -457,6 +460,7 @@ def jwt_refresh_tokens(errors: list[str] | None,
                               JwtDbConfig.COL_KID.value: int(token_kid[1:]),
                               JwtDbConfig.COL_ACCOUNT.value: account_id
                           },
+                          engine=JwtDbConfig.ENGINE.value,
                           connection=db_conn,
                           committable=False,
                           logger=logger)

pypomes_jwt/jwt_registry.py

@@ -141,6 +141,7 @@ class JwtRegistry:
         db_delete(errors=None,
                   delete_stmt=f"DELETE FROM {JwtDbConfig.value}",
                   where_data={JwtDbConfig.COL_ACCOUNT.value: account_id},
+                  engine=JwtDbConfig.ENGINE.value,
                   logger=logger)
         if logger:
             if account_data:
@@ -282,6 +283,7 @@ class JwtRegistry:
             # make sure to have a database connection
             curr_conn: Any = db_conn or db_connect(errors=errors,
                                                    autocommit=False,
+                                                   engine=JwtDbConfig.ENGINE.value,
                                                    logger=logger)
             if curr_conn:
                 # persist the candidate token (may raise an exception)
@@ -299,6 +301,7 @@ class JwtRegistry:
                           update_stmt=f"UPDATE {JwtDbConfig.TABLE.value}",
                           update_data={JwtDbConfig.COL_TOKEN.value: refresh_token},
                           where_data={JwtDbConfig.COL_KID.value: token_id},
+                          engine=JwtDbConfig.ENGINE.value,
                           connection=curr_conn,
                           committable=False,
                           logger=logger)
@@ -382,6 +385,7 @@ def _jwt_persist_token(account_id: str,
                   sel_stmt=f"SELECT {JwtDbConfig.COL_KID.value}, {JwtDbConfig.COL_TOKEN.value} "
                            f"FROM {JwtDbConfig.TABLE.value}",
                   where_data={JwtDbConfig.COL_ACCOUNT.value: account_id},
+                  engine=JwtDbConfig.ENGINE.value,
                   connection=db_conn,
                   committable=False,
                   logger=logger)
@@ -424,6 +428,7 @@ def _jwt_persist_token(account_id: str,
         db_delete(errors=errors,
                   delete_stmt=f"DELETE FROM {JwtDbConfig.TABLE.value}",
                   where_data={JwtDbConfig.COL_KID.value: expired},
+                  engine=JwtDbConfig.ENGINE.value,
                   connection=db_conn,
                   committable=False,
                   logger=logger)
@@ -438,6 +443,7 @@ def _jwt_persist_token(account_id: str,
         db_delete(errors=errors,
                   delete_stmt=f"DELETE FROM {JwtDbConfig.TABLE.value}",
                   where_data={JwtDbConfig.COL_KID.value: oldest_id},
+                  engine=JwtDbConfig.ENGINE.value,
                   connection=db_conn,
                   committable=False,
                   logger=logger)
@@ -455,6 +461,7 @@ def _jwt_persist_token(account_id: str,
                   JwtDbConfig.COL_ALGORITHM.value: JwtConfig.DEFAULT_ALGORITHM.value,
                   JwtDbConfig.COL_DECODER.value: urlsafe_b64encode(s=JwtConfig.DECODING_KEY.value).decode()
               },
+              engine=JwtDbConfig.ENGINE.value,
               connection=db_conn,
               committable=False,
               logger=logger)
@@ -473,6 +480,7 @@ def _jwt_persist_token(account_id: str,
                                         where_clause=where_clause,
                                         where_data={JwtDbConfig.COL_ACCOUNT.value: account_id},
                                         require_count=1,
+                                        engine=JwtDbConfig.ENGINE.value,
                                         connection=db_conn,
                                         committable=False,
                                         logger=logger)

{pypomes_jwt-1.1.2.dist-info → pypomes_jwt-1.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypomes_jwt
-Version: 1.1.2
+Version: 1.1.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
@@ -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.8
+Requires-Dist: pypomes-core>=1.9.9
 Requires-Dist: pypomes-db>=2.0.9

pypomes_jwt-1.1.3.dist-info/RECORD

@@ -0,0 +1,8 @@
+pypomes_jwt/__init__.py,sha256=g4tjg7gt5_vwiHM_6-T6Ji4XYJ5py9RuzGmF2Z-qlXI,800
+pypomes_jwt/jwt_configuration.py,sha256=mqTPblkfb4RXAzUe28T2gCk1auCYVY7gIlz2iFK4JSg,3127
+pypomes_jwt/jwt_pomes.py,sha256=OkkzKc87eviEovAPIlGJlFlMIKooSivTB9LvX2137mg,23559
+pypomes_jwt/jwt_registry.py,sha256=NEIYE15j4MnKaGVKp42WjriBzekvDZVTHFXP08EOcXA,23687
+pypomes_jwt-1.1.3.dist-info/METADATA,sha256=dm8aTZMrvDbHxcpLvp07PDw1F_pZSef6DLeXnoVPqbo,632
+pypomes_jwt-1.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pypomes_jwt-1.1.3.dist-info/licenses/LICENSE,sha256=NdakochSXm_H_-DSL_x2JlRCkYikj3snYYvTwgR5d_c,1086
+pypomes_jwt-1.1.3.dist-info/RECORD,,

pypomes_jwt-1.1.2.dist-info/RECORD

@@ -1,8 +0,0 @@
-pypomes_jwt/__init__.py,sha256=g4tjg7gt5_vwiHM_6-T6Ji4XYJ5py9RuzGmF2Z-qlXI,800
-pypomes_jwt/jwt_configuration.py,sha256=GBkt8ISgcRYMh1FuTxUBWiKFACHHz-67mejSaPdiEsc,4172
-pypomes_jwt/jwt_pomes.py,sha256=e-E-T_hkk_FNmpsndee8AhcuUWR775SIxo4YBqjCFDA,23290
-pypomes_jwt/jwt_registry.py,sha256=7eWFEdzCMXjdxwR8nO_rqAeZ6SDf-WAEksDlfLPM_o4,23212
-pypomes_jwt-1.1.2.dist-info/METADATA,sha256=nIpMJ0AN-R9XZNsbEBVAu9ueTCOSQj3LxDgAOQrLKRU,632
-pypomes_jwt-1.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pypomes_jwt-1.1.2.dist-info/licenses/LICENSE,sha256=NdakochSXm_H_-DSL_x2JlRCkYikj3snYYvTwgR5d_c,1086
-pypomes_jwt-1.1.2.dist-info/RECORD,,