Skip to content

Commit 89980c5

Browse files
committed
1 parent 963c4a3 commit 89980c5

File tree

4 files changed

+24
-4
lines changed

4 files changed

+24
-4
lines changed

Diff for: app/templates/server/api/user(auth)/user.controller.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ exports.me = function(req, res, next) {
8686
var userId = req.user._id;
8787
User.findOne({
8888
_id: userId
89-
}, '-salt -hashedPassword', function(err, user) { // don't ever give out the password or salt
89+
}, function(err, user) { // don't ever give out the password or salt
9090
if (err) return next(err);
9191
if (!user) return res.json(401);
9292
res.json(user);

Diff for: app/templates/server/api/user(auth)/user.model.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ var UserSchema = new Schema({
1212
type: String,
1313
default: 'user'
1414
},
15-
hashedPassword: String,
15+
hashedPassword: {type: String, select: false},
1616
provider: String,
17-
salt: String<% if (filters.oauth) { %>,<% if (filters.facebookAuth) { %>
17+
salt: {type: String, select: false}<% if (filters.oauth) { %>,<% if (filters.facebookAuth) { %>
1818
facebook: {},<% } %><% if (filters.twitterAuth) { %>
1919
twitter: {},<% } %><% if (filters.googleAuth) { %>
2020
google: {},<% } %>

Diff for: app/templates/server/api/user(auth)/user.model.spec.js

+20
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,26 @@ describe('User Model', function() {
5050
});
5151
});
5252

53+
it('should not have salt by default', function(done) {
54+
user.save(function() {
55+
});
56+
57+
User.find({name: user.name}, function(err, _user) {
58+
_user.should.not.have.property('salt');
59+
done();
60+
});
61+
});
62+
63+
it('should not have hashedPassword by default', function(done) {
64+
user.save(function() {
65+
});
66+
67+
User.find({name: user.name}, function(err, _user) {
68+
_user.should.not.have.property('hashedPassword');
69+
done();
70+
});
71+
});
72+
5373
it("should authenticate user if password is valid", function() {
5474
return user.authenticate('password').should.be.true;
5575
});

Diff for: app/templates/server/auth(auth)/local/passport.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ exports.setup = function (User, config) {
99
function(email, password, done) {
1010
User.findOne({
1111
email: email.toLowerCase()
12-
}, function(err, user) {
12+
}, '+salt +hashedPassword', function(err, user) {
1313
if (err) return done(err);
1414

1515
if (!user) {

0 commit comments

Comments
 (0)