diff --git a/bigbluebutton-html5/imports/api/breakouts/server/publishers.js b/bigbluebutton-html5/imports/api/breakouts/server/publishers.js index 5f682d423a3e0c41ca7ec0c56e48a0db1d1991ad..d0040bd87ecc475f1a1475dc82ef96ba822ff568 100755 --- a/bigbluebutton-html5/imports/api/breakouts/server/publishers.js +++ b/bigbluebutton-html5/imports/api/breakouts/server/publishers.js @@ -15,7 +15,7 @@ function breakouts(moderator = false) { Logger.debug(`Publishing Breakouts for ${meetingId} ${requesterUserId}`); if (moderator) { - const User = Users.findOne({ userId: requesterUserId }); + const User = Users.findOne({ userId: requesterUserId, meetingId }); if (!!User && User.role === ROLE_MODERATOR) { const presenterSelector = { $or: [ diff --git a/bigbluebutton-html5/imports/api/meetings/server/publishers.js b/bigbluebutton-html5/imports/api/meetings/server/publishers.js index 01a1e5452fe3a12556a799e7da4a6c25794f1eb2..997c79b66b4b158e2c50b38c7a09401c42934fa1 100755 --- a/bigbluebutton-html5/imports/api/meetings/server/publishers.js +++ b/bigbluebutton-html5/imports/api/meetings/server/publishers.js @@ -21,7 +21,7 @@ function meetings(isModerator = false) { }; if (isModerator) { - const User = Users.findOne({ userId: requesterUserId }); + const User = Users.findOne({ userId: requesterUserId, meetingId }); if (!!User && User.role === ROLE_MODERATOR) { selector.$or.push({ 'meetingProp.isBreakout': true, diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js b/bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js index 13755349dbf3bf12bfa4298615b2e029d5c7cdd5..8535499e2987ecb4a492d95dfad6a950fbe177e3 100755 --- a/bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js @@ -16,7 +16,7 @@ export default function removeUser(meetingId, userId) { check(meetingId, String); check(userId, String); - const userToRemove = Users.findOne({ userId }); + const userToRemove = Users.findOne({ userId, meetingId }); if (userToRemove) { const { presenter } = userToRemove; diff --git a/bigbluebutton-html5/imports/api/users/server/publishers.js b/bigbluebutton-html5/imports/api/users/server/publishers.js index 2e342ec03f452511df0991cc7de77ff472c9985c..861fb357e16daebcc17417ef6f1efc2eb8d69c5b 100644 --- a/bigbluebutton-html5/imports/api/users/server/publishers.js +++ b/bigbluebutton-html5/imports/api/users/server/publishers.js @@ -64,7 +64,7 @@ function users(isModerator = false) { }; if (isModerator) { - const User = Users.findOne({ userId: requesterUserId }); + const User = Users.findOne({ userId: requesterUserId, meetingId }); if (!!User && User.role === ROLE_MODERATOR) { selector.$or.push({ 'breakoutProps.isBreakoutUser': true, diff --git a/bigbluebutton-html5/imports/api/voice-users/server/methods/listenOnlyToggle.js b/bigbluebutton-html5/imports/api/voice-users/server/methods/listenOnlyToggle.js index c5ce88176a6d24b2ff757793e08033b3bdc31da1..9072b2ed4278da71a65f4a218f76b913e892ba53 100644 --- a/bigbluebutton-html5/imports/api/voice-users/server/methods/listenOnlyToggle.js +++ b/bigbluebutton-html5/imports/api/voice-users/server/methods/listenOnlyToggle.js @@ -24,6 +24,7 @@ export default function listenOnlyToggle(isJoining = true) { const VoiceUser = VoiceUsers.findOne({ intId: requesterUserId, + meetingId, }); const Meeting = Meetings.findOne({ meetingId }); diff --git a/bigbluebutton-html5/imports/api/voice-users/server/methods/muteToggle.js b/bigbluebutton-html5/imports/api/voice-users/server/methods/muteToggle.js index 81d4ab92b91b483c7c20426ef50486ce516438ea..fdc3c23f4d4a6df62b6e16e7ce6327bf3a23ddba 100644 --- a/bigbluebutton-html5/imports/api/voice-users/server/methods/muteToggle.js +++ b/bigbluebutton-html5/imports/api/voice-users/server/methods/muteToggle.js @@ -19,6 +19,7 @@ export default function muteToggle(uId) { const voiceUser = VoiceUsers.findOne({ intId: userToMute, + meetingId, }); if (!requester || !voiceUser) return;