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

Merge pull request #7072 from Tainan404/issue-6925

Browse Source 
Remove clear credentials that cause new client subscriptions.
This commit is contained in:
Anton Georgiev 2019-04-04 16:00:50 -04:00 committed by GitHub
commit d7a0a897ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bigbluebutton-html5/imports/ui/components/app/container.jsx
View File

@ -4,7 +4,6 @@ import { defineMessages, injectIntl } from 'react-intl';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import Auth from '/imports/ui/services/auth'; import Auth from '/imports/ui/services/auth';
import Users from '/imports/api/users'; import Users from '/imports/api/users';
import mapUser from '/imports/ui/services/user/mapUser';
import Breakouts from '/imports/api/breakouts'; import Breakouts from '/imports/api/breakouts';
import Meetings from '/imports/api/meetings'; import Meetings from '/imports/api/meetings';
@ -69,8 +68,6 @@ const AppContainer = (props) => {
export default injectIntl(withModalMounter(withTracker(({ intl, baseControls }) => { export default injectIntl(withModalMounter(withTracker(({ intl, baseControls }) => {
const currentUser = Users.findOne({ userId: Auth.userID }); const currentUser = Users.findOne({ userId: Auth.userID });
const currentUserIsLocked = mapUser(currentUser).isLocked;
const meeting = Meetings.findOne({ meetingId: Auth.meetingID });
const isMeetingBreakout = meetingIsBreakout(); const isMeetingBreakout = meetingIsBreakout();
if (!currentUser.approved) { if (!currentUser.approved) {
@ -92,7 +89,7 @@ export default injectIntl(withModalMounter(withTracker(({ intl, baseControls })
Meetings.find({ meetingId: Auth.meetingID }).observeChanges({ Meetings.find({ meetingId: Auth.meetingID }).observeChanges({
removed() { removed() {
if (isMeetingBreakout) { if (isMeetingBreakout) {
Auth.clearCredentials().then(window.close); window.close();
} else { } else {
endMeeting('410'); endMeeting('410');
} }
@ -102,7 +99,7 @@ export default injectIntl(withModalMounter(withTracker(({ intl, baseControls })
// Close the window when the current breakout room ends // Close the window when the current breakout room ends
Breakouts.find({ breakoutId: Auth.meetingID }).observeChanges({ Breakouts.find({ breakoutId: Auth.meetingID }).observeChanges({
removed() { removed() {
Auth.clearCredentials().then(window.close); window.close();
}, },
}); });

9
bigbluebutton-html5/imports/ui/components/meeting-ended/component.jsx
View File

@ -163,11 +163,18 @@ class MeetingEnded extends React.PureComponent {
} = this.state; } = this.state;
const noRating = selected <= 0; const noRating = selected <= 0;
logger.info({ feedback: code, logCode: 'meeting_ended_code' }, code);
return ( return (
<div className={styles.parent}> <div className={styles.parent}>
<div className={styles.modal}> <div className={styles.modal}>
<div className={styles.content}> <div className={styles.content}>
<h1 className={styles.title}>{intl.formatMessage(intlMessage[code])}</h1> <h1 className={styles.title}>
{
intl.formatMessage(intlMessage[code] || intlMessage[430])
}
</h1>
<div className={styles.text}> <div className={styles.text}>
{this.shouldShowFeedback {this.shouldShowFeedback
? intl.formatMessage(intlMessage.subtitle) ? intl.formatMessage(intlMessage.subtitle)