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

tweaking twitter login so that if the config is blank, trying to log in via twitter won't crash the server

Browse Source
This commit is contained in:
Julian Lam
2013-05-02 12:13:06 -04:00
parent 5708076137
commit 60c1e937a1
3 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/templates/footer.tpl
View File

@@ -45,7 +45,6 @@
}); });
socket.emit('api:user.get', { fields: ['username', 'picture'] }); socket.emit('api:user.get', { fields: ['username', 'picture'] });
socket.on('api:user.get', function(data) { socket.on('api:user.get', function(data) {
console.log(data);
if (data.uid > 0) { if (data.uid > 0) {
var gravatar = document.createElement('img'), var gravatar = document.createElement('img'),
name = document.createElement('span') name = document.createElement('span')

3
public/templates/login.tpl
View File

@@ -9,9 +9,8 @@
<form method="post" action="/login"> <form method="post" action="/login">
<label>Username</label><input type="text" placeholder="Enter Username" name="username" id="username" /><br /> <label>Username</label><input type="text" placeholder="Enter Username" name="username" id="username" /><br />
<label>Password</label><input type="password" placeholder="Enter Password" name="password" id="password" /><br /> <label>Password</label><input type="password" placeholder="Enter Password" name="password" id="password" /><br />
<button class="btn btn-primary" id="login" type="submit">Login</button> &nbsp; <button class="btn btn-primary" id="login" type="submit">Login</button> &nbsp; <a href="/reset">Forgot Password?</a>
</form> </form>
<a href="/reset">Forgot Password?</a>
</div> </div>
<div class="well span6"> <div class="well span6">
<h4>Alternative Logins</h4> <h4>Alternative Logins</h4>

39
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), redisServer = redis.createClient(config.redis.port, config.redis.host, config.redis.options),
passport = require('passport'), passport = require('passport'),
passportLocal = require('passport-local').Strategy, 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) { passport.use(new passportLocal(function(user, password, next) {
global.modules.user.loginViaLocal(user, password, function(login) { global.modules.user.loginViaLocal(user, password, function(login) {
@@ -17,16 +18,20 @@ passport.use(new passportLocal(function(user, password, next) {
}); });
})); }));
passport.use(new passportTwitter({ if (config.twitter.key.length > 0 && config.twitter.secret.length > 0) {
consumerKey: config.twitter.key, passport.use(new passportTwitter({
consumerSecret: config.twitter.secret, consumerKey: config.twitter.key,
callbackURL: config.url + "auth/twitter/callback" consumerSecret: config.twitter.secret,
}, function(token, tokenSecret, profile, done) { callbackURL: config.url + "auth/twitter/callback"
global.modules.user.loginViaTwitter(profile.id, profile.username, function(err, user) { }, function(token, tokenSecret, profile, done) {
if (err) { return done(err); } global.modules.user.loginViaTwitter(profile.id, profile.username, function(err, user) {
done(null, user); if (err) { return done(err); }
}); done(null, user);
})); });
}));
login_strategies.push('twitter');
}
passport.serializeUser(function(user, done) { passport.serializeUser(function(user, done) {
done(null, user.uid); done(null, user.uid);
@@ -147,12 +152,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', { app.get('/auth/twitter/callback', passport.authenticate('twitter', {
successRedirect: '/', successRedirect: '/',
failureRedirect: '/login' failureRedirect: '/login'
})); }));
}
app.get('/reset/:code', function(req, res) { app.get('/reset/:code', function(req, res) {
res.send(templates['header'] + templates['reset_code'].parse({ reset_code: req.params.code }) + templates['footer']); res.send(templates['header'] + templates['reset_code'].parse({ reset_code: req.params.code }) + templates['footer']);