address comments

Author: icecrasher321

apps/sim/blocks/blocks/instantly.ts

@@ -365,9 +365,9 @@ export const registry: Record<string, BlockConfig> = {
   incidentio: IncidentioBlock,
   infisical: InfisicalBlock,
   input_trigger: InputTriggerBlock,
+  instantly: InstantlyBlock,
   intercom: IntercomBlock,
   intercom_v2: IntercomV2Block,
-  instantly: InstantlyBlock,
   jina: JinaBlock,
   jira: JiraBlock,
   jira_service_management: JiraServiceManagementBlock,

apps/sim/blocks/registry.ts

@@ -22,7 +22,10 @@ const SIM_WEBHOOK_TOKEN_HEADER = 'x-sim-webhook-token'
 export const instantlyHandler: WebhookProviderHandler = {
   verifyAuth({ request, requestId, providerConfig }: AuthContext): NextResponse | null {
     const secretToken = providerConfig.secretToken as string | undefined
-    if (!secretToken) return null
+    if (!secretToken) {
+      logger.warn(`[${requestId}] Instantly webhook secret token is missing`)
+      return new NextResponse('Unauthorized', { status: 401 })
+    }
 
     if (!verifyTokenAuth(request, secretToken, SIM_WEBHOOK_TOKEN_HEADER)) {
       logger.warn(`[${requestId}] Unauthorized Instantly webhook request`)
@@ -85,9 +88,9 @@ export const instantlyHandler: WebhookProviderHandler = {
   async createSubscription(ctx: SubscriptionContext): Promise<SubscriptionResult | undefined> {
     const { webhook, requestId } = ctx
     const providerConfig = getProviderConfig(webhook)
-    const apiKey = providerConfig.apiKey as string | undefined
+    const apiKey = providerConfig.triggerApiKey as string | undefined
     const triggerId = providerConfig.triggerId as string | undefined
-    const campaignId = providerConfig.triggerCampaignId as string | undefined
+    const campaignId = optionalId(providerConfig.triggerCampaignId)
 
     if (!apiKey?.trim()) {
       throw new Error('Instantly API Key is required.')
@@ -119,8 +122,8 @@ export const instantlyHandler: WebhookProviderHandler = {
       },
     }
 
-    if (campaignId?.trim()) {
-      requestBody.campaign = campaignId.trim()
+    if (campaignId) {
+      requestBody.campaign = campaignId
     }
 
     logger.info(`[${requestId}] Creating Instantly webhook`, {
@@ -133,7 +136,7 @@ export const instantlyHandler: WebhookProviderHandler = {
     const response = await fetch(instantlyUrl('/api/v2/webhooks'), {
       method: 'POST',
       headers: {
-        Authorization: `Bearer ${apiKey}`,
+        Authorization: `Bearer ${apiKey.trim()}`,
         'Content-Type': 'application/json',
       },
       body: JSON.stringify(requestBody),
@@ -179,7 +182,7 @@ export const instantlyHandler: WebhookProviderHandler = {
 
     try {
       const providerConfig = getProviderConfig(webhook)
-      const apiKey = providerConfig.apiKey as string | undefined
+      const apiKey = providerConfig.triggerApiKey as string | undefined
       const externalId = providerConfig.externalId as string | undefined
 
       if (!apiKey?.trim() || !externalId?.trim()) {
@@ -193,11 +196,11 @@ export const instantlyHandler: WebhookProviderHandler = {
       }
 
       const response = await fetch(
-        instantlyUrl(`/api/v2/webhooks/${encodeURIComponent(externalId)}`),
+        instantlyUrl(`/api/v2/webhooks/${encodeURIComponent(externalId.trim())}`),
         {
           method: 'DELETE',
           headers: {
-            Authorization: `Bearer ${apiKey}`,
+            Authorization: `Bearer ${apiKey.trim()}`,
           },
         }
       )
@@ -254,6 +257,13 @@ function toBooleanOrNull(value: unknown): boolean | null {
   return typeof value === 'boolean' ? value : null
 }
 
+function optionalId(value: unknown): string | undefined {
+  if (typeof value !== 'string') return undefined
+  const trimmed = value.trim()
+  if (trimmed === '' || trimmed === '-') return undefined
+  return trimmed
+}
+
 function isRecord(value: unknown): value is Record<string, unknown> {
   return Boolean(value) && typeof value === 'object' && !Array.isArray(value)
 }

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

@@ -8,6 +8,7 @@ import {
   instantlyHeaders,
   instantlyUrl,
   mapCampaign,
+  parseInstantlyResponse,
 } from '@/tools/instantly/utils'
 import type { ToolConfig } from '@/tools/types'
 
@@ -29,12 +30,12 @@ export const activateCampaignTool: ToolConfig<
     },
   },
   request: {
-    url: (params) => instantlyUrl(`/api/v2/campaigns/${params.campaignId}/activate`),
+    url: (params) => instantlyUrl(`/api/v2/campaigns/${params.campaignId.trim()}/activate`),
     method: 'POST',
     headers: instantlyHeaders,
   },
   transformResponse: async (response) => {
-    const data: unknown = await response.json()
+    const data = await parseInstantlyResponse(response)
     const campaign = mapCampaign(data)
 
     return {

apps/sim/tools/instantly/activate_campaign.ts

@@ -9,6 +9,7 @@ import {
   instantlyHeaders,
   instantlyUrl,
   mapCampaign,
+  parseInstantlyResponse,
 } from '@/tools/instantly/utils'
 import type { ToolConfig } from '@/tools/types'
 
@@ -107,33 +108,18 @@ export const createCampaignTool: ToolConfig<
         campaign_schedule: params.campaign_schedule,
         sequences: params.sequences,
         pl_value: params.pl_value,
-        is_evergreen: params.is_evergreen,
         email_gap: params.email_gap,
-        random_wait_max: params.random_wait_max,
         text_only: params.text_only,
-        first_email_text_only: params.first_email_text_only,
         email_list: params.email_list,
         daily_limit: params.daily_limit,
         stop_on_reply: params.stop_on_reply,
-        email_tag_list: params.email_tag_list,
         link_tracking: params.link_tracking,
         open_tracking: params.open_tracking,
-        stop_on_auto_reply: params.stop_on_auto_reply,
         daily_max_leads: params.daily_max_leads,
-        prioritize_new_leads: params.prioritize_new_leads,
-        match_lead_esp: params.match_lead_esp,
-        stop_for_company: params.stop_for_company,
-        insert_unsubscribe_header: params.insert_unsubscribe_header,
-        allow_risky_contacts: params.allow_risky_contacts,
-        disable_bounce_protect: params.disable_bounce_protect,
-        cc_list: params.cc_list,
-        bcc_list: params.bcc_list,
-        owned_by: params.owned_by,
-        ai_sdr_id: params.ai_sdr_id,
       }),
   },
   transformResponse: async (response) => {
-    const data: unknown = await response.json()
+    const data = await parseInstantlyResponse(response)
     const campaign = mapCampaign(data)
 
     return {

apps/sim/tools/instantly/create_campaign.ts

@@ -6,6 +6,7 @@ import {
   instantlyUrl,
   leadOutputs,
   mapLead,
+  parseInstantlyResponse,
 } from '@/tools/instantly/utils'
 import type { ToolConfig } from '@/tools/types'
 
@@ -118,6 +119,12 @@ export const createLeadTool: ToolConfig<InstantlyCreateLeadParams, InstantlyLead
       visibility: 'user-or-llm',
       description: 'Blocklist ID to check for the lead',
     },
+    verify_leads_for_lead_finder: {
+      type: 'boolean',
+      required: false,
+      visibility: 'user-or-llm',
+      description: 'Whether to verify leads imported from Lead Finder',
+    },
     verify_leads_on_import: {
       type: 'boolean',
       required: false,
@@ -160,7 +167,7 @@ export const createLeadTool: ToolConfig<InstantlyCreateLeadParams, InstantlyLead
       }),
   },
   transformResponse: async (response) => {
-    const data: unknown = await response.json()
+    const data = await parseInstantlyResponse(response)
     const lead = mapLead(data)
 
     return {

apps/sim/tools/instantly/create_lead.ts

@@ -9,6 +9,7 @@ import {
   instantlyUrl,
   leadListOutputs,
   mapLeadList,
+  parseInstantlyResponse,
 } from '@/tools/instantly/utils'
 import type { ToolConfig } from '@/tools/types'
 
@@ -53,7 +54,7 @@ export const createLeadListTool: ToolConfig<
       }),
   },
   transformResponse: async (response) => {
-    const data: unknown = await response.json()
+    const data = await parseInstantlyResponse(response)
     const leadList = mapLeadList(data)
 
     return {

apps/sim/tools/instantly/create_lead_list.ts

@@ -8,6 +8,7 @@ import {
   instantlyBaseParamFields,
   instantlyHeaders,
   instantlyUrl,
+  parseInstantlyResponse,
 } from '@/tools/instantly/utils'
 import type { ToolConfig } from '@/tools/types'
 
@@ -65,7 +66,7 @@ export const deleteLeadsTool: ToolConfig<InstantlyDeleteLeadsParams, InstantlyDe
         }),
     },
     transformResponse: async (response) => {
-      const data: unknown = await response.json()
+      const data = await parseInstantlyResponse(response)
       const result = asRecord(data)
 
       return {

apps/sim/tools/instantly/delete_leads.ts

@@ -5,6 +5,7 @@ import {
   instantlyUrl,
   leadOutputs,
   mapLead,
+  parseInstantlyResponse,
 } from '@/tools/instantly/utils'
 import type { ToolConfig } from '@/tools/types'
 
@@ -23,12 +24,12 @@ export const getLeadTool: ToolConfig<InstantlyGetLeadParams, InstantlyLeadRespon
     },
   },
   request: {
-    url: (params) => instantlyUrl(`/api/v2/leads/${params.leadId}`),
+    url: (params) => instantlyUrl(`/api/v2/leads/${params.leadId.trim()}`),
     method: 'GET',
     headers: instantlyHeaders,
   },
   transformResponse: async (response) => {
-    const data: unknown = await response.json()
+    const data = await parseInstantlyResponse(response)
     const lead = mapLead(data)
 
     return {

apps/sim/tools/instantly/get_lead.ts

@@ -10,6 +10,7 @@ import {
   instantlyHeaders,
   instantlyUrl,
   mapCampaign,
+  parseInstantlyResponse,
 } from '@/tools/instantly/utils'
 import type { ToolConfig } from '@/tools/types'
 
@@ -74,7 +75,7 @@ export const listCampaignsTool: ToolConfig<
     headers: instantlyHeaders,
   },
   transformResponse: async (response) => {
-    const data: unknown = await response.json()
+    const data = await parseInstantlyResponse(response)
     const campaigns = getItems(data).map(mapCampaign)
 
     return {