feat(config) add flag to disable lobby password & group lobby config flags (#12793)

This commit is contained in:
Mihaela Dumitru
2023-02-09 14:46:25 +02:00
committed by GitHub
parent 1a113ba733
commit 2aa770e532
13 changed files with 135 additions and 42 deletions

View File

@@ -3,6 +3,7 @@ import React, { useEffect, useState } from 'react';
import { IReduxState } from '../../../../app/types';
import { setPassword as setPass } from '../../../../base/conference/actions';
import { getSecurityUiConfig } from '../../../../base/config/functions.any';
import { isLocalParticipantModerator } from '../../../../base/participants/functions';
import { connect } from '../../../../base/redux/functions';
import Dialog from '../../../../base/ui/components/web/Dialog';
@@ -37,6 +38,11 @@ interface IProps {
*/
_conference: Object;
/**
* Whether to hide the lobby password section.
*/
_disableLobbyPassword?: boolean;
/**
* The value for how the conference is locked (or undefined if not locked)
* as defined by room-lock constants.
@@ -73,6 +79,7 @@ function SecurityDialog({
_buttonsWithNotifyClick,
_canEditPassword,
_conference,
_disableLobbyPassword,
_locked,
_password,
_passwordNumberOfDigits,
@@ -94,16 +101,21 @@ function SecurityDialog({
titleKey = 'security.title'>
<div className = 'security-dialog'>
<LobbySection />
<PasswordSection
buttonsWithNotifyClick = { _buttonsWithNotifyClick }
canEditPassword = { _canEditPassword }
conference = { _conference }
locked = { _locked }
password = { _password }
passwordEditEnabled = { passwordEditEnabled }
passwordNumberOfDigits = { _passwordNumberOfDigits }
setPassword = { setPassword }
setPasswordEditEnabled = { setPasswordEditEnabled } />
{!_disableLobbyPassword && (
<>
<div className = 'separator-line' />
<PasswordSection
buttonsWithNotifyClick = { _buttonsWithNotifyClick }
canEditPassword = { _canEditPassword }
conference = { _conference }
locked = { _locked }
password = { _password }
passwordEditEnabled = { passwordEditEnabled }
passwordNumberOfDigits = { _passwordNumberOfDigits }
setPassword = { setPassword }
setPasswordEditEnabled = { setPasswordEditEnabled } />
</>
)}
{
_showE2ee ? <>
<div className = 'separator-line' />
@@ -131,7 +143,11 @@ function mapStateToProps(state: IReduxState) {
locked,
password
} = state['features/base/conference'];
const { roomPasswordNumberOfDigits, buttonsWithNotifyClick } = state['features/base/config'];
const {
roomPasswordNumberOfDigits,
buttonsWithNotifyClick
} = state['features/base/config'];
const { disableLobbyPassword } = getSecurityUiConfig(state);
const showE2ee = Boolean(e2eeSupported) && isLocalParticipantModerator(state);
@@ -140,6 +156,7 @@ function mapStateToProps(state: IReduxState) {
_canEditPassword: isLocalParticipantModerator(state),
_conference: conference,
_dialIn: state['features/invite'],
_disableLobbyPassword: disableLobbyPassword,
_locked: locked,
_password: password,
_passwordNumberOfDigits: roomPasswordNumberOfDigits,