jazz-tools 0.13.17 → 0.13.19

package/src/tests/coPlainText.test.ts

@@ -119,7 +119,7 @@ describe("CoPlainText", () => {
         await createJazzContextFromExistingCredentials({
           credentials: {
             accountID: me.id,
-            secret: me._raw.agentSecret,
+            secret: me._raw.core.node.getCurrentAgent().agentSecret,
           },
           sessionProvider: randomSessionProvider,
           peersToLoadFrom: [initialAsPeer],
@@ -150,7 +150,7 @@ describe("CoPlainText", () => {
       await createJazzContextFromExistingCredentials({
         credentials: {
           accountID: me.id,
-          secret: me._raw.agentSecret,
+          secret: me._raw.core.node.getCurrentAgent().agentSecret,
         },
         sessionProvider: randomSessionProvider,
         peersToLoadFrom: [initialAsPeer],

package/src/tests/createContext.test.ts

@@ -1,4 +1,4 @@
-import { AgentSecret } from "cojson";
+import { AgentSecret, RawCoMap } from "cojson";
 import { WasmCrypto } from "cojson/crypto/WasmCrypto";
 import { beforeEach, describe, expect, test, vi } from "vitest";
 import {
@@ -44,7 +44,7 @@ describe("createContext methods", () => {
 
       const credentials: Credentials = {
         accountID: account.id,
-        secret: account._raw.core.node.account.agentSecret,
+        secret: account._raw.core.node.getCurrentAgent().agentSecret,
       };
 
       const context = await createJazzContextFromExistingCredentials({
@@ -72,7 +72,7 @@ describe("createContext methods", () => {
 
       const credentials: Credentials = {
         accountID: account.id,
-        secret: account._raw.core.node.account.agentSecret,
+        secret: account._raw.core.node.getCurrentAgent().agentSecret,
       };
 
       const context = await createJazzContextFromExistingCredentials({
@@ -96,7 +96,7 @@ describe("createContext methods", () => {
       const context = await createJazzContextFromExistingCredentials({
         credentials: {
           accountID: account.id,
-          secret: account._raw.core.node.account.agentSecret,
+          secret: account._raw.core.node.getCurrentAgent().agentSecret,
         },
         peersToLoadFrom: [getPeerConnectedToTestSyncServer()],
         crypto: Crypto,
@@ -119,7 +119,7 @@ describe("createContext methods", () => {
       const context = await createJazzContextFromExistingCredentials({
         credentials: {
           accountID: account.id,
-          secret: account._raw.core.node.account.agentSecret,
+          secret: account._raw.core.node.getCurrentAgent().agentSecret,
         },
         peersToLoadFrom: [getPeerConnectedToTestSyncServer()],
         crypto: Crypto,
@@ -139,7 +139,7 @@ describe("createContext methods", () => {
       const context = await createJazzContextFromExistingCredentials({
         credentials: {
           accountID: account.id,
-          secret: account._raw.core.node.account.agentSecret,
+          secret: account._raw.core.node.getCurrentAgent().agentSecret,
         },
         peersToLoadFrom: [getPeerConnectedToTestSyncServer()],
         crypto: Crypto,
@@ -172,7 +172,7 @@ describe("createContext methods", () => {
         crypto: Crypto,
       });
 
-      expect(context.node.account.agentSecret).toBe(initialSecret);
+      expect(context.node.getCurrentAgent().agentSecret).toBe(initialSecret);
     });
 
     test("handles custom account schema", async () => {
@@ -311,7 +311,7 @@ describe("createContext methods", () => {
         sessionProvider: randomSessionProvider,
       });
 
-      expect(context.node.account.agentSecret).toBe(initialSecret);
+      expect(context.node.getCurrentAgent().agentSecret).toBe(initialSecret);
       expect(await storage.get()).toEqual({
         accountID: "test" as ID<Account>,
         secretSeed: new Uint8Array([1, 2, 3]),

package/src/tests/deepLoading.test.ts

@@ -57,7 +57,7 @@ describe("Deep loading with depth arg", async () => {
     await createJazzContextFromExistingCredentials({
       credentials: {
         accountID: me.id,
-        secret: me._raw.agentSecret,
+        secret: me._raw.core.node.getCurrentAgent().agentSecret,
       },
       sessionProvider: randomSessionProvider,
       peersToLoadFrom: [initialAsPeer],
@@ -281,7 +281,7 @@ test("Deep loading a record-like coMap", async () => {
     await createJazzContextFromExistingCredentials({
       credentials: {
         accountID: me.id,
-        secret: me._raw.agentSecret,
+        secret: me._raw.core.node.getCurrentAgent().agentSecret,
       },
       sessionProvider: randomSessionProvider,
       peersToLoadFrom: [initialAsPeer],
@@ -401,8 +401,7 @@ describe("Deep loading with unauthorized account", async () => {
     expect(mapOnAlice).toBe(null);
 
     expect(errorSpy).toHaveBeenCalledWith(
-      "Not enough permissions to load / subscribe to CoValue",
-      map.id,
+      `The current user is not authorized to access this value from ${map.id}`,
     );
 
     errorSpy.mockReset();
@@ -424,12 +423,7 @@ describe("Deep loading with unauthorized account", async () => {
     expect(mapWithListOnAlice).toBe(null);
 
     expect(errorSpy).toHaveBeenCalledWith(
-      "Not enough permissions to load / subscribe to CoValue",
-      map.id,
-      "on path",
-      "list",
-      "unaccessible value:",
-      map.list?.id,
+      `The current user is not authorized to access this value from ${map.id} on path list`,
     );
 
     errorSpy.mockReset();
@@ -463,12 +457,7 @@ describe("Deep loading with unauthorized account", async () => {
     expect(mapOnAlice).toBe(null);
 
     expect(errorSpy).toHaveBeenCalledWith(
-      "Not enough permissions to load / subscribe to CoValue",
-      map.id,
-      "on path",
-      "list.0",
-      "unaccessible value:",
-      map.list?.[0]?.id,
+      `The current user is not authorized to access this value from ${map.id} on path list.0`,
     );
 
     errorSpy.mockReset();
@@ -495,12 +484,7 @@ describe("Deep loading with unauthorized account", async () => {
     expect(mapOnAlice?.optionalRef?.value).toBe(undefined);
 
     expect(errorSpy).toHaveBeenCalledWith(
-      "Not enough permissions to load / subscribe to CoValue",
-      map.id,
-      "on path",
-      "optionalRef",
-      "unaccessible value:",
-      map.optionalRef?.id,
+      `The current user is not authorized to access this value from ${map.id} on path optionalRef`,
     );
 
     errorSpy.mockReset();
@@ -559,12 +543,7 @@ describe("Deep loading with unauthorized account", async () => {
     expect(mapOnAlice).toBe(null);
 
     expect(errorSpy).toHaveBeenCalledWith(
-      "Not enough permissions to load / subscribe to CoValue",
-      map.id,
-      "on path",
-      "list.0.stream",
-      "unaccessible value:",
-      map.list?.[0]?.stream?.id,
+      `The current user is not authorized to access this value from ${map.id} on path list.0.stream`,
     );
 
     errorSpy.mockReset();
@@ -600,12 +579,7 @@ describe("Deep loading with unauthorized account", async () => {
     expect(mapOnAlice).toBe(null);
 
     expect(errorSpy).toHaveBeenCalledWith(
-      "Not enough permissions to load / subscribe to CoValue",
-      map.id,
-      "on path",
-      "list.0.stream." + value.id,
-      "unaccessible value:",
-      value.id,
+      `The current user is not authorized to access this value from ${map.id} on path list.0.stream.${value.id}`,
     );
 
     errorSpy.mockReset();

package/src/tests/groupsAndAccounts.test.ts

@@ -3,7 +3,7 @@ import { assert, beforeEach, describe, expect, test } from "vitest";
 import { Account, CoMap, Group, Profile, co } from "../exports.js";
 import { Ref } from "../internal.js";
 import { createJazzTestAccount, setupJazzTestSync } from "../testing.js";
-import { setupTwoNodes } from "./utils.js";
+import { setupTwoNodes, waitFor } from "./utils.js";
 
 const Crypto = await WasmCrypto.create();
 
@@ -113,10 +113,12 @@ describe("Group inheritance", () => {
 
     mapInChild.title = "In Child (updated)";
 
-    const mapAsReaderAfterUpdate = await TestMap.load(mapInChild.id, {
-      loadAs: reader,
+    await waitFor(async () => {
+      const mapAsReaderAfterUpdate = await TestMap.load(mapInChild.id, {
+        loadAs: reader,
+      });
+      expect(mapAsReaderAfterUpdate).toBe(null);
     });
-    expect(mapAsReaderAfterUpdate).toBe(null);
   });
 
   test("Group inheritance with grand-children", async () => {