status-im
/
codimd
mirror of https://github.com/status-im/codimd.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Support hostedName in google OAuth provider
This commit is contained in:
Max Wu 2020-02-28 18:03:19 +08:00 committed by GitHub
parent 371e985e29 b9f0e37eee
commit c9badcf2e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/auth/google/index.js
View File

@ -17,7 +17,10 @@ passport.use(new GoogleStrategy({
googleAuth.get('/auth/google', function (req, res, next) { googleAuth.get('/auth/google', function (req, res, next) {
setReturnToFromReferer(req) 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 // google auth callback
googleAuth.get('/auth/google/callback', googleAuth.get('/auth/google/callback',

3
lib/config/default.js
View File

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

3
lib/config/environment.js
View File

@ -105,7 +105,8 @@ module.exports = {
}, },
google: { google: {
clientID: process.env.CMD_GOOGLE_CLIENTID, 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: { ldap: {
providerName: process.env.CMD_LDAP_PROVIDERNAME, providerName: process.env.CMD_LDAP_PROVIDERNAME,