Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-11 00:15:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

possible fix for #101

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-07-21 14:25:42 -04:00
parent e437b4df66
commit 0b7da34a03
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/routes/authentication.js
View File

@@ -5,7 +5,7 @@
passportGoogle = require('passport-google-oauth').OAuth2Strategy, passportGoogle = require('passport-google-oauth').OAuth2Strategy,
passportFacebook = require('passport-facebook').Strategy, passportFacebook = require('passport-facebook').Strategy,
login_strategies = [], login_strategies = [],
nconf = require('nconf'),
user_module = require('./../user.js'), user_module = require('./../user.js'),
login_module = require('./../login.js'); login_module = require('./../login.js');
@@ -20,7 +20,7 @@
passport.use(new passportTwitter({ passport.use(new passportTwitter({
consumerKey: global.config['social:twitter:key'], consumerKey: global.config['social:twitter:key'],
consumerSecret: global.config['social:twitter:secret'], consumerSecret: global.config['social:twitter:secret'],
callbackURL: config.url + 'auth/twitter/callback' callbackURL: nconf.get('url') + 'auth/twitter/callback'
}, function(token, tokenSecret, profile, done) { }, function(token, tokenSecret, profile, done) {
login_module.loginViaTwitter(profile.id, profile.username, function(err, user) { login_module.loginViaTwitter(profile.id, profile.username, function(err, user) {
if (err) { return done(err); } if (err) { return done(err); }
@@ -35,7 +35,7 @@
passport.use(new passportGoogle({ passport.use(new passportGoogle({
clientID: global.config['social:google:id'], clientID: global.config['social:google:id'],
clientSecret: global.config['social:google:secret'], clientSecret: global.config['social:google:secret'],
callbackURL: config.url + 'auth/google/callback' callbackURL: nconf.get('url') + 'auth/google/callback'
}, function(accessToken, refreshToken, profile, done) { }, function(accessToken, refreshToken, profile, done) {
login_module.loginViaGoogle(profile.id, profile.displayName, profile.emails[0].value, function(err, user) { login_module.loginViaGoogle(profile.id, profile.displayName, profile.emails[0].value, function(err, user) {
if (err) { return done(err); } if (err) { return done(err); }
@@ -47,10 +47,11 @@
} }
if (global.config['social:facebook:app_id'] && global.config['social:facebook:secret']) { if (global.config['social:facebook:app_id'] && global.config['social:facebook:secret']) {
console.log(config.url);
passport.use(new passportFacebook({ passport.use(new passportFacebook({
clientID: global.config['social:facebook:app_id'], clientID: global.config['social:facebook:app_id'],
clientSecret: global.config['social:facebook:secret'], clientSecret: global.config['social:facebook:secret'],
callbackURL: config.url + 'auth/facebook/callback' callbackURL: nconf.get('url') + 'auth/facebook/callback'
}, function(accessToken, refreshToken, profile, done) { }, function(accessToken, refreshToken, profile, done) {
login_module.loginViaFacebook(profile.id, profile.displayName, profile.emails[0].value, function(err, user) { login_module.loginViaFacebook(profile.id, profile.displayName, profile.emails[0].value, function(err, user) {
if (err) { return done(err); } if (err) { return done(err); }