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

Changed User.create signature to accept a hash, added a couple of utility functions as well

Browse Source
This commit is contained in:
Aziz Khoury
2014-01-20 12:41:35 -05:00
parent e2960e3ed6
commit f74f01ca77
7 changed files with 61 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public/src/utils.js
View File

@@ -116,8 +116,7 @@
// from http://stackoverflow.com/questions/46155/validate-email-address-in-javascript // from http://stackoverflow.com/questions/46155/validate-email-address-in-javascript
isEmailValid: function(email) { 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 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 email.indexOf('@') !== -1;
return valid;
}, },
isUserNameValid: function(name) { isUserNameValid: function(name) {
@@ -127,6 +126,21 @@
isPasswordValid: function(password) { isPasswordValid: function(password) {
return password && password.indexOf(' ') === -1; 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) { buildMetaTags: function(tagsArr) {
var tags = '', var tags = '',
tag; tag;

2
src/admin/user.js
View File

@@ -11,7 +11,7 @@ var utils = require('../../public/src/utils'),
} }
if (isAdmin) { if (isAdmin) {
user.create(userData.username, userData.password, userData.email, function(err) { user.create(userData, function(err) {
if(err) { if(err) {
return callback(err); return callback(err);
} }

2
src/install.js
View File

@@ -404,7 +404,7 @@ var async = require('async'),
} }
nconf.set('bcrypt_rounds', 12); 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) { if (err) {
winston.warn(err.message + ' Please try again.'); winston.warn(err.message + ' Please try again.');
return callback(new Error('invalid-values')); return callback(new Error('invalid-values'));

6
src/login.js
View File

@@ -70,7 +70,7 @@ var user = require('./user'),
}); });
} else { } else {
// New User // New User
user.create(handle, undefined, undefined, function(err, uid) { user.create({username: handle}, function(err, uid) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
@@ -123,7 +123,7 @@ var user = require('./user'),
} }
if (!uid) { if (!uid) {
user.create(handle, undefined, email, function(err, uid) { user.create({username: handle, email: email}, function(err, uid) {
if(err) { if(err) {
return callback(err); return callback(err);
} }
@@ -166,7 +166,7 @@ var user = require('./user'),
} }
if (!uid) { if (!uid) {
user.create(name, undefined, email, function(err, uid) { user.create({username: name, email: email}, function(err, uid) {
if(err) { if(err) {
return callback(err); return callback(err);
} }

2
src/routes/authentication.js
View File

@@ -197,7 +197,7 @@
return res.send(403); 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) { if (err === null && uid) {
req.login({ req.login({
uid: uid uid: uid

63
src/user.js
View File

@@ -19,34 +19,35 @@ var bcrypt = require('bcrypt'),
(function(User) { (function(User) {
'use strict'; 'use strict';
User.create = function(username, password, email, callback) { User.create = function(userData, callback) {
var userslug = utils.slugify(username); userData = userData || {};
userData.userslug = utils.slugify(userData.username);
username = username.trim(); userData.username = userData.username.trim();
if (email !== undefined) { if (userData.email !== undefined) {
email = email.trim(); userData.email = userData.email.trim();
} }
async.parallel([ async.parallel([
function(next) { function(next) {
if (email !== undefined) { if (userData.email) {
next(!utils.isEmailValid(email) ? new Error('Invalid Email!') : null); next(!utils.isEmailValid(userData.email) ? new Error('Invalid Email!') : null);
} else { } else {
next(); next();
} }
}, },
function(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) { function(next) {
if (password !== undefined) { if (userData.password) {
next(!utils.isPasswordValid(password) ? new Error('Invalid Password!') : null); next(!utils.isPasswordValid(userData.password) ? new Error('Invalid Password!') : null);
} else { } else {
next(); next();
} }
}, },
function(next) { function(next) {
User.exists(userslug, function(err, exists) { User.exists(userData.userslug, function(err, exists) {
if (err) { if (err) {
return next(err); return next(err);
} }
@@ -54,8 +55,8 @@ var bcrypt = require('bcrypt'),
}); });
}, },
function(next) { function(next) {
if (email !== undefined) { if (userData.email) {
User.isEmailAvailable(email, function(err, available) { User.isEmailAvailable(userData.email, function(err, available) {
if (err) { if (err) {
return next(err); return next(err);
} }
@@ -64,8 +65,14 @@ var bcrypt = require('bcrypt'),
} else { } else {
next(); next();
} }
},
function(next) {
plugins.fireHook('filter:user.create', userData, function(err, filteredUserData){
next(err, utils.merge(userData, filteredUserData));
});
} }
], function(err, results) { ], function(err, results) {
userData = results[results.length - 1];
if (err) { if (err) {
return callback(err); return callback(err);
} }
@@ -75,18 +82,18 @@ var bcrypt = require('bcrypt'),
return callback(err); return callback(err);
} }
var gravatar = User.createGravatarURLFromEmail(email); var gravatar = User.createGravatarURLFromEmail(userData.email);
var timestamp = Date.now(); var timestamp = Date.now();
db.setObject('user:' + uid, { userData = {
'uid': uid, 'uid': uid,
'username': username, 'username': userData.username,
'userslug': userslug, 'userslug': userData.userslug,
'fullname': '', 'fullname': '',
'location': '', 'location': '',
'birthday': '', 'birthday': '',
'website': '', 'website': '',
'email': email || '', 'email': userData.email || '',
'signature': '', 'signature': '',
'joindate': timestamp, 'joindate': timestamp,
'picture': gravatar, 'picture': gravatar,
@@ -98,17 +105,19 @@ var bcrypt = require('bcrypt'),
'lastposttime': 0, 'lastposttime': 0,
'banned': 0, 'banned': 0,
'showemail': 0 'showemail': 0
}); };
db.setObjectField('username:uid', username, uid); db.setObject('user:' + uid, userData);
db.setObjectField('userslug:uid', userslug, uid);
if (email !== undefined) { db.setObjectField('username:uid', userData.username, uid);
db.setObjectField('email:uid', email, uid); db.setObjectField('userslug:uid', userData.userslug, 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.incrObjectField('global', 'userCount');
db.sortedSetAdd('users:joindate', timestamp, uid); db.sortedSetAdd('users:joindate', timestamp, uid);
@@ -118,8 +127,8 @@ var bcrypt = require('bcrypt'),
// Join the "registered-users" meta group // Join the "registered-users" meta group
groups.joinByGroupName('registered-users', uid); groups.joinByGroupName('registered-users', uid);
if (password !== undefined) { if (userData.password) {
User.hashPassword(password, function(err, hash) { User.hashPassword(userData.password, function(err, hash) {
User.setUserField(uid, 'password', hash); User.setUserField(uid, 'password', hash);
callback(null, uid); callback(null, uid);
}); });

6
tests/user.js
View File

@@ -26,16 +26,16 @@ describe('User', function() {
describe('when created', function() { describe('when created', function() {
it('should be created properly', function(done){ 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.equal(error, null, 'was created with error');
assert.ok(userId); assert.ok(userId);
done(); done();
}); });
}); });
it('should have a valid email', function() { it('should have a valid email, if using an email', function() {
assert.throws( assert.throws(
User.create(userData.name, userData.password, 'fakeMail',function(){}), User.create({username: userData.name, password: userData.password, email: 'fakeMail'},function(){}),
Error, Error,
'does not validate email' 'does not validate email'
); );