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

fix(controller): Adjust next calls to throw errors instead inside promise

Browse Source
This commit is contained in:
Blade Barringer
2015-11-21 17:01:56 -06:00
parent d1839b816e
commit 867efd7078
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,11 +50,9 @@ api.registerLocal = {
.exec()
.then((user) => {
if (user) {
if (email === user.auth.local.email) return next(new NotAuthorized(res.t('emailTaken')));
if (email === user.auth.local.email) throw new NotAuthorized(res.t('emailTaken'));
// Check that the lowercase username isn't already used
if (lowerCaseUsername === user.auth.local.lowerCaseUsername) {
return next(new NotAuthorized(res.t('usernameTaken')));
}
if (lowerCaseUsername === user.auth.local.lowerCaseUsername) throw new NotAuthorized(res.t('usernameTaken'));
}
let salt = passwordUtils.makeSalt();
@@ -79,21 +77,19 @@ api.registerLocal = {
return newUser.save();
})
.then((savedUser) => {
if (savedUser) {
res.status(201).json(savedUser);
res.status(201).json(savedUser);
// Clean previous email preferences
EmailUnsubscription
.remove({email: savedUser.auth.local.email})
.then(() => sendTxnEmail(savedUser, 'welcome'));
// Clean previous email preferences
EmailUnsubscription
.remove({email: savedUser.auth.local.email})
.then(() => sendTxnEmail(savedUser, 'welcome'));
res.analytics.track('register', {
category: 'acquisition',
type: 'local',
gaLabel: 'local',
uuid: savedUser._id,
});
}
res.analytics.track('register', {
category: 'acquisition',
type: 'local',
gaLabel: 'local',
uuid: savedUser._id,
});
})
.catch(next);
},