add authorizer_result property to inv ctx class

whummer · whummer · commit bf62128e12d6 · 2023-02-24T02:12:05.000+01:00
diff --git a/localstack/services/apigateway/context.py b/localstack/services/apigateway/context.py
@@ -136,6 +136,11 @@ def authorizer_type(self) -> str:
         if isinstance(self.auth_context, dict):
             return self.auth_context.get("authorizer_type") if self.auth_context else None
 
+    @property
+    def authorizer_result(self) -> Dict[str, Any]:
+        if isinstance(self.auth_context, dict):
+            return self.auth_context.get("authorizer") if self.auth_context else {}
+
     def is_websocket_request(self) -> bool:
         upgrade_header = str(self.headers.get("upgrade") or "")
         return upgrade_header.lower() == "websocket"
diff --git a/localstack/services/apigateway/helpers.py b/localstack/services/apigateway/helpers.py
@@ -822,9 +822,9 @@ def get_event_request_context(invocation_context: ApiInvocationContext):
     }
 
     # set "authorizer" and "identity" event attributes from request context
-    auth_context = invocation_context.auth_context
-    if auth_context:
-        request_context["authorizer"] = auth_context
+    authorizer_result = invocation_context.authorizer_result
+    if authorizer_result:
+        request_context["authorizer"] = authorizer_result
     request_context["identity"].update(invocation_context.auth_identity or {})
 
     if not is_test_invoke_method(method, path):
diff --git a/localstack/services/apigateway/integration.py b/localstack/services/apigateway/integration.py
@@ -268,7 +268,7 @@ def invoke(self, invocation_context: ApiInvocationContext):
             func_arn = uri.split(":lambda:path")[1].split("functions/")[1].split("/invocations")[0]
 
         if invocation_context.authorizer_type:
-            invocation_context.context["authorizer"] = invocation_context.auth_context
+            invocation_context.context["authorizer"] = invocation_context.authorizer_result
 
         payload = self.request_templates.render(invocation_context)
 
@@ -343,7 +343,7 @@ def invoke(self, invocation_context: ApiInvocationContext):
         invocation_context.context = helpers.get_event_request_context(invocation_context)
         invocation_context.stage_variables = helpers.get_stage_variables(invocation_context)
         if invocation_context.authorizer_type:
-            invocation_context.context["authorizer"] = invocation_context.auth_context
+            invocation_context.context["authorizer"] = invocation_context.authorizer_result
 
         func_arn = self._lambda_integration_uri(invocation_context)
         request_templates = RequestTemplates()
