diff --git a/bigbluebutton-html5/imports/api/users/server/methods.js b/bigbluebutton-html5/imports/api/users/server/methods.js index cf81ba320c6021e4ca3b9178ca65b174ecc13145..450d0ecc8a8d115620168cb3855cbe10a48165a0 100644 --- a/bigbluebutton-html5/imports/api/users/server/methods.js +++ b/bigbluebutton-html5/imports/api/users/server/methods.js @@ -1,10 +1,10 @@ import { Meteor } from 'meteor/meteor'; import kickUser from './methods/kickUser'; -import listenOnlyRequestToggle from './methods/listenOnlyRequestToggle'; +import listenOnlyToggle from './methods/listenOnlyToggle'; import userLogout from './methods/userLogout'; Meteor.methods({ kickUser, - listenOnlyRequestToggle, + listenOnlyToggle, userLogout, }); diff --git a/bigbluebutton-html5/imports/api/users/server/methods/listenOnlyRequestToggle.js b/bigbluebutton-html5/imports/api/users/server/methods/listenOnlyToggle.js similarity index 96% rename from bigbluebutton-html5/imports/api/users/server/methods/listenOnlyRequestToggle.js rename to bigbluebutton-html5/imports/api/users/server/methods/listenOnlyToggle.js index bf5a4e0f87e9f76cabe34072480839c1353c4c8e..6bbc5237a12874aba257e8ca988ba73d895eb1fd 100755 --- a/bigbluebutton-html5/imports/api/users/server/methods/listenOnlyRequestToggle.js +++ b/bigbluebutton-html5/imports/api/users/server/methods/listenOnlyToggle.js @@ -6,7 +6,7 @@ import { isAllowedTo } from '/imports/startup/server/userPermissions'; import Meetings from '/imports/api/meetings'; import Users from '/imports/api/users'; -export default function listenOnlyRequestToggle(credentials, isJoining) { +export default function listenOnlyToggle(credentials, isJoining = true) { const REDIS_CONFIG = Meteor.settings.redis; const CHANNEL = REDIS_CONFIG.channels.toBBBApps.meeting; diff --git a/bigbluebutton-html5/imports/api/users/server/methods/userLeaving.js b/bigbluebutton-html5/imports/api/users/server/methods/userLeaving.js index bd5bb3ecb021543b86449b37f540c814cae2a4fb..0480e91dee36cbe40a949027ee46e752ae1514aa 100644 --- a/bigbluebutton-html5/imports/api/users/server/methods/userLeaving.js +++ b/bigbluebutton-html5/imports/api/users/server/methods/userLeaving.js @@ -6,7 +6,7 @@ import { isAllowedTo } from '/imports/startup/server/userPermissions'; import Users from '/imports/api/users'; import setConnectionStatus from '../modifiers/setConnectionStatus'; -import listenOnlyRequestToggle from './listenOnlyRequestToggle'; +import listenOnlyToggle from './listenOnlyToggle'; export default function userLeaving(credentials, userId) { const REDIS_CONFIG = Meteor.settings.redis; @@ -33,7 +33,7 @@ export default function userLeaving(credentials, userId) { setConnectionStatus(meetingId, requesterUserId, 'offline'); if (User.user.listenOnly) { - listenOnlyRequestToggle(credentials, false); + listenOnlyToggle(credentials, false); } let payload = { diff --git a/bigbluebutton-html5/imports/api/users/server/publishers.js b/bigbluebutton-html5/imports/api/users/server/publishers.js index ee361f3c50e9cf31b34558385a8c6c86ef145d6f..2dea57f474194c44fa3ce8be2553d3a88fb3130e 100644 --- a/bigbluebutton-html5/imports/api/users/server/publishers.js +++ b/bigbluebutton-html5/imports/api/users/server/publishers.js @@ -14,20 +14,11 @@ Meteor.publish('users', function (credentials) { check(requesterUserId, String); check(requesterToken, String); - let initializing = true; - validateAuthToken(credentials); - // const User = Users.find({ meetingId, userId: requesterUserId }).observeChanges({ - // changed: (id, fields) => { - // console.log(fields); - // }, - // }); - - if (!isAllowedTo('subscribeUsers', credentials)) { - console.error('lul'); - this.error(new Meteor.Error(402, "The user was not authorized to subscribe for 'Users'")); - } + // if (!isAllowedTo('subscribeUsers', credentials)) { + // this.error(new Meteor.Error(402, "The user was not authorized to subscribe for 'Users'")); + // } this.onStop(() => { userLeaving(credentials, requesterUserId); diff --git a/bigbluebutton-html5/imports/startup/server/userPermissions.js b/bigbluebutton-html5/imports/startup/server/userPermissions.js index 5011b0d80a3a504134b8972cc6df27dfb197742b..1e32aa613cf14c84edb50140f23db9977eb8ef5c 100755 --- a/bigbluebutton-html5/imports/startup/server/userPermissions.js +++ b/bigbluebutton-html5/imports/startup/server/userPermissions.js @@ -127,6 +127,8 @@ export function isAllowedTo(action, credentials) { userId, }); + console.log(user); + const allowedToInitiateRequest = null != user && authToken === user.authToken &&