Merge pull request #2999 from withspectrum/revert-2998-fix-alpha-slack-redirecting

Revert "Attempt fallback to allow alpha redirects for slack connections"

Author: brianlovin

api/routes/api/slackImporter.js

@@ -13,11 +13,8 @@ slackRouter.get('/', (req: any, res: any) => {
   const code = req.query.code;
   const communityId = req.query.state;
   const connectedBy = req.user.id;
-  const clientUrl = req.query.clientUrl;
   const returnURI = IS_PROD
-    ? clientUrl.indexOf('alpha') >= 0
-      ? 'https://alpha.spectrum.chat/api/slack'
-      : 'https://spectrum.chat/api/slack'
+    ? 'https://spectrum.chat/api/slack'
     : 'http://localhost:3001/api/slack';
 
   // generate an oauth token. This token will be used to communicate with the Slack API to get user information, and we'll store the token in the db record to allow for the user to access their Slack team info in the future.
@@ -40,9 +37,7 @@ slackRouter.get('/', (req: any, res: any) => {
     .then(community => community.slug)
     .then(slug => {
       return IS_PROD
-        ? clientUrl.indexOf('alpha') >= 0
-          ? res.redirect(`https://alpha.spectrum.chat/${slug}/settings`)
-          : res.redirect(`https://spectrum.chat/${slug}/settings`)
+        ? res.redirect(`https://spectrum.chat/${slug}/settings`)
         : res.redirect(`http://localhost:3000/${slug}/settings`);
     });
 });
@@ -52,11 +47,8 @@ slackRouter.get('/onboarding', (req: any, res: any) => {
   const code = req.query.code;
   const communityId = req.query.state;
   const connectedBy = req.user.id;
-  const clientUrl = req.query.clientUrl;
   const returnURI = IS_PROD
-    ? clientUrl.indexOf('alpha') >= 0
-      ? 'https://alpha.spectrum.chat/api/slack/onboarding'
-      : 'https://spectrum.chat/api/slack/onboarding'
+    ? 'https://spectrum.chat/api/slack/onboarding'
     : 'http://localhost:3001/api/slack/onboarding';
 
   // generate an oauth token. This token will be used to communicate with the Slack API to get user information, and we'll store the token in the db record to allow for the user to access their Slack team info in the future.
@@ -79,11 +71,7 @@ slackRouter.get('/onboarding', (req: any, res: any) => {
     .then(community => community.id)
     .then(id => {
       return IS_PROD
-        ? clientUrl.indexOf('alpha') >= 0
-          ? res.redirect(
-              `https://alpha.spectrum.chat/new/community?s=2&id=${id}`
-            )
-          : res.redirect(`https://spectrum.chat/new/community?s=2&id=${id}`)
+        ? res.redirect(`https://spectrum.chat/new/community?s=2&id=${id}`)
         : res.redirect(`http://localhost:3000/new/community?s=2&id=${id}`);
     });
 });

src/views/communitySettings/components/slack/connectSlack.js

@@ -9,7 +9,6 @@ import {
 } from 'src/components/settingsViews/style';
 import { Button } from 'src/components/buttons';
 import Icon from 'src/components/icons';
-import { CLIENT_URL } from 'src/api/constants';
 
 type Props = {
   community: GetSlackSettingsType,
@@ -23,17 +22,17 @@ class ImportSlackTeam extends React.Component<Props> {
     const url = isOnboarding
       ? `https://slack.com/oauth/authorize?client_id=201769987287.271382863153&scope=users:read.email%20users:read%20chat:write:bot%20groups:read%20channels:read&state=${
           community.id
-        }&clientUrl=${CLIENT_URL}&redirect_uri=${
+        }&redirect_uri=${
           process.env.NODE_ENV === 'development'
             ? 'http://localhost:3001/api/slack/onboarding'
-            : `${CLIENT_URL}/api/slack/onboarding`
+            : 'https://spectrum.chat/api/slack/onboarding'
         }`
       : `https://slack.com/oauth/authorize?client_id=201769987287.271382863153&scope=users:read.email%20users:read%20chat:write:bot%20groups:read%20channels:read&state=${
           community.id
-        }&clientUrl=${CLIENT_URL}&redirect_uri=${
+        }&redirect_uri=${
           process.env.NODE_ENV === 'development'
             ? 'http://localhost:3001/api/slack'
-            : `${CLIENT_URL}/api/slack`
+            : 'https://spectrum.chat/api/slack'
         }`;
 
     return (