Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-09 23:45:45 +01: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-12-11 10:12:33 -05:00
parent 3d653cbb98 607d1895ce
commit 2ab72ada3f
59 changed files with 771 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/api/users.js
View File

@@ -67,8 +67,8 @@ usersAPI.update = async function (caller, data) {
privileges.users.canEdit(caller.uid, data.uid),
]);
// Changing own email/username requires password confirmation
if (data.hasOwnProperty('email') || data.hasOwnProperty('username')) {
const isChangingEmailOrUsername = data.hasOwnProperty('email') || data.hasOwnProperty('username');
if (isChangingEmailOrUsername) {
await isPrivilegedOrSelfAndPasswordMatch(caller, data);
}
@@ -531,7 +531,6 @@ async function processDeletion({ uid, method, password, caller }) {
throw new Error('[[error:no-privileges]]');
}
// Self-deletions require a password
const hasPassword = await user.hasPassword(uid);
if (isSelf && hasPassword) {
const ok = await user.isPasswordCorrect(uid, password, caller.ip);