Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-11 16:35:47 +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:21:45 -04:00
parent d69e503d21
commit 31ae8a8323
3 changed files with 4 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/users.js
View File

@@ -27,7 +27,7 @@ usersAPI.update = async function (caller, data) {
]); ]);
// Changing own email/username requires password confirmation // Changing own email/username requires password confirmation
if (caller.uid === targetUid && !passwordMatch) { if (['email', 'username'].some(prop => Object.keys(data).includes(prop)) && !isAdminOrGlobalMod && caller.uid === targetUid && !passwordMatch) {
throw new Error('[[error:invalid-password]]'); throw new Error('[[error:invalid-password]]');
} }

2
src/controllers/write/users.js
View File

@@ -24,7 +24,7 @@ Users.create = async (req, res) => {
}; };
Users.update = async (req, res) => { Users.update = async (req, res) => {
const userObj = await api.users.update(req, req.body); const userObj = await api.users.update(req, { ...req.body, ...req.params });
helpers.formatApiResponse(200, res, userObj); helpers.formatApiResponse(200, res, userObj);
}; };

53
src/socket.io/user/profile.js
View File

@@ -2,10 +2,9 @@
const winston = require('winston'); const winston = require('winston');
const api = require('../../api');
const user = require('../../user'); const user = require('../../user');
const meta = require('../../meta');
const events = require('../../events'); const events = require('../../events');
const privileges = require('../../privileges');
const notifications = require('../../notifications'); const notifications = require('../../notifications');
const db = require('../../database'); const db = require('../../database');
const plugins = require('../../plugins'); const plugins = require('../../plugins');
@@ -98,55 +97,7 @@ module.exports = function (SocketUser) {
SocketUser.updateProfile = async function (socket, data) { SocketUser.updateProfile = async function (socket, data) {
sockets.warnDeprecated(socket, 'PUT /api/v3/users/:uid'); sockets.warnDeprecated(socket, 'PUT /api/v3/users/:uid');
return await api.users.update(socket, data);
if (!socket.uid) {
throw new Error('[[error:invalid-uid]]');
}
if (!data || !data.uid) {
throw new Error('[[error:invalid-data]]');
}
const oldUserData = await user.getUserFields(data.uid, ['email', 'username']);
if (!oldUserData || !oldUserData.username) {
throw new Error('[[error:invalid-data]]');
}
const [isAdminOrGlobalMod, canEdit] = await Promise.all([
user.isAdminOrGlobalMod(socket.uid),
privileges.users.canEdit(socket.uid, data.uid),
]);
if (!canEdit) {
throw new Error('[[error:no-privileges]]');
}
if (!isAdminOrGlobalMod && meta.config['username:disableEdit']) {
data.username = oldUserData.username;
}
if (!isAdminOrGlobalMod && meta.config['email:disableEdit']) {
data.email = oldUserData.email;
}
const userData = await user.updateProfile(socket.uid, data);
async function log(type, eventData) {
eventData.type = type;
eventData.uid = socket.uid;
eventData.targetUid = data.uid;
eventData.ip = socket.ip;
await events.log(eventData);
}
if (userData.email !== oldUserData.email) {
await log('email-change', { oldEmail: oldUserData.email, newEmail: userData.email });
}
if (userData.username !== oldUserData.username) {
await log('username-change', { oldUsername: oldUserData.username, newUsername: userData.username });
}
return userData;
}; };
SocketUser.toggleBlock = async function (socket, data) { SocketUser.toggleBlock = async function (socket, data) {