From ee47c6342dccd2b2a101e6c10b9b5f85663eae8d Mon Sep 17 00:00:00 2001
From: ramukaritik <ramukaritik@microsoft.com>
Date: Mon, 29 Jan 2024 11:09:03 +0530
Subject: [PATCH] Fix member removal bug and update user identification

---
 src/web/client/common/worker/webworker.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/web/client/common/worker/webworker.js b/src/web/client/common/worker/webworker.js
index 034c660bd..989a750e1 100644
--- a/src/web/client/common/worker/webworker.js
+++ b/src/web/client/common/worker/webworker.js
@@ -93,10 +93,10 @@ async function loadContainer(config, swpId, entityInfo) {
         }
 
         audience.on("memberRemoved", (clientId, member) => {
-            if (!existingMembers.get(member.userId)) {
+            if (!existingMembers.get(member.additionalDetails.AadObjectId)) {
                 self.postMessage({
                     type: "member-removed",
-                    userId: member.userId,
+                    userId: member.additionalDetails.AadObjectId,
                 });
             }
         });
@@ -106,7 +106,7 @@ async function loadContainer(config, swpId, entityInfo) {
             for (const [userId, member] of members.entries()) {
                 const connections = member.connections;
                 if (connections.some((connection) => connection.id === targetConnectionId)) {
-                    return { userId: userId, userName: member.userName };
+                    return { userId: userId, userName: member.userName, aadObjectId: member.additionalDetails.AadObjectId };
                 }
             }
 
@@ -132,9 +132,10 @@ async function loadContainer(config, swpId, entityInfo) {
                     );
                 });
 
+                // aadObjectId is the unique identifier for a user
                 await self.postMessage({
                     type: "client-data",
-                    userId: user.userId,
+                    userId: user.aadObjectId,
                     userName: user.userName,
                     containerId: swpId,
                     entityId: userEntityIdArray,