diff --git a/bigbluebutton-html5/imports/api/screenshare/client/bridge/kurento.js b/bigbluebutton-html5/imports/api/screenshare/client/bridge/kurento.js index 125c13e7b300ce63f680600db65440eb194ed6b7..3ad3aa1c251133caebe974ee5a7c9b34479a732d 100755 --- a/bigbluebutton-html5/imports/api/screenshare/client/bridge/kurento.js +++ b/bigbluebutton-html5/imports/api/screenshare/client/bridge/kurento.js @@ -18,6 +18,8 @@ const getUserId = () => Auth.userID; const getMeetingId = () => Auth.meetingID; +const getUsername = () => Auth.fullname; + const getSessionToken = () => Auth.sessionToken; export default class KurentoScreenshareBridge { @@ -75,6 +77,7 @@ export default class KurentoScreenshareBridge { wsUrl: Auth.authenticateURL(SFU_URL), iceServers, logger, + userName: getUsername(), }; const screenshareTag = document.getElementById(SCREENSHARE_VIDEO_TAG); @@ -173,6 +176,7 @@ export default class KurentoScreenshareBridge { firefoxScreenshareSource: FIREFOX_SCREENSHARE_SOURCE, iceServers, logger, + userName: getUsername(), }; let started = false; diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx index 4eb09762942385d3a1e90553bc7f978c31446258..0dbe52c672c6b19243c30facbf2d506e994245ef 100755 --- a/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/video-provider/component.jsx @@ -575,7 +575,7 @@ class VideoProvider extends Component { } async createWebRTCPeer(id, shareWebcam) { - const { meetingId, sessionToken, voiceBridge } = this.props; + const { meetingId, sessionToken, voiceBridge, userId, userName } = this.props; let iceServers = []; const role = shareWebcam ? 'share' : 'viewer'; @@ -662,6 +662,8 @@ class VideoProvider extends Component { meetingId, voiceBridge, bitrate, + userId, + userName, }; logger.info({ diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/container.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/container.jsx index ff9b730114c0575041a42516f263fe3d272abee1..de0b10491134faef58623b14db46e2be05dd3c9f 100755 --- a/bigbluebutton-html5/imports/ui/components/video-provider/container.jsx +++ b/bigbluebutton-html5/imports/ui/components/video-provider/container.jsx @@ -25,6 +25,7 @@ export default withTracker(props => ({ role: { $ne: ROLE_MODERATOR }, }, { fields: {} }) && VideoService.webcamsLocked(), userHasStream: !!VideoStreams.findOne({ userId: Auth.userID }, { fields: {} }), + userName: Auth.fullname, sessionToken: VideoService.sessionToken(), enableVideoStats: getFromUserSettings('bbb_enable_video_stats', Meteor.settings.public.kurento.enableVideoStats), voiceBridge: VideoService.voiceBridge(), diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/service.js b/bigbluebutton-html5/imports/ui/components/video-provider/service.js index 7d1924333b0bb722f6d3818129afacf3ab45f37f..398830b5f810143d2a2ecc4fbda21ace3a6bf578 100755 --- a/bigbluebutton-html5/imports/ui/components/video-provider/service.js +++ b/bigbluebutton-html5/imports/ui/components/video-provider/service.js @@ -145,11 +145,6 @@ class VideoService { return Auth.userID; } - userName() { - const currentUser = Users.findOne({ userId: Auth.userID }, { fields: { name: 1 } }); - return currentUser.name; - } - meetingId() { return Auth.meetingID; } @@ -189,7 +184,6 @@ export default { joinedVideo: () => videoService.joinedVideo(), sendUserShareWebcam: stream => videoService.sendUserShareWebcam(stream), sendUserUnshareWebcam: stream => videoService.sendUserUnshareWebcam(stream), - userName: () => videoService.userName(), meetingId: () => videoService.meetingId(), getAllWebcamUsers: () => videoService.getAllWebcamUsers(), sessionToken: () => videoService.sessionToken(), diff --git a/bigbluebutton-html5/public/compatibility/kurento-extension.js b/bigbluebutton-html5/public/compatibility/kurento-extension.js index e74f643598a7b0c035b973c997e897ab0d36a283..1b4efc5c58cdd391483b47e6416bdf34513888d9 100755 --- a/bigbluebutton-html5/public/compatibility/kurento-extension.js +++ b/bigbluebutton-html5/public/compatibility/kurento-extension.js @@ -415,6 +415,7 @@ Kurento.prototype.onOfferPresenter = function (error, offerSdp) { sdpOffer: offerSdp, vh: this.height, vw: this.width, + userName: self.userName, }; this.logger.info({ @@ -581,6 +582,7 @@ Kurento.prototype.onOfferViewer = function (error, offerSdp) { voiceBridge: self.voiceBridge, callerName: self.userId, sdpOffer: offerSdp, + userName: self.userName, }; this.logger.info({