Przeglądaj źródła

feat: Drop lockRoomGuestEnabled.

master
damencho 5 lat temu
rodzic
commit
c4ba97e87c

+ 0
- 3
config.js Wyświetl plik

@@ -370,9 +370,6 @@ var config = {
370 370
     // Whether or not some features are checked based on token.
371 371
     // enableFeaturesBasedOnToken: false,
372 372
 
373
-    // Enable lock room for all moderators, even when userRolesBasedOnToken is enabled and participants are guests.
374
-    // lockRoomGuestEnabled: false,
375
-
376 373
     // When enabled the password used for locking a room is restricted to up to the number of digits specified
377 374
     // roomPasswordNumberOfDigits: 10,
378 375
     // default: roomPasswordNumberOfDigits: false,

+ 3
- 7
react/features/base/participants/functions.js Wyświetl plik

@@ -298,12 +298,9 @@ export function isIconUrl(icon: ?string | ?Object) {
298 298
  *
299 299
  * @param {Object|Function} stateful - Object or function that can be resolved
300 300
  * to the Redux state.
301
- * @param {?boolean} ignoreToken - When true we ignore the token check.
302 301
  * @returns {boolean}
303 302
  */
304
-export function isLocalParticipantModerator(
305
-        stateful: Object | Function,
306
-        ignoreToken: ?boolean = false) {
303
+export function isLocalParticipantModerator(stateful: Object | Function) {
307 304
     const state = toState(stateful);
308 305
     const localParticipant = getLocalParticipant(state);
309 306
 
@@ -313,9 +310,8 @@ export function isLocalParticipantModerator(
313 310
 
314 311
     return (
315 312
         localParticipant.role === PARTICIPANT_ROLE.MODERATOR
316
-        && (ignoreToken
317
-                || !state['features/base/config'].enableUserRolesBasedOnToken
318
-                || !state['features/base/jwt'].isGuest));
313
+        && (!state['features/base/config'].enableUserRolesBasedOnToken
314
+            || !state['features/base/jwt'].isGuest));
319 315
 }
320 316
 
321 317
 /**

+ 2
- 5
react/features/security/components/security-dialog/SecurityDialog.js Wyświetl plik

@@ -125,13 +125,10 @@ function mapStateToProps(state) {
125 125
         locked,
126 126
         password
127 127
     } = state['features/base/conference'];
128
-    const {
129
-        lockRoomGuestEnabled,
130
-        roomPasswordNumberOfDigits
131
-    } = state['features/base/config'];
128
+    const { roomPasswordNumberOfDigits } = state['features/base/config'];
132 129
 
133 130
     return {
134
-        _canEditPassword: isLocalParticipantModerator(state, lockRoomGuestEnabled),
131
+        _canEditPassword: isLocalParticipantModerator(state),
135 132
         _conference: conference,
136 133
         _dialIn: state['features/invite'],
137 134
         _locked: locked,

Ładowanie…
Anuluj
Zapisz