Hot fix metadata leek from the space (workadventure#4578)

* Hot fix metadata leek from the space

Author: gparant

back/src/Model/Space.ts

@@ -91,6 +91,10 @@ export class Space implements CustomJsonReplacerInterface {
             sourceWatcher
         );
         debug(`${this.name} : user => removed ${id}`);
+
+        if (usersList.size === 0) {
+            this.users.delete(sourceWatcher);
+        }
     }
 
     public updateMetadata(watcher: SpacesWatcher, metadata: { [key: string]: unknown }) {

back/src/Services/SocketManager.ts

@@ -1454,6 +1454,11 @@ export class SocketManager {
         const space = this.spaces.get(removeSpaceUserMessage.spaceName);
         if (space) {
             space.removeUser(pusher, removeSpaceUserMessage.userId);
+            if (space.canBeDeleted()) {
+                debug("[space] Space %s => deleted", space.name);
+                this.spaces.delete(space.name);
+                pusher.unwatchSpace(space.name);
+            }
         }
     }
 

back/tests/Space.test.ts

@@ -143,11 +143,14 @@ describe("Space", () => {
 
         space.removeUser(watcher1, 1);
 
+        // should return false because Space is not empty
+        expect(space.canBeDeleted()).toBe(false);
+
         // should have received the removeUser event
         expect(eventsWatcher3.some((message) => message.message?.$case === "removeSpaceUserMessage")).toBe(true);
         space.removeWatcher(watcher3);
     });
-    it("should return false because Space is not empty", () => {
-        expect(space.canBeDeleted()).toBe(false);
+    it("should return true because Space is empty at the end (watcher1, watcher2 and watcher3 as removed)", () => {
+        expect(space.canBeDeleted()).toBe(true);
     });
 });

play/src/pusher/services/SocketManager.ts

@@ -1333,12 +1333,12 @@ export class SocketManager implements ZoneEventListener {
         if (space) {
             space.removeClientWatcher(client);
             space.removeUser(socketData.spaceUser.id);
+            this.deleteSpaceIfEmpty(space);
             const success = socketData.spaces.delete(space.name);
             if (!success) {
                 console.error("Could not find space", spaceName, "to leave");
                 Sentry.captureException(new Error("Could not find space " + spaceName + " to leave"));
             }
-            this.deleteSpaceIfEmpty(space);
         } else {
             console.error("Could not find space", spaceName, "to leave");
             Sentry.captureException(new Error("Could not find space " + spaceName + " to leave"));