From 5c59354c58115dde8d00a29bf6793e06e225b4c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 14 Mar 2021 15:20:14 -0400 Subject: [PATCH] fix: #9389, allow admins to add themselves to private groups --- src/api/groups.js | 2 +- test/groups.js | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/api/groups.js b/src/api/groups.js index ad8f3c4f51..58927d9f73 100644 --- a/src/api/groups.js +++ b/src/api/groups.js @@ -98,7 +98,7 @@ groupsAPI.join = async function (caller, data) { return; } - if (isSelf && groupData.private && groupData.disableJoinRequests) { + if (!isCallerAdmin && isSelf && groupData.private && groupData.disableJoinRequests) { throw new Error('[[error:group-join-disabled]]'); } diff --git a/test/groups.js b/test/groups.js index 87d6c8fb69..255a4d52eb 100644 --- a/test/groups.js +++ b/test/groups.js @@ -723,6 +723,12 @@ describe('Groups', () => { } meta.config.allowPrivateGroups = oldValue; }); + + it('should allow admins to join private groups', async () => { + const groupsAPI = require('../src/api/groups'); + await groupsAPI.join({ uid: adminUid }, { uid: adminUid, slug: 'global-moderators' }); + assert(await Groups.isMember(adminUid, 'Global Moderators')); + }); }); describe('.leave()', () => {