refactored user authentication (passport-local, instead of my own

half-baked implementation)
This commit is contained in:
Julian Lam
2013-05-01 21:03:37 -04:00
parent 70d3105a8e
commit d712f57141
5 changed files with 114 additions and 53 deletions

View File

@@ -5,7 +5,26 @@ var express = require('express'),
path = require('path'),
config = require('../config.js'),
redis = require('redis'),
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'),
passportLocal = require('passport-local').Strategy;
passport.use(new passportLocal(function(user, password, next) {
global.modules.user.loginViaLocal(user, password, function(login) {
if (login.status === 'ok') next(null, login.user);
else next(null, false, login);
});
}));
passport.serializeUser(function(user, done) {
done(null, user.uid);
});
passport.deserializeUser(function(uid, done) {
done(null, {
uid: uid
});
});
(function(app) {
var templates = global.templates;
@@ -32,26 +51,34 @@ var express = require('express'),
secret: config.secret,
key: 'express.sid'
}));
app.use(passport.initialize());
app.use(passport.session());
app.use(function(req, res, next) {
// Don't bother with session handling for API requests
if (/^\/api\//.test(req.url)) return next();
if (req.session.uid === undefined) {
console.log('info: [Auth] First load, retrieving uid...');
global.modules.user.get_uid_by_session(req.sessionID, function(uid) {
if (uid !== null) {
req.session.uid = uid;
console.log('info: [Auth] uid ' + req.session.uid + ' found. Welcome back.');
} else {
req.session.uid = 0;
console.log('info: [Auth] No login session found.');
}
});
} else {
// console.log('SESSION: ' + req.sessionID);
// console.log('info: [Auth] Ping from uid ' + req.session.uid);
if (req.user && req.user.uid) {
console.log('** YOU ARE LOGGED IN AS UID: ' + req.user.uid + ' ***');
global.modules.user.session_ping(req.sessionID, req.user.uid);
}
// if (req.session.uid === undefined) {
// console.log('info: [Auth] First load, retrieving uid...');
// global.modules.user.get_uid_by_session(req.sessionID, function(uid) {
// if (uid !== null) {
// req.session.uid = uid;
// console.log('info: [Auth] uid ' + req.session.uid + ' found. Welcome back.');
// } else {
// req.session.uid = 0;
// console.log('info: [Auth] No login session found.');
// }
// });
// } else {
// // console.log('SESSION: ' + req.sessionID);
// // console.log('info: [Auth] Ping from uid ' + req.session.uid);
// }
// (Re-)register the session as active
global.modules.user.active.register(req.sessionID);
@@ -100,16 +127,17 @@ var express = require('express'),
res.send(templates['header'] + templates['login'] + templates['footer']);
});
app.post('/login', passport.authenticate('local', {
successRedirect: '/',
failureRedirect: '/login'
}));
app.get('/logout', function(req, res) {
console.log('info: [Auth] Session ' + res.sessionID + ' logout (uid: ' + global.uid + ')');
global.modules.user.logout(req.sessionID, function(logout) {
if (logout === true) {
delete(req.session.uid);
req.session.destroy();
}
req.logout();
res.send(templates['header'] + templates['logout'] + templates['footer']);
});
res.send(templates['header'] + templates['logout'] + templates['footer']);
});
app.get('/reset/:code', function(req, res) {