Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-06 15:42:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #5869

Browse Source
This commit is contained in:
Baris Usakli
2017-08-10 16:48:51 -04:00
parent 7c99af13e5
commit 24bbf8fe00
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/user/reset.js
View File

@@ -120,12 +120,14 @@ UserReset.commit = function (code, password, callback) {
},
function (hash, next) {
async.parallel([
async.apply(user.setUserField, uid, 'password', hash),
async.apply(user.setUserFields, uid, { password: hash, 'email:confirmed': 1 }),
async.apply(db.deleteObjectField, 'reset:uid', code),
async.apply(db.sortedSetRemove, 'reset:issueDate', code),
async.apply(db.sortedSetRemove, 'reset:issueDate:uid', uid),
async.apply(user.reset.updateExpiry, uid),
async.apply(user.auth.resetLockout, uid),
async.apply(db.delete, 'uid:' + uid + ':confirm:email:sent'),
async.apply(db.sortedSetRemove, 'users:notvalidated', uid),
], next);
},
], callback);

7
test/user.js
View File

@@ -446,15 +446,16 @@ describe('User', function () {
});
});
it('.commit() should update the user\'s password', function (done) {
it('.commit() should update the user\'s password and confirm their email', function (done) {
User.reset.commit(code, 'newpassword', function (err) {
assert.ifError(err);
db.getObjectField('user:' + uid, 'password', function (err, newPassword) {
db.getObject('user:' + uid, function (err, userData) {
assert.ifError(err);
Password.compare('newpassword', newPassword, function (err, match) {
Password.compare('newpassword', userData.password, function (err, match) {
assert.ifError(err);
assert(match);
assert.equal(parseInt(userData['email:confirmed'], 10), 1);
done();
});
});