refactor(salesforce): share payload object type parsing

Remove dead code in the Salesforce provider and move shared object-type extraction into a single helper so trigger matching and input shaping stay in sync.

Made-with: Cursor

Author: waleedlatif1

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

@@ -9,6 +9,7 @@ import type {
   WebhookProviderHandler,
 } from '@/lib/webhooks/providers/types'
 import { verifyTokenAuth } from '@/lib/webhooks/providers/utils'
+import { extractSalesforceObjectTypeFromPayload } from '@/lib/webhooks/salesforce-payload-utils'
 
 const logger = createLogger('WebhookProvider:Salesforce')
 
@@ -25,39 +26,6 @@ function asRecord(body: unknown): Record<string, unknown> {
     : {}
 }
 
-function extractObjectTypeFromPayload(body: Record<string, unknown>): string | undefined {
-  const direct =
-    (typeof body.objectType === 'string' && body.objectType) ||
-    (typeof body.sobjectType === 'string' && body.sobjectType) ||
-    undefined
-  if (direct) {
-    return direct
-  }
-
-  const attrs = body.attributes as Record<string, unknown> | undefined
-  if (typeof attrs?.type === 'string') {
-    return attrs.type
-  }
-
-  const record = body.record
-  if (record && typeof record === 'object' && !Array.isArray(record)) {
-    const r = record as Record<string, unknown>
-    if (typeof r.sobjectType === 'string') {
-      return r.sobjectType
-    }
-    const ra = r.attributes as Record<string, unknown> | undefined
-    if (typeof ra?.type === 'string') {
-      return ra.type
-    }
-  }
-
-  return undefined
-}
-
-function normalizeSObjectType(t: string): string {
-  return t.trim().toLowerCase()
-}
-
 function extractRecordCore(body: Record<string, unknown>): Record<string, unknown> {
   const nested = body.record
   if (nested && typeof nested === 'object' && !Array.isArray(nested)) {
@@ -176,7 +144,7 @@ export const salesforceHandler: WebhookProviderHandler = {
 
     const record = extractRecordCore(body)
     const objectType =
-      extractObjectTypeFromPayload(body) ||
+      extractSalesforceObjectTypeFromPayload(body) ||
       (typeof record.attributes === 'object' &&
       record.attributes &&
       typeof (record.attributes as Record<string, unknown>).type === 'string'

apps/sim/lib/webhooks/salesforce-payload-utils.ts

@@ -0,0 +1,30 @@
+export function extractSalesforceObjectTypeFromPayload(
+  body: Record<string, unknown>
+): string | undefined {
+  const direct =
+    (typeof body.objectType === 'string' && body.objectType) ||
+    (typeof body.sobjectType === 'string' && body.sobjectType) ||
+    undefined
+  if (direct) {
+    return direct
+  }
+
+  const attrs = body.attributes as Record<string, unknown> | undefined
+  if (typeof attrs?.type === 'string') {
+    return attrs.type
+  }
+
+  const record = body.record
+  if (record && typeof record === 'object' && !Array.isArray(record)) {
+    const r = record as Record<string, unknown>
+    if (typeof r.sobjectType === 'string') {
+      return r.sobjectType
+    }
+    const ra = r.attributes as Record<string, unknown> | undefined
+    if (typeof ra?.type === 'string') {
+      return ra.type
+    }
+  }
+
+  return undefined
+}

apps/sim/triggers/salesforce/utils.ts

@@ -1,3 +1,4 @@
+import { extractSalesforceObjectTypeFromPayload } from '@/lib/webhooks/salesforce-payload-utils'
 import type { SubBlockConfig } from '@/blocks/types'
 import type { TriggerOutput } from '@/triggers/types'
 
@@ -20,32 +21,6 @@ function normalizeToken(s: string): string {
     .replace(/[\s-]+/g, '_')
 }
 
-function payloadObjectType(body: Record<string, unknown>): string | undefined {
-  const direct =
-    (typeof body.objectType === 'string' && body.objectType) ||
-    (typeof body.sobjectType === 'string' && body.sobjectType) ||
-    undefined
-  if (direct) {
-    return direct
-  }
-  const attrs = body.attributes as Record<string, unknown> | undefined
-  if (typeof attrs?.type === 'string') {
-    return attrs.type
-  }
-  const record = body.record
-  if (record && typeof record === 'object' && !Array.isArray(record)) {
-    const r = record as Record<string, unknown>
-    if (typeof r.sobjectType === 'string') {
-      return r.sobjectType
-    }
-    const ra = r.attributes as Record<string, unknown> | undefined
-    if (typeof ra?.type === 'string') {
-      return ra.type
-    }
-  }
-  return undefined
-}
-
 const RECORD_CREATED = new Set([
   'record_created',
   'created',
@@ -115,15 +90,15 @@ export function isSalesforceEventMatch(
     if (!want) {
       return true
     }
-    const got = payloadObjectType(body)
+    const got = extractSalesforceObjectTypeFromPayload(body)
     if (!got) {
       return false
     }
     return normalizeToken(got) === normalizeToken(want)
   }
 
   const wantType = configuredObjectType?.trim()
-  const gotType = payloadObjectType(body)
+  const gotType = extractSalesforceObjectTypeFromPayload(body)
   if (wantType) {
     if (!gotType) {
       return false