Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed #129

Browse Source
This commit is contained in:
Julian Lam
2013-07-24 12:04:32 -04:00
parent 42d1cade23
commit 762cecf1c3
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/login.js
View File

@@ -62,7 +62,7 @@ var user = require('./user.js'),
});
} else {
// New User
user.create(handle, null, null, function(err, uid) {
user.create(handle, undefined, undefined, function(err, uid) {
if (err !== null) {
callback(err);
} else {
@@ -98,7 +98,7 @@ var user = require('./user.js'),
user.get_uid_by_email(email, function(uid) {
if (!uid) {
user.create(handle, null, email, function(err, uid) {
user.create(handle, undefined, email, function(err, uid) {
if (err !== null) {
callback(err);
} else success(uid);
@@ -129,7 +129,7 @@ var user = require('./user.js'),
user.get_uid_by_email(email, function(uid) {
if (!uid) {
user.create(name, null, email, function(err, uid) {
user.create(name, undefined, email, function(err, uid) {
if (err !== null) {
callback(err);
} else success(uid);

18
src/user.js
View File

@@ -14,17 +14,19 @@ var utils = require('./../public/src/utils.js'),
var userslug = utils.slugify(username);
username = username.trim();
email = email.trim();
if (email !== undefined) email = email.trim();
async.parallel([
function(next) {
next(!utils.isEmailValid(email) ? new Error('Invalid Email!') : null);
if (email !== undefined) next(!utils.isEmailValid(email) ? new Error('Invalid Email!') : null);
else next();
},
function(next) {
next(!utils.isUserNameValid(username) ? new Error('Invalid Username!') : null);
},
function(next) {
next(!utils.isPasswordValid(password) ? new Error('Invalid Password!') : null);
if (password !== undefined) next(!utils.isPasswordValid(password) ? new Error('Invalid Password!') : null);
else next();
},
function(next) {
User.exists(userslug, function(exists) {
@@ -32,9 +34,11 @@ var utils = require('./../public/src/utils.js'),
});
},
function(next) {
if (email !== undefined) {
User.isEmailAvailable(email, function(available) {
next(!available ? new Error('Email taken!') : null);
});
} else next();
}
], function(err, results) {
if (err) return callback(err, 0); // FIXME: Maintaining the 0 for backwards compatibility. Do we need this?
@@ -52,7 +56,7 @@ var utils = require('./../public/src/utils.js'),
'location':'',
'birthday':'',
'website':'',
'email' : email,
'email' : email || '',
'signature':'',
'joindate' : Date.now(),
'picture': gravatar,
@@ -65,10 +69,12 @@ var utils = require('./../public/src/utils.js'),
});
RDB.set('username:' + username + ':uid', uid);
RDB.set('email:' + email +':uid', uid);
RDB.set('userslug:'+ userslug +':uid', uid);
if (email !== undefined) {
RDB.set('email:' + email +':uid', uid);
User.sendConfirmationEmail(email);
}
RDB.incr('usercount', function(err, count) {
RDB.handle(err);
@@ -80,7 +86,7 @@ var utils = require('./../public/src/utils.js'),
io.sockets.emit('user.latest', {userslug: userslug, username: username});
if (password) {
if (password !== undefined) {
User.hashPassword(password, function(hash) {
User.setUserField(uid, 'password', hash);
});