diff --git a/bigbluebutton-html5/imports/api/users/server/methods/setMobileUser.js b/bigbluebutton-html5/imports/api/users/server/methods/setMobileUser.js index 6dd7d9be90148bdf8b26872b990005eb6accff72..b20bb276eb2684b09bd5a8d0bb8523018eab4103 100644 --- a/bigbluebutton-html5/imports/api/users/server/methods/setMobileUser.js +++ b/bigbluebutton-html5/imports/api/users/server/methods/setMobileUser.js @@ -2,9 +2,10 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; import Logger from '/imports/startup/server/logger'; import setMobile from '../modifiers/setMobile'; +import { extractCredentials } from '/imports/api/common/server/helpers'; -export default function setMobileUser(credentials) { - const { meetingId, requesterUserId } = credentials; +export default function setMobileUser() { + const { meetingId, requesterUserId } = extractCredentials(this.userId); check(meetingId, String); check(requesterUserId, String); diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/setMobile.js b/bigbluebutton-html5/imports/api/users/server/modifiers/setMobile.js index 3f0a959ac5c4b8da271e00b499df6ec543cf6af2..7f6bc297309e49140a21defc15892506a325ac1f 100644 --- a/bigbluebutton-html5/imports/api/users/server/modifiers/setMobile.js +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/setMobile.js @@ -3,9 +3,6 @@ import { check } from 'meteor/check'; import Users from '/imports/api/users'; export default function setMobile(meetingId, userId) { - check(meetingId, String); - check(userId, String); - const selector = { meetingId, userId, @@ -17,16 +14,13 @@ export default function setMobile(meetingId, userId) { }, }; - const cb = (err, numChanged) => { - if (err) { - Logger.error(`Assigning mobile user: ${err}`); - return; - } + try { + const numberAffected = Users.update(selector, modifier); - if (numChanged) { + if (numberAffected) { Logger.info(`Assigned mobile user id=${userId} meeting=${meetingId}`); } - }; - - return Users.update(selector, modifier, cb); + } catch (err) { + Logger.error(`Assigning mobile user: ${err}`); + } }