Merge branch 'main' into configuredSharedTree

microsoft · Mar 26, 2024 · 2b7ef49 · 2b7ef49
2 parents 7bb79af + f49f533
commit 2b7ef49
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/server/routerlicious/packages/protocol-base/src/protocol.ts b/server/routerlicious/packages/protocol-base/src/protocol.ts
@@ -159,15 +159,16 @@ export class ProtocolOpHandler implements IProtocolHandler {
 
 		if (scrubUserData) {
 			// In place, remove any identifying client information
-			snapshot.members.forEach((member) => {
-				member[1] = {
-					...member[1],
+			snapshot.members = snapshot.members.map(([id, sequencedClient]) => [
+				id,
+				{
+					...sequencedClient,
 					client: {
-						...member[1].client,
+						...sequencedClient.client,
 						user: { id: "" },
 					},
-				};
-			});
+				},
+			]);
 		}
 
 		return {

diff --git a/server/routerlicious/packages/protocol-base/src/test/protocol.spec.ts b/server/routerlicious/packages/protocol-base/src/test/protocol.spec.ts
@@ -221,6 +221,18 @@ describe("Protocol", () => {
 			});
 			assert.strictEqual(protocolOpHandler.attributes.sequenceNumber, 2);
 
+			const scrubbedProtocolState = protocolOpHandler.getProtocolState(true);
+			scrubbedProtocolState.members.forEach(([, member]) => {
+				assert(!member.client.user.id, "user id should be empty");
+				assert(
+					!(member.client.user as unknown as any).name,
+					"user name should not be present",
+				);
+				assert(
+					!(member.client.user as unknown as any).additionalDetails?.favoriteColor,
+					"user additional details should not be present",
+				);
+			});
 			const protocolState = protocolOpHandler.getProtocolState();
 			protocolState.members.forEach(([, member]) => {
 				assert(member.client.user.id, "user id should be present");