fix: Adds sip jibri to the allow list for prod.

fix(tests): Ignore clickable for password dialog.

It gives strange error that is not clickable, but it is seen on the screenshot and test passes without it.

fix(tests): Fixes a problem with two notifications.

modules/API/API.js

@@ -790,7 +790,7 @@ function initCommands() {
             }
 
             if (transcription) {
-                APP.store.dispatch(setRequestingSubtitles(true, false, null));
+                APP.store.dispatch(setRequestingSubtitles(true, false, null, true));
             }
         },
 
@@ -812,7 +812,7 @@ function initCommands() {
             }
 
             if (transcription) {
-                APP.store.dispatch(setRequestingSubtitles(false, false, null));
+                APP.store.dispatch(setRequestingSubtitles(false, false, null, true));
             }
 
             if (mode === 'local') {

package-lock.json

@@ -66,7 +66,7 @@
         "js-md5": "0.6.1",
         "js-sha512": "0.8.0",
         "jwt-decode": "2.2.0",
-        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v2118.0.0+67fd2c84/lib-jitsi-meet.tgz",
+        "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet#release-8979",
         "lodash-es": "4.17.21",
         "null-loader": "4.0.1",
         "optional-require": "1.0.3",
@@ -18360,8 +18360,7 @@
     },
     "node_modules/lib-jitsi-meet": {
       "version": "0.0.0",
-      "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v2118.0.0+67fd2c84/lib-jitsi-meet.tgz",
-      "integrity": "sha512-V0fp3/ZJRjHZgRlpzfCcdIF4nZ+WWWkAxKuWVTMHXfcZj07aQUHTiwIukgRludtaj9RcyNcqCVC0PrGBeeUzTw==",
+      "resolved": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#67fd2c84dce4a4b540455bf40f08476859e211af",
       "license": "Apache-2.0",
       "dependencies": {
         "@jitsi/js-utils": "^2.6.7",
@@ -39717,8 +39716,8 @@
       }
     },
     "lib-jitsi-meet": {
-      "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v2118.0.0+67fd2c84/lib-jitsi-meet.tgz",
-      "integrity": "sha512-V0fp3/ZJRjHZgRlpzfCcdIF4nZ+WWWkAxKuWVTMHXfcZj07aQUHTiwIukgRludtaj9RcyNcqCVC0PrGBeeUzTw==",
+      "version": "git+ssh://git@github.com/jitsi/lib-jitsi-meet.git#67fd2c84dce4a4b540455bf40f08476859e211af",
+      "from": "lib-jitsi-meet@https://github.com/jitsi/lib-jitsi-meet#release-8979",
       "requires": {
         "@jitsi/js-utils": "^2.6.7",
         "@jitsi/logger": "2.1.1",

package.json

@@ -72,7 +72,7 @@
     "js-md5": "0.6.1",
     "js-sha512": "0.8.0",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v2118.0.0+67fd2c84/lib-jitsi-meet.tgz",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet#release-8979",
     "lodash-es": "4.17.21",
     "null-loader": "4.0.1",
     "optional-require": "1.0.3",

react/features/av-moderation/middleware.ts

@@ -81,7 +81,6 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
         break;
     }
     case LOCAL_PARTICIPANT_MODERATION_NOTIFICATION: {
-        let descriptionKey;
         let titleKey;
         let uid = '';
         const localParticipant = getLocalParticipant(getState);
@@ -111,8 +110,6 @@ MiddlewareRegistry.register(({ dispatch, getState }) => next => action => {
                 !raisedHand && dispatch(raiseHand(true));
                 dispatch(hideNotification(uid));
             }) ],
-            descriptionKey,
-            sticky: true,
             titleKey,
             uid
         }, NOTIFICATION_TIMEOUT_TYPE.MEDIUM));
@@ -271,7 +268,6 @@ StateListenerRegistry.register(
 
                 dispatch(showNotification({
                     titleKey: 'notify.hostAskedUnmute',
-                    sticky: true,
                     customActionNameKey,
                     customActionHandler,
                     uid: ASKED_TO_UNMUTE_NOTIFICATION_ID

react/features/base/responsive-ui/actions.ts

@@ -112,7 +112,7 @@ export function setReducedUI(width: number, height: number) {
         const threshold = navigator.product === 'ReactNative'
             ? REDUCED_UI_THRESHOLD
             : WEB_REDUCED_UI_THRESHOLD;
-        const reducedUI = Math.min(width, height) < threshold;
+        const reducedUI = Math.max(width, height) < threshold;
 
         if (reducedUI !== getState()['features/base/responsive-ui'].reducedUI) {
             return dispatch({

react/features/conference/components/web/Conference.tsx

@@ -257,6 +257,9 @@ class Conference extends AbstractConference<IProps, any> {
                             id = 'videospace'
                             onTouchStart = { this._onVideospaceTouchStart }>
                             <LargeVideo />
+                            <StageFilmstrip />
+                            <ScreenshareFilmstrip />
+                            <MainFilmstrip />
                         </div>
                         <span
                             aria-level = { 1 }

react/features/filmstrip/components/web/Filmstrip.tsx

@@ -338,6 +338,11 @@ export interface IProps extends WithTranslation {
      */
     _maxTopPanelHeight: number;
 
+    /**
+     * Whethere reduced UI feature is enabled or not.
+     */
+    _reducedUI: boolean;
+
     /**
      * The participants in the call.
      */
@@ -546,6 +551,7 @@ class Filmstrip extends PureComponent <IProps, IState> {
             _filmstripDisabled,
             _localScreenShareId,
             _mainFilmstripVisible,
+            _reducedUI,
             _resizableFilmstrip,
             _topPanelFilmstrip,
             _topPanelMaxHeight,
@@ -589,6 +595,13 @@ class Filmstrip extends PureComponent <IProps, IState> {
             }
         }
 
+        // FIX: Until we move AudioTracksContainer to a more global place,
+        // we apply this css hot fix to hide Filmstrip but keep AudioTracksContainer in the DOM,
+        // so we don't have audio problems when reduced UI is enabled.
+        if (_reducedUI) {
+            filmstripStyle.display = 'none';
+        }
+
         let toolbar: React.ReactNode = null;
 
         if (!this.props._iAmRecorder && this.props._isFilmstripButtonEnabled
@@ -1120,6 +1133,7 @@ function _mapStateToProps(state: IReduxState, ownProps: any) {
     const _currentLayout = getCurrentLayout(state);
     const _isVerticalFilmstrip = _currentLayout === LAYOUTS.VERTICAL_FILMSTRIP_VIEW
         || (filmstripType === FILMSTRIP_TYPE.MAIN && _currentLayout === LAYOUTS.STAGE_FILMSTRIP_VIEW);
+    const { reducedUI } = state['features/base/responsive-ui'];
 
     return {
         _className: className,
@@ -1137,6 +1151,7 @@ function _mapStateToProps(state: IReduxState, ownProps: any) {
         _mainFilmstripVisible: notDisabled,
         _maxFilmstripWidth: videoSpaceWidth - MIN_STAGE_VIEW_WIDTH,
         _maxTopPanelHeight: clientHeight - MIN_STAGE_VIEW_HEIGHT,
+        _reducedUI: reducedUI,
         _remoteParticipantsLength: _remoteParticipants?.length ?? 0,
         _topPanelHeight: topPanelHeight.current,
         _topPanelMaxHeight: topPanelHeight.current || TOP_FILMSTRIP_HEIGHT,

react/features/mobile/external-api/middleware.ts

@@ -588,7 +588,7 @@ function _registerForNativeEvents(store: IStore) {
         }
 
         if (transcription) {
-            store.dispatch(setRequestingSubtitles(true, false, null));
+            store.dispatch(setRequestingSubtitles(true, false, null, true));
         }
     });
 
@@ -603,7 +603,7 @@ function _registerForNativeEvents(store: IStore) {
         }
 
         if (transcription) {
-            store.dispatch(setRequestingSubtitles(false, false, null));
+            store.dispatch(setRequestingSubtitles(false, false, null, true));
         }
 
         if (![ JitsiRecordingConstants.mode.FILE, JitsiRecordingConstants.mode.STREAM ].includes(mode)) {

react/features/notifications/types.ts

@@ -13,7 +13,6 @@ export interface INotificationProps {
     hideErrorSupportLink?: boolean;
     icon?: string;
     maxLines?: number;
-    sticky?: boolean;
     title?: string;
     titleArguments?: {
         [key: string]: string | number;

react/features/recording/components/Recording/AbstractStartRecordingDialog.ts

@@ -415,7 +415,7 @@ class AbstractStartRecordingDialog extends Component<IProps, IState> {
 
         if (this.state.selectedRecordingService === RECORDING_TYPES.JITSI_REC_SERVICE
                 && this.state.shouldRecordTranscription) {
-            dispatch(setRequestingSubtitles(true, _displaySubtitles, _subtitlesLanguage));
+            dispatch(setRequestingSubtitles(true, _displaySubtitles, _subtitlesLanguage, true));
         } else {
             _conference?.getMetadataHandler().setMetadata(RECORDING_METADATA_ID, {
                 isTranscribingEnabled: this.state.shouldRecordTranscription

react/features/recording/components/Recording/AbstractStopRecordingDialog.ts

@@ -108,7 +108,8 @@ export default class AbstractStopRecordingDialog<P extends IProps>
         }
 
         // TODO: this should be an action in transcribing. -saghul
-        this.props.dispatch(setRequestingSubtitles(Boolean(_displaySubtitles), _displaySubtitles, _subtitlesLanguage));
+        this.props.dispatch(
+            setRequestingSubtitles(Boolean(_displaySubtitles), _displaySubtitles, _subtitlesLanguage, true));
 
         this.props._conference?.getMetadataHandler().setMetadata(RECORDING_METADATA_ID, {
             isTranscribingEnabled: false

react/features/subtitles/actions.any.ts

@@ -83,7 +83,7 @@ export function toggleRequestingSubtitles() {
  * @param {boolean} enabled - The new state of the subtitles.
  * @param {boolean} displaySubtitles - Whether to display subtitles or not.
  * @param {string} language - The language of the subtitles.
- * @param {boolean} backendRecordingOn - Whether backend recording is on.
+ * @param {boolean} forceBackendRecordingOn - Whether to force that backend recording is on.
  * @returns {{
  *    type: SET_REQUESTING_SUBTITLES,
  *    backendRecordingOn: boolean,
@@ -95,11 +95,13 @@ export function toggleRequestingSubtitles() {
 export function setRequestingSubtitles(
         enabled: boolean,
         displaySubtitles = true,
-        language: string | null = `translation-languages:${DEFAULT_LANGUAGE}`) {
+        language: string | null = `translation-languages:${DEFAULT_LANGUAGE}`,
+        forceBackendRecordingOn: boolean = false) {
     return {
         type: SET_REQUESTING_SUBTITLES,
         displaySubtitles,
         enabled,
+        forceBackendRecordingOn,
         language
     };
 }

react/features/subtitles/components/web/LanguageSelector.tsx

@@ -51,6 +51,13 @@ function LanguageSelector() {
         state,
         selectedLanguage?.replace('translation-languages:', '')
     ));
+    const isAsyncTranscriptionEnabled = useSelector((state: IReduxState) =>
+        state['features/base/conference'].conference?.getMetadataHandler()?.getMetadata()?.asyncTranscription);
+
+    // Hide the "Translate to" option when asyncTranscription is enabled
+    if (isAsyncTranscriptionEnabled) {
+        return null;
+    }
 
     /**
      * Maps available languages to Select component options format.

react/features/subtitles/middleware.ts

@@ -98,7 +98,7 @@ MiddlewareRegistry.register(store => next => action => {
         break;
     }
     case SET_REQUESTING_SUBTITLES:
-        _requestingSubtitlesChange(store, action.enabled, action.language);
+        _requestingSubtitlesChange(store, action.enabled, action.language, action.forceBackendRecordingOn);
         break;
     }
 
@@ -344,13 +344,16 @@ function _getPrimaryLanguageCode(language: string) {
  * @param {Store} store - The redux store.
  * @param {boolean} enabled - Whether subtitles should be enabled or not.
  * @param {string} language - The language to use for translation.
+ * @param {boolean} forceBackendRecordingOn - Whether to force backend recording is on or not. This is used only when
+ * we start recording, stopping is based on whether isTranscribingEnabled is already set.
  * @private
  * @returns {void}
  */
 function _requestingSubtitlesChange(
         { dispatch, getState }: IStore,
         enabled: boolean,
-        language?: string | null) {
+        language?: string | null,
+        forceBackendRecordingOn: boolean = false) {
     const state = getState();
     const { conference } = state['features/base/conference'];
     const backendRecordingOn = conference?.getMetadataHandler()?.getMetadata()?.asyncTranscription;
@@ -375,7 +378,9 @@ function _requestingSubtitlesChange(
                     }));
                     dispatch(setSubtitlesError(true));
                 });
-        } else {
+        }
+
+        if (backendRecordingOn || forceBackendRecordingOn) {
             conference?.getMetadataHandler()?.setMetadata(RECORDING_METADATA_ID, {
                 isTranscribingEnabled: true
             });
@@ -388,7 +393,7 @@ function _requestingSubtitlesChange(
             language.replace('translation-languages:', ''));
     }
 
-    if (!enabled && backendRecordingOn
+    if (!enabled && (backendRecordingOn || forceBackendRecordingOn)
         && conference?.getMetadataHandler()?.getMetadata()[RECORDING_METADATA_ID]?.isTranscribingEnabled) {
         conference?.getMetadataHandler()?.setMetadata(RECORDING_METADATA_ID, {
             isTranscribingEnabled: false

resources/prosody-plugins/mod_token_verification.lua

@@ -47,7 +47,11 @@ local require_token_for_moderation;
 local allowlist;
 local function load_config()
     require_token_for_moderation = module:get_option_boolean("token_verification_require_token_for_moderation");
-    allowlist = module:get_option_set('token_verification_allowlist', {});
+    allowlist = module:get_option_set('token_verification_allowlist_fallback_to_defaults', {
+        'recorder.8x8.vc';
+        'jigasia.8x8.vc';
+        'sipjibri.8x8.vc';
+    });
 end
 load_config();
 
@@ -74,17 +78,7 @@ local function verify_user(session, stanza)
         or allowlist:contains(user_bare_jid)
 
         -- allow main participants in visitor mode
-        or session.type == 's2sin'
-
-        -- Let Jigasi or transcriber pass throw
-        or util.is_sip_jigasi(stanza)
-        or util.is_transcriber_jigasi(stanza)
-
-        -- is jibri
-        or util.is_jibri(user_jid)
-
-        -- Let Sip Jibri pass through
-        or util.is_sip_jibri_join(stanza) then
+        or session.type == 's2sin' then
         if DEBUG then module:log("debug", "Token not required from user in allow list: %s", user_jid); end
         return true;
     end

tests/pageobjects/Notifications.ts

@@ -2,6 +2,7 @@ import BasePageObject from './BasePageObject';
 
 const ASK_TO_UNMUTE_NOTIFICATION_ID = 'notify.hostAskedUnmute';
 const AV_MODERATION_MUTED_NOTIFICATION_ID = 'notify.moderationInEffectTitle';
+const AV_MODERATION_VIDEO_MUTED_NOTIFICATION_ID = 'notify.moderationInEffectVideoTitle';
 const JOIN_MULTIPLE_TEST_ID = 'notify.connectedThreePlusMembers';
 const JOIN_ONE_TEST_ID = 'notify.connectedOneMember';
 const JOIN_TWO_TEST_ID = 'notify.connectedTwoMembers';
@@ -57,6 +58,13 @@ export default class Notifications extends BasePageObject {
         return this.closeNotification(AV_MODERATION_MUTED_NOTIFICATION_ID, skipNonExisting);
     }
 
+    /**
+     * Closes the video muted notification.
+     */
+    async closeAVModerationVideoMutedNotification(skipNonExisting = false) {
+        return this.closeNotification(AV_MODERATION_VIDEO_MUTED_NOTIFICATION_ID, skipNonExisting);
+    }
+
     /**
      * Closes the ask to unmute notification.
      */
@@ -106,14 +114,22 @@ export default class Notifications extends BasePageObject {
      * @private
      */
     private async closeNotification(testId: string, skipNonExisting = false) {
-        const closeButton = this.participant.driver.$('[data-testid="${testId}"] #close-notification');
+        const closeButton = this.participant.driver.$(`[data-testid="${testId}"] #close-notification`);
 
-        if (skipNonExisting && !await closeButton.isExisting()) {
-            return Promise.resolve();
+        try {
+            if (skipNonExisting && !await closeButton.isExisting()) {
+                return Promise.resolve();
+            }
+
+            await closeButton.moveTo();
+            await closeButton.click();
+        } catch (e) {
+            console.error(`Error closing notification ${testId}`, e);
+
+            if (!skipNonExisting) {
+                throw e;
+            }
         }
-
-        await closeButton.moveTo();
-        await closeButton.click();
     }
 
     /**

tests/pageobjects/PasswordDialog.ts

@@ -40,7 +40,7 @@ export default class PasswordDialog extends BaseDialog {
         const passwordInput = this.participant.driver.$(INPUT_KEY_XPATH);
 
         await passwordInput.waitForExist();
-        await passwordInput.waitForClickable({ timeout: 2000 });
+        await passwordInput.waitForStable();
         await passwordInput.click();
         await passwordInput.clearValue();
 

tests/specs/helpers/mute.ts

@@ -45,6 +45,8 @@ export async function unmuteAudioAndCheck(testee: Participant, observer: Partici
  * @param observer
  */
 export async function unmuteVideoAndCheck(testee: Participant, observer: Participant): Promise<void> {
+    await testee.getNotifications().closeAskToUnmuteNotification(true);
+    await testee.getNotifications().closeAVModerationVideoMutedNotification(true);
     await testee.getToolbar().clickVideoUnmuteButton();
 
     await testee.getParticipantsPane().assertVideoMuteIconIsDisplayed(testee, true);

tests/specs/media/audioVideoModeration.spec.ts

@@ -122,12 +122,12 @@ describe('Audio/video moderation', () => {
         await moderatorParticipantsPane.assertVideoMuteIconIsDisplayed(moderator);
         await nonModeratorParticipantsPane.assertVideoMuteIconIsDisplayed(nonModerator);
 
-        await moderatorParticipantsPane.allowVideo(nonModerator);
         await moderatorParticipantsPane.askToUnmute(nonModerator, false);
-
         await nonModerator.getNotifications().waitForAskToUnmuteNotification();
-
         await unmuteAudioAndCheck(nonModerator, p1);
+
+        await moderatorParticipantsPane.allowVideo(nonModerator);
+        await nonModerator.getNotifications().waitForAskToUnmuteNotification();
         await unmuteVideoAndCheck(nonModerator, p1);
 
         await moderatorParticipantsPane.clickContextMenuButton();
@@ -190,6 +190,10 @@ describe('Audio/video moderation', () => {
         // stop video and check
         await p1.getFilmstrip().muteVideo(p2);
 
+        // close and open participants pane to make sure the context menu disappears
+        await p1.getParticipantsPane().close();
+        await p1.getParticipantsPane().open();
+
         await p1.getParticipantsPane().assertVideoMuteIconIsDisplayed(p2);
         await p2.getParticipantsPane().assertVideoMuteIconIsDisplayed(p2);
 
@@ -256,11 +260,12 @@ async function unmuteByModerator(
     await moderator.getNotifications().waitForRaisedHandNotification();
 
     // ask participant to unmute
-    await moderatorParticipantsPane.allowVideo(participant);
     await moderatorParticipantsPane.askToUnmute(participant, false);
     await participant.getNotifications().waitForAskToUnmuteNotification();
-
     await unmuteAudioAndCheck(participant, moderator);
+
+    await moderatorParticipantsPane.allowVideo(participant);
+    await participant.getNotifications().waitForAskToUnmuteNotification();
     await unmuteVideoAndCheck(participant, moderator);
 
     if (stopModeration) {

tests/specs/misc/xmppConferenceRequest.spec.ts

@@ -0,0 +1,35 @@
+import { setTestProperties } from '../../helpers/TestProperties';
+import { ensureOneParticipant } from '../../helpers/participants';
+
+setTestProperties(__filename, {
+    description: 'Test that conference requests work over XMPP',
+    usesBrowsers: [ 'p1' ]
+});
+
+describe('XMPP Conference Request', () => {
+    it('join with conferenceRequestUrl disabled', async () => {
+        await ensureOneParticipant({
+            skipWaitToJoin: true,
+            configOverwrite: {
+                prejoinConfig: {
+                    enabled: true
+                }
+            }
+        });
+
+        const { p1 } = ctx;
+
+        // Update config before joining, because this option cannot be overridden with URL params.
+        await p1.driver.execute(async () => {
+            config.conferenceRequestUrl = '';
+            APP.store.dispatch({
+                type: 'OVERWRITE_CONFIG',
+                config
+            });
+        });
+
+        await p1.getPreJoinScreen().getJoinButton().click();
+        await p1.waitForMucJoinedOrError();
+        expect(await p1.isInMuc()).toBe(true);
+    });
+});

tests/specs/moderation/lobby.spec.ts

@@ -110,7 +110,6 @@ describe('Lobby', () => {
         await p3.waitForSendReceiveData();
         await p3.waitForRemoteStreams(2);
 
-        // now check third one display name in the room, is the one set in the prejoin screen
         // now check third one display name in the room, is the one set in the prejoin screen
         const name = await p1.getFilmstrip().getRemoteDisplayName(await p3.getEndpointId());