Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-17 19:21:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove socketGroups.addMember; update admin checks to allow admin:groups privilege, hide add member controls if not admin

Browse Source
This commit is contained in:
Julian Lam
2023-04-05 16:14:09 -04:00
parent f043dcec96
commit 18447b06af
3 changed files with 5 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/groups.js
View File

@@ -77,7 +77,7 @@ groupsAPI.join = async function (caller, data) {
throw new Error('[[error:no-group]]');
}
const isCallerAdmin = await user.isAdministrator(caller.uid);
const isCallerAdmin = await privileges.admin.can('admin:groups', caller.uid);
if (!isCallerAdmin && (
groups.systemGroups.includes(groupName) ||
groups.isPrivilegeGroup(groupName)
@@ -85,9 +85,8 @@ groupsAPI.join = async function (caller, data) {
throw new Error('[[error:not-allowed]]');
}
const [groupData, isCallerOwner, userExists] = await Promise.all([
const [groupData, userExists] = await Promise.all([
groups.getGroupData(groupName),
groups.ownership.isOwner(caller.uid, groupName),
user.exists(data.uid),
]);
@@ -110,9 +109,9 @@ groupsAPI.join = async function (caller, data) {
throw new Error('[[error:group-join-disabled]]');
}
if ((!groupData.private && isSelf) || isCallerAdmin || isCallerOwner) {
if ((!groupData.private && isSelf) || isCallerAdmin) {
await groups.join(groupName, data.uid);
logGroupEvent(caller, 'group-join', {
logGroupEvent(caller, `group-${isSelf ? 'join' : 'add-member'}`, {
groupName: groupName,
targetUid: data.uid,
});