sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-17 09:22:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix to auth route to show if the problem was username, not just password

Browse source
This commit is contained in:
Tyler Renelle 2013-09-09 11:01:57 -04:00
parent 3929c789d1
commit 6591524079
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/controllers/auth.js
View file

@ -103,24 +103,18 @@ api.registerUser = function(req, res, next) {
api.loginLocal = function(req, res, next) {
var username = req.body.username;
var password = req.body.password;
async.waterfall([
function(cb) {
if (!(username && password)) return cb('No username or password');
User.findOne({'auth.local.username': username}, cb);
}, function(user, cb) {
if (!user) return cb('Username not found');
// We needed the whole user object first so we can get his salt to encrypt password comparison
User.findOne({
'auth.local.username': username,
'auth.local.hashed_password': utils.encryptPassword(password, user.auth.local.salt)
}, cb);
}
], function(err, user) {
if (!user) err = 'Incorrect password';
if (err) return res.json(401, {err: err});
res.json(200, {
id: user._id,
token: user.apiToken
if (!(username && password)) return res.json(401, {err:'Missing :username or :password in request body, please provide both'});
User.findOne({'auth.local.username': username}, function(err, user){
if (err) return res.json(500,{err:err});
if (!user) return res.json(401, {err:"Username '" + username + "' not found. Usernames are case-sensitive, click 'Forgot Password' if you can't remember the capitalization."});
// We needed the whole user object first so we can get his salt to encrypt password comparison
User.findOne({
'auth.local.username': username,
'auth.local.hashed_password': utils.encryptPassword(password, user.auth.local.salt)
}, function(err, user){
if (err) return res.json(500,{err:err});
if (!user) return res.json(401,{err:'Incorrect password'});
res.json({id: user._id,token: user.apiToken});
});
});
};