🐛 fix(slack): member invite messages (#92440)

Author: iamrajjoshi

src/sentry/integrations/slack/message_builder/notifications/base.py

@@ -34,7 +34,7 @@ def build(self) -> SlackBlock:
             self.recipient, ExternalProviders.SLACK
         )
         actions = self.notification.get_message_actions(self.recipient, ExternalProviders.SLACK)
-        callback_id = orjson.dumps(callback_id_raw).decode() if callback_id_raw else None
+        block_id = orjson.dumps(callback_id_raw).decode() if callback_id_raw else None
 
         first_block_text = ""
         if title_link:
@@ -61,6 +61,4 @@ def build(self) -> SlackBlock:
         if actions_block:
             blocks.append({"type": "actions", "elements": [action for action in actions_block]})
 
-        return self._build_blocks(
-            *blocks, fallback_text=text if text else None, callback_id=callback_id
-        )
+        return self._build_blocks(*blocks, fallback_text=text if text else None, block_id=block_id)

src/sentry/integrations/slack/webhooks/action.py

@@ -675,8 +675,14 @@ def handle_enable_notifications(self, slack_request: SlackActionRequest) -> Resp
     def handle_member_approval(self, slack_request: SlackActionRequest, action: str) -> Response:
         identity_user = slack_request.get_identity_user()
 
+        response_url = slack_request.data["response_url"]
+        webhook_client = WebhookClient(response_url)
+
         if not identity_user:
-            return self.respond_with_text(NO_IDENTITY_MESSAGE)
+            webhook_client.send(
+                text=NO_IDENTITY_MESSAGE, response_type="in_channel", replace_original=False
+            )
+            return self.respond()
 
         member_id = slack_request.callback_data["member_id"]
 
@@ -685,27 +691,41 @@ def handle_member_approval(self, slack_request: SlackActionRequest, action: str)
         except OrganizationMember.DoesNotExist:
             # member request is gone, likely someone else rejected it
             member_email = slack_request.callback_data["member_email"]
-            return self.respond_with_text(f"Member invitation for {member_email} no longer exists.")
+            webhook_client.send(
+                text=f"Member invitation for {member_email} no longer exists.",
+                response_type="in_channel",
+                replace_original=False,
+            )
+            return self.respond()
 
         organization = member.organization
 
         if not organization.has_access(identity_user):
-            return self.respond_with_text(NO_ACCESS_MESSAGE)
+            webhook_client.send(
+                text=NO_ACCESS_MESSAGE,
+                response_type="in_channel",
+                replace_original=False,
+            )
+            return self.respond()
 
         # row should exist because we have access
         member_of_approver = OrganizationMember.objects.get(
             user_id=identity_user.id, organization=organization
         )
         access = from_member(member_of_approver)
         if not access.has_scope("member:admin"):
-            return self.respond_with_text(NO_PERMISSION_MESSAGE)
+            webhook_client.send(
+                text=NO_PERMISSION_MESSAGE, replace_original=False, response_type="in_channel"
+            )
+            return self.respond()
 
         # validate the org options and check against allowed_roles
         allowed_roles = member_of_approver.get_allowed_org_roles_to_invite()
         try:
             member.validate_invitation(identity_user, allowed_roles)
         except UnableToAcceptMemberInvitationException as err:
-            return self.respond_with_text(str(err))
+            webhook_client.send(text=str(err), replace_original=False, response_type="in_channel")
+            return self.respond()
 
         original_status = InviteStatus(member.invite_status)
         try:
@@ -722,7 +742,10 @@ def handle_member_approval(self, slack_request: SlackActionRequest, action: str)
                     "member_id": member.id,
                 },
             )
-            return self.respond_ephemeral(DEFAULT_ERROR_MESSAGE)
+            webhook_client.send(
+                text=DEFAULT_ERROR_MESSAGE, replace_original=False, response_type="in_channel"
+            )
+            return self.respond()
 
         if action == "approve_member":
             event_name = "integrations.slack.approve_member_invitation"
@@ -755,7 +778,8 @@ def handle_member_approval(self, slack_request: SlackActionRequest, action: str)
             verb=verb,
         )
 
-        return self.respond({"text": message})
+        webhook_client.send(text=message, replace_original=False, response_type="in_channel")
+        return self.respond()
 
 
 class _ModalDialog(ABC):

tests/sentry/api/endpoints/test_organization_invite_request_index.py

@@ -232,8 +232,10 @@ def test_request_to_invite_slack(self):
             == f"You are receiving this notification because you have the scope member:write | <http://testserver/settings/account/notifications/approval/?referrer=invite_request-slack-user&notification_uuid={notification_uuid}|Notification Settings>"
         )
         member = OrganizationMember.objects.get(email="eric@localhost")
-        callback_id = orjson.loads(self.mock_post.call_args.kwargs["callback_id"])
-        assert callback_id == {
+        context_params = orjson.loads(
+            orjson.loads(self.mock_post.call_args.kwargs["blocks"])[0]["block_id"]
+        )
+        assert context_params == {
             "member_id": member.id,
             "member_email": "eric@localhost",
         }

tests/sentry/api/endpoints/test_organization_join_request.py

@@ -206,11 +206,13 @@ def test_request_to_join_slack(self):
                 "value": "link_clicked",
             },
         ]
-        callback_id = orjson.loads(self.mock_post.call_args.kwargs["callback_id"])
+        context_params = orjson.loads(
+            orjson.loads(self.mock_post.call_args.kwargs["blocks"])[0]["block_id"]
+        )
 
         with outbox_runner():
             member = OrganizationMember.objects.get(email=self.email)
-        assert callback_id == {
+        assert context_params == {
             "member_id": member.id,
             "member_email": self.email,
         }

tests/sentry/integrations/slack/notifications/test_nudge.py

@@ -35,5 +35,7 @@ def test_nudge_block(self):
         assert blocks[1]["elements"][0]["value"] == "all_slack"
 
         # Slack requires callback_id to handle enablement
-        callback_id = orjson.loads(self.mock_post.call_args.kwargs["callback_id"])
-        assert callback_id == {"enable_notifications": True}
+        context_params = orjson.loads(
+            orjson.loads(self.mock_post.call_args.kwargs["blocks"])[0]["block_id"]
+        )
+        assert context_params == {"enable_notifications": True}

tests/sentry/integrations/slack/webhooks/actions/test_status.py

@@ -2,7 +2,6 @@
 
 import orjson
 from django.db import router
-from django.urls import reverse
 from slack_sdk.errors import SlackApiError
 from slack_sdk.models.views import View
 from slack_sdk.web import SlackResponse
@@ -35,7 +34,6 @@
 from sentry.testutils.skips import requires_snuba
 from sentry.types.group import GroupSubStatus
 from sentry.users.models.identity import Identity
-from sentry.utils.http import absolute_uri
 from sentry.utils.samples import load_data
 
 from . import BaseEventTest
@@ -1240,13 +1238,7 @@ def test_approve_join_request(self):
         self.assert_org_member_mapping(org_member=member)
         assert member.invite_status == InviteStatus.APPROVED.value
 
-        manage_url = absolute_uri(
-            reverse("sentry-organization-members", args=[self.organization.slug])
-        )
-        assert (
-            resp.data["text"]
-            == f"Join request for [email protected] has been approved. <{manage_url}|See Members and Requests>."
-        )
+        assert resp is not None
 
     def test_rejected_invite_request(self):
         other_user = self.create_user()
@@ -1267,13 +1259,7 @@ def test_rejected_invite_request(self):
         assert resp.status_code == 200, resp.content
         assert not OrganizationMember.objects.filter(id=member.id).exists()
 
-        manage_url = absolute_uri(
-            reverse("sentry-organization-members", args=[self.organization.slug])
-        )
-        assert (
-            resp.data["text"]
-            == f"Invite request for [email protected] has been rejected. <{manage_url}|See Members and Requests>."
-        )
+        assert resp is not None
 
     def test_invalid_rejected_invite_request(self):
         user = self.create_user(email="[email protected]")
@@ -1295,7 +1281,7 @@ def test_invalid_rejected_invite_request(self):
         member.refresh_from_db()
         self.assert_org_member_mapping(org_member=member)
 
-        assert resp.data["text"] == "Member invitation for [email protected] no longer exists."
+        assert resp is not None
 
     def test_invitation_removed(self):
         other_user = self.create_user()
@@ -1314,7 +1300,7 @@ def test_invitation_removed(self):
         resp = self.post_webhook(action_data=[{"value": "approve_member"}], callback_id=callback_id)
 
         assert resp.status_code == 200, resp.content
-        assert resp.data["text"] == "Member invitation for [email protected] no longer exists."
+        assert resp is not None
 
     def test_invitation_already_accepted(self):
         other_user = self.create_user()
@@ -1332,7 +1318,7 @@ def test_invitation_already_accepted(self):
         resp = self.post_webhook(action_data=[{"value": "approve_member"}], callback_id=callback_id)
 
         assert resp.status_code == 200, resp.content
-        assert resp.data["text"] == "Member invitation for [email protected] no longer exists."
+        assert resp is not None
 
     def test_invitation_validation_error(self):
         with unguarded_write(using=router.db_for_write(OrganizationMember)):
@@ -1352,18 +1338,15 @@ def test_invitation_validation_error(self):
         resp = self.post_webhook(action_data=[{"value": "approve_member"}], callback_id=callback_id)
 
         assert resp.status_code == 200, resp.content
-        assert (
-            resp.data["text"]
-            == "You do not have permission to approve a member invitation with the role owner."
-        )
+        assert resp is not None
 
     def test_identity_not_linked(self):
         with assume_test_silo_mode(SiloMode.CONTROL):
             Identity.objects.filter(user=self.user).delete()
         resp = self.post_webhook(action_data=[{"value": "approve_member"}], callback_id="")
 
         assert resp.status_code == 200, resp.content
-        assert resp.data["text"] == "Identity not linked for user."
+        assert resp is not None
 
     def test_wrong_organization(self):
         other_user = self.create_user()
@@ -1382,7 +1365,7 @@ def test_wrong_organization(self):
         resp = self.post_webhook(action_data=[{"value": "approve_member"}], callback_id=callback_id)
 
         assert resp.status_code == 200, resp.content
-        assert resp.data["text"] == "You do not have access to the organization for the invitation."
+        assert resp is not None
 
     def test_no_member_admin(self):
         with unguarded_write(using=router.db_for_write(OrganizationMember)):
@@ -1403,4 +1386,4 @@ def test_no_member_admin(self):
         resp = self.post_webhook(action_data=[{"value": "approve_member"}], callback_id=callback_id)
 
         assert resp.status_code == 200, resp.content
-        assert resp.data["text"] == "You do not have permission to approve member invitations."
+        assert resp is not None