cojson 0.18.36 → 0.18.37

package/src/tests/group.inheritance.test.ts

@@ -7,6 +7,7 @@ import {
   createThreeConnectedNodes,
   createTwoConnectedNodes,
   loadCoValueOrFail,
+  setupTestAccount,
   setupTestNode,
 } from "./testUtils";
 import { expectMap } from "../coValue.js";
@@ -1161,4 +1162,64 @@ describe("extend with role mapping", () => {
     expect(map.get("test")).toEqual("Written from the admin");
     expect(mapOnNode2.get("test")).toEqual("Written from the admin");
   });
+
+  test("if an account is revoked on the child but still a member of the parent, transactions should be considered valid", async () => {
+    const alice = await setupTestAccount({
+      connected: true,
+    });
+    const bob = await setupTestAccount({
+      connected: true,
+    });
+    const charlie = await setupTestAccount({
+      connected: true,
+    });
+
+    const group = alice.node.createGroup();
+    const parentGroup = alice.node.createGroup();
+
+    const bobInAlice = await loadCoValueOrFail(alice.node, bob.accountID);
+    group.addMember(bobInAlice, "admin");
+    group.extend(parentGroup, "admin");
+    parentGroup.addMember(bobInAlice, "admin");
+
+    const groupInBob = await loadCoValueOrFail(bob.node, group.id);
+    groupInBob.removeMember(bob.node.getCurrentAgent());
+
+    const charlieInBob = await loadCoValueOrFail(bob.node, charlie.accountID);
+    groupInBob.addMember(charlieInBob, "reader");
+
+    expect(groupInBob.roleOf(charlie.accountID)).toBe("reader");
+  });
+
+  test("if an account is revoked on the parent, their old transactions on the child should stay valid", async () => {
+    const alice = await setupTestAccount({
+      connected: true,
+    });
+    const bob = await setupTestAccount({
+      connected: true,
+    });
+    const charlie = await setupTestAccount({
+      connected: true,
+    });
+
+    const group = alice.node.createGroup();
+    const parentGroup = alice.node.createGroup();
+
+    const bobInAlice = await loadCoValueOrFail(alice.node, bob.accountID);
+    group.extend(parentGroup, "admin");
+    parentGroup.addMember(bobInAlice, "admin");
+
+    const groupInBob = await loadCoValueOrFail(bob.node, group.id);
+    const parentGroupInBob = await loadCoValueOrFail(bob.node, parentGroup.id);
+    const charlieInBob = await loadCoValueOrFail(bob.node, charlie.accountID);
+    groupInBob.addMember(charlieInBob, "reader");
+
+    await new Promise((r) => setTimeout(r, 10));
+
+    parentGroupInBob.removeMember(bob.node.getCurrentAgent());
+
+    const groupInCharlie = await loadCoValueOrFail(charlie.node, group.id);
+
+    expect(groupInCharlie.roleOf(charlie.accountID)).toBe("reader");
+  });
 });

package/src/tests/group.invite.test.ts

@@ -346,15 +346,9 @@ describe("Group invites", () => {
     });
 
     const group = admin.node.createGroup();
-    const person = group.createMap({
-      name: "John Doe",
-    });
 
     // First add member as admin
-    const memberAccount = await loadCoValueOrFail(
-      member.node,
-      member.accountID,
-    );
+    const memberAccount = await loadCoValueOrFail(admin.node, member.accountID);
     group.addMember(memberAccount, "admin");
 
     // Create a reader invite
@@ -367,8 +361,6 @@ describe("Group invites", () => {
     expect(groupOnMemberNode.roleOf(member.accountID)).toEqual("admin");
   });
 
-  logger.setLevel(LogLevel.DEBUG);
-
   test("invites should be able to upgrade the role of an existing member", async () => {
     const admin = await setupTestAccount({
       connected: true,
@@ -381,10 +373,7 @@ describe("Group invites", () => {
     const group = admin.node.createGroup();
 
     // First add member as reader
-    const memberAccount = await loadCoValueOrFail(
-      member.node,
-      member.accountID,
-    );
+    const memberAccount = await loadCoValueOrFail(admin.node, member.accountID);
     group.addMember(memberAccount, "reader");
 
     // Create an admin invite
@@ -401,10 +390,7 @@ describe("Group invites", () => {
     const reader = await setupTestAccount({
       connected: true,
     });
-    const readerAccount = await loadCoValueOrFail(
-      member.node,
-      reader.accountID,
-    );
+    const readerAccount = await loadCoValueOrFail(admin.node, reader.accountID);
     groupOnMemberNode.addMember(readerAccount, "reader");
   });
 
@@ -423,10 +409,7 @@ describe("Group invites", () => {
     });
 
     // First add member as reader
-    const memberAccount = await loadCoValueOrFail(
-      member.node,
-      member.accountID,
-    );
+    const memberAccount = await loadCoValueOrFail(admin.node, member.accountID);
     group.addMember(memberAccount, "reader");
     await group.removeMember(memberAccount);