Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-09 15:35:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into activitypub

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2024-05-12 21:24:27 -04:00
parent 129017f735 d926d9dd51
commit 70d2a6249d
36 changed files with 744 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/users.js
View File

@@ -438,7 +438,7 @@ usersAPI.addEmail = async (caller, { email, skipConfirmation, uid }) => {
throw new Error('[[error:email-taken]]');
}
await user.setUserField(uid, 'email', email);
await user.email.confirmByUid(uid);
await user.email.confirmByUid(uid, caller.uid);
}
} else {
await usersAPI.update(caller, { uid, email });
@@ -488,7 +488,7 @@ usersAPI.confirmEmail = async (caller, { uid, email, sessionId }) => {
await user.email.confirmByCode(code, sessionId);
return true;
} else if (current && current === email) { // i.e. old account w/ unconf. email in user hash
await user.email.confirmByUid(uid);
await user.email.confirmByUid(uid, caller.uid);
return true;
}