fix: JS error from #1962 refactor when Google or Slack auth credentials are missing

2021-03-29 22:03:40 -07:00
parent ae57cdea2a
commit b5dcb1b3fe
2 changed files with 219 additions and 211 deletions
--- a/server/auth/providers/google.js
+++ b/server/auth/providers/google.js
@@ -30,69 +30,71 @@ export const config = {
  enabled: !!GOOGLE_CLIENT_ID,
 };

-passport.use(
-  new GoogleStrategy(
-    {
-      clientID: GOOGLE_CLIENT_ID,
-      clientSecret: GOOGLE_CLIENT_SECRET,
-      callbackURL: `${env.URL}/auth/google.callback`,
-      prompt: "select_account consent",
-      passReqToCallback: true,
-      store: new StateStore(),
-      scope: scopes,
-    },
-    async function (req, accessToken, refreshToken, profile, done) {
-      try {
-        const domain = profile._json.hd;
+if (GOOGLE_CLIENT_ID) {
+  passport.use(
+    new GoogleStrategy(
+      {
+        clientID: GOOGLE_CLIENT_ID,
+        clientSecret: GOOGLE_CLIENT_SECRET,
+        callbackURL: `${env.URL}/auth/google.callback`,
+        prompt: "select_account consent",
+        passReqToCallback: true,
+        store: new StateStore(),
+        scope: scopes,
+      },
+      async function (req, accessToken, refreshToken, profile, done) {
+        try {
+          const domain = profile._json.hd;

-        if (!domain) {
-          throw new GoogleWorkspaceRequiredError();
+          if (!domain) {
+            throw new GoogleWorkspaceRequiredError();
+          }
+
+          if (allowedDomains.length && !allowedDomains.includes(domain)) {
+            throw new GoogleWorkspaceInvalidError();
+          }
+
+          const subdomain = domain.split(".")[0];
+          const teamName = capitalize(subdomain);
+
+          const result = await accountProvisioner({
+            ip: req.ip,
+            team: {
+              name: teamName,
+              domain,
+              subdomain,
+            },
+            user: {
+              name: profile.displayName,
+              email: profile.email,
+              avatarUrl: profile.picture,
+            },
+            authenticationProvider: {
+              name: providerName,
+              providerId: domain,
+            },
+            authentication: {
+              providerId: profile.id,
+              accessToken,
+              refreshToken,
+              scopes,
+            },
+          });
+          return done(null, result.user, result);
+        } catch (err) {
+          return done(err, null);
        }
-
-        if (allowedDomains.length && !allowedDomains.includes(domain)) {
-          throw new GoogleWorkspaceInvalidError();
-        }
-
-        const subdomain = domain.split(".")[0];
-        const teamName = capitalize(subdomain);
-
-        const result = await accountProvisioner({
-          ip: req.ip,
-          team: {
-            name: teamName,
-            domain,
-            subdomain,
-          },
-          user: {
-            name: profile.displayName,
-            email: profile.email,
-            avatarUrl: profile.picture,
-          },
-          authenticationProvider: {
-            name: providerName,
-            providerId: domain,
-          },
-          authentication: {
-            providerId: profile.id,
-            accessToken,
-            refreshToken,
-            scopes,
-          },
-        });
-        return done(null, result.user, result);
-      } catch (err) {
-        return done(err, null);
      }
-    }
-  )
-);
+    )
+  );

-router.get("google", passport.authenticate(providerName));
+  router.get("google", passport.authenticate(providerName));

-router.get(
-  "google.callback",
-  auth({ required: false }),
-  passportMiddleware(providerName)
-);
+  router.get(
+    "google.callback",
+    auth({ required: false }),
+    passportMiddleware(providerName)
+  );
+}

 export default router;