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

test: fixed broken tests from #9605, removed token clean on token usage as it is superceded by token clean on generation (+ associated test)

Browse Source
This commit is contained in:
Julian Lam
2021-06-11 15:43:03 -04:00
parent f6c14d6b62
commit 5c42b3eab0
2 changed files with 12 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/user/reset.js
View File

@@ -60,6 +60,8 @@ UserReset.send = async function (email) {
template: 'reset',
uid: uid,
}).catch(err => winston.error(`[emailer.send] ${err.stack}`));
return code;
};
UserReset.commit = async function (code, password) {
@@ -102,7 +104,6 @@ UserReset.commit = async function (code, password) {
await user.reset.updateExpiry(uid);
await user.auth.resetLockout(uid);
await db.delete(`uid:${uid}:confirm:email:sent`);
await UserReset.cleanByUid(uid);
};
UserReset.updateExpiry = async function (uid) {

51
test/user.js
View File

@@ -575,6 +575,14 @@ describe('User', () => {
});
});
it('.generate() should invalidate a previous generated reset code', async () => {
const _code = await User.reset.generate(uid);
const valid = await User.reset.validate(code);
assert.strictEqual(valid, false);
code = _code;
});
it('.validate() should ensure that this new code is valid', (done) => {
User.reset.validate(code, (err, valid) => {
assert.ifError(err);
@@ -591,13 +599,8 @@ describe('User', () => {
});
});
it('.send() should create a new reset code and reset password', (done) => {
User.reset.send('reset@me.com', (err) => {
if (err) {
console.log(err);
}
done();
});
it('.send() should create a new reset code and reset password', async () => {
code = await User.reset.send('reset@me.com');
});
it('.commit() should update the user\'s password and confirm their email', (done) => {
@@ -623,40 +626,6 @@ describe('User', () => {
});
});
it('.commit() should invalidate old codes', (done) => {
let code1;
let code2;
let uid;
async.waterfall([
function (next) {
User.create({ username: 'doublereseter', email: 'sorry@forgot.com', password: '123456' }, next);
},
function (_uid, next) {
uid = _uid;
User.reset.generate(uid, next);
},
function (code, next) {
code1 = code;
User.reset.generate(uid, next);
},
function (code, next) {
code2 = code;
User.reset.validate(code1, next);
},
function (isValid, next) {
assert(isValid);
User.reset.commit(code2, 'newPwd123', next);
},
function (next) {
User.reset.validate(code1, next);
},
function (isValid, next) {
assert(!isValid);
next();
},
], done);
});
it('.should error if same password is used for reset', async () => {
const uid = await User.create({ username: 'badmemory', email: 'bad@memory.com', password: '123456' });
const code = await User.reset.generate(uid);