jaaql-middleware-python 4.33.14__tar.gz → 4.33.17__tar.gz

{jaaql_middleware_python-4.33.14 → jaaql_middleware_python-4.33.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaaql-middleware-python
-Version: 4.33.14
+Version: 4.33.17
 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.33.14 → jaaql_middleware_python-4.33.17}/jaaql/constants.py

@@ -208,5 +208,5 @@ ROLE__postgres = "postgres"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "4.33.14"
+VERSION = "4.33.17"
 

{jaaql_middleware_python-4.33.14 → jaaql_middleware_python-4.33.17}/jaaql/mvc/base_controller.py

@@ -1,5 +1,6 @@
 import threading
 import traceback
+from werkzeug.datastructures import Headers
 import uuid
 from functools import wraps
 
@@ -667,9 +668,15 @@ class BaseJAAQLController:
                     if jaaql_resp.raw_response is not None:
                         resp = jaaql_resp.raw_response
                     if jaaql_resp.is_binary:
-                        resp = Response(resp, mimetype=jaaql_resp.response_type, status=jaaql_resp.response_code)
+                        hdrs = Headers(jaaql_resp.raw_headers or {})
+                        content_type = hdrs.pop("Content-Type", None)
+                        try:
+                            del jaaql_resp.raw_headers["Content-Type"]
+                        except:
+                            pass
+                        resp = Response(resp, status=jaaql_resp.response_code, content_type=content_type or "application/octet-stream")
                     else:
-                        resp = Response(resp, status=jaaql_resp.response_code)
+                        resp = Response(resp, mimetype=jaaql_resp.response_type, status=jaaql_resp.response_code)
 
                 for key, val in jaaql_resp.raw_headers.items():
                     resp.headers.add(key, val)

{jaaql_middleware_python-4.33.14 → jaaql_middleware_python-4.33.17}/jaaql/mvc/controller.py

@@ -151,7 +151,7 @@ class JAAQLController(BaseJAAQLController):
 
         @self.publish_route('/webhook/<application>/<name>', DOCUMENTATION__webhook)
         def handle_webhook(application: str, name: str, body: bytes, headers: dict, args: dict, response: JAAQLResponse):
-            self.model.handle_webhook(application, name, body, headers, args, response)
+            self.model.handle_webhook(application, name, body, headers, args, response, None)
 
         @self.publish_route('/secure/<application>/<name>', DOCUMENTATION__secure_webhook)
         def handle_secure_webhook(application: str, name: str, body: bytes, headers: dict, args: dict,

{jaaql_middleware_python-4.33.14 → jaaql_middleware_python-4.33.17}/jaaql/mvc/model.py

@@ -1647,7 +1647,7 @@ WHERE
             raise HttpStatusException("Could not intepret remote procedure result", HTTPStatus.INTERNAL_SERVER_ERROR)
 
     def handle_webhook(self, application: str, name: str, body: bytes, headers: dict, args: dict,
-                       response: JAAQLResponse, account_id: str):
+                       response: JAAQLResponse, account_id: str | None):
         rpc = remote_procedure__select(self.jaaql_lookup_connection, application, name)
         if rpc[KG__remote_procedure__access] != RPC_ACCESS__webhook:
             raise HttpStatusException("Procedure type is not type webhook")
@@ -1667,7 +1667,9 @@ WHERE
             base_cmd = m.group(2)
 
         argv = shlex.split(base_cmd)  # ["node","--import","./__imports__.js","RemoteProcedures/...entrypoint.js"]
-        argv += [encoded_headers, encoded_args, encoded_body, account_id]
+        argv += [encoded_headers, encoded_args, encoded_body]
+        if account_id is not None:
+            argv += [account_id]
 
         # No shell; pass argv list. Capture output as text.
         result = subprocess.run(

{jaaql_middleware_python-4.33.14 → jaaql_middleware_python-4.33.17}/jaaql/utilities/utils_no_project_imports.py

@@ -78,7 +78,7 @@ COOKIE_FLAG_SECURE = "Secure"
 COOKIE_ATTR_SAME_SITE = "SameSite"
 COOKIE_ATTR_EXPIRES = "Expires"
 COOKIE_ATTR_MAX_AGE = "Max-Age"
-COOKIE_VAL_STRICT = "Strict"
+COOKIE_VAL_LAX = "Lax"
 COOKIE_VAL_INACTIVITY_15_MINUTES = "900"
 COOKIE_EXPIRY_90_DAYS = 90
 COOKIE_ATTR_PATH = "Path"
@@ -89,7 +89,7 @@ from datetime import timedelta
 
 
 def get_cookie_attrs(vigilant_sessions: bool, remember_me: bool, is_gunicorn: bool):
-    cookie_attrs = {COOKIE_ATTR_SAME_SITE: COOKIE_VAL_STRICT}
+    cookie_attrs = {COOKIE_ATTR_SAME_SITE: COOKIE_VAL_LAX}
     cookie_attrs[COOKIE_ATTR_PATH] = "/api" if is_gunicorn else "/"
 
     if vigilant_sessions:

{jaaql_middleware_python-4.33.14 → jaaql_middleware_python-4.33.17}/jaaql_middleware_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaaql-middleware-python
-Version: 4.33.14
+Version: 4.33.17
 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