Skip to content

Node.js based forum software built for the modern web

refactor: use write api route for admin/remove admin

Barış Soner Uşaklıe6f7c259cd45
diff --git a/public/src/admin/manage/admins-mods.js b/public/src/admin/manage/admins-mods.js
index 282713f8d3..4298929ee4 100644
--- a/public/src/admin/manage/admins-mods.js
+++ b/public/src/admin/manage/admins-mods.js
@@ -7,11 +7,7 @@ define('admin/manage/admins-mods', [
AdminsMods.init = function () {
autocomplete.user($('#admin-search'), function (ev, ui) {
- socket.emit('admin.user.makeAdmins', [ui.item.user.uid], function (err) {
- if (err) {
- return alerts.error(err);
- }
-
+ api.put(`/groups/administrators/membership/${ui.item.user.uid}`).then(() => {
$('#admin-search').val('');
if ($('.administrator-area [data-uid="' + ui.item.user.uid + '"]').length) {
@@ -21,7 +17,7 @@ define('admin/manage/admins-mods', [
app.parseAndTranslate('admin/manage/admins-mods', 'admins.members', { admins: { members: [ui.item.user] } }, function (html) {
$('.administrator-area').prepend(html);
});
- });
+ }).catch(alerts.error);
});
$('.administrator-area').on('click', '.remove-user-icon', function () {
@@ -32,12 +28,9 @@ define('admin/manage/admins-mods', [
}
modals.confirm('[[admin/manage/users:alerts.confirm-remove-admin]]', function (confirm) {
if (confirm) {
- socket.emit('admin.user.removeAdmins', [uid], function (err) {
- if (err) {
- return alerts.error(err.message);
- }
+ api.del(`/groups/administrators/membership/${uid}`).then(() => {
userCard.remove();
- });
+ }).catch(alerts.error);
}
});
});
diff --git a/src/api/groups.js b/src/api/groups.js
index faf8fe072c..6705089799 100644
--- a/src/api/groups.js
+++ b/src/api/groups.js
@@ -41,7 +41,7 @@ groupsAPI.create = async function (caller, data) {
data.ownerUid = caller.uid;
data.system = false;
const groupData = await groups.create(data);
- logGroupEvent(caller, 'group-create', {
+ await logGroupEvent(caller, 'group-create', {
groupName: data.name,
});
@@ -72,7 +72,7 @@ groupsAPI.delete = async function (caller, data) {
}
await groups.destroy(groupName);
- logGroupEvent(caller, 'group-delete', {
+ await logGroupEvent(caller, 'group-delete', {
groupName: groupName,
});
};
@@ -134,6 +134,13 @@ groupsAPI.join = async function (caller, data) {
if (!groupName) {
throw new Error('[[error:no-group]]');
}
+ const isJoiningAdmin = groupName === 'administrators';
+ if (isJoiningAdmin) {
+ const isMemberOfBanned = await groups.isMember(data.uid, groups.BANNED_USERS);
+ if (isMemberOfBanned) {
+ throw new Error('[[error:cant-make-banned-users-admin]]');
+ }
+ }
const isCallerAdmin = await privileges.admin.can('admin:groups', caller.uid);
if (!isCallerAdmin && (
@@ -156,7 +163,7 @@ groupsAPI.join = async function (caller, data) {
if (!meta.config.allowPrivateGroups && isSelf) {
// all groups are public!
await groups.join(groupName, data.uid);
- logGroupEvent(caller, 'group-join', {
+ await logGroupEvent(caller, 'group-join', {
groupName: groupName,
targetUid: data.uid,
});
@@ -169,10 +176,15 @@ groupsAPI.join = async function (caller, data) {
if ((!groupData.private && isSelf) || isCallerAdmin) {
await groups.join(groupName, data.uid);
- logGroupEvent(caller, `group-${isSelf ? 'join' : 'add-member'}`, {
+ await logGroupEvent(caller, `group-${isSelf ? 'join' : 'add-member'}`, {
groupName: groupName,
targetUid: data.uid,
});
+ if (isJoiningAdmin) {
+ await logGroupEvent(caller, 'user-makeAdmin', {
+ targetUid: data.uid,
+ });
+ }
} else if (isSelf) {
// users who can approve membership requests for this group (owners,
// global moderators) would only have to approve themselves, so let
@@ -180,13 +192,13 @@ groupsAPI.join = async function (caller, data) {
const canApprove = await isOwner(caller, groupName, false);
if (canApprove) {
await groups.join(groupName, data.uid);
- logGroupEvent(caller, 'group-join', {
+ await logGroupEvent(caller, 'group-join', {
groupName: groupName,
targetUid: data.uid,
});
} else {
await groups.requestMembership(groupName, caller.uid);
- logGroupEvent(caller, 'group-request-membership', {
+ await logGroupEvent(caller, 'group-request-membership', {
groupName: groupName,
targetUid: data.uid,
});
@@ -212,9 +224,16 @@ groupsAPI.leave = async function (caller, data) {
if (typeof groupName !== 'string') {
throw new Error('[[error:invalid-group-name]]');
}
+ const isLeavingAdmin = groupName === 'administrators';
- if (groupName === 'administrators' && isSelf) {
- throw new Error('[[error:cant-remove-self-as-admin]]');
+ if (isLeavingAdmin) {
+ if (isSelf) {
+ throw new Error('[[error:cant-remove-self-as-admin]]');
+ }
+ const count = await groups.getMemberCount('administrators');
+ if (count === 1) {
+ throw new Error('[[error:cant-remove-last-admin]]');
+ }
}
const [groupData, isCallerOwner, userExists, isMember] = await Promise.all([
@@ -254,10 +273,15 @@ groupsAPI.leave = async function (caller, data) {
const uids = await groups.getOwners(groupName);
await notifications.push(notification, uids);
- logGroupEvent(caller, `group-${isSelf ? 'leave' : 'kick'}`, {
+ await logGroupEvent(caller, `group-${isSelf ? 'leave' : 'kick'}`, {
groupName: groupName,
targetUid: data.uid,
});
+ if (isLeavingAdmin) {
+ await logGroupEvent(caller, 'user-removeAdmin', {
+ targetUid: data.uid,
+ });
+ }
};
groupsAPI.grant = async (caller, data) => {
@@ -265,7 +289,7 @@ groupsAPI.grant = async (caller, data) => {
await isOwner(caller, groupName);
await groups.ownership.grant(data.uid, groupName);
- logGroupEvent(caller, 'group-owner-grant', {
+ await logGroupEvent(caller, 'group-owner-grant', {
groupName: groupName,
targetUid: data.uid,
});
@@ -276,7 +300,7 @@ groupsAPI.rescind = async (caller, data) => {
await isOwner(caller, groupName);
await groups.ownership.rescind(data.uid, groupName);
- logGroupEvent(caller, 'group-owner-rescind', {
+ await logGroupEvent(caller, 'group-owner-rescind', {
groupName,
targetUid: data.uid,
});
@@ -299,7 +323,7 @@ groupsAPI.accept = async (caller, { slug, uid }) => {
}
await groups.acceptMembership(groupName, uid);
- logGroupEvent(caller, 'group-accept-membership', {
+ await logGroupEvent(caller, 'group-accept-membership', {
groupName,
targetUid: uid,
});
@@ -333,7 +357,7 @@ groupsAPI.issueInvite = async (caller, { slug, uid }) => {
await isOwner(caller, groupName);
await groups.invite(groupName, uid);
- logGroupEvent(caller, 'group-invite', {
+ await logGroupEvent(caller, 'group-invite', {
groupName,
targetUid: uid,
});
@@ -352,7 +376,7 @@ groupsAPI.acceptInvite = async (caller, { slug, uid }) => {
}
await groups.acceptMembership(groupName, uid);
- logGroupEvent(caller, 'group-invite-accept', { groupName });
+ await logGroupEvent(caller, 'group-invite-accept', { groupName });
};
groupsAPI.rejectInvite = async (caller, { slug, uid }) => {
@@ -371,7 +395,7 @@ groupsAPI.rejectInvite = async (caller, { slug, uid }) => {
await groups.rejectMembership(groupName, uid);
if (!owner) {
- logGroupEvent(caller, 'group-invite-reject', { groupName });
+ await logGroupEvent(caller, 'group-invite-reject', { groupName });
}
};
@@ -394,8 +418,8 @@ async function isOwner(caller, groupName, throwOnFalse = true) {
return check;
}
-function logGroupEvent(caller, event, additional) {
- events.log({
+async function logGroupEvent(caller, event, additional) {
+ await events.log({
type: event,
uid: caller.uid,
ip: caller.ip,
diff --git a/src/socket.io/admin/user.js b/src/socket.io/admin/user.js
index 608fa6e836..e4a29b2e20 100644
--- a/src/socket.io/admin/user.js
+++ b/src/socket.io/admin/user.js
@@ -10,47 +10,31 @@ const groups = require('../../groups');
const user = require('../../user');
const events = require('../../events');
const utils = require('../../utils');
+const api = require('../../api');
const sockets = require('..');
const User = module.exports;
User.makeAdmins = async function (socket, uids) {
+ sockets.warnDeprecated(socket, 'PUT /api/v3/groups/:slug/membership/:uid');
if (!Array.isArray(uids)) {
throw new Error('[[error:invalid-data]]');
}
- const isMembersOfBanned = await groups.isMembers(uids, groups.BANNED_USERS);
- if (isMembersOfBanned.includes(true)) {
- throw new Error('[[error:cant-make-banned-users-admin]]');
- }
for (const uid of uids) {
- /* eslint-disable no-await-in-loop */
- await groups.join('administrators', uid);
- await events.log({
- type: 'user-makeAdmin',
- uid: socket.uid,
- targetUid: uid,
- ip: socket.ip,
- });
+ // eslint-disable-next-line no-await-in-loop
+ await api.groups.join({ uid: socket.uid }, { uid: uid, slug: 'administrators' });
}
};
User.removeAdmins = async function (socket, uids) {
+ sockets.warnDeprecated(socket, 'DEL /api/v3/groups/:slug/membership/:uid');
if (!Array.isArray(uids)) {
throw new Error('[[error:invalid-data]]');
}
+
for (const uid of uids) {
- /* eslint-disable no-await-in-loop */
- const count = await groups.getMemberCount('administrators');
- if (count === 1) {
- throw new Error('[[error:cant-remove-last-admin]]');
- }
- await groups.leave('administrators', uid);
- await events.log({
- type: 'user-removeAdmin',
- uid: socket.uid,
- targetUid: uid,
- ip: socket.ip,
- });
+ // eslint-disable-next-line no-await-in-loop
+ await api.groups.leave({ uid: socket.uid }, { uid: uid, slug: 'administrators' });
}
};