Merge pull request #1426 from hackmdio/feat/support-google-hosted-name

Support hostedName in google OAuth provider

Author: jackycute

lib/auth/google/index.js

@@ -17,7 +17,10 @@ passport.use(new GoogleStrategy({
 
 googleAuth.get('/auth/google', function (req, res, next) {
   setReturnToFromReferer(req)
-  passport.authenticate('google', { scope: ['profile'] })(req, res, next)
+  passport.authenticate('google', {
+    scope: ['profile'],
+    hostedDomain: config.google.hostedDomain
+  })(req, res, next)
 })
 // google auth callback
 googleAuth.get('/auth/google/callback',

lib/config/default.js

@@ -133,7 +133,8 @@ module.exports = {
   },
   google: {
     clientID: undefined,
-    clientSecret: undefined
+    clientSecret: undefined,
+    hostedDomain: undefined
   },
   ldap: {
     providerName: undefined,

lib/config/environment.js

@@ -105,7 +105,8 @@ module.exports = {
   },
   google: {
     clientID: process.env.CMD_GOOGLE_CLIENTID,
-    clientSecret: process.env.CMD_GOOGLE_CLIENTSECRET
+    clientSecret: process.env.CMD_GOOGLE_CLIENTSECRET,
+    hostedDomain: process.env.CMD_GOOGLE_HOSTEDDOMAIN
   },
   ldap: {
     providerName: process.env.CMD_LDAP_PROVIDERNAME,