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

refactor: socket profile update to use api lib

Browse Source
This commit is contained in:
Julian Lam
2020-10-15 16:22:40 -04:00
parent 31ae8a8323
commit 77481947f0
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/api/users.js
View File

@@ -13,21 +13,19 @@ usersAPI.create = async function (caller, data) {
}; };
usersAPI.update = async function (caller, data) { usersAPI.update = async function (caller, data) {
const targetUid = caller.params ? caller.params.uid : data.uid; const oldUserData = await user.getUserFields(data.uid, ['email', 'username']);
const oldUserData = await user.getUserFields(targetUid, ['email', 'username']);
if (!oldUserData || !oldUserData.username) { if (!oldUserData || !oldUserData.username) {
throw new Error('[[error:invalid-data]]'); throw new Error('[[error:invalid-data]]');
} }
const [isAdminOrGlobalMod, canEdit, passwordMatch] = await Promise.all([ const [isAdminOrGlobalMod, canEdit, passwordMatch] = await Promise.all([
user.isAdminOrGlobalMod(caller.uid), user.isAdminOrGlobalMod(caller.uid),
privileges.users.canEdit(caller.uid, targetUid), privileges.users.canEdit(caller.uid, data.uid),
data.password ? user.isPasswordCorrect(targetUid, data.password, caller.ip) : false, data.password ? user.isPasswordCorrect(data.uid, data.password, caller.ip) : false,
]); ]);
// Changing own email/username requires password confirmation // Changing own email/username requires password confirmation
if (['email', 'username'].some(prop => Object.keys(data).includes(prop)) && !isAdminOrGlobalMod && caller.uid === targetUid && !passwordMatch) { if (['email', 'username'].some(prop => Object.keys(data).includes(prop)) && !isAdminOrGlobalMod && caller.uid === data.uid && !passwordMatch) {
throw new Error('[[error:invalid-password]]'); throw new Error('[[error:invalid-password]]');
} }
@@ -43,14 +41,13 @@ usersAPI.update = async function (caller, data) {
data.email = oldUserData.email; data.email = oldUserData.email;
} }
data.uid = targetUid; // The `uid` argument in `updateProfile` refers to calling user, not target user
await user.updateProfile(caller.uid, data); await user.updateProfile(caller.uid, data);
const userData = await user.getUserData(data.uid); const userData = await user.getUserData(data.uid);
async function log(type, eventData) { async function log(type, eventData) {
eventData.type = type; eventData.type = type;
eventData.uid = caller.uid; eventData.uid = caller.uid;
eventData.targetUid = targetUid; eventData.targetUid = data.uid;
eventData.ip = caller.ip; eventData.ip = caller.ip;
await events.log(eventData); await events.log(eventData);
} }