jazz-tools 0.17.12 → 0.17.13

package/src/tools/auth/clerk/tests/JazzClerkAuth.test.ts

@@ -13,6 +13,7 @@ const authSecretStorage = new AuthSecretStorage();
 
 describe("JazzClerkAuth", () => {
   const mockAuthenticate = vi.fn();
+  const mockLogOut = vi.fn();
   let auth: JazzClerkAuth;
 
   beforeEach(async () => {
@@ -21,7 +22,7 @@ describe("JazzClerkAuth", () => {
     await createJazzTestAccount({
       isCurrentActiveAccount: true,
     });
-    auth = new JazzClerkAuth(mockAuthenticate, authSecretStorage);
+    auth = new JazzClerkAuth(mockAuthenticate, mockLogOut, authSecretStorage);
   });
 
   describe("onClerkUserChange", () => {
@@ -118,6 +119,35 @@ describe("JazzClerkAuth", () => {
         provider: "clerk",
       });
     });
+
+    it("should call LogOut", async () => {
+      // Set up local auth
+      await authSecretStorage.set({
+        accountID: "xxxx" as ID<Account>,
+        secretSeed: new Uint8Array([2, 2, 2]),
+        accountSecret: "xxxx" as AgentSecret,
+        provider: "anonymous",
+      });
+
+      const mockClerk = {
+        user: {
+          fullName: "Guido",
+          unsafeMetadata: {
+            jazzAccountID: "test123",
+            jazzAccountSecret: "secret123",
+            jazzAccountSeed: [1, 2, 3],
+          },
+        },
+        signOut: vi.fn(),
+      } as unknown as MinimalClerkClient;
+
+      await auth.onClerkUserChange(mockClerk);
+
+      await auth.onClerkUserChange({ user: null });
+
+      expect(authSecretStorage.isAuthenticated).toBe(false);
+      expect(mockLogOut).toHaveBeenCalled();
+    });
   });
 
   describe("registerListener", () => {
@@ -147,7 +177,11 @@ describe("JazzClerkAuth", () => {
     it("should call onClerkUserChange on the first trigger", async () => {
       const { client, triggerUserChange } = setupMockClerk(null);
 
-      const auth = new JazzClerkAuth(mockAuthenticate, authSecretStorage);
+      const auth = new JazzClerkAuth(
+        mockAuthenticate,
+        mockLogOut,
+        authSecretStorage,
+      );
       const onClerkUserChangeSpy = vi.spyOn(auth, "onClerkUserChange");
 
       auth.registerListener(client);
@@ -160,7 +194,11 @@ describe("JazzClerkAuth", () => {
     it("should call onClerkUserChange when user changes", async () => {
       const { client, triggerUserChange } = setupMockClerk(null);
 
-      const auth = new JazzClerkAuth(mockAuthenticate, authSecretStorage);
+      const auth = new JazzClerkAuth(
+        mockAuthenticate,
+        mockLogOut,
+        authSecretStorage,
+      );
       const onClerkUserChangeSpy = vi.spyOn(auth, "onClerkUserChange");
 
       auth.registerListener(client);
@@ -181,7 +219,11 @@ describe("JazzClerkAuth", () => {
     it("should call onClerkUserChange when user passes from null to non-null", async () => {
       const { client, triggerUserChange } = setupMockClerk(null);
 
-      const auth = new JazzClerkAuth(mockAuthenticate, authSecretStorage);
+      const auth = new JazzClerkAuth(
+        mockAuthenticate,
+        mockLogOut,
+        authSecretStorage,
+      );
       const onClerkUserChangeSpy = vi.spyOn(auth, "onClerkUserChange");
 
       auth.registerListener(client);
@@ -194,7 +236,11 @@ describe("JazzClerkAuth", () => {
     it("should not call onClerkUserChange when user is the same", async () => {
       const { client, triggerUserChange } = setupMockClerk(null);
 
-      const auth = new JazzClerkAuth(mockAuthenticate, authSecretStorage);
+      const auth = new JazzClerkAuth(
+        mockAuthenticate,
+        mockLogOut,
+        authSecretStorage,
+      );
       const onClerkUserChangeSpy = vi.spyOn(auth, "onClerkUserChange");
 
       auth.registerListener(client);
@@ -221,7 +267,11 @@ describe("JazzClerkAuth", () => {
     it("should not call onClerkUserChange when user switches from undefined to null", async () => {
       const { client, triggerUserChange } = setupMockClerk(null);
 
-      const auth = new JazzClerkAuth(mockAuthenticate, authSecretStorage);
+      const auth = new JazzClerkAuth(
+        mockAuthenticate,
+        mockLogOut,
+        authSecretStorage,
+      );
       const onClerkUserChangeSpy = vi.spyOn(auth, "onClerkUserChange");
 
       auth.registerListener(client);

package/src/tools/tests/coMap.test.ts

@@ -726,9 +726,11 @@ describe("CoMap resolution", async () => {
     const currentAccount = Account.getMe();
 
     // Disconnect the current account
-    currentAccount._raw.core.node.syncManager.getPeers().forEach((peer) => {
-      peer.gracefulShutdown();
-    });
+    currentAccount._raw.core.node.syncManager
+      .getServerPeers(currentAccount._raw.id)
+      .forEach((peer) => {
+        peer.gracefulShutdown();
+      });
 
     const group = Group.create();
     group.addMember("everyone", "writer");
@@ -771,9 +773,11 @@ describe("CoMap resolution", async () => {
     const currentAccount = Account.getMe();
 
     // Disconnect the current account
-    currentAccount._raw.core.node.syncManager.getPeers().forEach((peer) => {
-      peer.gracefulShutdown();
-    });
+    currentAccount._raw.core.node.syncManager
+      .getServerPeers(currentAccount._raw.id)
+      .forEach((peer) => {
+        peer.gracefulShutdown();
+      });
 
     const group = Group.create();
     group.addMember("everyone", "writer");

package/src/tools/tests/exportImport.test.ts

@@ -257,7 +257,7 @@ describe("importContentPieces", () => {
     const alice = await createJazzTestAccount();
     const bob = await createJazzTestAccount();
 
-    bob._raw.core.node.syncManager.getPeers().forEach((peer) => {
+    bob._raw.core.node.syncManager.getClientPeers().forEach((peer) => {
       peer.gracefulShutdown();
     });
 
@@ -300,7 +300,7 @@ describe("importContentPieces", () => {
     const alice = await createJazzTestAccount();
     const bob = await createJazzTestAccount();
 
-    bob._raw.core.node.syncManager.getPeers().forEach((peer) => {
+    bob._raw.core.node.syncManager.getClientPeers().forEach((peer) => {
       peer.gracefulShutdown();
     });
 
@@ -340,7 +340,7 @@ describe("importContentPieces", () => {
     const alice = await createJazzTestAccount();
     const { guest } = await createJazzTestGuest();
 
-    guest.node.syncManager.getPeers().forEach((peer) => {
+    guest.node.syncManager.getClientPeers().forEach((peer) => {
       peer.gracefulShutdown();
     });
 
@@ -374,7 +374,7 @@ describe("importContentPieces", () => {
       isCurrentActiveAccount: true,
     });
 
-    bob._raw.core.node.syncManager.getPeers().forEach((peer) => {
+    bob._raw.core.node.syncManager.getClientPeers().forEach((peer) => {
       peer.gracefulShutdown();
     });
 
@@ -415,7 +415,7 @@ describe("importContentPieces", () => {
     const alice = await createJazzTestAccount();
     const bob = await createJazzTestAccount();
 
-    bob._raw.core.node.syncManager.getPeers().forEach((peer) => {
+    bob._raw.core.node.syncManager.getClientPeers().forEach((peer) => {
       peer.gracefulShutdown();
     });
 
@@ -479,7 +479,7 @@ describe("importContentPieces", () => {
     const alice = await createJazzTestAccount();
     const bob = await createJazzTestAccount();
 
-    bob._raw.core.node.syncManager.getPeers().forEach((peer) => {
+    bob._raw.core.node.syncManager.getClientPeers().forEach((peer) => {
       peer.gracefulShutdown();
     });
 

package/src/tools/tests/load.test.ts

@@ -137,7 +137,7 @@ test("retry an unavailable value", async () => {
   const currentAccount = Account.getMe();
 
   // Disconnect the current account
-  currentAccount._raw.core.node.syncManager.getPeers().forEach((peer) => {
+  currentAccount._raw.core.node.syncManager.getClientPeers().forEach((peer) => {
     peer.gracefulShutdown();
   });
 
@@ -169,9 +169,11 @@ test("returns null if the value is unavailable after retries", async () => {
   const currentAccount = Account.getMe();
 
   // Disconnect the current account
-  currentAccount._raw.core.node.syncManager.getPeers().forEach((peer) => {
-    peer.gracefulShutdown();
-  });
+  currentAccount._raw.core.node.syncManager
+    .getServerPeers(currentAccount._raw.id)
+    .forEach((peer) => {
+      peer.gracefulShutdown();
+    });
 
   const group = Group.create();
   const map = Person.create({ name: "John" }, group);

package/src/tools/tests/subscribe.test.ts

@@ -503,9 +503,11 @@ describe("subscribeToCoValue", () => {
     });
 
     // Disconnect the creator from the sync server
-    creator._raw.core.node.syncManager.getPeers().forEach((peer) => {
-      peer.gracefulShutdown();
-    });
+    creator._raw.core.node.syncManager
+      .getServerPeers(creator._raw.id)
+      .forEach((peer) => {
+        peer.gracefulShutdown();
+      });
 
     const everyone = Group.create(creator);
     everyone.addMember("everyone", "reader");
@@ -867,9 +869,11 @@ describe("subscribeToCoValue", () => {
     await person.waitForSync();
 
     // Disconnect from the sync server, so we can change permissions but not sync them
-    creator._raw.core.node.syncManager.getPeers().forEach((peer) => {
-      peer.gracefulShutdown();
-    });
+    creator._raw.core.node.syncManager
+      .getServerPeers(creator._raw.id)
+      .forEach((peer) => {
+        peer.gracefulShutdown();
+      });
 
     group.removeMember(writer1);
     group.addMember(writer2, "writer");