Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-27 17:59:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Baris Usakli
2013-05-02 12:56:17 -04:00
parent 39b24436d0 c73feeea2a
commit 8cedb33c82
6 changed files with 60 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/templates.js
View File

@@ -1,4 +1,4 @@
var fs = require('fs');
(function(Templates) {
@@ -7,7 +7,7 @@ var fs = require('fs');
function loadTemplates(templatesToLoad) {
for (var t in templatesToLoad) {
(function(file) {
fs.readFile(global.configuration.ROOT_DIRECTORY + '/public/templates/' + file + '.tpl', function(err, html) {
modules.fs.readFile(global.configuration.ROOT_DIRECTORY + '/public/templates/' + file + '.tpl', function(err, html) {
var template = function() {
this.toString = function() {
return this.html;

61
src/webserver.js
View File

@@ -8,7 +8,8 @@ var express = require('express'),
redisServer = redis.createClient(config.redis.port, config.redis.host, config.redis.options),
passport = require('passport'),
passportLocal = require('passport-local').Strategy,
passportTwitter = require('passport-twitter').Strategy;
passportTwitter = require('passport-twitter').Strategy,
login_strategies = [];
passport.use(new passportLocal(function(user, password, next) {
global.modules.user.loginViaLocal(user, password, function(login) {
@@ -17,16 +18,20 @@ passport.use(new passportLocal(function(user, password, next) {
});
}));
passport.use(new passportTwitter({
consumerKey: config.twitter.key,
consumerSecret: config.twitter.secret,
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); }
done(null, user);
});
}));
if (config.twitter && config.twitter.key && config.twitter.key.length > 0 && config.twitter.secret.length > 0) {
passport.use(new passportTwitter({
consumerKey: config.twitter.key,
consumerSecret: config.twitter.secret,
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); }
done(null, user);
});
}));
login_strategies.push('twitter');
}
passport.serializeUser(function(user, done) {
done(null, user.uid);
@@ -120,6 +125,28 @@ passport.deserializeUser(function(uid, done) {
res.send(JSON.stringify(data));
});
break;
case 'login' :
var data = {},
num_strategies = login_strategies.length;
if (num_strategies == 0) {
data = {
'login_window:spansize': 'span12',
'alternate_logins:display': 'none'
};
} else {
data = {
'login_window:spansize': 'span6',
'alternate_logins:display': 'block'
}
for (var i=0, ii=num_strategies; i<ii; i++) {
data[login_strategies[i] + ':display'] = 'block';
}
}
console.log(data);
res.send(JSON.stringify(data));
break;
case 'topic' :
global.modules.posts.get(function(data) {
res.send(JSON.stringify(data));
@@ -147,12 +174,14 @@ passport.deserializeUser(function(uid, done) {
});
});
app.get('/auth/twitter', passport.authenticate('twitter'));
if (login_strategies.indexOf('twitter') !== -1) {
app.get('/auth/twitter', passport.authenticate('twitter'));
app.get('/auth/twitter/callback', passport.authenticate('twitter', {
successRedirect: '/',
failureRedirect: '/login'
}));
app.get('/auth/twitter/callback', passport.authenticate('twitter', {
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']);