haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(conference/reducer): clear 'authRequired' on connection will connect 

It is required to clear the flag, before the connection attempt.
Otherwise the app may confuse deployments without guest access with
a one with guess access if it was visited previously and
the WaitForOwnerDialog was canceled. That's because there will be no
conference related event that clears the flag.
This commit is contained in:
paweldomas 2017-09-22 15:09:04 -05:00 committed by Lyubo Marinov
parent a12984ed6f
commit 628dc99bfe
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
react/features/base/conference/reducer.js
View File

@ -1,7 +1,7 @@
import { LOCKED_LOCALLY, LOCKED_REMOTELY } from '../../room-lock';
import { CONNECTION_WILL_CONNECT } from '../connection';
import { JitsiConferenceErrors } from '../lib-jitsi-meet';
import { assign, ReducerRegistry, set } from '../redux';
import { LOCKED_LOCALLY, LOCKED_REMOTELY } from '../../room-lock';
import {
CONFERENCE_FAILED,
@ -42,6 +42,9 @@ ReducerRegistry.register('features/base/conference', (state = {}, action) => {
case CONFERENCE_WILL_LEAVE:
return _conferenceWillLeave(state, action);
case CONNECTION_WILL_CONNECT:
return set(state, 'authRequired', undefined);
case LOCK_STATE_CHANGED:
return _lockStateChanged(state, action);
@ -79,15 +82,18 @@ function _conferenceFailed(state, { conference, error }) {
return state;
}
const passwordRequired
= JitsiConferenceErrors.PASSWORD_REQUIRED === error
? conference
: undefined;
let authRequired;
let passwordRequired;
const authRequired
= JitsiConferenceErrors.AUTHENTICATION_REQUIRED === error
? conference
: undefined;
switch (error) {
case JitsiConferenceErrors.AUTHENTICATION_REQUIRED:
authRequired = conference;
break;
case JitsiConferenceErrors.PASSWORD_REQUIRED:
passwordRequired = conference;
break;
}
return assign(state, {
authRequired,