Merge pull request #8759 from capilkey/2.2-join-fix

Only join a user if the connection is still active

bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js

@@ -30,7 +30,7 @@ export default function handleValidateAuthToken({ body }, meetingId) {
   if (!User) return;
 
   // Publish user join message
-  if (valid && !waitForApproval) {
+  if (valid && !waitForApproval && !!User.connectionId) {
     Logger.info('User=', User);
     userJoin(meetingId, userId, User.authToken);
   }

bigbluebutton-html5/imports/api/users/server/methods/userLeaving.js

@@ -27,6 +27,13 @@ export default function userLeaving(meetingId, userId, connectionId) {
     return false;
   }
 
+  const modifier = {
+    $set: {
+      connectionId: false,
+    },
+  };
+  Users.upsert(selector, modifier);
+
   const payload = {
     userId,
     sessionId: meetingId,

bigbluebutton-html5/imports/api/users/server/modifiers/removeUser.js

@@ -45,7 +45,7 @@ export default function removeUser(meetingId, userId) {
       return Logger.error(`Removing user from collection: ${err}`);
     }
 
-    const sessionUserId = `${meetingId}-${userId}`;
+    const sessionUserId = `${meetingId}--${userId}`;
     clearAllSessions(sessionUserId);
 
     clearUserInfoForRequester(meetingId, userId);