chore: updated types

MatrixAI · Aug 26, 2024 · c2723ac · c2723ac
1 parent ef9032e
commit c2723ac
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/src/client/handlers/VaultsSecretsList.ts b/src/client/handlers/VaultsSecretsList.ts
@@ -3,7 +3,7 @@ import type {
   ClientRPCRequestParams,
   ClientRPCResponseResult,
   SecretFilesMessage,
-  SecretFiles,
+  SecretIdentifierMessage,
 } from '../types';
 import type VaultManager from '../../vaults/VaultManager';
 import path from 'path';
@@ -17,13 +17,13 @@ class VaultsSecretsList extends ServerHandler<
     vaultManager: VaultManager;
     db: DB;
   },
-  ClientRPCRequestParams<SecretFilesMessage>,
-  ClientRPCResponseResult<SecretFiles>
+  ClientRPCRequestParams<SecretIdentifierMessage>,
+  ClientRPCResponseResult<SecretFilesMessage>
 > {
   public async *handle(
-    input: ClientRPCRequestParams<SecretFilesMessage>,
+    input: ClientRPCRequestParams<SecretIdentifierMessage>,
     _cancel: any,
-  ): AsyncGenerator<ClientRPCResponseResult<SecretFiles>, void, void> {
+  ): AsyncGenerator<ClientRPCResponseResult<SecretFilesMessage>, void, void> {
     const { vaultManager, db } = this.container;
     const vaultId = await db.withTransactionF(async (tran) => {
       const vaultIdFromName = await vaultManager.getVaultId(
@@ -38,7 +38,7 @@ class VaultsSecretsList extends ServerHandler<
 
     yield* vaultManager.withVaultsG([vaultId], (vault) => {
       return vault.readG(async function* (fs): AsyncGenerator<
-        SecretFiles,
+        SecretFilesMessage,
         void,
         void
       > {
@@ -48,11 +48,11 @@ class VaultsSecretsList extends ServerHandler<
           files = await fs.promises.readdir(input.path);
         } catch (e) {
           throw new clientErrors.ErrorClientFSReadFailed(
-            `No matches exist for path: ${input.path}`,
+            `No matches exist for path: ${input.secretPath}`,
             { cause: e },
           );
         }
-        files = files.map((file) => path.join(input.path, file));
+        files = files.map((file) => path.join(input.secretPath, file));
 
         for await (const file of files) {
           const stat = await fs.promises.stat(file);

diff --git a/src/client/types.ts b/src/client/types.ts
@@ -300,15 +300,11 @@ type VaultsLatestVersionMessage = {
 };
 
 // Secrets
-type SecretFilesMessage = VaultIdentifierMessage & {
-  path: string;
-};
-
-type SecretNameMessage = {
-  secretName: string;
+type SecretPathMessage = {
+  secretPath: string;
 };
 
-type SecretIdentifierMessage = VaultIdentifierMessage & SecretNameMessage;
+type SecretIdentifierMessage = VaultIdentifierMessage & SecretPathMessage;
 
 // Contains binary content as a binary string 'toString('binary')'
 type ContentMessage = {
@@ -330,7 +326,7 @@ type SecretRenameMessage = SecretIdentifierMessage & {
   newSecretName: string;
 };
 
-type SecretFiles = {
+type SecretFilesMessage = {
   path: string;
   type: 'FILE' | 'DIRECTORY';
 };
@@ -418,15 +414,14 @@ export type {
   VaultsScanMessage,
   VaultsVersionMessage,
   VaultsLatestVersionMessage,
-  SecretNameMessage,
+  SecretPathMessage,
   SecretIdentifierMessage,
-  SecretFilesMessage,
   ContentMessage,
   SecretContentMessage,
   SecretMkdirMessage,
   SecretDirMessage,
   SecretRenameMessage,
-  SecretFiles,
+  SecretFilesMessage,
   SecretStatMessage,
   SignatureMessage,
   OverrideRPClientType,