Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-22 00:10:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/psychobunny/node-forum

Browse Source 
Conflicts:
	public/css/style.less
	src/webserver.js
This commit is contained in:
psychobunny
2013-05-02 19:48:14 +00:00
parent 517b4de2fe 4c41011d83
commit c113f4151b
11 changed files with 150 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/webserver.js
View File

@@ -9,6 +9,7 @@ var express = require('express'),
passport = require('passport'),
passportLocal = require('passport-local').Strategy,
passportTwitter = require('passport-twitter').Strategy,
passportGoogle = require('passport-google-oauth').OAuth2Strategy,
login_strategies = [];
passport.use(new passportLocal(function(user, password, next) {
@@ -22,7 +23,7 @@ if (config.twitter && config.twitter.key && config.twitter.key.length > 0 && con
passport.use(new passportTwitter({
consumerKey: config.twitter.key,
consumerSecret: config.twitter.secret,
callbackURL: config.url + "auth/twitter/callback"
callbackURL: config.url + 'auth/twitter/callback'
}, function(token, tokenSecret, profile, done) {
global.modules.user.loginViaTwitter(profile.id, profile.username, function(err, user) {
if (err) { return done(err); }
@@ -33,6 +34,21 @@ if (config.twitter && config.twitter.key && config.twitter.key.length > 0 && con
login_strategies.push('twitter');
}
if (config.google.id.length > 0 && config.google.secret.length > 0) {
passport.use(new passportGoogle({
clientID: config.google.id,
clientSecret: config.google.secret,
callbackURL: config.url + 'auth/google/callback'
}, function(accessToken, refreshToken, profile, done) {
global.modules.user.loginViaGoogle(profile.id, profile.displayName, profile.emails[0].value, function(err, user) {
if (err) { return done(err); }
done(null, user);
});
}))
login_strategies.push('google');
}
passport.serializeUser(function(user, done) {
done(null, user.uid);
});
@@ -140,12 +156,11 @@ passport.deserializeUser(function(uid, done) {
'alternate_logins:display': 'block'
}
for (var i=0, ii=num_strategies; i<ii; i++) {
data[login_strategies[i] + ':display'] = 'block';
data[login_strategies[i] + ':display'] = 'active';
}
}
res.send(JSON.stringify(data));
break;
case 'topic' :
global.modules.posts.get(function(data) {
@@ -183,6 +198,15 @@ passport.deserializeUser(function(uid, done) {
}));
}
if (login_strategies.indexOf('google') !== -1) {
app.get('/auth/google', passport.authenticate('google', { scope: 'https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email' }));
app.get('/auth/google/callback', passport.authenticate('google', {
successRedirect: '/',
failureRedirect: '/login'
}));
}
app.get('/reset/:code', function(req, res) {
res.send(templates['header'] + templates['reset_code'].parse({ reset_code: req.params.code }) + templates['footer']);
});