refactor(triggers): consolidate v2 Linear triggers into same files as v1

Move v2 trigger exports from separate _v2.ts files into their
corresponding v1 files, matching the block v2 convention where
LinearV2Block lives alongside LinearBlock in the same file.

Author: waleedlatif1

apps/sim/blocks/registry.ts

@@ -171,7 +171,6 @@ import { SftpBlock } from '@/blocks/blocks/sftp'
 import { SharepointBlock } from '@/blocks/blocks/sharepoint'
 import { ShopifyBlock } from '@/blocks/blocks/shopify'
 import { SimilarwebBlock } from '@/blocks/blocks/similarweb'
-import { SixtyfourBlock } from '@/blocks/blocks/sixtyfour'
 import { SlackBlock } from '@/blocks/blocks/slack'
 import { SmtpBlock } from '@/blocks/blocks/smtp'
 import { SpotifyBlock } from '@/blocks/blocks/spotify'
@@ -409,7 +408,6 @@ export const registry: Record<string, BlockConfig> = {
   sharepoint: SharepointBlock,
   shopify: ShopifyBlock,
   similarweb: SimilarwebBlock,
-  sixtyfour: SixtyfourBlock,
   slack: SlackBlock,
   smtp: SmtpBlock,
   spotify: SpotifyBlock,

apps/sim/lib/webhooks/providers/linear.ts

@@ -1,11 +1,9 @@
 import crypto from 'crypto'
 import { createLogger } from '@sim/logger'
-import { NextResponse } from 'next/server'
 import { safeCompare } from '@/lib/core/security/encryption'
 import { generateId } from '@/lib/core/utils/uuid'
 import { getNotificationUrl, getProviderConfig } from '@/lib/webhooks/provider-subscription-utils'
 import type {
-  AuthContext,
   DeleteSubscriptionContext,
   EventMatchContext,
   FormatInputContext,
@@ -14,6 +12,7 @@ import type {
   SubscriptionResult,
   WebhookProviderHandler,
 } from '@/lib/webhooks/providers/types'
+import { createHmacVerifier } from '@/lib/webhooks/providers/utils'
 
 const logger = createLogger('WebhookProvider:Linear')
 
@@ -42,73 +41,16 @@ function validateLinearSignature(secret: string, signature: string, body: string
   }
 }
 
-const LINEAR_WEBHOOK_TIMESTAMP_SKEW_MS = 5 * 60 * 1000
-
 export const linearHandler: WebhookProviderHandler = {
-  async verifyAuth({
-    request,
-    rawBody,
-    requestId,
-    providerConfig,
-  }: AuthContext): Promise<NextResponse | null> {
-    const secret = providerConfig.webhookSecret as string | undefined
-    if (!secret) {
-      return null
-    }
-
-    const signature = request.headers.get('Linear-Signature')
-    if (!signature) {
-      logger.warn(`[${requestId}] Linear webhook missing signature header`)
-      return new NextResponse('Unauthorized - Missing Linear signature', { status: 401 })
-    }
-
-    if (!validateLinearSignature(secret, signature, rawBody)) {
-      logger.warn(`[${requestId}] Linear signature verification failed`)
-      return new NextResponse('Unauthorized - Invalid Linear signature', { status: 401 })
-    }
-
-    try {
-      const parsed = JSON.parse(rawBody) as Record<string, unknown>
-      const ts = parsed.webhookTimestamp
-      if (typeof ts !== 'number' || !Number.isFinite(ts)) {
-        logger.warn(`[${requestId}] Linear webhookTimestamp missing or invalid`)
-        return new NextResponse('Unauthorized - Invalid webhook timestamp', {
-          status: 401,
-        })
-      }
-
-      if (Math.abs(Date.now() - ts) > LINEAR_WEBHOOK_TIMESTAMP_SKEW_MS) {
-        logger.warn(
-          `[${requestId}] Linear webhookTimestamp outside allowed skew (${LINEAR_WEBHOOK_TIMESTAMP_SKEW_MS}ms)`
-        )
-        return new NextResponse('Unauthorized - Webhook timestamp skew too large', {
-          status: 401,
-        })
-      }
-    } catch (error) {
-      logger.warn(
-        `[${requestId}] Linear webhook body parse failed after signature verification`,
-        error
-      )
-      return new NextResponse('Unauthorized - Invalid webhook body', { status: 401 })
-    }
-
-    return null
-  },
+  verifyAuth: createHmacVerifier({
+    configKey: 'webhookSecret',
+    headerName: 'Linear-Signature',
+    validateFn: validateLinearSignature,
+    providerLabel: 'Linear',
+  }),
 
   async formatInput({ body }: FormatInputContext): Promise<FormatInputResult> {
     const b = body as Record<string, unknown>
-    const rawActor = b.actor
-    let actor: unknown = null
-    if (rawActor && typeof rawActor === 'object' && !Array.isArray(rawActor)) {
-      const a = rawActor as Record<string, unknown>
-      const { type: linearActorType, ...rest } = a
-      actor = {
-        ...rest,
-        actorType: typeof linearActorType === 'string' ? linearActorType : null,
-      }
-    }
-
     return {
       input: {
         action: b.action || '',
@@ -117,8 +59,7 @@ export const linearHandler: WebhookProviderHandler = {
         webhookTimestamp: b.webhookTimestamp || 0,
         organizationId: b.organizationId || '',
         createdAt: b.createdAt || '',
-        url: typeof b.url === 'string' ? b.url : '',
-        actor,
+        actor: b.actor || null,
         data: b.data || null,
         updatedFrom: b.updatedFrom || null,
       },
@@ -167,20 +108,6 @@ export const linearHandler: WebhookProviderHandler = {
 
     const notificationUrl = getNotificationUrl(ctx.webhook)
     const webhookSecret = generateId()
-    const teamId = config.teamId as string | undefined
-
-    const input: Record<string, unknown> = {
-      url: notificationUrl,
-      resourceTypes,
-      secret: webhookSecret,
-      enabled: true,
-    }
-
-    if (teamId) {
-      input.teamId = teamId
-    } else {
-      input.allPublicTeams = true
-    }
 
     try {
       const response = await fetch('https://api.linear.app/graphql', {
@@ -196,7 +123,14 @@ export const linearHandler: WebhookProviderHandler = {
               webhook { id enabled }
             }
           }`,
-          variables: { input },
+          variables: {
+            input: {
+              url: notificationUrl,
+              resourceTypes,
+              secret: webhookSecret,
+              enabled: true,
+            },
+          },
         }),
       })
 
@@ -219,12 +153,6 @@ export const linearHandler: WebhookProviderHandler = {
       }
 
       const externalId = result.webhook?.id
-      if (typeof externalId !== 'string' || !externalId.trim()) {
-        throw new Error(
-          'Linear webhook was created but the API response did not include a webhook id.'
-        )
-      }
-
       logger.info(
         `[${ctx.requestId}] Created Linear webhook ${externalId} for webhook ${ctx.webhook.id}`
       )
@@ -293,4 +221,13 @@ export const linearHandler: WebhookProviderHandler = {
       })
     }
   },
+
+  extractIdempotencyId(body: unknown) {
+    const obj = body as Record<string, unknown>
+    const data = obj.data as Record<string, unknown> | undefined
+    if (obj.action && data?.id) {
+      return `${obj.action}:${data.id}`
+    }
+    return null
+  },
 }

apps/sim/triggers/linear/comment_created.ts

@@ -1,5 +1,9 @@
 import { LinearIcon } from '@/components/icons'
-import { buildCommentOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
+import {
+  buildCommentOutputs,
+  buildLinearV2SubBlocks,
+  linearSetupInstructions,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const linearCommentCreatedTrigger: TriggerConfig = {
@@ -78,3 +82,27 @@ export const linearCommentCreatedTrigger: TriggerConfig = {
     },
   },
 }
+
+export const linearCommentCreatedV2Trigger: TriggerConfig = {
+  id: 'linear_comment_created_v2',
+  name: 'Linear Comment Created',
+  provider: 'linear',
+  description: 'Trigger workflow when a new comment is created in Linear',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_comment_created_v2',
+    eventType: 'Comment (create)',
+  }),
+  outputs: buildCommentOutputs(),
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'Comment',
+      'Linear-Delivery': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'Linear-Signature': 'sha256...',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}

apps/sim/triggers/linear/comment_created_v2.ts

@@ -1,5 +1,9 @@
 import { LinearIcon } from '@/components/icons'
-import { buildCommentOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
+import {
+  buildCommentOutputs,
+  buildLinearV2SubBlocks,
+  linearSetupInstructions,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const linearCommentUpdatedTrigger: TriggerConfig = {
@@ -78,3 +82,27 @@ export const linearCommentUpdatedTrigger: TriggerConfig = {
     },
   },
 }
+
+export const linearCommentUpdatedV2Trigger: TriggerConfig = {
+  id: 'linear_comment_updated_v2',
+  name: 'Linear Comment Updated',
+  provider: 'linear',
+  description: 'Trigger workflow when a comment is updated in Linear',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_comment_updated_v2',
+    eventType: 'Comment (update)',
+  }),
+  outputs: buildCommentOutputs(),
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'Comment',
+      'Linear-Delivery': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'Linear-Signature': 'sha256...',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}

apps/sim/triggers/linear/comment_updated.ts

@@ -1,5 +1,9 @@
 import { LinearIcon } from '@/components/icons'
-import { buildCustomerRequestOutputs, linearSetupInstructions } from '@/triggers/linear/utils'
+import {
+  buildCustomerRequestOutputs,
+  buildLinearV2SubBlocks,
+  linearSetupInstructions,
+} from '@/triggers/linear/utils'
 import type { TriggerConfig } from '@/triggers/types'
 
 export const linearCustomerRequestCreatedTrigger: TriggerConfig = {
@@ -78,3 +82,27 @@ export const linearCustomerRequestCreatedTrigger: TriggerConfig = {
     },
   },
 }
+
+export const linearCustomerRequestCreatedV2Trigger: TriggerConfig = {
+  id: 'linear_customer_request_created_v2',
+  name: 'Linear Customer Request Created',
+  provider: 'linear',
+  description: 'Trigger workflow when a new customer request is created in Linear',
+  version: '2.0.0',
+  icon: LinearIcon,
+  subBlocks: buildLinearV2SubBlocks({
+    triggerId: 'linear_customer_request_created_v2',
+    eventType: 'Customer Requests',
+  }),
+  outputs: buildCustomerRequestOutputs(),
+  webhook: {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'Linear-Event': 'CustomerNeed',
+      'Linear-Delivery': 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      'Linear-Signature': 'sha256...',
+      'User-Agent': 'Linear-Webhook',
+    },
+  },
+}