Merge pull request #233 from gentlementlegen/fix/payload-signature

fix: unified inputs for worker and action to generate the same payload and signature
ubiquity-os · Jan 17, 2025 · bec803b · bec803b
2 parents 32996e5 + 5e9adb2
commit bec803b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 28 deletions.
diff --git a/src/github/handlers/index.ts b/src/github/handlers/index.ts
@@ -104,14 +104,14 @@ async function handleEvent(event: EmitterWebhookEvent, eventHandler: InstanceTyp
     try {
       console.log(`Dispatching event for ${JSON.stringify(plugin)}`);
       if (!isGithubPluginObject) {
-        await dispatchWorker(plugin, await inputs.getWorkerInputs());
+        await dispatchWorker(plugin, await inputs.getInputs());
       } else {
         await dispatchWorkflow(context, {
           owner: plugin.owner,
           repository: plugin.repo,
           workflowId: plugin.workflowId,
           ref: plugin.ref,
-          inputs: await inputs.getWorkflowInputs(),
+          inputs: await inputs.getInputs(),
         });
       }
       console.log(`Event dispatched for ${JSON.stringify(plugin)}`);

diff --git a/src/github/handlers/issue-comment-created.ts b/src/github/handlers/issue-comment-created.ts
@@ -195,14 +195,14 @@ The input will include the following fields:
 
   try {
     if (!isGithubPluginObject) {
-      await dispatchWorker(plugin, await inputs.getWorkerInputs());
+      await dispatchWorker(plugin, await inputs.getInputs());
     } else {
       await dispatchWorkflow(context, {
         owner: plugin.owner,
         repository: plugin.repo,
         workflowId: plugin.workflowId,
         ref: ref,
-        inputs: await inputs.getWorkflowInputs(),
+        inputs: await inputs.getInputs(),
       });
     }
   } catch (e) {

diff --git a/src/github/handlers/repository-dispatch.ts b/src/github/handlers/repository-dispatch.ts
@@ -73,10 +73,10 @@ export async function repositoryDispatch(context: GitHubContext<"repository_disp
       repository: nextPlugin.plugin.repo,
       ref: nextPlugin.plugin.ref,
       workflowId: nextPlugin.plugin.workflowId,
-      inputs: await inputs.getWorkflowInputs(),
+      inputs: await inputs.getInputs(),
     });
   } else {
-    await dispatchWorker(nextPlugin.plugin, await inputs.getWorkerInputs());
+    await dispatchWorker(nextPlugin.plugin, await inputs.getInputs());
   }
 }
 

diff --git a/src/github/types/plugin.ts b/src/github/types/plugin.ts
@@ -44,7 +44,7 @@ export class PluginInput<T extends EmitterWebhookEventName = EmitterWebhookEvent
     this.command = command;
   }
 
-  public async getWorkflowInputs() {
+  public async getInputs() {
     const inputs = {
       stateId: this.stateId,
       eventName: this.eventName,
@@ -60,23 +60,6 @@ export class PluginInput<T extends EmitterWebhookEventName = EmitterWebhookEvent
       signature,
     };
   }
-
-  public async getWorkerInputs() {
-    const inputs = {
-      stateId: this.stateId,
-      eventName: this.eventName,
-      eventPayload: this.eventPayload,
-      settings: this.settings,
-      authToken: this.authToken,
-      ref: this.ref,
-      command: this.command,
-    };
-    const signature = await this.eventHandler.signPayload(JSON.stringify(inputs));
-    return {
-      ...inputs,
-      signature,
-    };
-  }
 }
 
 export type PluginChainState<T extends EmitterWebhookEventName = EmitterWebhookEventName> = {

diff --git a/tests/dispatch.test.ts b/tests/dispatch.test.ts
@@ -29,16 +29,16 @@ jest.mock("../src/github/types/plugin", () => {
   return {
     ...originalModule,
     PluginInput: class extends originalModule.PluginInput {
-      async getWorkerInputs() {
+      async getInputs() {
         return {
           stateId: this.stateId,
           eventName: this.eventName,
-          eventPayload: this.eventPayload,
-          settings: this.settings,
+          eventPayload: JSON.stringify(this.eventPayload),
+          settings: JSON.stringify(this.settings),
           authToken: this.authToken,
           ref: this.ref,
           signature: "",
-          command: this.command,
+          command: JSON.stringify(this.command),
         };
       }
     },