feat(deployment-urls): Whitelist deploymentUrls; remove JaaS restriction
This commit is contained in:
parent
aee94ad6fb
commit
d49c86bd5f
|
@ -83,6 +83,7 @@ export default [
|
||||||
'debugAudioLevels',
|
'debugAudioLevels',
|
||||||
'defaultLocalDisplayName',
|
'defaultLocalDisplayName',
|
||||||
'defaultRemoteDisplayName',
|
'defaultRemoteDisplayName',
|
||||||
|
'deploymentUrls',
|
||||||
'desktopSharingFrameRate',
|
'desktopSharingFrameRate',
|
||||||
'desktopSharingSources',
|
'desktopSharingSources',
|
||||||
'disable1On1Mode',
|
'disable1On1Mode',
|
||||||
|
|
|
@ -6,7 +6,6 @@ import { IconDownload } from '../../base/icons';
|
||||||
import { connect } from '../../base/redux';
|
import { connect } from '../../base/redux';
|
||||||
import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
|
import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
|
||||||
import { openURLInBrowser } from '../../base/util';
|
import { openURLInBrowser } from '../../base/util';
|
||||||
import { isVpaasMeeting } from '../../jaas/functions';
|
|
||||||
|
|
||||||
type Props = AbstractButtonProps & {
|
type Props = AbstractButtonProps & {
|
||||||
|
|
||||||
|
@ -48,7 +47,7 @@ class DownloadButton extends AbstractButton<Props, *> {
|
||||||
*/
|
*/
|
||||||
function _mapStateToProps(state: Object) {
|
function _mapStateToProps(state: Object) {
|
||||||
const { downloadAppsUrl } = state['features/base/config'].deploymentUrls || {};
|
const { downloadAppsUrl } = state['features/base/config'].deploymentUrls || {};
|
||||||
const visible = typeof downloadAppsUrl === 'string' && !isVpaasMeeting(state);
|
const visible = typeof downloadAppsUrl === 'string';
|
||||||
|
|
||||||
return {
|
return {
|
||||||
_downloadAppsUrl: downloadAppsUrl,
|
_downloadAppsUrl: downloadAppsUrl,
|
||||||
|
|
|
@ -7,7 +7,6 @@ import { IconHelp } from '../../base/icons';
|
||||||
import { connect } from '../../base/redux';
|
import { connect } from '../../base/redux';
|
||||||
import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
|
import { AbstractButton, type AbstractButtonProps } from '../../base/toolbox/components';
|
||||||
import { openURLInBrowser } from '../../base/util';
|
import { openURLInBrowser } from '../../base/util';
|
||||||
import { isVpaasMeeting } from '../../jaas/functions';
|
|
||||||
|
|
||||||
type Props = AbstractButtonProps & {
|
type Props = AbstractButtonProps & {
|
||||||
|
|
||||||
|
@ -50,7 +49,7 @@ class HelpButton extends AbstractButton<Props, *> {
|
||||||
function _mapStateToProps(state: Object) {
|
function _mapStateToProps(state: Object) {
|
||||||
const { userDocumentationURL } = state['features/base/config'].deploymentUrls || {};
|
const { userDocumentationURL } = state['features/base/config'].deploymentUrls || {};
|
||||||
const enabled = getFeatureFlag(state, HELP_BUTTON_ENABLED, true);
|
const enabled = getFeatureFlag(state, HELP_BUTTON_ENABLED, true);
|
||||||
const visible = typeof userDocumentationURL === 'string' && enabled && !isVpaasMeeting(state);
|
const visible = typeof userDocumentationURL === 'string' && enabled;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
_userDocumentationURL: userDocumentationURL,
|
_userDocumentationURL: userDocumentationURL,
|
||||||
|
|
Loading…
Reference in New Issue