Node.js based forum software built for the modern web
fix: changing a public room's groups left members who lost access in the room (#14906)
palmoni56cdb54b9b250
diff --git a/src/api/chats.js b/src/api/chats.jsindex 881a0cc9fc..b744430c9d 100644--- a/src/api/chats.js+++ b/src/api/chats.js@@ -163,6 +163,7 @@ chatsAPI.update = async (caller, data) => {if (data.hasOwnProperty('groups')) {if (roomData.public && isAdmin) {await db.setObjectField(`chat:room:${data.roomId}`, 'groups', JSON.stringify(data.groups));+ await messaging.removeUsersWithoutAccess(data.roomId);}}if (isAdmin) {diff --git a/src/groups/delete.js b/src/groups/delete.jsindex ec27ecae18..7ea2512dee 100644--- a/src/groups/delete.js+++ b/src/groups/delete.js@@ -67,16 +67,7 @@ module.exports = function (Groups) {groups.push('administrators');}await db.setObjectField(`chat:room:${room.roomId}`, 'groups', JSON.stringify(groups));-- const uids = await messaging.getUidsInRoom(room.roomId, 0, -1);- const [isMembers, isAdmins] = await Promise.all([- Promise.all(uids.map(uid => Groups.isMemberOfAny(uid, groups))),- Groups.isMembers(uids, 'administrators'),- ]);- const uidsToRemove = uids.filter((uid, index) => !isMembers[index] && !isAdmins[index]);- if (uidsToRemove.length) {- await messaging.leaveRoom(uidsToRemove, room.roomId);- }+ await messaging.removeUsersWithoutAccess(room.roomId);}));}diff --git a/src/messaging/rooms.js b/src/messaging/rooms.jsindex a38c7b9bb4..0cdba10821 100644--- a/src/messaging/rooms.js+++ b/src/messaging/rooms.js@@ -331,6 +331,22 @@ module.exports = function (Messaging) {await Messaging.leaveRoom(payload.uids, payload.roomId);};+ Messaging.removeUsersWithoutAccess = async (roomId) => {+ const room = await Messaging.getRoomData(roomId, ['public', 'groups']);+ if (!room || !room.public || !room.groups.length) {+ return;+ }+ const uids = await Messaging.getUidsInRoom(roomId, 0, -1);+ const [isMembers, isAdmins] = await Promise.all([+ Promise.all(uids.map(uid => groups.isMemberOfAny(uid, room.groups))),+ groups.isMembers(uids, 'administrators'),+ ]);+ const uidsToRemove = uids.filter((uid, index) => !isMembers[index] && !isAdmins[index]);+ if (uidsToRemove.length) {+ await Messaging.leaveRoom(uidsToRemove, roomId);+ }+ };+Messaging.isGroupChat = async function (roomId) {return (await Messaging.getRoomData(roomId)).groupChat;};diff --git a/test/messaging.js b/test/messaging.jsindex 22652acff3..669354f2d9 100644--- a/test/messaging.js+++ b/test/messaging.js@@ -1033,7 +1033,29 @@ describe('Messaging Library', () => {});});- describe('unread count pushes', () => {+ describe('public room groups', () => {+ it('should remove members who lose access when the room\'s groups change', async () => {+ const memberUid = await User.create({ username: utils.generateUUID().slice(0, 10) });+ await Groups.create({ name: 'public-room-before' });+ await Groups.create({ name: 'public-room-after' });+ await Groups.join('public-room-before', memberUid);++ const roomId = await Messaging.newRoom(mocks.users.foo.uid, {+ type: 'public',+ roomName: utils.generateUUID(),+ groups: ['public-room-before'],+ });+ await Messaging.loadRoom(memberUid, { roomId });+ assert(await Messaging.isUserInRoom(memberUid, roomId));++ await api.chats.update({ uid: mocks.users.foo.uid }, { roomId, groups: ['public-room-after'] });++ assert.strictEqual(await Messaging.isUserInRoom(memberUid, roomId), false);+ assert.strictEqual(await Messaging.isUserInRoom(mocks.users.foo.uid, roomId), true);+ });+ });++ describe('unread count pushes', () => {it('should follow membership changes in a private room', async () => {const ownerUid = await User.create({ username: utils.generateUUID().slice(0, 10) });const leaverUid = await User.create({ username: utils.generateUUID().slice(0, 10) });