Browse Source

feat(deployment-urls): Whitelist deploymentUrls; remove JaaS restriction

master
Horatiu Muresan 3 years ago
parent
commit
d49c86bd5f
No account linked to committer's email address

+ 1
- 0
react/features/base/config/configWhitelist.js View File

83
     'debugAudioLevels',
83
     'debugAudioLevels',
84
     'defaultLocalDisplayName',
84
     'defaultLocalDisplayName',
85
     'defaultRemoteDisplayName',
85
     'defaultRemoteDisplayName',
86
+    'deploymentUrls',
86
     'desktopSharingFrameRate',
87
     'desktopSharingFrameRate',
87
     'desktopSharingSources',
88
     'desktopSharingSources',
88
     'disable1On1Mode',
89
     'disable1On1Mode',

+ 1
- 2
react/features/toolbox/components/DownloadButton.js View File

6
 import { connect } from '../../base/redux';
6
 import { connect } from '../../base/redux';
7
 import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
7
 import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
8
 import { openURLInBrowser } from '../../base/util';
8
 import { openURLInBrowser } from '../../base/util';
9
-import { isVpaasMeeting } from '../../jaas/functions';
10
 
9
 
11
 type Props = AbstractButtonProps & {
10
 type Props = AbstractButtonProps & {
12
 
11
 
48
  */
47
  */
49
 function _mapStateToProps(state: Object) {
48
 function _mapStateToProps(state: Object) {
50
     const { downloadAppsUrl } = state['features/base/config'].deploymentUrls || {};
49
     const { downloadAppsUrl } = state['features/base/config'].deploymentUrls || {};
51
-    const visible = typeof downloadAppsUrl === 'string' && !isVpaasMeeting(state);
50
+    const visible = typeof downloadAppsUrl === 'string';
52
 
51
 
53
     return {
52
     return {
54
         _downloadAppsUrl: downloadAppsUrl,
53
         _downloadAppsUrl: downloadAppsUrl,

+ 1
- 2
react/features/toolbox/components/HelpButton.js View File

7
 import { connect } from '../../base/redux';
7
 import { connect } from '../../base/redux';
8
 import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
8
 import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
9
 import { openURLInBrowser } from '../../base/util';
9
 import { openURLInBrowser } from '../../base/util';
10
-import { isVpaasMeeting } from '../../jaas/functions';
11
 
10
 
12
 type Props = AbstractButtonProps & {
11
 type Props = AbstractButtonProps & {
13
 
12
 
50
 function _mapStateToProps(state: Object) {
49
 function _mapStateToProps(state: Object) {
51
     const { userDocumentationURL } = state['features/base/config'].deploymentUrls || {};
50
     const { userDocumentationURL } = state['features/base/config'].deploymentUrls || {};
52
     const enabled = getFeatureFlag(state, HELP_BUTTON_ENABLED, true);
51
     const enabled = getFeatureFlag(state, HELP_BUTTON_ENABLED, true);
53
-    const visible = typeof userDocumentationURL === 'string' && enabled && !isVpaasMeeting(state);
52
+    const visible = typeof userDocumentationURL === 'string' && enabled;
54
 
53
 
55
     return {
54
     return {
56
         _userDocumentationURL: userDocumentationURL,
55
         _userDocumentationURL: userDocumentationURL,

Loading…
Cancel
Save