BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7500 from capilkey/fix-html5-logout

Browse Source 
Fix HTML5 logout
This commit is contained in:
Chad Pilkey 2019-05-24 18:59:19 -04:00 committed by GitHub
commit b8e4445eb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bigbluebutton-html5/imports/startup/client/base.jsx
View File

@ -182,7 +182,10 @@ class Base extends Component {
}
if (codeError && !meetingHasEnded) {
// 680 is set for the codeError when the user requests a logout
if (codeError !== '680') {
logger.error({ logCode: 'startup_client_usercouldnotlogin_error' }, `User could not log in HTML5, hit ${codeError}`);
}
return (<ErrorScreen code={codeError} />);
}
// this.props.annotationsHandler.stop();

2
bigbluebutton-html5/imports/ui/components/app/component.jsx
View File

@ -127,8 +127,10 @@ class App extends Component {
componentWillUnmount() {
window.removeEventListener('resize', this.handleWindowResize, false);
if (navigator.connection) {
navigator.connection.addEventListener('change', this.handleNetworkConnection, false);
}
}
handleWindowResize() {
const { enableResize } = this.state;

3
bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
View File

@ -166,7 +166,8 @@ class SettingsDropdown extends PureComponent {
leaveSession() {
document.dispatchEvent(new Event('exitVideo'));
const LOGOUT_CODE = '403';
// Set the logout code to 680 because it's not a real code and can be matched on the other side
const LOGOUT_CODE = '680';
makeCall('userLeftMeeting');
// we don't check askForFeedbackOnLogout here,
// it is checked in meeting-ended component