krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix bugs on user controller

Browse Source
This commit is contained in:
Matteo Pagliazzi
2015-11-21 12:26:48 +01:00
parent 22464f53e9
commit 3608742e20
3 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
website/src/controllers/api-v3/user.js
View File

@@ -28,11 +28,32 @@ api.registerLocal = {
method: 'POST',
url: '/user/auth/local/register',
handler (req, res, next) {
let email = req.body.email.toLowerCase();
let email = req.body.email && req.body.email.toLowerCase();
let username = req.body.username;
// Get the lowercase version of username to check that we do not have duplicates
// So we can search for it in the database and then reject the choosen username if 1 or more results are found
let lowerCaseUsername = username.toLowerCase();
let lowerCaseUsername = username && username.toLowerCase();
let newUser = new User({
auth: {
local: {
username,
lowerCaseUsername, // Store the lowercase version of the username
email, // Store email as lowercase
salt: passwordUtils.makeSalt(),
password: req.body.password,
passwordConfirmation: req.body.passwordConfirmation,
},
},
preferences: {
language: req.language,
},
});
newUser.registeredThrough = req.headers['x-client']; // TODO is this saved somewhere?
let validationErrors = newUser.validateSync(); // Validate synchronously for speed, remove if we add any async validator
if (validationErrors) return next(validationErrors);
// Search for duplicates using lowercase version of username
User.findOne({$or: [
@@ -47,24 +68,6 @@ api.registerLocal = {
if (lowerCaseUsername === user.auth.local.lowerCaseUsername) return next(new NotAuthorized(res.t('usernameTaken')));
}
let newUser = new User({
auth: {
local: {
username,
lowerCaseUsername, // Store the lowercase version of the username
email, // Store email as lowercase
salt: passwordUtils.makeSalt(),
password: req.body.password,
passwordConfirmation: req.body.passwordConfirmation,
},
},
preferences: {
language: req.language,
},
});
newUser.registeredThrough = req.headers['x-client']; // TODO is this saved somewhere?
return newUser.save();
})
.then((savedUser) => {