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

fix: #8556, catch errors from admin check

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-08-13 14:56:58 -04:00
parent 326827382a
commit bfaf648ec3
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/socket.io/admin/user.js
View File

@@ -122,32 +122,27 @@ User.forcePasswordReset = async function (socket, uids) {
}; };
User.deleteUsers = async function (socket, uids) { User.deleteUsers = async function (socket, uids) {
await canDeleteUids(uids);
deleteUsers(socket, uids, async function (uid) { deleteUsers(socket, uids, async function (uid) {
return await user.deleteAccount(uid); return await user.deleteAccount(uid);
}); });
}; };
User.deleteUsersContent = async function (socket, uids) { User.deleteUsersContent = async function (socket, uids) {
if (!Array.isArray(uids)) { await canDeleteUids(uids);
throw new Error('[[error:invalid-data]]');
}
const isMembers = await groups.isMembers(uids, 'administrators');
if (isMembers.includes(true)) {
throw new Error('[[error:cant-delete-other-admins]]');
}
await Promise.all(uids.map(async (uid) => { await Promise.all(uids.map(async (uid) => {
await user.deleteContent(socket.uid, uid); await user.deleteContent(socket.uid, uid);
})); }));
}; };
User.deleteUsersAndContent = async function (socket, uids) { User.deleteUsersAndContent = async function (socket, uids) {
await canDeleteUids(uids);
deleteUsers(socket, uids, async function (uid) { deleteUsers(socket, uids, async function (uid) {
return await user.delete(socket.uid, uid); return await user.delete(socket.uid, uid);
}); });
}; };
async function deleteUsers(socket, uids, method) { async function canDeleteUids(uids) {
if (!Array.isArray(uids)) { if (!Array.isArray(uids)) {
throw new Error('[[error:invalid-data]]'); throw new Error('[[error:invalid-data]]');
} }
@@ -155,6 +150,9 @@ async function deleteUsers(socket, uids, method) {
if (isMembers.includes(true)) { if (isMembers.includes(true)) {
throw new Error('[[error:cant-delete-other-admins]]'); throw new Error('[[error:cant-delete-other-admins]]');
} }
}
async function deleteUsers(socket, uids, method) {
async function doDelete(uid) { async function doDelete(uid) {
await flags.resolveFlag('user', uid, socket.uid); await flags.resolveFlag('user', uid, socket.uid);
const userData = await method(uid); const userData = await method(uid);