Skip to content

Commit 772133d

Browse files
committed
fix(server): exposed configured passport from passport module
1 parent ce2ee23 commit 772133d

File tree

2 files changed

+35
-35
lines changed

2 files changed

+35
-35
lines changed

Diff for: templates/express/config/passport.js

+34-34
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,41 @@ var mongoose = require('mongoose'),
88
/**
99
* Passport configuration
1010
*/
11-
module.exports = function() {
12-
passport.serializeUser(function(user, done) {
13-
done(null, user.id);
11+
passport.serializeUser(function(user, done) {
12+
done(null, user.id);
13+
});
14+
passport.deserializeUser(function(id, done) {
15+
User.findOne({
16+
_id: id
17+
}, '-salt -hashedPassword', function(err, user) { // don't ever give out the password or salt
18+
done(err, user);
1419
});
15-
passport.deserializeUser(function(id, done) {
20+
});
21+
22+
// add other strategies for more authentication flexibility
23+
passport.use(new LocalStrategy({
24+
usernameField: 'email',
25+
passwordField: 'password' // this is the virtual field on the model
26+
},
27+
function(email, password, done) {
1628
User.findOne({
17-
_id: id
18-
}, '-salt -hashedPassword', function(err, user) { // don't ever give out the password or salt
19-
done(err, user);
29+
email: email
30+
}, function(err, user) {
31+
if (err) return done(err);
32+
33+
if (!user) {
34+
return done(null, false, {
35+
message: 'This email is not registered.'
36+
});
37+
}
38+
if (!user.authenticate(password)) {
39+
return done(null, false, {
40+
message: 'This password is not correct.'
41+
});
42+
}
43+
return done(null, user);
2044
});
21-
});
45+
}
46+
));
2247

23-
// add other strategies for more authentication flexibility
24-
passport.use(new LocalStrategy({
25-
usernameField: 'email',
26-
passwordField: 'password' // this is the virtual field on the model
27-
},
28-
function(email, password, done) {
29-
User.findOne({
30-
email: email
31-
}, function(err, user) {
32-
if (err) return done(err);
33-
34-
if (!user) {
35-
return done(null, false, {
36-
message: 'This email is not registered.'
37-
});
38-
}
39-
if (!user.authenticate(password)) {
40-
return done(null, false, {
41-
message: 'This password is not correct.'
42-
});
43-
}
44-
return done(null, user);
45-
});
46-
}
47-
));
48-
};
48+
module.exports = passport;

Diff for: templates/express/server.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fs.readdirSync(modelsPath).forEach(function (file) {
3030
require('./lib/config/dummydata');<% } %><% if(mongoPassportUser) { %>
3131

3232
// Passport Configuration
33-
require('./lib/config/passport')();<% } %>
33+
var passport = require('./lib/config/passport');<% } %>
3434

3535
var app = express();
3636

0 commit comments

Comments
 (0)