diff --git a/bigbluebutton-html5/imports/api/1.1/slides/server/methods.js b/bigbluebutton-html5/imports/api/1.1/slides/server/methods.js old mode 100644 new mode 100755 index 058a83233238295edb2db15b7407beca47d475e2..5757396e2b739acd680b2975fbe14fee7f9103e6 --- a/bigbluebutton-html5/imports/api/1.1/slides/server/methods.js +++ b/bigbluebutton-html5/imports/api/1.1/slides/server/methods.js @@ -1,8 +1,5 @@ import { Meteor } from 'meteor/meteor'; -import mapToAcl from '/imports/startup/mapToAcl'; -import switchSlide from './methods/switchSlide'; -Meteor.methods(mapToAcl(['methods.switchSlide', 'methods.switchSlideMessage'], { - switchSlide, - switchSlideMessage: switchSlide, // legacy -})); +Meteor.methods({ + +}); diff --git a/bigbluebutton-html5/imports/api/2.0/slides/server/methods.js b/bigbluebutton-html5/imports/api/2.0/slides/server/methods.js old mode 100644 new mode 100755 index 04807692af65f8eb178e763031e202fcd493eba7..5d69c6254dea71a8ca690ed6bf6ff926f44a4132 --- a/bigbluebutton-html5/imports/api/2.0/slides/server/methods.js +++ b/bigbluebutton-html5/imports/api/2.0/slides/server/methods.js @@ -2,7 +2,6 @@ import { Meteor } from 'meteor/meteor'; import mapToAcl from '/imports/startup/mapToAcl'; import switchSlide from './methods/switchSlide'; -Meteor.methods(mapToAcl(['methods.switchSlide', 'methods.switchSlideMessage'], { - // switchSlide, - // switchSlideMessage: switchSlide, // legacy +Meteor.methods(mapToAcl(['methods.switchSlide'], { + switchSlide, })); diff --git a/bigbluebutton-html5/imports/api/2.0/slides/server/methods/switchSlide.js b/bigbluebutton-html5/imports/api/2.0/slides/server/methods/switchSlide.js index dc2467ea55db767e5d848a86e757e3bad2ab614d..76964d3e4e1194bcf14d38dadcd6f622f8a01087 100755 --- a/bigbluebutton-html5/imports/api/2.0/slides/server/methods/switchSlide.js +++ b/bigbluebutton-html5/imports/api/2.0/slides/server/methods/switchSlide.js @@ -7,8 +7,8 @@ import RedisPubSub from '/imports/startup/server/redis2x'; export default function switchSlide(credentials, slideNumber) { const REDIS_CONFIG = Meteor.settings.redis; - const CHANNEL = REDIS_CONFIG.channels.toBBBApps.presentation; - const EVENT_NAME = 'go_to_slide'; + const CHANNEL = REDIS_CONFIG.channels.toAkkaApps; + const EVENT_NAME = 'SetCurrentPagePubMsg'; const { meetingId, requesterUserId, requesterToken } = credentials; @@ -30,7 +30,7 @@ export default function switchSlide(credentials, slideNumber) { const Slide = Slides.findOne({ meetingId, presentationId: Presentation.presentation.id, - 'slide.num': parseInt(slideNumber, 2), + 'slide.num': parseInt(slideNumber, 10), }); if (!Slide) { @@ -38,10 +38,16 @@ export default function switchSlide(credentials, slideNumber) { 'slide-not-found', `Slide number ${slideNumber} not found in the current presentation`); } + const header = { + name: EVENT_NAME, + userId: requesterUserId, + meetingId, + }; + const payload = { - page: Slide.slide.id, - meeting_id: meetingId, + presentationId: Presentation.presentation.id, + pageId: Slide.slide.id, }; - return RedisPubSub.publish(CHANNEL, EVENT_NAME, payload); + return RedisPubSub.publish(CHANNEL, EVENT_NAME, meetingId, payload, header); } diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/service.js b/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/service.js index 392a74dd423a4b292cb10940cb76f38f85abcf23..976da29d6a47eefb77cbb87914052ef1bbe2f75b 100755 --- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/service.js +++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-toolbar/service.js @@ -4,7 +4,7 @@ import Slides from '/imports/api/2.0/slides'; import { makeCall } from '/imports/ui/services/api'; const getSlideData = (params) => { - const { currentSlideNum, presentationId } = params; + const { presentationId } = params; // Get userId and meetingId const userId = AuthSingleton.userID; @@ -35,19 +35,19 @@ const getSlideData = (params) => { const previousSlide = (currentSlideNum) => { if (currentSlideNum > 1) { - makeCall('switchSlideMessage', currentSlideNum - 1); + makeCall('switchSlide', currentSlideNum - 1); } }; const nextSlide = (currentSlideNum, numberOfSlides) => { if (currentSlideNum < numberOfSlides) { - makeCall('switchSlideMessage', currentSlideNum + 1); + makeCall('switchSlide', currentSlideNum + 1); } }; const skipToSlide = (event) => { - const requestedSlideNum = parseInt(event.target.value); - makeCall('switchSlideMessage', requestedSlideNum); + const requestedSlideNum = parseInt(event.target.value, 10); + makeCall('switchSlide', requestedSlideNum); }; export default { diff --git a/bigbluebutton-html5/private/config/public/acl.yaml b/bigbluebutton-html5/private/config/public/acl.yaml old mode 100644 new mode 100755 index 354387e70b2e5e6a634f137ded662bf285787aba..698feddba35e81bfa8309511193eb423516cb742 --- a/bigbluebutton-html5/private/config/public/acl.yaml +++ b/bigbluebutton-html5/private/config/public/acl.yaml @@ -27,4 +27,3 @@ acl: methods: - 'assignPresenter' - 'switchSlide' - - 'switchSlideMessage'