fix(webhooks): use next public app url instead of request origin for webhook registration

waleed · waleed · commit 46ca31ea905c · 2025-10-10T16:41:12.000-07:00
diff --git a/apps/sim/app/api/webhooks/[id]/route.ts b/apps/sim/app/api/webhooks/[id]/route.ts
@@ -282,11 +282,13 @@ export async function DELETE(
 
         if (!resolvedExternalId) {
           try {
-            const requestOrigin = new URL(request.url).origin
-            const effectiveOrigin = requestOrigin.includes('localhost')
-              ? env.NEXT_PUBLIC_APP_URL || requestOrigin
-              : requestOrigin
-            const expectedNotificationUrl = `${effectiveOrigin}/api/webhooks/trigger/${foundWebhook.path}`
+            if (!env.NEXT_PUBLIC_APP_URL) {
+              logger.error(
+                `[${requestId}] NEXT_PUBLIC_APP_URL not configured, cannot match Airtable webhook`
+              )
+              throw new Error('NEXT_PUBLIC_APP_URL must be configured')
+            }
+            const expectedNotificationUrl = `${env.NEXT_PUBLIC_APP_URL}/api/webhooks/trigger/${foundWebhook.path}`
 
             const listUrl = `https://api.airtable.com/v0/bases/${baseId}/webhooks`
             const listResp = await fetch(listUrl, {
diff --git a/apps/sim/app/api/webhooks/route.ts b/apps/sim/app/api/webhooks/route.ts
@@ -432,25 +432,20 @@ async function createAirtableWebhookSubscription(
       logger.warn(
         `[${requestId}] Could not retrieve Airtable access token for user ${userId}. Cannot create webhook in Airtable.`
       )
-      // Instead of silently returning, throw an error with clear user guidance
       throw new Error(
         'Airtable account connection required. Please connect your Airtable account in the trigger configuration and try again.'
       )
     }
 
-    const requestOrigin = new URL(request.url).origin
-    // Ensure origin does not point to localhost for external API calls
-    const effectiveOrigin = requestOrigin.includes('localhost')
-      ? env.NEXT_PUBLIC_APP_URL || requestOrigin // Use env var if available, fallback to original
-      : requestOrigin
-
-    const notificationUrl = `${effectiveOrigin}/api/webhooks/trigger/${path}`
-    if (effectiveOrigin !== requestOrigin) {
-      logger.debug(
-        `[${requestId}] Remapped localhost origin to ${effectiveOrigin} for notificationUrl`
+    if (!env.NEXT_PUBLIC_APP_URL) {
+      logger.error(
+        `[${requestId}] NEXT_PUBLIC_APP_URL not configured, cannot register Airtable webhook`
       )
+      throw new Error('NEXT_PUBLIC_APP_URL must be configured for Airtable webhook registration')
     }
 
+    const notificationUrl = `${env.NEXT_PUBLIC_APP_URL}/api/webhooks/trigger/${path}`
+
     const airtableApiUrl = `https://api.airtable.com/v0/bases/${baseId}/webhooks`
 
     const specification: any = {
@@ -549,19 +544,15 @@ async function createTelegramWebhookSubscription(
       return // Cannot proceed without botToken
     }
 
-    const requestOrigin = new URL(request.url).origin
-    // Ensure origin does not point to localhost for external API calls
-    const effectiveOrigin = requestOrigin.includes('localhost')
-      ? env.NEXT_PUBLIC_APP_URL || requestOrigin // Use env var if available, fallback to original
-      : requestOrigin
-
-    const notificationUrl = `${effectiveOrigin}/api/webhooks/trigger/${path}`
-    if (effectiveOrigin !== requestOrigin) {
-      logger.debug(
-        `[${requestId}] Remapped localhost origin to ${effectiveOrigin} for notificationUrl`
+    if (!env.NEXT_PUBLIC_APP_URL) {
+      logger.error(
+        `[${requestId}] NEXT_PUBLIC_APP_URL not configured, cannot register Telegram webhook`
       )
+      throw new Error('NEXT_PUBLIC_APP_URL must be configured for Telegram webhook registration')
     }
 
+    const notificationUrl = `${env.NEXT_PUBLIC_APP_URL}/api/webhooks/trigger/${path}`
+
     const telegramApiUrl = `https://api.telegram.org/bot${botToken}/setWebhook`
 
     const requestBody: any = {
diff --git a/apps/sim/app/api/webhooks/test/route.ts b/apps/sim/app/api/webhooks/test/route.ts
@@ -2,6 +2,7 @@ import { db } from '@sim/db'
 import { webhook } from '@sim/db/schema'
 import { eq } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
+import { env } from '@/lib/env'
 import { createLogger } from '@/lib/logs/console/logger'
 import { generateRequestId } from '@/lib/utils'
 
@@ -13,7 +14,6 @@ export async function GET(request: NextRequest) {
   const requestId = generateRequestId()
 
   try {
-    // Get the webhook ID and provider from the query parameters
     const { searchParams } = new URL(request.url)
     const webhookId = searchParams.get('id')
 
@@ -24,7 +24,6 @@ export async function GET(request: NextRequest) {
 
     logger.debug(`[${requestId}] Testing webhook with ID: ${webhookId}`)
 
-    // Find the webhook in the database
     const webhooks = await db.select().from(webhook).where(eq(webhook.id, webhookId)).limit(1)
 
     if (webhooks.length === 0) {
@@ -36,8 +35,7 @@ export async function GET(request: NextRequest) {
     const provider = foundWebhook.provider || 'generic'
     const providerConfig = (foundWebhook.providerConfig as Record<string, any>) || {}
 
-    // Construct the webhook URL
-    const baseUrl = new URL(request.url).origin
+    const baseUrl = env.NEXT_PUBLIC_APP_URL || new URL(request.url).origin
     const webhookUrl = `${baseUrl}/api/webhooks/trigger/${foundWebhook.path}`
 
     logger.info(`[${requestId}] Testing webhook for provider: ${provider}`, {
@@ -46,7 +44,6 @@ export async function GET(request: NextRequest) {
       isActive: foundWebhook.isActive,
     })
 
-    // Provider-specific test logic
     switch (provider) {
       case 'whatsapp': {
         const verificationToken = providerConfig.verificationToken
@@ -59,30 +56,25 @@ export async function GET(request: NextRequest) {
           )
         }
 
-        // Generate a test challenge
         const challenge = `test_${Date.now()}`
 
-        // Construct the WhatsApp verification URL
         const whatsappUrl = `${webhookUrl}?hub.mode=subscribe&hub.verify_token=${verificationToken}&hub.challenge=${challenge}`
 
         logger.debug(`[${requestId}] Testing WhatsApp webhook verification`, {
           webhookId,
           challenge,
         })
 
-        // Make a request to the webhook endpoint
         const response = await fetch(whatsappUrl, {
           headers: {
             'User-Agent': 'facebookplatform/1.0',
           },
         })
 
-        // Get the response details
         const status = response.status
         const contentType = response.headers.get('content-type')
         const responseText = await response.text()
 
-        // Check if the test was successful
         const success = status === 200 && responseText === challenge
 
         if (success) {
@@ -139,7 +131,6 @@ export async function GET(request: NextRequest) {
           )
         }
 
-        // Test the webhook endpoint with a simple message to check if it's reachable
         const testMessage = {
           update_id: 12345,
           message: {
@@ -165,7 +156,6 @@ export async function GET(request: NextRequest) {
           url: webhookUrl,
         })
 
-        // Make a test request to the webhook endpoint
         const response = await fetch(webhookUrl, {
           method: 'POST',
           headers: {
@@ -175,16 +165,12 @@ export async function GET(request: NextRequest) {
           body: JSON.stringify(testMessage),
         })
 
-        // Get the response details
         const status = response.status
         let responseText = ''
         try {
           responseText = await response.text()
-        } catch (_e) {
-          // Ignore if we can't get response text
-        }
+        } catch (_e) {}
 
-        // Consider success if we get a 2xx response
         const success = status >= 200 && status < 300
 
         if (success) {
@@ -196,7 +182,6 @@ export async function GET(request: NextRequest) {
           })
         }
 
-        // Get webhook info from Telegram API
         let webhookInfo = null
         try {
           const webhookInfoUrl = `https://api.telegram.org/bot${botToken}/getWebhookInfo`
@@ -215,7 +200,6 @@ export async function GET(request: NextRequest) {
           logger.warn(`[${requestId}] Failed to get Telegram webhook info`, e)
         }
 
-        // Format the curl command for testing
         const curlCommand = [
           `curl -X POST "${webhookUrl}"`,
           `-H "Content-Type: application/json"`,
@@ -288,16 +272,13 @@ export async function GET(request: NextRequest) {
       }
 
       case 'generic': {
-        // Get the general webhook configuration
         const token = providerConfig.token
         const secretHeaderName = providerConfig.secretHeaderName
         const requireAuth = providerConfig.requireAuth
         const allowedIps = providerConfig.allowedIps
 
-        // Generate sample curl command for testing
         let curlCommand = `curl -X POST "${webhookUrl}" -H "Content-Type: application/json"`
 
-        // Add auth headers to the curl command if required
         if (requireAuth && token) {
           if (secretHeaderName) {
             curlCommand += ` -H "${secretHeaderName}: ${token}"`
@@ -306,7 +287,6 @@ export async function GET(request: NextRequest) {
           }
         }
 
-        // Add a sample payload
         curlCommand += ` -d '{"event":"test_event","timestamp":"${new Date().toISOString()}"}'`
 
         logger.info(`[${requestId}] General webhook test successful: ${webhookId}`)
@@ -391,7 +371,6 @@ export async function GET(request: NextRequest) {
         })
       }
 
-      // Add the Airtable test case
       case 'airtable': {
         const baseId = providerConfig.baseId
         const tableId = providerConfig.tableId
@@ -408,7 +387,6 @@ export async function GET(request: NextRequest) {
           )
         }
 
-        // Define a sample payload structure
         const samplePayload = {
           webhook: {
             id: 'whiYOUR_WEBHOOK_ID',
@@ -418,16 +396,15 @@ export async function GET(request: NextRequest) {
           },
           payloadFormat: 'v0',
           actionMetadata: {
-            source: 'tableOrViewChange', // Example source
+            source: 'tableOrViewChange',
             sourceMetadata: {},
           },
           payloads: [
             {
               timestamp: new Date().toISOString(),
-              baseTransactionNumber: Date.now(), // Example transaction number
+              baseTransactionNumber: Date.now(),
               changedTablesById: {
                 [tableId]: {
-                  // Example changes - structure may vary based on actual event
                   changedRecordsById: {
                     recSAMPLEID1: {
                       current: { cellValuesByFieldId: { fldSAMPLEID: 'New Value' } },
@@ -442,7 +419,6 @@ export async function GET(request: NextRequest) {
           ],
         }
 
-        // Generate sample curl command
         let curlCommand = `curl -X POST "${webhookUrl}" -H "Content-Type: application/json"`
         curlCommand += ` -d '${JSON.stringify(samplePayload, null, 2)}'`
 
@@ -519,7 +495,6 @@ export async function GET(request: NextRequest) {
       }
 
       default: {
-        // Generic webhook test
         logger.info(`[${requestId}] Generic webhook test successful: ${webhookId}`)
         return NextResponse.json({
           success: true,
