From 7438464052a5be6512f8057959515e74b41c4e04 Mon Sep 17 00:00:00 2001 From: Julia Date: Fri, 11 Nov 2022 10:38:24 +0100 Subject: [PATCH 1/2] Add warning pop-up on action in slack if user is not connected to OnCall --- engine/apps/slack/views.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/engine/apps/slack/views.py b/engine/apps/slack/views.py index 3f312cb2..7987f890 100644 --- a/engine/apps/slack/views.py +++ b/engine/apps/slack/views.py @@ -270,6 +270,12 @@ class SlackEventApiEndpointView(APIView): # Open pop-up to inform user why OnCall bot doesn't work if any action was triggered self._open_warning_window_if_needed(payload, slack_team_identity, warning_text) return Response(status=200) + elif not slack_user_identity.users.exists(): + # Means that slack_user_identity doesn't have any connected user + warning_text = "Permission denied. Please connect your Slack account to OnCall." + # Open pop-up to inform user why OnCall bot doesn't work if any action was triggered + self._open_warning_window_if_needed(payload, slack_team_identity, warning_text) + return Response(status=200) action_record = SlackActionRecord(user=user, organization=organization, payload=payload) From cc028783bb9ac3f93a39291d2cf4ea5b3148e0f0 Mon Sep 17 00:00:00 2001 From: Julia Date: Mon, 14 Nov 2022 12:34:05 +0100 Subject: [PATCH 2/2] Change warning window text --- engine/apps/slack/views.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/engine/apps/slack/views.py b/engine/apps/slack/views.py index 7987f890..b22e0ba2 100644 --- a/engine/apps/slack/views.py +++ b/engine/apps/slack/views.py @@ -272,9 +272,8 @@ class SlackEventApiEndpointView(APIView): return Response(status=200) elif not slack_user_identity.users.exists(): # Means that slack_user_identity doesn't have any connected user - warning_text = "Permission denied. Please connect your Slack account to OnCall." # Open pop-up to inform user why OnCall bot doesn't work if any action was triggered - self._open_warning_window_if_needed(payload, slack_team_identity, warning_text) + self._open_warning_for_unconnected_user(sc, payload) return Response(status=200) action_record = SlackActionRecord(user=user, organization=organization, payload=payload)