make things work for org apps

Author: WilliamBergamin

slack_bolt/middleware/attaching_agent_kwargs/async_attaching_agent_kwargs.py

@@ -44,7 +44,7 @@ async def async_process(
                 req.context["say_stream"] = AsyncSayStream(
                     client=req.context.client,
                     channel=req.context.channel_id,
-                    recipient_team_id=req.context.team_id,
+                    recipient_team_id=req.context.team_id or req.context.enterprise_id,
                     recipient_user_id=req.context.user_id,
                     thread_ts=thread_ts,
                 )

slack_bolt/middleware/attaching_agent_kwargs/attaching_agent_kwargs.py

@@ -38,7 +38,7 @@ def process(self, *, req: BoltRequest, resp: BoltResponse, next: Callable[[], Bo
                 req.context["say_stream"] = SayStream(
                     client=req.context.client,
                     channel=req.context.channel_id,
-                    recipient_team_id=req.context.team_id,
+                    recipient_team_id=req.context.team_id or req.context.enterprise_id,
                     recipient_user_id=req.context.user_id,
                     thread_ts=thread_ts,
                 )

tests/scenario_tests/test_events_say_stream.py

@@ -64,6 +64,24 @@ def handle_mention(say_stream: SayStream, context: BoltContext):
         assert response.status == 200
         assert_target_called(called)
 
+    def test_say_stream_with_org_level_install(self):
+        app = App(client=self.web_client)
+        called = {"value": False}
+
+        @app.event("app_mention")
+        def handle_mention(say_stream: SayStream, context: BoltContext):
+            assert context.team_id is None
+            assert context.enterprise_id == "E111"
+            assert say_stream is not None
+            assert isinstance(say_stream, SayStream)
+            assert say_stream.recipient_team_id == "E111"
+            called["value"] = True
+
+        request = BoltRequest(body=org_app_mention_event_body, mode="socket_mode")
+        response = app.dispatch(request)
+        assert response.status == 200
+        assert_target_called(called)
+
     def test_say_stream_injected_for_threaded_message(self):
         app = App(client=self.web_client)
         called = {"value": False}
@@ -187,3 +205,34 @@ def handle_view(ack, say_stream, context: BoltContext):
         response = app.dispatch(request)
         assert response.status == 200
         assert_target_called(called)
+
+
+org_app_mention_event_body = {
+    "token": "verification_token",
+    "team_id": "T111",
+    "enterprise_id": "E111",
+    "api_app_id": "A111",
+    "event": {
+        "client_msg_id": "9cbd4c5b-7ddf-4ede-b479-ad21fca66d63",
+        "type": "app_mention",
+        "text": "<@W111> Hi there!",
+        "user": "W222",
+        "ts": "1595926230.009600",
+        "team": "T111",
+        "channel": "C111",
+        "event_ts": "1595926230.009600",
+    },
+    "type": "event_callback",
+    "event_id": "Ev111",
+    "event_time": 1595926230,
+    "authorizations": [
+        {
+            "enterprise_id": "E111",
+            "team_id": None,
+            "user_id": "W111",
+            "is_bot": True,
+            "is_enterprise_install": True,
+        }
+    ],
+    "is_ext_shared_channel": False,
+}

tests/scenario_tests_async/test_events_say_stream.py

@@ -69,6 +69,25 @@ async def handle_mention(say_stream: AsyncSayStream, context: AsyncBoltContext):
         assert response.status == 200
         await assert_target_called(called)
 
+    @pytest.mark.asyncio
+    async def test_say_stream_with_org_level_install(self):
+        app = AsyncApp(client=self.web_client)
+        called = {"value": False}
+
+        @app.event("app_mention")
+        async def handle_mention(say_stream: AsyncSayStream, context: AsyncBoltContext):
+            assert context.team_id is None
+            assert context.enterprise_id == "E111"
+            assert say_stream is not None
+            assert isinstance(say_stream, AsyncSayStream)
+            assert say_stream.recipient_team_id == "E111"
+            called["value"] = True
+
+        request = AsyncBoltRequest(body=org_app_mention_event_body, mode="socket_mode")
+        response = await app.async_dispatch(request)
+        assert response.status == 200
+        await assert_target_called(called)
+
     @pytest.mark.asyncio
     async def test_say_stream_injected_for_threaded_message(self):
         app = AsyncApp(client=self.web_client)
@@ -198,3 +217,34 @@ async def handle_view(ack, say_stream, context: AsyncBoltContext):
         response = await app.async_dispatch(request)
         assert response.status == 200
         await assert_target_called(called)
+
+
+org_app_mention_event_body = {
+    "token": "verification_token",
+    "team_id": "T111",
+    "enterprise_id": "E111",
+    "api_app_id": "A111",
+    "event": {
+        "client_msg_id": "9cbd4c5b-7ddf-4ede-b479-ad21fca66d63",
+        "type": "app_mention",
+        "text": "<@W111> Hi there!",
+        "user": "W222",
+        "ts": "1595926230.009600",
+        "team": "T111",
+        "channel": "C111",
+        "event_ts": "1595926230.009600",
+    },
+    "type": "event_callback",
+    "event_id": "Ev111",
+    "event_time": 1595926230,
+    "authorizations": [
+        {
+            "enterprise_id": "E111",
+            "team_id": None,
+            "user_id": "W111",
+            "is_bot": True,
+            "is_enterprise_install": True,
+        }
+    ],
+    "is_ext_shared_channel": False,
+}