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

Merge remote-tracking branch 'origin/develop' into activitypub

Browse Source
This commit is contained in:
Julian Lam
2024-09-04 14:38:50 -04:00
parent f3eb6d500e 90e0013c73
commit ba2c3fcef4
84 changed files with 299 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/api.js
View File

@@ -575,8 +575,15 @@ describe('API', async () => {
const reloginPaths = ['GET /api/user/{userslug}/edit/email', 'PUT /users/{uid}/password', 'DELETE /users/{uid}/sessions/{uuid}'];
if (reloginPaths.includes(`${method.toUpperCase()} ${path}`)) {
({ jar } = await helpers.loginUser('admin', '123456'));
const sessionIds = await db.getSortedSetRange('uid:1:sessions', 0, -1);
const sessObj = await db.sessionStoreGet(sessionIds[0]);
let sessionIds = await db.getSortedSetRange('uid:1:sessions', 0, -1);
let sessObj = await db.sessionStoreGet(sessionIds[0]);
if (!sessObj) {
// password changed so login with new pwd
({ jar } = await helpers.loginUser('admin', '654321'));
sessionIds = await db.getSortedSetRange('uid:1:sessions', 0, -1);
sessObj = await db.sessionStoreGet(sessionIds[0]);
}
const { uuid } = sessObj.meta;
mocks.delete['/users/{uid}/sessions/{uuid}'][1].example = uuid;

12
test/user.js
View File

@@ -776,6 +776,18 @@ describe('User', () => {
assert(correct);
});
it('should not let user change their password to their current password', async () => {
const uid = await User.create({ username: 'changepasswordsame', password: '123456' });
await assert.rejects(
apiUser.changePassword({ uid: uid }, {
uid: uid,
newPassword: '123456',
currentPassword: '123456',
}),
{ message: '[[user:change-password-error-same-password]]' },
);
});
it('should not let user change another user\'s password', async () => {
const regularUserUid = await User.create({ username: 'regularuserpwdchange', password: 'regularuser1234' });
const uid = await User.create({ username: 'changeadminpwd1', password: '123456' });