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

deleteObjectFields method

Browse Source 
cleaned up user reset
This commit is contained in:
barisusakli
2015-02-17 22:22:06 -05:00
parent 75657605ad
commit 3bcd8aefb0
4 changed files with 108 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/database/mongo/hash.js
View File

@@ -200,13 +200,20 @@ module.exports = function(db, module) {
};
module.deleteObjectField = function(key, field, callback) {
module.deleteObjectFields(key, [field], callback);
};
module.deleteObjectFields = function(key, fields, callback) {
callback = callback || helpers.noop;
if (!key || !field) {
if (!key || !Array.isArray(fields) || !fields.length) {
return callback();
}
var data = {};
field = helpers.fieldToString(field);
data[field] = '';
fields.forEach(function(field) {
field = helpers.fieldToString(field);
data[field] = '';
});
db.collection('objects').update({_key: key}, {$unset : data}, function(err, res) {
callback(err);
});

6
src/database/redis/hash.js
View File

@@ -94,6 +94,12 @@ module.exports = function(redisClient, module) {
});
};
module.deleteObjectFields = function(key, fields, callback) {
helpers.multiKeyValues(redisClient, 'hdel', key, fields, function(err, results) {
callback(err);
});
};
module.incrObjectField = function(key, field, callback) {
redisClient.hincrby(key, field, 1, callback);
};

132
src/user/reset.js
View File

@@ -10,91 +10,109 @@ var async = require('async'),
db = require('../database'),
meta = require('../meta'),
events = require('../events'),
emailer = require('../emailer');
(function(UserReset) {
var twoHours = 7200000;
UserReset.validate = function(code, callback) {
db.getObjectField('reset:uid', code, function(err, uid) {
if (err || !uid) {
return callback(err, false);
}
db.sortedSetScore('reset:issueDate', code, function(err, issueDate) {
if (err) {
return callback(err);
async.waterfall([
function(next) {
db.getObjectField('reset:uid', code, next);
},
function(uid, next) {
if (!uid) {
return callback(null, false);
}
callback(null, parseInt(issueDate, 10) > (Date.now() - (1000*60*120)));
});
});
db.sortedSetScore('reset:issueDate', code, next);
},
function(issueDate, next) {
next(null, parseInt(issueDate, 10) > Date.now() - twoHours);
}
], callback);
};
UserReset.send = function(email, callback) {
user.getUidByEmail(email, function(err, uid) {
if (err || !uid) {
return callback(err || new Error('[[error:invalid-email]]'));
}
var reset_code = utils.generateUUID();
var uid;
async.waterfall([
function(next) {
user.getUidByEmail(email, next);
},
function(_uid, next) {
if (!_uid) {
return next(new Error('[[error:invalid-email]]'));
}
var reset_code = utils.generateUUID();
db.setObjectField('reset:uid', reset_code, uid);
db.sortedSetAdd('reset:issueDate', Date.now(), reset_code);
var reset_link = nconf.get('url') + '/reset/' + reset_code;
translator.translate('[[email:password-reset-requested, ' + (meta.config.title || 'NodeBB') + ']]', meta.config.defaultLang, function(subject) {
uid = _uid;
async.parallel([
async.apply(db.setObjectField, 'reset:uid', reset_code, uid),
async.apply(db.sortedSetAdd, 'reset:issueDate', Date.now(), reset_code)
], next);
},
function(results, next) {
translator.translate('[[email:password-reset-requested, ' + (meta.config.title || 'NodeBB') + ']]', meta.config.defaultLang, function(subject) {
next(null, subject);
});
},
function(subject, next) {
var reset_link = nconf.get('url') + '/reset/' + reset_code;
emailer.send('reset', uid, {
site_title: (meta.config.title || 'NodeBB'),
reset_link: reset_link,
subject: subject,
template: 'reset',
uid: uid
});
callback(null, reset_code);
});
});
}, next);
},
function(next) {
next(null, reset_code);
}
], callback);
};
UserReset.commit = function(code, password, callback) {
UserReset.validate(code, function(err, validated) {
if(err) {
return callback(err);
}
if (!validated) {
return callback(new Error('[[error:reset-code-not-valid]]'));
}
db.getObjectField('reset:uid', code, function(err, uid) {
if (err) {
return callback(err);
var uid;
async.waterfall([
function(next) {
UserReset.validate(code, next);
},
function(validated, next) {
if (!validated) {
return next(new Error('[[error:reset-code-not-valid]]'));
}
db.getObjectField('reset:uid', code, next);
},
function(_uid, next) {
uid = _uid;
if (!uid) {
return next(new Error('[[error:reset-code-not-valid]]'));
}
user.hashPassword(password, function(err, hash) {
if (err) {
return callback(err);
}
user.setUserField(uid, 'password', hash);
db.deleteObjectField('reset:uid', code);
db.sortedSetRemove('reset:issueDate', code);
user.auth.resetLockout(uid, callback);
});
});
});
user.hashPassword(password, next);
},
function(hash, next) {
async.parallel([
async.apply(user.setUserField, uid, 'password', hash),
async.apply(db.deleteObjectField, 'reset:uid', code),
async.apply(db.sortedSetRemove, 'reset:issueDate', code),
async.apply(user.auth.resetLockout, uid)
], next);
}
], callback);
};
UserReset.clean = function(callback) {
// Locate all codes that have expired, and remove them from the set/hash
async.waterfall([
async.apply(db.getSortedSetRangeByScore, 'reset:issueDate', 0, -1, -1, +new Date()-(1000*60*120)),
async.apply(db.getSortedSetRangeByScore, 'reset:issueDate', 0, -1, 0, Date.now() - twoHours),
function(tokens, next) {
if (!tokens.length) { return next(); }
if (!tokens.length) {
return next();
}
winston.verbose('[UserReset.clean] Removing ' + tokens.length + ' reset tokens from database');
async.parallel([
async.apply(db.deleteObjectField, 'reset:uid', tokens),
async.apply(db.deleteObjectFields, 'reset:uid', tokens),
async.apply(db.sortedSetRemove, 'reset:issueDate', tokens)
], next);
}

18
tests/database/hash.js
View File

@@ -263,7 +263,7 @@ describe('Hash methods', function() {
describe('deleteObjectField()', function() {
before(function(done) {
db.setObject('testObject10', {foo: 'bar', delete: 'this'}, done);
db.setObject('testObject10', {foo: 'bar', delete: 'this', delete1: 'this', delete2: 'this'}, done);
});
it('should delete an objects field', function(done) {
@@ -277,6 +277,22 @@ describe('Hash methods', function() {
});
});
});
it('should delete multiple fields of the object', function(done) {
db.deleteObjectFields('testObject10', ['delete1', 'delete2'], function(err) {
assert.ifError(err);
assert.equal(arguments.length, 1);
async.parallel({
delete1: async.apply(db.isObjectField, 'testObject10', 'delete1'),
delete2: async.apply(db.isObjectField, 'testObject10', 'delete2')
}, function(err, results) {
assert.ifError(err);
assert.equal(results.delete1, false);
assert.equal(results.delete2, false);
done();
});
});
});
});
describe('incrObjectField()', function() {