Merge remote-tracking branch 'upstream/main' into feat/zendesk-sell

onyedikachi-david · onyedikachi-david · commit 4ce0dd4b84da · 2025-10-27T09:11:56.000Z
diff --git a/packages/pieces/community/framework/src/lib/trigger/trigger.ts b/packages/pieces/community/framework/src/lib/trigger/trigger.ts
@@ -107,40 +107,30 @@ export type Trigger<
   S extends TriggerStrategy = TriggerStrategy,
 > = ITrigger<S, PieceAuth, TriggerProps>
 
+// TODO refactor and extract common logic
 export const createTrigger = <
   TS extends TriggerStrategy,
   PieceAuth extends PieceAuthProperty,
   TriggerProps extends InputPropertyMap,
 >(params: CreateTriggerParams<PieceAuth, TriggerProps, TS>) => {
-  // Extract common defaults to reduce duplication
-  const commonDefaults = {
-    requireAuth: params.requireAuth ?? true,
-    onStart: params.onStart ?? (async () => Promise.resolve()),
-    test: params.test ?? (() => Promise.resolve([params.sampleData])),
-    handshakeNone: { strategy: WebhookHandshakeStrategy.NONE } as const,
-    renewNone: { strategy: WebhookRenewStrategy.NONE } as const,
-    defaultWebhookResponse: async () => ({ status: 200 }),
-    defaultOnRenew: async () => Promise.resolve(),
-  }
-
   switch (params.type) {
     case TriggerStrategy.WEBHOOK:
       return new ITrigger(
         params.name,
         params.displayName,
         params.description,
-        commonDefaults.requireAuth,
+        params.requireAuth ?? true,
         params.props,
         params.type,
-        params.handshakeConfiguration ?? commonDefaults.handshakeNone,
-        params.onHandshake ?? commonDefaults.defaultWebhookResponse,
-        params.renewConfiguration ?? commonDefaults.renewNone,
-        params.onRenew ?? commonDefaults.defaultOnRenew,
+        params.handshakeConfiguration ?? { strategy: WebhookHandshakeStrategy.NONE },
+        params.onHandshake ?? (async () => ({ status: 200 })),
+        params.renewConfiguration ?? { strategy: WebhookRenewStrategy.NONE },
+        params.onRenew ?? (async () => Promise.resolve()),
         params.onEnable,
         params.onDisable,
-        commonDefaults.onStart,
+        params.onStart ?? (async () => Promise.resolve()),
         params.run,
-        commonDefaults.test,
+        params.test ?? (() => Promise.resolve([params.sampleData])),
         params.sampleData,
         params.test ? TriggerTestStrategy.TEST_FUNCTION : TriggerTestStrategy.SIMULATION,
       )
@@ -149,18 +139,18 @@ export const createTrigger = <
         params.name,
         params.displayName,
         params.description,
-        commonDefaults.requireAuth,
+        params.requireAuth ?? true,
         params.props,
         params.type,
-        commonDefaults.handshakeNone,
-        commonDefaults.defaultWebhookResponse,
-        commonDefaults.renewNone,
-        commonDefaults.defaultOnRenew,
+        { strategy: WebhookHandshakeStrategy.NONE },
+        async () => ({ status: 200 }),
+        { strategy: WebhookRenewStrategy.NONE },
+        (async () => Promise.resolve()),
         params.onEnable,
         params.onDisable,
-        commonDefaults.onStart,
+        params.onStart ?? (async () => Promise.resolve()),
         params.run,
-        commonDefaults.test,
+        params.test ?? (() => Promise.resolve([params.sampleData])),
         params.sampleData,
         TriggerTestStrategy.TEST_FUNCTION,
       )
@@ -169,18 +159,18 @@ export const createTrigger = <
         params.name,
         params.displayName,
         params.description,
-        commonDefaults.requireAuth,
+        params.requireAuth ?? true,
         params.props,
         params.type,
-        commonDefaults.handshakeNone,
-        commonDefaults.defaultWebhookResponse,
-        commonDefaults.renewNone,
-        commonDefaults.defaultOnRenew,
+        { strategy: WebhookHandshakeStrategy.NONE },
+        async () => ({ status: 200 }),
+        { strategy: WebhookRenewStrategy.NONE },
+        (async () => Promise.resolve()),
         params.onEnable,
         params.onDisable,
-        commonDefaults.onStart,
+        params.onStart ?? (async () => Promise.resolve()),
         params.run,
-        commonDefaults.test,
+        params.test ?? (() => Promise.resolve([params.sampleData])),
         params.sampleData,
         (isNil(params.sampleData) && isNil(params.test)) ? TriggerTestStrategy.SIMULATION : TriggerTestStrategy.TEST_FUNCTION,
       )
