Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release

bigbluebutton-html5/imports/api/breakouts/server/handlers/breakoutStarted.js

@@ -4,6 +4,9 @@ import { check } from 'meteor/check';
 import flat from 'flat';
 
 export default function handleBreakoutRoomStarted({ body }, meetingId) {
+  // 0 seconds default breakout time, forces use of real expiration time
+  const DEFAULT_TIME_REMAINING = 0;
+
   const {
     parentMeetingId,
     breakout,
@@ -11,8 +14,6 @@ export default function handleBreakoutRoomStarted({ body }, meetingId) {
 
   const { breakoutId } = breakout;
 
-  const timeRemaining = 15;
-
   check(meetingId, String);
 
   const selector = {
@@ -22,7 +23,7 @@ export default function handleBreakoutRoomStarted({ body }, meetingId) {
   const modifier = {
     $set: Object.assign(
       { users: [] },
-      { timeRemaining: Number(timeRemaining) },
+      { timeRemaining: DEFAULT_TIME_REMAINING },
       { parentMeetingId },
       flat(breakout),
     ),

bigbluebutton-html5/imports/ui/components/app/container.jsx

@@ -84,15 +84,18 @@ export default withRouter(injectIntl(withModalMounter(withTracker(({ router, int
     },
   });
 
-  // forcelly logged out when the meeting is ended
+  // forcefully log out when the meeting ends
   Meetings.find({ meetingId: Auth.meetingID }).observeChanges({
     removed() {
-      if (isMeetingBreakout) return;
-      router.push(`/ended/${410}`);
+      if (isMeetingBreakout) {
+        Auth.clearCredentials().then(window.close);
+      } else {
+        router.push(`/ended/${410}`);
+      }
     },
   });
 
-  // Close the widow when the current breakout room ends
+  // Close the window when the current breakout room ends
   Breakouts.find({ breakoutId: Auth.meetingID }).observeChanges({
     removed() {
       Auth.clearCredentials().then(window.close);

bigbluebutton-html5/imports/ui/components/notifications-bar/container.jsx

@@ -173,7 +173,7 @@ export default injectIntl(withTracker(({ intl }) => {
         clearInterval(timeRemainingInterval);
         data.message = intl.formatMessage(intlMessages.breakoutWillClose);
       }
-    } else if (!timeRemaining && currentBreakout) {
+    } else if (currentBreakout) {
       data.message = intl.formatMessage(intlMessages.calculatingBreakoutTimeRemaining);
     }
   }