Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 20:16:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

adding callback to settings.load, and omitting password validation check on user creation if no password is entered (e.g. SSO login)

Browse Source
This commit is contained in:
Julian Lam
2014-03-18 20:21:24 -04:00
parent cc0fabc619
commit da1a1d5930
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/src/modules/settings.js
View File

@@ -16,12 +16,15 @@
define(function() {
var Settings = {};
Settings.load = function(hash, formEl) {
Settings.load = function(hash, formEl, callback) {
socket.emit('admin.settings.get', {
hash: hash
}, function(err, values) {
if (!err) {
$(formEl).deserialize(values);
if (typeof callback === 'function') {
callback();
}
} else {
console.log('[settings] Unable to load settings for hash: ', hash);
}

6
src/user/create.js
View File

@@ -27,7 +27,11 @@ module.exports = function(User) {
next((!utils.isUserNameValid(userData.username) || !userData.userslug) ? new Error('Invalid Username!') : null);
},
function(next) {
next(!utils.isPasswordValid(userData.password) ? new Error('Invalid Password!') : null);
if (userData.password) {
next(!utils.isPasswordValid(userData.password) ? new Error('Invalid Password!') : null);
} else {
next();
}
},
function(next) {
User.exists(userData.userslug, function(err, exists) {