fixes for #305

MatrixAI · Feb 28, 2022 · 2523d70 · 2523d70
1 parent 81cffaa
commit 2523d70
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/src/agent/service/vaultsGitInfoGet.ts b/src/agent/service/vaultsGitInfoGet.ts
@@ -1,23 +1,23 @@
 import type { VaultName } from '../../vaults/types';
 import type { VaultManager } from '../../vaults';
 import type { ACL } from '../../acl';
-import type { ConnectionInfoGetter } from '../../agent/types';
+import type { ConnectionInfoGet } from '../../agent/types';
 import * as grpc from '@grpc/grpc-js';
 import { utils as grpcUtils } from '../../grpc';
 import { utils as vaultsUtils, errors as vaultsErrors } from '../../vaults';
 import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
 import * as validationUtils from '../../validation/utils';
 import * as nodesUtils from '../../nodes/utils';
-import { never } from '../../utils/utils';
+import * as agentErrors from '../errors';
 
 function vaultsGitInfoGet({
   vaultManager,
   acl,
-  connectionInfoGetter,
+  connectionInfoGet,
 }: {
   vaultManager: VaultManager;
   acl: ACL;
-  connectionInfoGetter: ConnectionInfoGetter;
+  connectionInfoGet: ConnectionInfoGet;
 }) {
   return async (
     call: grpc.ServerWritableStream<vaultsPB.InfoRequest, vaultsPB.PackChunk>,
@@ -43,10 +43,12 @@ function vaultsGitInfoGet({
       }
     }
     // Getting the NodeId from the ReverseProxy connection info
-    const connectionInfo = connectionInfoGetter(call.getPeer());
+    const connectionInfo = connectionInfoGet(call);
     // If this is getting run the connection exists
     // It SHOULD exist here
-    if (connectionInfo == null) never();
+    if (connectionInfo == null) {
+      throw new agentErrors.ErrorConnectionInfoMissing();
+    }
     const nodeId = connectionInfo.nodeId;
     const nodeIdEncoded = nodesUtils.encodeNodeId(nodeId);
     const actionType = validationUtils.parseVaultAction(request.getAction());

diff --git a/src/agent/service/vaultsGitPackGet.ts b/src/agent/service/vaultsGitPackGet.ts
@@ -1,23 +1,23 @@
 import type * as grpc from '@grpc/grpc-js';
 import type { VaultName } from '../../vaults/types';
 import type { VaultManager } from '../../vaults';
-import type { ConnectionInfoGetter } from '../../agent/types';
+import type { ConnectionInfoGet } from '../../agent/types';
 import type ACL from '../../acl/ACL';
-import { never } from '../../utils/utils';
 import * as nodesUtils from '../../nodes/utils';
 import { errors as grpcErrors, utils as grpcUtils } from '../../grpc';
 import { utils as vaultsUtils, errors as vaultsErrors } from '../../vaults';
 import * as vaultsPB from '../../proto/js/polykey/v1/vaults/vaults_pb';
 import * as validationUtils from '../../validation/utils';
+import * as agentErrors from '../errors';
 
 function vaultsGitPackGet({
   vaultManager,
   acl,
-  connectionInfoGetter,
+  connectionInfoGet,
 }: {
   vaultManager: VaultManager;
   acl: ACL;
-  connectionInfoGetter: ConnectionInfoGetter;
+  connectionInfoGet: ConnectionInfoGet;
 }) {
   return async (
     call: grpc.ServerDuplexStream<vaultsPB.PackChunk, vaultsPB.PackChunk>,
@@ -29,10 +29,12 @@ function vaultsGitPackGet({
     const body = Buffer.concat(clientBodyBuffers);
     const meta = call.metadata;
     // Getting the NodeId from the ReverseProxy connection info
-    const connectionInfo = connectionInfoGetter(call.getPeer());
+    const connectionInfo = connectionInfoGet(call);
     // If this is getting run the connection exists
     // It SHOULD exist here
-    if (connectionInfo == null) never();
+    if (connectionInfo == null) {
+      throw new agentErrors.ErrorConnectionInfoMissing();
+    }
     const nodeId = connectionInfo.nodeId;
     const nodeIdEncoded = nodesUtils.encodeNodeId(nodeId);
     // Getting vaultId