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

Avoid setting profile name to not found (#8357)

Browse Source 
* avoid setting profile name to not found

* only set profile name when empty

* profile.name is required

* set profile name before validation

* fix and add tests
This commit is contained in:
Matteo Pagliazzi
2017-01-03 00:00:01 +01:00
committed by GitHub
parent 47bb217068
commit 2f1b683ec9
5 changed files with 46 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
website/server/models/user/hooks.js
View File

@@ -131,6 +131,16 @@ function _setProfileName (user) {
return localUsername || _getFacebookName(user.auth.facebook) || googleUsername || anonymous;
}
schema.pre('validate', function preValidateUser (next) {
// Populate new user with profile name, not running in pre('save') because the field
// is required and validation fails if it doesn't exists like for new users
if (this.isNew && !this.profile.name) {
this.profile.name = _setProfileName(this);
}
next();
});
schema.pre('save', true, function preSaveUser (next, done) {
next();
@@ -138,10 +148,6 @@ schema.pre('save', true, function preSaveUser (next, done) {
this.preferences.dayStart = 0;
}
if (!this.profile.name) {
this.profile.name = _setProfileName(this);
}
// Determines if Beast Master should be awarded
let beastMasterProgress = shared.count.beastMasterProgress(this.items.pets);