浏览代码

feat: Drop lockRoomGuestEnabled.

master
damencho 5 年前
父节点
当前提交
c4ba97e87c

+ 0
- 3
config.js 查看文件

370
     // Whether or not some features are checked based on token.
370
     // Whether or not some features are checked based on token.
371
     // enableFeaturesBasedOnToken: false,
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
     // When enabled the password used for locking a room is restricted to up to the number of digits specified
373
     // When enabled the password used for locking a room is restricted to up to the number of digits specified
377
     // roomPasswordNumberOfDigits: 10,
374
     // roomPasswordNumberOfDigits: 10,
378
     // default: roomPasswordNumberOfDigits: false,
375
     // default: roomPasswordNumberOfDigits: false,

+ 3
- 7
react/features/base/participants/functions.js 查看文件

298
  *
298
  *
299
  * @param {Object|Function} stateful - Object or function that can be resolved
299
  * @param {Object|Function} stateful - Object or function that can be resolved
300
  * to the Redux state.
300
  * to the Redux state.
301
- * @param {?boolean} ignoreToken - When true we ignore the token check.
302
  * @returns {boolean}
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
     const state = toState(stateful);
304
     const state = toState(stateful);
308
     const localParticipant = getLocalParticipant(state);
305
     const localParticipant = getLocalParticipant(state);
309
 
306
 
313
 
310
 
314
     return (
311
     return (
315
         localParticipant.role === PARTICIPANT_ROLE.MODERATOR
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 查看文件

125
         locked,
125
         locked,
126
         password
126
         password
127
     } = state['features/base/conference'];
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
     return {
130
     return {
134
-        _canEditPassword: isLocalParticipantModerator(state, lockRoomGuestEnabled),
131
+        _canEditPassword: isLocalParticipantModerator(state),
135
         _conference: conference,
132
         _conference: conference,
136
         _dialIn: state['features/invite'],
133
         _dialIn: state['features/invite'],
137
         _locked: locked,
134
         _locked: locked,

正在加载...
取消
保存