Skip to content

Commit

Permalink
fix(server): exposed configured passport from passport module
Browse files Browse the repository at this point in the history
  • Loading branch information
DaftMonk committed Feb 7, 2014
1 parent ce2ee23 commit 772133d
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 35 deletions.
68 changes: 34 additions & 34 deletions templates/express/config/passport.js
Expand Up @@ -8,41 +8,41 @@ var mongoose = require('mongoose'),
/**
* Passport configuration
*/
module.exports = function() {
passport.serializeUser(function(user, done) {
done(null, user.id);
passport.serializeUser(function(user, done) {
done(null, user.id);
});
passport.deserializeUser(function(id, done) {
User.findOne({
_id: id
}, '-salt -hashedPassword', function(err, user) { // don't ever give out the password or salt
done(err, user);
});
passport.deserializeUser(function(id, done) {
});

// add other strategies for more authentication flexibility
passport.use(new LocalStrategy({
usernameField: 'email',
passwordField: 'password' // this is the virtual field on the model
},
function(email, password, done) {
User.findOne({
_id: id
}, '-salt -hashedPassword', function(err, user) { // don't ever give out the password or salt
done(err, user);
email: email
}, function(err, user) {
if (err) return done(err);

if (!user) {
return done(null, false, {
message: 'This email is not registered.'
});
}
if (!user.authenticate(password)) {
return done(null, false, {
message: 'This password is not correct.'
});
}
return done(null, user);
});
});
}
));

// add other strategies for more authentication flexibility
passport.use(new LocalStrategy({
usernameField: 'email',
passwordField: 'password' // this is the virtual field on the model
},
function(email, password, done) {
User.findOne({
email: email
}, function(err, user) {
if (err) return done(err);

if (!user) {
return done(null, false, {
message: 'This email is not registered.'
});
}
if (!user.authenticate(password)) {
return done(null, false, {
message: 'This password is not correct.'
});
}
return done(null, user);
});
}
));
};
module.exports = passport;
2 changes: 1 addition & 1 deletion templates/express/server.js
Expand Up @@ -30,7 +30,7 @@ fs.readdirSync(modelsPath).forEach(function (file) {
require('./lib/config/dummydata');<% } %><% if(mongoPassportUser) { %>

// Passport Configuration
require('./lib/config/passport')();<% } %>
var passport = require('./lib/config/passport');<% } %>

var app = express();

Expand Down

0 comments on commit 772133d

Please sign in to comment.