From 74d7e4fde74ddb12c9a9c9e3914554c3e16f2492 Mon Sep 17 00:00:00 2001 From: abora8x8 <56257143+abora8x8@users.noreply.github.com> Date: Tue, 11 Jan 2022 12:26:05 +0200 Subject: [PATCH] fix(jaas) log settings error --- react/features/jaas/actionTypes.js | 2 +- react/features/jaas/middleware.web.js | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/react/features/jaas/actionTypes.js b/react/features/jaas/actionTypes.js index d00a8d01a..875a83ec2 100644 --- a/react/features/jaas/actionTypes.js +++ b/react/features/jaas/actionTypes.js @@ -1,4 +1,4 @@ /** * Action used to store jaas customer details */ -export const SET_DETAILS = 'SET_DETAILS'; +export const SET_DETAILS = 'SET_DETAILS'; \ No newline at end of file diff --git a/react/features/jaas/middleware.web.js b/react/features/jaas/middleware.web.js index bd7fc9bfd..f10edb791 100644 --- a/react/features/jaas/middleware.web.js +++ b/react/features/jaas/middleware.web.js @@ -1,9 +1,14 @@ import { redirectToStaticPage } from '../app/actions'; +import { CONFERENCE_JOINED } from '../base/conference/actionTypes'; +import { + JitsiConferenceErrors, + JitsiConferenceEvents +} from '../base/lib-jitsi-meet'; import { MiddlewareRegistry } from '../base/redux'; - import { SET_DETAILS } from './actionTypes'; import { STATUSES } from './constants'; +import logger from './logger'; /** * The redux middleware for jaas. @@ -13,12 +18,28 @@ import { STATUSES } from './constants'; */ MiddlewareRegistry.register(store => next => async action => { switch (action.type) { + case CONFERENCE_JOINED: { + const { conference } = action; + + if (store.getState()['features/base/config'].iAmRecorder) { + // We don't register anything on web if we are in iAmRecorder mode + return; + } + + conference.on( + JitsiConferenceEvents.CONFERENCE_ERROR, (errorType, errorMsg) => { + errorType === JitsiConferenceErrors.SETTINGS_ERROR && logger.error(errorMsg); + }); + break; + } + case SET_DETAILS: { const { status } = action.payload; if (status === STATUSES.BLOCKED) { store.dispatch(redirectToStaticPage('/static/planLimit.html')); } + break; } }