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

merged master fixed conflicts

Browse Source
This commit is contained in:
Baris Usakli
2013-12-05 12:17:01 -05:00
parent 2dd295118c fe4aee177d
commit c096656eff
16 changed files with 407 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/authentication.js
View File

@@ -36,7 +36,7 @@
passport.use(new passportTwitter({
consumerKey: meta.config['social:twitter:key'],
consumerSecret: meta.config['social:twitter:secret'],
callbackURL: 'auth/twitter/callback'
callbackURL: nconf.get('url') + 'auth/twitter/callback'
}, function(token, tokenSecret, profile, done) {
login_module.loginViaTwitter(profile.id, profile.username, profile.photos, function(err, user) {
if (err) {
@@ -59,7 +59,7 @@
passport.use(new passportGoogle({
clientID: meta.config['social:google:id'],
clientSecret: meta.config['social:google:secret'],
callbackURL: 'auth/google/callback'
callbackURL: nconf.get('url') + 'auth/google/callback'
}, function(accessToken, refreshToken, profile, done) {
login_module.loginViaGoogle(profile.id, profile.displayName, profile.emails[0].value, function(err, user) {
if (err) {