kisa-utils 0.43.1__py3-none-any.whl → 0.43.2__py3-none-any.whl

kisa_utils/servers/flask.py

@@ -26,7 +26,7 @@ import types
 
 
 _VALID_HTTP_METHODS = {'GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS'}
-_WHITE_LISTED_PARAMS = ["headers"]
+_WHITE_LISTED_PARAMS = ["headers", 'requestHeaders', 'requestForm', 'requestJSON', 'requestOrigin']
 
 from typing import Optional, Callable
 from functools import wraps
@@ -537,8 +537,12 @@ def endpoint(
                     __DEFAULTS[key] = value.default
 
             # print(typeHints)
-            if "headers" in typeHints and "headers" in _WHITE_LISTED_PARAMS:
-                del typeHints["headers"]
+            for whiteListed in _WHITE_LISTED_PARAMS:
+                if whiteListed in typeHints:
+                    del typeHints[whiteListed]
+
+            # if "headers" in typeHints and "headers" in _WHITE_LISTED_PARAMS:
+            #     del typeHints["headers"]
 
             validationStructure = copy.deepcopy(typeHints)
             del validationStructure["return"]
@@ -587,15 +591,23 @@ def endpoint(
 
             for item in kwargs:
                 kwarg = item[0]
-                _headers_present = True if kwarg == "headers" else False  
+
+                if kwarg in _WHITE_LISTED_PARAMS:
+                    _kwargs[kwarg] = {
+                        "headers": request.headers,
+                        "requestHeaders": request.headers,
+                        "requestForm": request.form,
+                        "requestJSON": request.json,
+                        'requestOrigin': request.remote_addr,
+                    }[kwarg]
+
+                    if kwarg not in ['requestOrigin']:
+                        _kwargs[kwarg] = dict(_kwargs[kwarg])
+                    continue
 
                 if kwarg in payload:
                     _kwargs[kwarg] = payload[kwarg]
                 else:
-                    if _headers_present and kwarg == "headers":
-                            _kwargs[kwarg] = dict(request.headers)
-                            continue
-                    
                     if len(item) == 2:
                         default = item[1]
                         _kwargs[kwarg] = default

{kisa_utils-0.43.1.dist-info → kisa_utils-0.43.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kisa-utils
-Version: 0.43.1
+Version: 0.43.2
 Summary: Utility functions and modules for KISA Developers
 Author: Tom Bukenya
 Author-email: glayn2bukman@gmail.com

{kisa_utils-0.43.1.dist-info → kisa_utils-0.43.2.dist-info}/RECORD

@@ -24,11 +24,11 @@ kisa_utils/queues/callables/__init__.py,sha256=OJL3AQnaAS1Eek4H6WBH3WefA2wf-x03c
 kisa_utils/queues/callables/enqueueFunctionCalls.py,sha256=VIliaMvw4MUdOqts0dXdZCYNxs-QrOVjIRAR3scGrRM,11786
 kisa_utils/queues/callables/executorQueues.py,sha256=x6bAqxBSZRZ_kL8CK1lSN6JYAYFLxzM84LC1RmwaOLw,6626
 kisa_utils/servers/__init__.py,sha256=lPqDyGTrFo0qwPZ2WA9Xtcpc5D8AIU4huqgFx1iZf68,19
-kisa_utils/servers/flask.py,sha256=XZYY1pWnP1mSvaS5Uv8G3EFJV5BJBQtU2gDbO8suvLc,40422
+kisa_utils/servers/flask.py,sha256=fjtWCJOkA9rbKv-tAJDcc6GDymGWDe7hL3TYJZUER10,40918
 kisa_utils/structures/__init__.py,sha256=JBU1j3A42jQ62ALKnsS1Hav9YXcYwjDw1wQJtohXPbU,83
 kisa_utils/structures/utils.py,sha256=665rXIapGwFqejizeJwy3DryeskCQOdgP25BCdLkGvk,2898
 kisa_utils/structures/validator.py,sha256=oCSgY_itst6bZdC5g8yVU4-lSH2xnUsOx3X-oPyV7nA,4626
-kisa_utils-0.43.1.dist-info/METADATA,sha256=luP5gb2UHCEqyQJwmf_8dVIYx4b5vlyKZMEJUydIi3w,477
-kisa_utils-0.43.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-kisa_utils-0.43.1.dist-info/top_level.txt,sha256=GFOLXZYqpBG9xtscGa2uGJAEiZ5NwsqHBH9NylnB29M,11
-kisa_utils-0.43.1.dist-info/RECORD,,
+kisa_utils-0.43.2.dist-info/METADATA,sha256=tbGoEe4EqF1uwX1HE6VZb9lOAICb_91GaukrK-1qFFE,477
+kisa_utils-0.43.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+kisa_utils-0.43.2.dist-info/top_level.txt,sha256=GFOLXZYqpBG9xtscGa2uGJAEiZ5NwsqHBH9NylnB29M,11
+kisa_utils-0.43.2.dist-info/RECORD,,