ref(slack): Remove slack-v2 creds and usage

src/sentry/identity/slack/provider.py

@@ -26,10 +26,10 @@ def get_oauth_access_token_url(self):
         return "https://slack.com/api/oauth.v2.access"
 
     def get_oauth_client_id(self):
-        return options.get("slack-v2.client-id") or options.get("slack.client-id")
+        return options.get("slack.client-id")
 
     def get_oauth_client_secret(self):
-        return options.get("slack-v2.client-secret") or options.get("slack.client-secret")
+        return options.get("slack.client-secret")
 
     def get_user_scopes(self):
         return self.config.get("user_scopes", self.user_scopes)

src/sentry/integrations/slack/requests.py

@@ -93,19 +93,18 @@ def _validate_data(self):
             raise SlackRequestError(status=400)
 
     def _authorize(self):
-        # check v1 then v2
+        # XXX(meredith): Signing secrets are the prefered way
+        # but self-hosted could still have an older slack bot
+        # app that just has the verification token.
         signing_secret = options.get("slack.signing-secret")
         verification_token = options.get("slack.verification-token")
-        # for v1, only check the verification_token if we don't have a signing_secret
+
         if signing_secret:
             if self._check_signing_secret(signing_secret):
                 return
         elif verification_token and self._check_verification_token(verification_token):
             return
-        # for v2, only check signing secret
-        signing_secret = options.get("slack-v2.signing-secret")
-        if signing_secret and self._check_signing_secret(signing_secret):
-            return
+
         # unfortunately, we can't know which auth was supposed to succeed
         self._error("slack.action.auth")
         raise SlackRequestError(status=401)

src/sentry/options/defaults.py

@@ -119,14 +119,9 @@
 # Slack Integration
 register("slack.client-id", flags=FLAG_PRIORITIZE_DISK)
 register("slack.client-secret", flags=FLAG_PRIORITIZE_DISK)
+# signing-secret is preferred, but need to keep verification-token for apps that use it
 register("slack.verification-token", flags=FLAG_PRIORITIZE_DISK)
 register("slack.signing-secret", flags=FLAG_PRIORITIZE_DISK)
-register("slack.legacy-app", flags=FLAG_PRIORITIZE_DISK, type=Bool, default=True)
-
-# Slack V2 Integration
-register("slack-v2.client-id", flags=FLAG_PRIORITIZE_DISK)
-register("slack-v2.client-secret", flags=FLAG_PRIORITIZE_DISK)
-register("slack-v2.signing-secret", flags=FLAG_PRIORITIZE_DISK)
 
 # GitHub Integration
 register("github-app.id", default=0)

src/sentry/utils/pytest/sentry.py

@@ -117,7 +117,7 @@ def pytest_configure(config):
             "slack.client-id": "slack-client-id",
             "slack.client-secret": "slack-client-secret",
             "slack.verification-token": "slack-verification-token",
-            "slack.legacy-app": True,
+            "slack.signing-secret": "slack-signing-secret",
             "github-app.name": "sentry-test-app",
             "github-app.client-id": "github-client-id",
             "github-app.client-secret": "github-client-secret",

tests/sentry/integrations/slack/test_integration.py

@@ -13,7 +13,6 @@
     OrganizationIntegration,
 )
 from sentry.testutils import IntegrationTestCase, TestCase
-from sentry.testutils.helpers import override_options
 
 
 class SlackIntegrationTest(IntegrationTestCase):
@@ -149,16 +148,6 @@ def test_reassign_user(self):
         identity = Identity.objects.get()
         assert identity.external_id == "UXXXXXXX2"
 
-    @responses.activate
-    def test_install_v2(self):
-        with override_options(
-            {"slack-v2.client-id": "other-id", "slack-v2.client-secret": "other-secret"}
-        ):
-            self.assert_setup_flow(
-                expected_client_id="other-id",
-                expected_client_secret="other-secret",
-            )
-
 
 class SlackIntegrationConfigTest(TestCase):
     def setUp(self):

tests/sentry/integrations/slack/test_requests.py

@@ -163,16 +163,6 @@ def test_signing_secret(self):
             self.set_signature(options.get("slack.signing-secret"), self.request.body)
             self.slack_request.validate()
 
-    def test_signing_secret_v2(self):
-        with override_options({"slack-v2.signing-secret": "secret-v2"}):
-            self.request.data = {"challenge": "abc123", "type": "url_verification"}
-
-            # we get a url encoded body with Slack
-            self.request.body = urlencode(self.request.data).encode("utf-8")
-
-            self.set_signature(options.get("slack-v2.signing-secret"), self.request.body)
-            self.slack_request.validate()
-
     def test_signing_secret_bad(self):
         with override_options({"slack.signing-secret": "secret"}):
             # even though we provide the token, should still fail