Merge branch 'main' into dependabot/pip/asgiref-gte-3.12.1-and-lt-4

Author: mwbrooks

docs/english/concepts/custom-steps-dynamic-options.md

@@ -88,13 +88,13 @@ The `inputs` attribute defines the parameters to be passed as inputs to the step
 
 The following format can be used to reference any input parameter defined by the step: `{{input_parameters.<PARAMETER_NAME>}}`.
 
-In addition, the `{{client.query}}` parameter can be used as a placeholder for an input value. The `{{client.builder_context}}` parameter will inject the [`slack#/types/user_context`](/tools/deno-slack-sdk/reference/slack-types/#usercontext) of the user building the workflow as the value to the input parameter.
+In addition, the `{{client.query}}` parameter can be used as a placeholder for an input value. The `{{client.builder_context}}` parameter will inject the [`slack#/types/user_context`](/reference/types/user_context-type) of the user building the workflow as the value to the input parameter.
 
 ### Types of dynamic options UIs {#dynamic-option-UIs}
 
 The above example demonstrates one possible UI to be rendered for builders: a single-select drop-down menu of dynamic options. However, dynamic options in Workflow Builder can be rendered in one of two ways: as a drop-down menu (single-select or multi-select), or as a set of fields.
 
-The type is dictated by the output parameter of the custom step used as a dynamic option. In order to use a custom step in a dynamic option context, its output must adhere to a defined interface, that is, it must have an `options` parameter of type [`options_select`](/tools/deno-slack-sdk/reference/slack-types#options_select) or [`options_field`](/tools/deno-slack-sdk/reference/slack-types#options_field), as shown in the following code snippet.
+The type is dictated by the output parameter of the custom step used as a dynamic option. In order to use a custom step in a dynamic option context, its output must adhere to a defined interface, that is, it must have an `options` parameter of type [`options_select`](/reference/types/options_select-type) or [`options_field`](/reference/types/options_field-type), as shown in the following code snippet.
 
 ```js
 "output_parameters": {
@@ -109,9 +109,9 @@ The type is dictated by the output parameter of the custom step used as a dynami
 
 #### Drop-down menus {#drop-down}
 
-Your dynamic input parameter can be rendered as a drop-down menu, which will use the options obtained from a custom step with an `options` output parameter of the type [`options_select`](/tools/deno-slack-sdk/reference/slack-types#options_select).
+Your dynamic input parameter can be rendered as a drop-down menu, which will use the options obtained from a custom step with an `options` output parameter of the type [`options_select`](/reference/types/options_select-type).
 
-The drop-down menu UI component can be rendered in two ways: single-select, or multi-select. To render the dynamic input as a single-select menu, the input parameter defining the dynamic option must be of the type [`string`](/tools/deno-slack-sdk/reference/slack-types#string).
+The drop-down menu UI component can be rendered in two ways: single-select, or multi-select. To render the dynamic input as a single-select menu, the input parameter defining the dynamic option must be of the type [`string`](/reference/types/string-type).
 
 ```js
 "step-with-dynamic-input": {
@@ -133,7 +133,7 @@ The drop-down menu UI component can be rendered in two ways: single-select, or m
 }
 ```
 
-To render the dynamic input as a multi-select menu, the input parameter defining the dynamic option must be of the type [`array`](/tools/deno-slack-sdk/reference/slack-types#array), and its `items` must be of type [`string`](/tools/deno-slack-sdk/reference/slack-types#string).
+To render the dynamic input as a multi-select menu, the input parameter defining the dynamic option must be of the type [`array`](/reference/types/array-type), and its `items` must be of type [`string`](/reference/types/string-type).
 
 ```js
 "step-with-dynamic-input": {
@@ -159,9 +159,9 @@ To render the dynamic input as a multi-select menu, the input parameter defining
 
 #### Fields {#fields}
 
-In the code snippet below, the input parameter is rendered as a set of fields with keys and values. The option fields are obtained from a custom step with an `options` output parameter of type [`options_field`](/tools/deno-slack-sdk/reference/slack-types#options_field).
+In the code snippet below, the input parameter is rendered as a set of fields with keys and values. The option fields are obtained from a custom step with an `options` output parameter of type [`options_field`](/reference/types/options_field-type).
 
-The input parameter that defines the dynamic option must be of type [`object`](/tools/deno-slack-sdk/reference/slack-types#object), as the completed set of fields in Workflow Builder will be passed to the custom step as an [untyped object](/tools/deno-slack-sdk/reference/slack-types#untyped-object) during workflow execution.
+The input parameter that defines the dynamic option must be of type [`object`](/reference/types/object-type), as the completed set of fields in Workflow Builder will be passed to the custom step as an [untyped object](/reference/types/object-type#untyped-object) during workflow execution.
 
 ```js
 "test-field-dynamic-options": {
@@ -185,15 +185,15 @@ The input parameter that defines the dynamic option must be of type [`object`](/
 
 ### Dynamic option types {#dynamic-option-types}
 
-As mentioned earlier, in order to use a custom step as a dynamic option, its output must adhere to a defined interface: it must have an `options` output parameter of the type either [`options_select`](/tools/deno-slack-sdk/reference/slack-types#options_select) or [`options_field`](/tools/deno-slack-sdk/reference/slack-types#options_field). 
+As mentioned earlier, in order to use a custom step as a dynamic option, its output must adhere to a defined interface: it must have an `options` output parameter of the type either [`options_select`](/reference/types/options_select-type) or [`options_field`](/reference/types/options_field-type). 
 
-To take a look at these in more detail, refer to our [Options Slack type](/tools/deno-slack-sdk/reference/slack-types#options) documentation.
+To take a look at these in more detail, refer to our [Options Slack type](/reference/types) documentation.
 
 ## Dynamic options handler {#dynamic-option-handler}
 
 Each custom step defined in the manifest needs a corresponding handler in your Slack app. Although implemented similarly to existing function execution event handlers, there are two key differences between regular custom step invocations and those used for dynamic options:
 
-* The custom step must have an `options` output parameter that is of type [`options_select`](/tools/deno-slack-sdk/reference/slack-types#options_select) or [`options_field`](/tools/deno-slack-sdk/reference/slack-types#options_field).
+* The custom step must have an `options` output parameter that is of type [`options_select`](/reference/types/options_select-type) or [`options_field`](/reference/types/options_field-type).
 * The [`function_executed`](/reference/events/function_executed) event must be handled synchronously. This optimizes the response time of returned dynamic options and provides a crisp builder experience.
 
 ### Asynchronous event handling {#async}

docs/english/tutorial/ai-chatbot/ai-chatbot.md

@@ -195,7 +195,7 @@ To test this, leave the channel you just invited Bolty to and rejoin it. This wi
 
 ![Channel summary](7.png)
 
-The central part of this functionality is shown in the following code snippet. Note the use of the [`user_context`](/tools/deno-slack-sdk/reference/slack-types#usercontext) object, a Slack type that represents the user who is interacting with our workflow, as well as the `history` of the channel that will be summarized, which includes the ten most recent messages.
+The central part of this functionality is shown in the following code snippet. Note the use of the [`user_context`](/reference/types/user_context-type) object, a Slack type that represents the user who is interacting with our workflow, as well as the `history` of the channel that will be summarized, which includes the ten most recent messages.
 
 ```python
 from ai.providers import get_provider_response

docs/japanese/concepts/updating-pushing-views.md

@@ -8,7 +8,7 @@
 
 **`views_push`**
 
-既存のモーダルの上に新しいモーダルをスタックのように追加する場合は、組み込みのクライアントで `views_push` API を呼び出します。この API 呼び出しでは、有効な `trigger_id` と新しい[ビューのペイロード](/reference/interaction-payloads/view-interactions-payload/#view_submission)を指定します。`views_push` の引数は [モーダルの開始](#creating-modals) と同じです。モーダルを開いた後、このモーダルのスタックに追加できるモーダルビューは 2 つまでです。
+既存のモーダルの上に新しいモーダルをスタックのように追加する場合は、組み込みのクライアントで `views_push` API を呼び出します。この API 呼び出しでは、有効な `trigger_id` と新しい[ビューのペイロード](/reference/interaction-payloads/view-interactions-payload/#view_submission)を指定します。`views_push` の引数は [モーダルの開始](/tools/bolt-python/ja-jp/concepts/opening-modals) と同じです。モーダルを開いた後、このモーダルのスタックに追加できるモーダルビューは 2 つまでです。
 
 モーダルの更新と多重表示に関する詳細は、[API ドキュメント](/surfaces/modals)を参照してください。
 

requirements/adapter_dev.txt

@@ -77,4 +77,4 @@ tornado>=6.5.8,<7; python_version >= "3.9"
 # Note: Socket Mode 3rd party implementation
 websocket_client>=1.2.3,<1.9; python_version < "3.9"
 websocket_client>=1.9.0,<1.9.1; python_version >= "3.9" and python_version < "3.10"
-websocket_client>=1.9.1,<2; python_version >= "3.10"
+websocket_client>=1.9.2,<2; python_version >= "3.10"

slack_bolt/adapter/aws_lambda/handler.py

@@ -71,22 +71,22 @@ def handle(self, event, context):
 
 
 def to_bolt_request(event) -> BoltRequest:
-    body = event.get("body", "")
-    if event["isBase64Encoded"]:
+    body = event.get("body") or ""
+    if event.get("isBase64Encoded") is True and body:
         body = base64.b64decode(body).decode("utf-8")
-    cookies: Sequence[str] = event.get("cookies", [])
-    if cookies is None or len(cookies) == 0:
+    cookies: Sequence[str] = event.get("cookies") or []
+    if len(cookies) == 0:
         # In the case of format v1
-        multiValueHeaders = event.get("multiValueHeaders", {})
-        cookies = multiValueHeaders.get("cookie", [])
+        multiValueHeaders = event.get("multiValueHeaders") or {}
+        cookies = multiValueHeaders.get("cookie") or []
         if len(cookies) == 0:
             # Try using uppercase
-            cookies = multiValueHeaders.get("Cookie", [])
-    headers = event.get("headers", {})
+            cookies = multiValueHeaders.get("Cookie") or []
+    headers = dict(event.get("headers") or {})
     headers["cookie"] = cookies
     return BoltRequest(
         body=body,
-        query=event.get("queryStringParameters", {}),
+        query=event.get("queryStringParameters") or {},
         headers=headers,
     )
 

tests/adapter_tests/aws/test_aws_lambda.py

@@ -1,3 +1,4 @@
+import base64
 import json
 from time import time
 from urllib.parse import quote
@@ -70,6 +71,55 @@ def test_not_found(self):
         response = not_found()
         assert response["statusCode"] == 404
 
+    def test_null_fields_in_api_gateway_event(self):
+        app = App(client=self.web_client, signing_secret=self.signing_secret)
+        event = {
+            "httpMethod": "POST",
+            "requestContext": {"httpMethod": "POST"},
+            "headers": None,
+            "multiValueHeaders": None,
+            "queryStringParameters": None,
+            "body": "{}",
+            "isBase64Encoded": False,
+        }
+        response = SlackRequestHandler(app).handle(event, self.context)
+        assert response["statusCode"] == 401
+        assert event["headers"] is None
+
+    def test_missing_is_base64_encoded_and_null_body(self):
+        app = App(client=self.web_client, signing_secret=self.signing_secret)
+        event = {"requestContext": {"http": {"method": "POST"}}, "headers": {}, "body": "{}"}
+        assert SlackRequestHandler(app).handle(event, self.context)["statusCode"] == 401
+        event = {"requestContext": {"http": {"method": "POST"}}, "headers": {}, "body": None, "isBase64Encoded": True}
+        assert SlackRequestHandler(app).handle(event, self.context)["statusCode"] == 401
+
+    def test_base64_encoded_body(self):
+        app = App(client=self.web_client, signing_secret=self.signing_secret)
+
+        def event_handler():
+            pass
+
+        app.event("app_mention")(event_handler)
+        input = {
+            "token": "verification_token",
+            "team_id": "T111",
+            "api_app_id": "A111",
+            "event": {"type": "app_mention", "text": "<@W111> Hi", "user": "W222", "team": "T111", "channel": "C111"},
+            "type": "event_callback",
+            "event_id": "Ev111",
+            "event_time": 1595926230,
+        }
+        timestamp, body = str(int(time())), json.dumps(input)
+        event = {
+            "body": base64.b64encode(body.encode("utf-8")).decode("ascii"),
+            "queryStringParameters": None,
+            "headers": self.build_headers(timestamp, body),
+            "requestContext": {"http": {"method": "POST"}},
+            "isBase64Encoded": True,
+        }
+        response = SlackRequestHandler(app).handle(event, self.context)
+        assert response["statusCode"] == 200
+
     def test_first_value(self):
         assert _first_value({"foo": [1, 2, 3]}, "foo") == 1
         assert _first_value({"foo": []}, "foo") is None