api-foundry-query-engine 0.8.65__tar.gz → 0.8.67__tar.gz

{api_foundry_query_engine-0.8.65 → api_foundry_query_engine-0.8.67}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: api-foundry-query-engine
-Version: 0.8.65
+Version: 0.8.67
 Summary: The AWS lambda service handler use by the `api_foundry` project is a powerful tool designed to automate the deployment of REST APIs on AWS using Lambda services to access and interact with relational databases (RDBMS). This project leverages the OpenAPI specification to define and manage the APIs
 Project-URL: Documentation, https://github.com/DanRepik/api-foundry
 Project-URL: Source, https://github.com/DanRepik/api-foundry
@@ -16,6 +16,7 @@ Provides-Extra: dev
 Requires-Dist: black>=23.0.0; extra == 'dev'
 Requires-Dist: fixture-foundry>=0.1.0; extra == 'dev'
 Requires-Dist: isort>=5.12.0; extra == 'dev'
+Requires-Dist: pulumi>=3.224.0; extra == 'dev'
 Requires-Dist: pytest-cov>=4.0.0; extra == 'dev'
 Requires-Dist: pytest>=7.0; extra == 'dev'
 Requires-Dist: simple-oauth-server; extra == 'dev'

api_foundry_query_engine-0.8.67/api_foundry_query_engine/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.8.67"

{api_foundry_query_engine-0.8.65 → api_foundry_query_engine-0.8.67}/api_foundry_query_engine/dao/sql_delete_query_handler.py

@@ -93,16 +93,15 @@ class SQLDeleteSchemaQueryHandler(SQLSchemaQueryHandler):
 
         # Process audit fields
         audit_props = self.schema_object.get_soft_delete_audit_properties()
-        claims = self.operation.claims or {}
-
         for _, prop in audit_props.items():
             config = prop.get_soft_delete_config()
             action = config.get("action", "")
 
-            if action == "delete" and "sub" in claims:
+            claim_sub = self.extract_injected_value("claim:sub")
+            if action == "delete" and claim_sub is not None:
                 placeholder_key = f"audit_{prop.api_name}"
                 columns.append(f"{prop.column_name} = %({placeholder_key})s")
-                self.store_placeholders[placeholder_key] = claims["sub"]
+                self.store_placeholders[placeholder_key] = claim_sub
 
         return " SET " + ", ".join(columns) if columns else ""
 

{api_foundry_query_engine-0.8.65 → api_foundry_query_engine-0.8.67}/api_foundry_query_engine/dao/sql_query_handler.py

@@ -413,7 +413,20 @@ class SQLQueryHandler:
         """
         if inject_value_source.startswith("claim:"):
             claim_key = inject_value_source[6:]
-            return self.operation.claims.get(claim_key)
+            if claim_key in self.operation.claims:
+                return self.operation.claims.get(claim_key)
+
+            claims_payload = self.operation.claims.get("claims")
+            if isinstance(claims_payload, dict) and claim_key in claims_payload:
+                return claims_payload.get(claim_key)
+
+            jwt_payload = self.operation.claims.get("jwt")
+            if isinstance(jwt_payload, dict):
+                jwt_claims = jwt_payload.get("claims")
+                if isinstance(jwt_claims, dict):
+                    return jwt_claims.get(claim_key)
+
+            return None
         elif inject_value_source == "timestamp":
             return datetime.utcnow().isoformat()
         elif inject_value_source == "date":

{api_foundry_query_engine-0.8.65 → api_foundry_query_engine-0.8.67}/api_foundry_query_engine/dao/sql_restore_query_handler.py

@@ -89,16 +89,15 @@ class SQLRestoreSchemaQueryHandler(SQLSchemaQueryHandler):
 
         # Process audit fields for restore action
         audit_props = self.schema_object.get_soft_delete_audit_properties()
-        claims = self.operation.claims or {}
-
         for _, prop in audit_props.items():
             config = prop.get_soft_delete_config()
             action = config.get("action", "")
 
-            if action == "restore" and "sub" in claims:
+            claim_sub = self.extract_injected_value("claim:sub")
+            if action == "restore" and claim_sub is not None:
                 placeholder_key = f"audit_{prop.api_name}"
                 columns.append(f"{prop.column_name} = %({placeholder_key})s")
-                self.store_placeholders[placeholder_key] = claims["sub"]
+                self.store_placeholders[placeholder_key] = claim_sub
             elif action == "restore_timestamp":
                 columns.append(f"{prop.column_name} = CURRENT_TIMESTAMP")
 

{api_foundry_query_engine-0.8.65 → api_foundry_query_engine-0.8.67}/api_foundry_query_engine/dao/sql_select_query_handler.py

@@ -69,8 +69,7 @@ class SQLSelectSchemaQueryHandler(SQLSchemaQueryHandler):
 
         def _replace(m: Match[str]) -> str:
             key = m.group(1)
-            claims = self.operation.claims or {}
-            return _quote(claims.get(key))
+            return _quote(self.extract_injected_value(f"claim:{key}"))
 
         return re.sub(r"\$\{claims\.([A-Za-z0-9_]+)\}", _replace, expr)
 

{api_foundry_query_engine-0.8.65 → api_foundry_query_engine-0.8.67}/api_foundry_query_engine/dao/sql_update_query_handler.py

@@ -26,8 +26,7 @@ class SQLUpdateSchemaQueryHandler(SQLSchemaQueryHandler):
 
         def _replace(m: Match[str]) -> str:
             key = m.group(1)
-            claims = self.operation.claims or {}
-            return _quote(claims.get(key))
+            return _quote(self.extract_injected_value(f"claim:{key}"))
 
         return re.sub(r"\$\{claims\.([A-Za-z0-9_]+)\}", _replace, expr)
 

{api_foundry_query_engine-0.8.65 → api_foundry_query_engine-0.8.67}/pyproject.toml

@@ -26,7 +26,8 @@ dev = [
     "black>=23.0.0",
     "isort>=5.12.0",
     "fixture_foundry>=0.1.0",
-    "simple-oauth-server"
+    "simple-oauth-server",
+    "pulumi>=3.224.0",
 ]
 
 [project.urls]
@@ -40,14 +41,7 @@ include = ["api_foundry_query_engine"]
 include = ["api_foundry_query_engine"]
 
 [tool.hatch.envs.dev]
-dependencies = [
-    "pytest>=7.0",
-    "pytest-cov>=4.0.0",
-    "black>=23.0.0",
-    "isort>=5.12.0",
-    "fixture_foundry>=0.1.0",
-    "simple-oauth-server",
-    ]
+features = ["dev"]
 
 [project.scripts]
 

api_foundry_query_engine-0.8.65/api_foundry_query_engine/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.8.65"