Updated secret tests and added exectution validation

packages/sdk-js/src/index.ts

@@ -6,10 +6,10 @@ import { BoolValue } from "google-protobuf/google/protobuf/wrappers_pb";
 import { Timestamp } from "google-protobuf/google/protobuf/timestamp_pb";
 import Workflow, { WorkflowProps } from "./models/workflow";
 import Edge, { EdgeProps } from "./models/edge";
-import Execution from "./models/execution";
+import Execution, { ExecutionProps } from "./models/execution";
+import Step, { StepProps } from "./models/step";
 import NodeFactory from "./models/node/factory";
 import TriggerFactory from "./models/trigger/factory";
-import Secret from "./models/secret";
 import type {
   GetKeyRequestApiKey,
   GetKeyRequestSignature,
@@ -25,9 +25,8 @@ import {
   GetExecutionsRequest,
   GetWorkflowsRequest,
   DEFAULT_LIMIT,
-  ListSecretRequest,
   ListSecretResponse,
-  DeleteSecretRequest,
+  SecretRequestOptions,
 } from "./types";
 
 import TriggerMetadata, {
@@ -77,7 +76,7 @@ class BaseClient {
   }
 
   /**
-   * The API key could retrieve a wallet’s authKey by skipping its signature verification
+   * The API key could retrieve a wallet's authKey by skipping its signature verification
    * @param chainId - The chain id
    * @param address - The address of the EOA wallet
    * @param issuedAt - The issued at timestamp
@@ -153,7 +152,7 @@ class BaseClient {
   }
 
   /**
-   * Get the auth key if it’s set in the client
+   * Get the auth key if it's set in the client
    * @returns {string | undefined} - The auth key
    */
   public getAuthKey(): string | undefined {
@@ -169,7 +168,7 @@ class BaseClient {
   }
 
   /**
-   * Get the factory address if it’s set in the client
+   * Get the factory address if it's set in the client
    * @returns {string | undefined} - The factory address
    */
   public getFactoryAddress(): string | undefined {
@@ -507,10 +506,22 @@ export default class Client extends BaseClient {
   }
 
   async createSecret(
-    secret: Secret,
-    options?: RequestOptions
+    name: string,
+    value: string,
+    options?: SecretRequestOptions
   ): Promise<boolean> {
-    const request = secret.toRequest();
+    const request = new avs_pb.CreateOrUpdateSecretReq();
+
+    request.setName(name);
+    request.setSecret(value);
+
+    if (options?.workflowId) {
+      request.setWorkflowId(options.workflowId);
+    }
+
+    if (options?.orgId) {
+      request.setOrgId(options.orgId);
+    }
 
     const result = await this.sendGrpcRequest<
       BoolValue,
@@ -520,37 +531,91 @@ export default class Client extends BaseClient {
     return result.getValue();
   }
 
+  /**
+   * Update an existing secret; the secret is updated in the user scope by default, derived from the auth key.
+   * @param secret - The secret object containing updated information
+   * @param options - Request options, including workflowId and orgId for scoping
+   * @returns {Promise<boolean>} - Whether the secret was successfully updated
+   */
+  async updateSecret(
+    name: string,
+    value: string,
+    options?: SecretRequestOptions
+  ): Promise<boolean> {
+    const request = new avs_pb.CreateOrUpdateSecretReq();
+
+    request.setName(name);
+    request.setSecret(value);
+
+    if (options?.workflowId) {
+      request.setWorkflowId(options.workflowId);
+    }
+
+    if (options?.orgId) {
+      request.setOrgId(options.orgId);
+    }
+
+    const result = await this.sendGrpcRequest<
+      BoolValue,
+      avs_pb.CreateOrUpdateSecretReq
+    >("updateSecret", request, options);
+
+    return result.getValue();
+  }
+
+  /**
+   * Retrieve a list of secrets; secrets can be filtered by workflowId or orgId.
+   * @param params - Parameters for listing secrets
+   * @param options - Request options, including workflowId and orgId for filtering
+   * @returns {Promise<ListSecretResponse[]>} - The list of secrets
+   */
   async listSecrets(
-    params: ListSecretRequest,
-    options?: RequestOptions
+    options?: SecretRequestOptions
   ): Promise<ListSecretResponse[]> {
     const request = new avs_pb.ListSecretsReq();
-    if (params?.workflowId) {
-      request.setWorkflowId(params.workflowId);
+
+    if (options?.workflowId) {
+      request.setWorkflowId(options.workflowId);
+    }
+
+    if (options?.orgId) {
+      // TODO: wait for the AVS to support orgId in ListSecrets
+      // request.setOrgId(options.orgId);
     }
 
     const result = await this.sendGrpcRequest<
       avs_pb.ListSecretsResp,
       avs_pb.ListSecretsReq
     >("listSecrets", request, options);
 
-    return result.getItemsList().map((item) => {
-      return {
-        name: item.getName(),
-        workflowId: item.getWorkflowId(),
-        orgId: item.getOrgId(),
-      };
-    });
+    return result.getItemsList().map((item) => ({
+      name: item.getName(),
+      workflowId: item.getWorkflowId(),
+      orgId: item.getOrgId(),
+    }));
   }
 
+  /**
+   * Delete a secret by its name; by default, the secret is deleted from the user scope, derived from the auth key
+   * @param name - The name of the secret
+   * @param options - Request options
+   * @param options.workflowId - The workflow id; if specified, the secret will be deleted from the workflow scope
+   * @param options.orgId - The organization id; if specified, the secret will be deleted from the organization scope
+   * @returns {Promise<boolean>} - Whether the secret was successfully deleted
+   */
   async deleteSecret(
-    params: DeleteSecretRequest,
-    options?: RequestOptions
+    name: string,
+    options?: SecretRequestOptions
   ): Promise<boolean> {
     const request = new avs_pb.DeleteSecretReq();
-    request.setName(params.name);
-    if (params?.workflowId) {
-      request.setWorkflowId(params.workflowId);
+    request.setName(name);
+
+    if (options?.workflowId) {
+      request.setWorkflowId(options.workflowId);
+    }
+
+    if (options?.orgId) {
+      request.setOrgId(options.orgId);
     }
 
     const result = await this.sendGrpcRequest<
@@ -560,26 +625,13 @@ export default class Client extends BaseClient {
 
     return result.getValue();
   }
-
-  async updateSecret(
-    secret: Secret,
-    options?: RequestOptions
-  ): Promise<boolean> {
-    const request = secret.toRequest();
-
-    const result = await this.sendGrpcRequest<
-      BoolValue,
-      avs_pb.CreateOrUpdateSecretReq
-    >("updateSecret", request, options);
-    return result.getValue();
-  }
 }
 
 // Export types for easier use
 export * from "./types";
 export * from "./models/node/factory";
 export * from "./models/trigger/factory";
 
-export { Workflow, Edge, Execution, NodeFactory, TriggerFactory, Secret };
+export { Workflow, Edge, Execution, Step, NodeFactory, TriggerFactory };
 
-export type { WorkflowProps, EdgeProps };
+export type { WorkflowProps, EdgeProps, ExecutionProps, StepProps };

packages/sdk-js/src/models/secret.ts

@@ -1,39 +1,39 @@
-import * as avs_pb from "@/grpc_codegen/avs_pb";
+// import * as avs_pb from "@/grpc_codegen/avs_pb";
 
-export type SecretProps = {
-  name: string;
-  secret: string;
-  workflowId?: string;
-  orgId?: string;
-};
+// export type SecretProps = {
+//   name: string;
+//   secret: string;
+//   workflowId?: string;
+//   orgId?: string;
+// };
 
-class Secret implements SecretProps {
-  name: string;
-  secret: string;
-  workflowId?: string;
-  orgId?: string;
+// class Secret implements SecretProps {
+//   name: string;
+//   secret: string;
+//   workflowId?: string;
+//   orgId?: string;
 
-  constructor(props: SecretProps) {
-    this.name = props.name;
-    this.secret = props.secret;
-    this.workflowId = props.workflowId;
-    this.orgId = props.orgId;
-  }
+//   constructor(props: SecretProps) {
+//     this.name = props.name;
+//     this.secret = props.secret;
+//     this.workflowId = props.workflowId;
+//     this.orgId = props.orgId;
+//   }
 
-  toRequest(): avs_pb.CreateOrUpdateSecretReq {
-    const request = new avs_pb.CreateOrUpdateSecretReq();
+//   toRequest(): avs_pb.CreateOrUpdateSecretReq {
+//     const request = new avs_pb.CreateOrUpdateSecretReq();
 
-    request.setName(this.name);   
-    request.setSecret(this.secret);
-    if (this.orgId) {
-      request.setOrgId(this.orgId);
-    }
-    if (this.workflowId) {
-      request.setWorkflowId(this.workflowId);
-    }
+//     request.setName(this.name);   
+//     request.setSecret(this.secret);
+//     if (this.orgId) {
+//       request.setOrgId(this.orgId);
+//     }
+//     if (this.workflowId) {
+//       request.setWorkflowId(this.workflowId);
+//     }
 
-    return request;
-  }
-}
+//     return request;
+//   }
+// }
 
-export default Secret;
+// export default Secret;

packages/sdk-js/src/types.ts

@@ -58,16 +58,11 @@ export const ExecutionStatus = avs_pb.ExecutionStatus;
 
 export interface ListSecretResponse {
   name: string;
-  workflowId: string;
-  orgId: string;
-}
-
-export interface ListSecretRequest {
   workflowId?: string;
+  orgId?: string;
 }
 
-export interface DeleteSecretRequest {
-  name: string;
-  workflowId: string;
-  orgId: string;
+export interface SecretRequestOptions extends RequestOptions {
+  workflowId?: string;
+  orgId?: string;
 }

tests/auth.test.ts

@@ -218,20 +218,6 @@ describe("Authentication Tests", () => {
       expect(res2).toHaveProperty("factory", FACTORY_ADDRESS);
     });
 
-    test("getWallets works with options.authKey", async () => {
-      const wallets = await client.getWallets({ authKey: authKeyViaAPI });
-      expect(wallets.length).toBeGreaterThanOrEqual(1);
-
-      expect(wallets[0]).toHaveProperty("address");
-      expect(wallets[0]).toHaveProperty("salt", "0");
-      expect(wallets[0]).toHaveProperty("factory", FACTORY_ADDRESS);
-
-      const wallets2 = await client.getWallets({
-        authKey: authKeyViaSignature,
-      });
-      expect(wallets2.length).toBeGreaterThanOrEqual(1);
-    });
-
     test("createWorkflow works with options.authKey", async () => {
       const wallet = await client.getWallet(
         { salt: "345" },