From f74f01ca77cffcf3a68ae34492c58f2dc56494a9 Mon Sep 17 00:00:00 2001 From: Aziz Khoury Date: Mon, 20 Jan 2014 12:41:35 -0500 Subject: [PATCH] Changed User.create signature to accept a hash, added a couple of utility functions as well --- public/src/utils.js | 18 +++++++++-- src/admin/user.js | 2 +- src/install.js | 2 +- src/login.js | 6 ++-- src/routes/authentication.js | 2 +- src/user.js | 63 ++++++++++++++++++++---------------- tests/user.js | 6 ++-- 7 files changed, 61 insertions(+), 38 deletions(-) diff --git a/public/src/utils.js b/public/src/utils.js index 9f987b5ef0..b6f55e5cd9 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -116,8 +116,7 @@ // from http://stackoverflow.com/questions/46155/validate-email-address-in-javascript isEmailValid: function(email) { // var re = /[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/; - var valid = email.indexOf('@') !== -1 ? true : false; - return valid; + return email.indexOf('@') !== -1; }, isUserNameValid: function(name) { @@ -127,6 +126,21 @@ isPasswordValid: function(password) { return password && password.indexOf(' ') === -1; }, + isNumber: function(n) { + return !isNaN(parseFloat(n)) && isFinite(n); + }, + // shallow objects merge + merge: function() { + var result = {}, obj, keys; + for (var i = 0; i < arguments.length; i++) { + obj = arguments[i] || {}; + keys = Object.keys(obj); + for (var j = 0; j < keys.length; j++) { + result[keys[j]] = obj[keys[j]]; + } + } + return result; + }, buildMetaTags: function(tagsArr) { var tags = '', tag; diff --git a/src/admin/user.js b/src/admin/user.js index f295f78916..3c1fb77ab0 100644 --- a/src/admin/user.js +++ b/src/admin/user.js @@ -11,7 +11,7 @@ var utils = require('../../public/src/utils'), } if (isAdmin) { - user.create(userData.username, userData.password, userData.email, function(err) { + user.create(userData, function(err) { if(err) { return callback(err); } diff --git a/src/install.js b/src/install.js index bb52441d40..7d4106b058 100644 --- a/src/install.js +++ b/src/install.js @@ -404,7 +404,7 @@ var async = require('async'), } nconf.set('bcrypt_rounds', 12); - User.create(results.username, results.password, results.email, function (err, uid) { + User.create({username: results.username, password: results.password, email: results.email}, function (err, uid) { if (err) { winston.warn(err.message + ' Please try again.'); return callback(new Error('invalid-values')); diff --git a/src/login.js b/src/login.js index c4eb226586..b6341b93b6 100644 --- a/src/login.js +++ b/src/login.js @@ -70,7 +70,7 @@ var user = require('./user'), }); } else { // New User - user.create(handle, undefined, undefined, function(err, uid) { + user.create({username: handle}, function(err, uid) { if(err) { return callback(err); } @@ -123,7 +123,7 @@ var user = require('./user'), } if (!uid) { - user.create(handle, undefined, email, function(err, uid) { + user.create({username: handle, email: email}, function(err, uid) { if(err) { return callback(err); } @@ -166,7 +166,7 @@ var user = require('./user'), } if (!uid) { - user.create(name, undefined, email, function(err, uid) { + user.create({username: name, email: email}, function(err, uid) { if(err) { return callback(err); } diff --git a/src/routes/authentication.js b/src/routes/authentication.js index ea6228717a..2ae95e4da9 100644 --- a/src/routes/authentication.js +++ b/src/routes/authentication.js @@ -197,7 +197,7 @@ return res.send(403); } - user.create(req.body.username, req.body.password, req.body.email, function(err, uid) { + user.create({username: req.body.username, password: req.body.password, email: req.body.email, ip: req.ip}, function(err, uid) { if (err === null && uid) { req.login({ uid: uid diff --git a/src/user.js b/src/user.js index ed0e92a1dd..b77ceb251f 100644 --- a/src/user.js +++ b/src/user.js @@ -19,34 +19,35 @@ var bcrypt = require('bcrypt'), (function(User) { 'use strict'; - User.create = function(username, password, email, callback) { - var userslug = utils.slugify(username); + User.create = function(userData, callback) { + userData = userData || {}; + userData.userslug = utils.slugify(userData.username); - username = username.trim(); - if (email !== undefined) { - email = email.trim(); + userData.username = userData.username.trim(); + if (userData.email !== undefined) { + userData.email = userData.email.trim(); } async.parallel([ function(next) { - if (email !== undefined) { - next(!utils.isEmailValid(email) ? new Error('Invalid Email!') : null); + if (userData.email) { + next(!utils.isEmailValid(userData.email) ? new Error('Invalid Email!') : null); } else { next(); } }, function(next) { - next((!utils.isUserNameValid(username) || !userslug) ? new Error('Invalid Username!') : null); + next((!utils.isUserNameValid(userData.username) || !userData.userslug) ? new Error('Invalid Username!') : null); }, function(next) { - if (password !== undefined) { - next(!utils.isPasswordValid(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(userslug, function(err, exists) { + User.exists(userData.userslug, function(err, exists) { if (err) { return next(err); } @@ -54,8 +55,8 @@ var bcrypt = require('bcrypt'), }); }, function(next) { - if (email !== undefined) { - User.isEmailAvailable(email, function(err, available) { + if (userData.email) { + User.isEmailAvailable(userData.email, function(err, available) { if (err) { return next(err); } @@ -64,8 +65,14 @@ var bcrypt = require('bcrypt'), } else { next(); } + }, + function(next) { + plugins.fireHook('filter:user.create', userData, function(err, filteredUserData){ + next(err, utils.merge(userData, filteredUserData)); + }); } ], function(err, results) { + userData = results[results.length - 1]; if (err) { return callback(err); } @@ -75,18 +82,18 @@ var bcrypt = require('bcrypt'), return callback(err); } - var gravatar = User.createGravatarURLFromEmail(email); + var gravatar = User.createGravatarURLFromEmail(userData.email); var timestamp = Date.now(); - db.setObject('user:' + uid, { + userData = { 'uid': uid, - 'username': username, - 'userslug': userslug, + 'username': userData.username, + 'userslug': userData.userslug, 'fullname': '', 'location': '', 'birthday': '', 'website': '', - 'email': email || '', + 'email': userData.email || '', 'signature': '', 'joindate': timestamp, 'picture': gravatar, @@ -98,17 +105,19 @@ var bcrypt = require('bcrypt'), 'lastposttime': 0, 'banned': 0, 'showemail': 0 - }); + }; + + db.setObject('user:' + uid, userData); - db.setObjectField('username:uid', username, uid); - db.setObjectField('userslug:uid', userslug, uid); + db.setObjectField('username:uid', userData.username, uid); + db.setObjectField('userslug:uid', userData.userslug, uid); - if (email !== undefined) { - db.setObjectField('email:uid', email, uid); - if (uid !== 1) User.email.verify(uid, email); + if (userData.email !== undefined) { + db.setObjectField('email:uid', userData.email, uid); + if (uid !== 1) User.email.verify(uid, userData.email); } - plugins.fireHook('action:user.create', {uid: uid, username: username, email: email, picture: gravatar, timestamp: timestamp}); + plugins.fireHook('action:user.create', userData); db.incrObjectField('global', 'userCount'); db.sortedSetAdd('users:joindate', timestamp, uid); @@ -118,8 +127,8 @@ var bcrypt = require('bcrypt'), // Join the "registered-users" meta group groups.joinByGroupName('registered-users', uid); - if (password !== undefined) { - User.hashPassword(password, function(err, hash) { + if (userData.password) { + User.hashPassword(userData.password, function(err, hash) { User.setUserField(uid, 'password', hash); callback(null, uid); }); diff --git a/tests/user.js b/tests/user.js index 7adfca61ee..40c7156cbd 100644 --- a/tests/user.js +++ b/tests/user.js @@ -26,16 +26,16 @@ describe('User', function() { describe('when created', function() { it('should be created properly', function(done){ - User.create(userData.name, userData.password, userData.email, function(error,userId){ + User.create({usename: userData.name, password: userData.password, email: userData.email}, function(error,userId){ assert.equal(error, null, 'was created with error'); assert.ok(userId); done(); }); }); - it('should have a valid email', function() { + it('should have a valid email, if using an email', function() { assert.throws( - User.create(userData.name, userData.password, 'fakeMail',function(){}), + User.create({username: userData.name, password: userData.password, email: 'fakeMail'},function(){}), Error, 'does not validate email' );