Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

This commit is contained in:
Quincy Larson
2015-08-16 08:03:48 -07:00

View File

@@ -41,7 +41,7 @@ module.exports = {
}, },
'google-login': { 'google-login': {
provider: 'google', provider: 'google',
authScheme: 'oauth', authScheme: 'oauth2',
module: 'passport-google-oauth2', module: 'passport-google-oauth2',
clientID: process.env.GOOGLE_ID, clientID: process.env.GOOGLE_ID,
clientSecret: process.env.GOOGLE_SECRET, clientSecret: process.env.GOOGLE_SECRET,
@@ -55,7 +55,7 @@ module.exports = {
}, },
'google-link': { 'google-link': {
provider: 'google', provider: 'google',
authScheme: 'oauth', authScheme: 'oauth2',
module: 'passport-google-oauth2', module: 'passport-google-oauth2',
clientID: process.env.GOOGLE_ID, clientID: process.env.GOOGLE_ID,
clientSecret: process.env.GOOGLE_SECRET, clientSecret: process.env.GOOGLE_SECRET,