This commit is contained in:
barisusakli
2015-09-14 15:50:02 -04:00
parent b660eec67f
commit 30d087cbd3
4 changed files with 17 additions and 7 deletions

View File

@@ -157,7 +157,7 @@ module.exports = function(User) {
},
passwordValid: function(next) {
if (userData.password) {
next(!utils.isPasswordValid(userData.password) ? new Error('[[error:invalid-password]]') : null);
User.isPasswordValid(userData.password, next);
} else {
next();
}
@@ -179,6 +179,17 @@ module.exports = function(User) {
});
};
User.isPasswordValid = function(password, callback) {
if (!password || !utils.isPasswordValid(password)) {
return callback(new Error('[[error:invalid-password]]'));
}
if (password.length < meta.config.minimumPasswordLength) {
return callback(new Error('[[user:change_password_error_length]]'));
}
callback();
};
function renameUsername(userData, callback) {
meta.userOrGroupExists(userData.userslug, function(err, exists) {
if (err || !exists) {