WIP

MatrixAI · Oct 25, 2021 · 9e0cd03 · 9e0cd03
1 parent ad47dc0
commit 9e0cd03
Show file tree

Hide file tree

Showing 6 changed files with 119 additions and 117 deletions.
diff --git a/src/vaults/VaultManager.ts b/src/vaults/VaultManager.ts
@@ -328,15 +328,15 @@ class VaultManager {
         await this.gestaltGraph.setGestaltActionByNode(nodeId, 'scan');
         await this.acl.setVaultAction(vaultId, nodeId, 'pull');
         await this.acl.setVaultAction(vaultId, nodeId, 'clone');
-        // await this.notificationsManager.sendNotification(nodeId, {
-        //   type: 'VaultShare',
-        //   vaultId: idUtils.toString(vaultId),
-        //   vaultName,
-        //   actions: {
-        //     clone: null,
-        //     pull: null,
-        //   },
-        // });
+        await this.notificationsManager.sendNotification(nodeId, {
+          type: 'VaultShare',
+          vaultId: idUtils.toString(vaultId),
+          vaultName,
+          actions: {
+            clone: null,
+            pull: null,
+          },
+        });
       });
     });
   }

diff --git a/tests/agent/GRPCClientAgent.test.ts b/tests/agent/GRPCClientAgent.test.ts
@@ -134,6 +134,7 @@ describe('GRPC agent', () => {
       db: db,
       acl: acl,
       gestaltGraph: gestaltGraph,
+      notificationsManager: notificationsManager,
       fs: fs,
       logger: logger,
     });
@@ -151,6 +152,7 @@ describe('GRPC agent', () => {
       nodeManager,
       sigchain,
       notificationsManager,
+      acl,
     });
     client = await testUtils.openTestAgentClient(port);
   }, global.polykeyStartupTimeout);

diff --git a/tests/agent/utils.ts b/tests/agent/utils.ts
@@ -11,26 +11,30 @@ import { NodeManager } from '@/nodes';
 import { promisify } from '@/utils';
 import { Sigchain } from '@/sigchain';
 import { NotificationsManager } from '@/notifications';
+import { ACL } from '@/acl';
 
 async function openTestAgentServer({
   keyManager,
   vaultManager,
   nodeManager,
   sigchain,
   notificationsManager,
+  acl,
 }: {
   keyManager: KeyManager;
   vaultManager: VaultManager;
   nodeManager: NodeManager;
   sigchain: Sigchain;
   notificationsManager: NotificationsManager;
+  acl: ACL;
 }) {
   const agentService: IAgentServer = createAgentService({
     keyManager,
     vaultManager,
     nodeManager,
     sigchain: sigchain,
     notificationsManager: notificationsManager,
+    acl: acl,
   });
 
   const server = new grpc.Server();

diff --git a/tests/nodes/NodeConnection.test.ts b/tests/nodes/NodeConnection.test.ts
@@ -163,6 +163,14 @@ describe('NodeConnection', () => {
       fs: fs,
       logger: logger,
     });
+    serverNotificationsManager =
+      await NotificationsManager.createNotificationsManager({
+        acl: serverACL,
+        db: serverDb,
+        nodeManager: serverNodeManager,
+        keyManager: serverKeyManager,
+        logger: logger,
+      });
     serverVaultManager = await VaultManager.createVaultManager({
       keyManager: serverKeyManager,
       vaultsPath: serverVaultsPath,
@@ -171,17 +179,10 @@ describe('NodeConnection', () => {
       db: serverDb,
       acl: serverACL,
       gestaltGraph: serverGestaltGraph,
+      notificationsManager: serverNotificationsManager,
       fs: fs,
       logger: logger,
     });
-    serverNotificationsManager =
-      await NotificationsManager.createNotificationsManager({
-        acl: serverACL,
-        db: serverDb,
-        nodeManager: serverNodeManager,
-        keyManager: serverKeyManager,
-        logger: logger,
-      });
     await serverDb.start();
     await serverGestaltGraph.setNode(node);
     await serverNodeManager.start();
@@ -191,6 +192,7 @@ describe('NodeConnection', () => {
       nodeManager: serverNodeManager,
       sigchain: serverSigchain,
       notificationsManager: serverNotificationsManager,
+      acl: serverACL,
     });
     server = await GRPCServer.createGRPCServer({
       logger: logger,

diff --git a/tests/notifications/NotificationsManager.test.ts b/tests/notifications/NotificationsManager.test.ts
@@ -127,6 +127,15 @@ describe('NotificationsManager', () => {
       fs: fs,
       logger: logger,
     });
+    receiverNotificationsManager =
+      await NotificationsManager.createNotificationsManager({
+        acl: receiverACL,
+        db: receiverDb,
+        nodeManager: receiverNodeManager,
+        keyManager: receiverKeyManager,
+        messageCap: 5,
+        logger: logger,
+      });
     receiverVaultManager = await VaultManager.createVaultManager({
       keyManager: receiverKeyManager,
       vaultsPath: receiverVaultsPath,
@@ -135,18 +144,10 @@ describe('NotificationsManager', () => {
       db: receiverDb,
       acl: receiverACL,
       gestaltGraph: receiverGestaltGraph,
+      notificationsManager: receiverNotificationsManager,
       fs: fs,
       logger: logger,
     });
-    receiverNotificationsManager =
-      await NotificationsManager.createNotificationsManager({
-        acl: receiverACL,
-        db: receiverDb,
-        nodeManager: receiverNodeManager,
-        keyManager: receiverKeyManager,
-        messageCap: 5,
-        logger: logger,
-      });
     receiverKeyPairPem = receiverKeyManager.getRootKeyPairPem();
     receiverCertPem = receiverKeyManager.getRootCertPem();
     receiverNodeId = networkUtils.certNodeId(receiverKeyManager.getRootCert());
@@ -164,6 +165,7 @@ describe('NotificationsManager', () => {
       nodeManager: receiverNodeManager,
       sigchain: receiverSigchain,
       notificationsManager: receiverNotificationsManager,
+      acl: receiverACL,
     });
     server = await GRPCServer.createGRPCServer({
       logger: logger,