jaaql-middleware-python 4.23.42__tar.gz → 4.23.43__tar.gz

{jaaql-middleware-python-4.23.42/jaaql_middleware_python.egg-info → jaaql-middleware-python-4.23.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaaql-middleware-python
-Version: 4.23.42
+Version: 4.23.43
 Summary: The jaaql package, allowing for rapid development and deployment of RESTful HTTP applications
 Home-page: https://github.com/JAAQL/JAAQL-middleware-python
 Author: Software Quality Measurement and Improvement bv

{jaaql-middleware-python-4.23.42 → jaaql-middleware-python-4.23.43}/jaaql/constants.py

@@ -180,5 +180,5 @@ ROLE__postgres = "postgres"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "4.23.42"
+VERSION = "4.23.43"
 

{jaaql-middleware-python-4.23.42 → jaaql-middleware-python-4.23.43}/jaaql/documentation/documentation_public.py

@@ -79,8 +79,8 @@ DOCUMENTATION__password = SwaggerDocumentation(
         method=REST__POST,
         name="Change password",
         description="Will change the logged in users password to the new one",
-        arguments=[
-            rename_arg(ARG_RES__username, KEY__old_password, "The old password for the user"),
+        body=[
+            rename_arg(ARG_RES__password, KEY__old_password, "The old password for the user"),
             ARG_RES__password
         ],
         response=RES__oauth_token

{jaaql-middleware-python-4.23.42 → jaaql-middleware-python-4.23.43}/jaaql/exceptions/jaaql_interpretable_handled_errors.py

@@ -184,12 +184,12 @@ class InvalidSecurityEventLock(JaaqlInterpretableHandledError):
 
 
 class MissingParameterInQuery(JaaqlInterpretableHandledError):
-    def __init__(self, _set, descriptor=None):
+    def __init__(self, message, _set, descriptor=None):
         super().__init__(
             error_code=1014,
             http_response_code=422,
             table_name=None,
-            message="A query has been sent that expects a parameter but this parameter has not been provided",
+            message=message,
             column_name=None,
             _set=_set,
             index=None,
@@ -198,12 +198,12 @@ class MissingParameterInQuery(JaaqlInterpretableHandledError):
 
 
 class ExpectedParameterInQuery(JaaqlInterpretableHandledError):
-    def __init__(self, descriptor=None):
+    def __init__(self, message, descriptor=None):
         super().__init__(
             error_code=1015,
             http_response_code=422,
             table_name=None,
-            message="A parameter has been sent to a query that has not been used",
+            message=message,
             column_name=None,
             _set=None,
             index=None,

{jaaql-middleware-python-4.23.42 → jaaql-middleware-python-4.23.43}/jaaql/mvc/exception_queries.py

@@ -1,5 +1,5 @@
 """
-This script was generated from jaaql.exceptions.fxli at 2024-04-30, 13:33:05
+This script was generated from jaaql.exceptions.fxli at 2024-09-19, 19:54:40
 """
 
 from jaaql.utilities.crypt_utils import get_repeatable_salt
@@ -205,7 +205,7 @@ QUERY__check_security_event_unlock = """
     WHERE
         S.application = A.name AND
         (S.event_lock = :event_lock OR S.unlock_key = :unlock_key) AND S.finish_timestamp is null AND
-        S.creation_timestamp + (A.unlock_code_validity_period || ' seconds')::interval > current_timestamp
+        S.creation_timestamp + (A.unlock_key_validity_period || ' seconds')::interval > current_timestamp
     RETURNING S.*, A.unlock_code_validity_period, (S.unlock_code = :unlock_code OR S.unlock_key = :unlock_key) as key_fits
 """
 

{jaaql-middleware-python-4.23.42 → jaaql-middleware-python-4.23.43}/jaaql/mvc/generated_queries.py

@@ -1,5 +1,5 @@
 """
-This script was generated from jaaql.fxli at 2024-04-30, 13:33:05
+This script was generated from jaaql.fxli at 2024-09-19, 19:54:40
 """
 
 from jaaql.db.db_interface import DBInterface

{jaaql-middleware-python-4.23.42 → jaaql-middleware-python-4.23.43}/jaaql/mvc/model.py

@@ -850,7 +850,7 @@ WHERE
                 KG__security_event__fake_account: get_repeatable_salt(self.get_vault_repeatable_salt(), fake_account_username)})
 
         sign_up_perms_data_view = template[KG__email_template__permissions_and_data_view]
-        if re.match(REGEX__dmbs_object_name, sign_up_perms_data_view) is None:
+        if sign_up_perms_data_view is not None and re.match(REGEX__dmbs_object_name, sign_up_perms_data_view) is None:
             raise HttpStatusException("Unsafe data relation specified for sign up")
         reset_password_data = None
         try:
@@ -864,16 +864,20 @@ WHERE
                 reset_password_data = submit(self.vault, self.config, self.get_db_crypt_key(), self.jaaql_lookup_connection, submit_data, account_id,
                                              None, self.cached_canned_query_service, interface=account_db_interface, as_objects=False, singleton=True)
                 reset_password_data = objectify(reset_password_data, singleton=True)
-            else:
+            elif sign_up_perms_data_view is not None:
                 submit_data = {
                     KEY__application: inputs[KG__security_event__application],
                     KEY__schema: template[KG__email_template__validation_schema],
                     KEY_query: f'SELECT * FROM {sign_up_perms_data_view}'  # Ignore pycharm PEP issue
                 }
 
+                # Likely that we'll need to add a where clause to this!
+
                 reset_password_data = submit(self.vault, self.config, self.get_db_crypt_key(),
                                              self.jaaql_lookup_connection, submit_data, ROLE__jaaql,
                                              None, self.cached_canned_query_service, as_objects=True, singleton=True)
+            else:
+                reset_password_data = {}  # The common case where there is simply no data associated with the reset password
 
         except HttpSingletonStatusException:
             raise HttpSingletonStatusException("Multiple rows returned when selecting from reset password data view")