Fix slackapi#132 by handling requestContext in AWS Lambda payloads

jlcjohns · Oct 29, 2020 · 3f67a08 · 3f67a08
1 parent bea7fc7
commit 3f67a08
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 0 deletions.
diff --git a/scripts/install_all_and_run_tests.sh b/scripts/install_all_and_run_tests.sh
@@ -6,6 +6,8 @@
 script_dir=`dirname $0`
 cd ${script_dir}/..
 rm -rf ./slack_bolt.egg-info
+# The package causes a conflict with moto
+pip uninstall python-lambda
 
 test_target="$1"
 

diff --git a/slack_bolt/adapter/aws_lambda/handler.py b/slack_bolt/adapter/aws_lambda/handler.py
@@ -33,6 +33,9 @@ def handle(self, event, context):
         self.logger.debug(f"Incoming event: {event}, context: {context}")
 
         method = event.get("requestContext", {}).get("http", {}).get("method")
+        if method is None:
+            method = event.get("requestContext", {}).get("httpMethod")
+
         if method is None:
             return not_found()
         if method == "GET":

diff --git a/tests/adapter_tests/test_aws_lambda.py b/tests/adapter_tests/test_aws_lambda.py
@@ -115,6 +115,17 @@ def event_handler():
         assert response["statusCode"] == 200
         assert self.mock_received_requests["/auth.test"] == 1
 
+        event = {
+            "body": body,
+            "queryStringParameters": {},
+            "headers": self.build_headers(timestamp, body),
+            "requestContext": {"httpMethod": "POST"},
+            "isBase64Encoded": False,
+        }
+        response = SlackRequestHandler(app).handle(event, self.context)
+        assert response["statusCode"] == 200
+        assert self.mock_received_requests["/auth.test"] == 1
+
     @mock_lambda
     def test_shortcuts(self):
         app = App(client=self.web_client, signing_secret=self.signing_secret,)
@@ -151,6 +162,17 @@ def shortcut_handler(ack):
         assert response["statusCode"] == 200
         assert self.mock_received_requests["/auth.test"] == 1
 
+        event = {
+            "body": body,
+            "queryStringParameters": {},
+            "headers": self.build_headers(timestamp, body),
+            "requestContext": {"httpMethod": "POST"},
+            "isBase64Encoded": False,
+        }
+        response = SlackRequestHandler(app).handle(event, self.context)
+        assert response["statusCode"] == 200
+        assert self.mock_received_requests["/auth.test"] == 1
+
     @mock_lambda
     def test_commands(self):
         app = App(client=self.web_client, signing_secret=self.signing_secret,)
@@ -187,6 +209,17 @@ def command_handler(ack):
         assert response["statusCode"] == 200
         assert self.mock_received_requests["/auth.test"] == 1
 
+        event = {
+            "body": body,
+            "queryStringParameters": {},
+            "headers": self.build_headers(timestamp, body),
+            "requestContext": {"httpMethod": "POST"},
+            "isBase64Encoded": False,
+        }
+        response = SlackRequestHandler(app).handle(event, self.context)
+        assert response["statusCode"] == 200
+        assert self.mock_received_requests["/auth.test"] == 1
+
     @mock_lambda
     def test_lazy_listeners(self):
         app = App(client=self.web_client, signing_secret=self.signing_secret,)
@@ -251,3 +284,13 @@ def test_oauth(self):
         }
         response = SlackRequestHandler(app).handle(event, self.context)
         assert response["statusCode"] == 302
+
+        event = {
+            "body": "",
+            "queryStringParameters": {},
+            "headers": {},
+            "requestContext": {"httpMethod": "GET"},
+            "isBase64Encoded": False,
+        }
+        response = SlackRequestHandler(app).handle(event, self.context)
+        assert response["statusCode"] == 302