From 3a93898af057659550927f6fe9e6de13e91fcafd Mon Sep 17 00:00:00 2001 From: Guilherme Leme Date: Fri, 8 Apr 2022 11:28:47 -0300 Subject: [PATCH 1/6] [issue-14749] - Refactored `temporaryPresId` format to not rely on UTF-8 encoding when sending the multipart/form-data content-type in `futch` method. --- .../presentation/presentation-uploader/service.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/service.js b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/service.js index 31d3f997e8..c2ca9cbc79 100644 --- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/service.js +++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/service.js @@ -5,6 +5,7 @@ import Poll from '/imports/api/polls/'; import { makeCall } from '/imports/ui/services/api'; import logger from '/imports/startup/client/logger'; import _ from 'lodash'; +import { Random } from 'meteor/random' const CONVERSION_TIMEOUT = 300000; const TOKEN_TIMEOUT = 5000; @@ -153,7 +154,6 @@ const requestPresentationUploadToken = ( }); const uploadAndConvertPresentation = ( - tmpPresId, file, downloadable, podId, @@ -163,9 +163,9 @@ const uploadAndConvertPresentation = ( onProgress, onConversion, ) => { + const tmpPresId = _.uniqueId(Random.id(20)) + const data = new FormData(); - data.append('presentation_name', file.name); - data.append('Filename', file.name); data.append('fileUpload', file); data.append('conference', meetingId); data.append('room', meetingId); @@ -207,7 +207,7 @@ const uploadAndConvertPresentations = ( podId, uploadEndpoint, ) => Promise.all(presentationsToUpload.map((p) => uploadAndConvertPresentation( - p.id, p.file, p.isDownloadable, podId, meetingId, uploadEndpoint, + p.file, p.isDownloadable, podId, meetingId, uploadEndpoint, p.onUpload, p.onProgress, p.onConversion, ))); From def29e33888efe8cca5d8db8bf7b8454727c8a88 Mon Sep 17 00:00:00 2001 From: Ramon Souza Date: Fri, 8 Apr 2022 11:45:17 -0300 Subject: [PATCH 2/6] fix join screenshare --- .../imports/ui/components/app/component.jsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx index 7e27615f6f..9cc636592f 100755 --- a/bigbluebutton-html5/imports/ui/components/app/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/app/component.jsx @@ -155,6 +155,8 @@ class App extends Component { isRTL, hidePresentation, autoSwapLayout, + shouldShowScreenshare, + shouldShowExternalVideo, } = this.props; const { browserName } = browserInfo; const { osName } = deviceInfo; @@ -166,9 +168,12 @@ class App extends Component { value: isRTL, }); + const presentationOpen = !(autoSwapLayout || hidePresentation) + || shouldShowExternalVideo || shouldShowScreenshare; + layoutContextDispatch({ type: ACTIONS.SET_PRESENTATION_IS_OPEN, - value: !(autoSwapLayout || hidePresentation), + value: presentationOpen, }); Modal.setAppElement('#app'); From b60e77500bad67a3c80709e3f485b734320c3876 Mon Sep 17 00:00:00 2001 From: Fred Dixon Date: Mon, 11 Apr 2022 07:25:48 -0500 Subject: [PATCH 3/6] Set securitySalt (shared secret) in bbb-web.properties --- bigbluebutton-config/bin/bbb-conf | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf index ce5bb9acb7..883dcf8bad 100755 --- a/bigbluebutton-config/bin/bbb-conf +++ b/bigbluebutton-config/bin/bbb-conf @@ -649,10 +649,12 @@ fi if [[ $SECRET ]]; then need_root - if get_properties_value securitySalt "$BBB_WEB_ETC_CONFIG" > /dev/null ; then - change_var_salt "$BBB_WEB_ETC_CONFIG" securitySalt "$SECRET" + + echo "Assigning secret in $BBB_WEB_ETC_CONFIG" + if [ -f "$BBB_WEB_ETC_CONFIG" ] && grep "^securitySalt" "$BBB_WEB_ETC_CONFIG" > /dev/null ; then + change_var_value "$BBB_WEB_ETC_CONFIG" securitySalt "$SECRET" else - echo "securitySalt=$SECRET" >> "$BBB_WEB_ETC_CONFIG" + echo "securitySaltL=$SECRET" >> "$BBB_WEB_ETC_CONFIG" fi if [ -f /usr/local/bigbluebutton/bbb-webhooks/config/default.yml ]; then From 4627e39435aed7bf58e10ac4cd959f316de7222c Mon Sep 17 00:00:00 2001 From: Guilherme Leme Date: Mon, 11 Apr 2022 10:26:15 -0300 Subject: [PATCH 4/6] [issue-14749] - fix downloadable persistence. --- .../presentation-uploader/component.jsx | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx index 11ecb3f3f7..9f96b6e0fa 100755 --- a/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/presentation/presentation-uploader/component.jsx @@ -302,12 +302,23 @@ class PresentationUploader extends Component { } }); - this.setState({ - presentations: Object.values({ - ...presentations, - ...propPresentations, - }), + const presState = Object.values({ + ...propPresentations, + ...presentations, }); + const presStateMapped = presState.map((presentation) => { + propPresentations.forEach((propPres) => { + if (propPres.id == presentation.id){ + presentation.isCurrent = propPres.isCurrent; + } + }) + return presentation; + }) + + this.setState({ + presentations: presStateMapped, + }) + } if (presentations.length > 0) { From 6a269428e5d5378429313df4cfd73bcbe708a308 Mon Sep 17 00:00:00 2001 From: Anton Georgiev Date: Mon, 11 Apr 2022 09:48:00 -0400 Subject: [PATCH 5/6] Revert "Update securitySalt (shared secret) in bbb-web.properties" --- bigbluebutton-config/bin/bbb-conf | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bigbluebutton-config/bin/bbb-conf b/bigbluebutton-config/bin/bbb-conf index 883dcf8bad..ce5bb9acb7 100755 --- a/bigbluebutton-config/bin/bbb-conf +++ b/bigbluebutton-config/bin/bbb-conf @@ -649,12 +649,10 @@ fi if [[ $SECRET ]]; then need_root - - echo "Assigning secret in $BBB_WEB_ETC_CONFIG" - if [ -f "$BBB_WEB_ETC_CONFIG" ] && grep "^securitySalt" "$BBB_WEB_ETC_CONFIG" > /dev/null ; then - change_var_value "$BBB_WEB_ETC_CONFIG" securitySalt "$SECRET" + if get_properties_value securitySalt "$BBB_WEB_ETC_CONFIG" > /dev/null ; then + change_var_salt "$BBB_WEB_ETC_CONFIG" securitySalt "$SECRET" else - echo "securitySaltL=$SECRET" >> "$BBB_WEB_ETC_CONFIG" + echo "securitySalt=$SECRET" >> "$BBB_WEB_ETC_CONFIG" fi if [ -f /usr/local/bigbluebutton/bbb-webhooks/config/default.yml ]; then From 1c3d29daa1c0c59fd22bcda73d9d571f8cb36ade Mon Sep 17 00:00:00 2001 From: Ramon Souza Date: Mon, 11 Apr 2022 14:40:37 -0300 Subject: [PATCH 6/6] adjust video list icon in rtl --- .../ui/components/video-provider/video-list/styles.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss index 4ba023531b..d8200fb266 100755 --- a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/styles.scss @@ -230,6 +230,11 @@ &::before { font-size: var(--audio-indicator-fs); } + + [dir="rtl"] & { + right: auto; + left: 7px; + } } .muted {