Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-29 18:59:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

#1110 - moved isEmailAvailable into User.email

Browse Source
This commit is contained in:
Julian Lam
2014-03-05 21:21:53 -05:00
parent e0dcf95138
commit e956c19587
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/user.js
View File

@@ -58,7 +58,7 @@ var bcrypt = require('bcryptjs'),
},
function(next) {
if (userData.email) {
User.isEmailAvailable(userData.email, function(err, available) {
User.email.available(userData.email, function(err, available) {
if (err) {
return next(err);
}
@@ -278,7 +278,7 @@ var bcrypt = require('bcryptjs'),
return next(null, true);
}
User.isEmailAvailable(data.email, function(err, available) {
User.email.available(data.email, function(err, available) {
if (err) {
return next(err, null);
}
@@ -422,12 +422,6 @@ var bcrypt = require('bcryptjs'),
});
};
User.isEmailAvailable = function(email, callback) {
db.isObjectField('email:uid', email, function(err, exists) {
callback(err, !exists);
});
};
User.changePassword = function(uid, data, callback) {
if(!data || !data.uid) {
return callback(new Error('invalid-uid'));
@@ -1029,6 +1023,11 @@ var bcrypt = require('bcryptjs'),
});
}
});
},
available: function(email, callback) {
db.isObjectField('email:uid', email, function(err, exists) {
callback(err, !exists);
});
}
};