fix(engine): 🐛 Standalone '?' when no query params

baptisteArno · Mar 1, 2022 · d6c3e8d · d6c3e8d · vercel · Mar 1, 2022
1 parent ae347ee
commit d6c3e8d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/executeWebhook.ts b/apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/steps/[stepId]/executeWebhook.ts
@@ -95,7 +95,9 @@ const executeWebhook =
     })
     try {
       const response = await got(
-        parseVariables(variables)(webhook.url + `?${queryParams}`),
+        parseVariables(variables)(
+          webhook.url + (queryParams !== '' ? `?${queryParams}` : '')
+        ),
         {
           method: webhook.method as Method,
           headers,

diff --git a/packages/bot-engine/src/services/integration.ts b/packages/bot-engine/src/services/integration.ts
@@ -207,8 +207,12 @@ const executeWebhook = async (
       resultValues,
     },
   })
-  const statusCode = (data as Record<string, string>).statusCode.toString()
-  const isError = statusCode.startsWith('4') || statusCode.startsWith('5')
+  const statusCode = (
+    data as Record<string, string> | undefined
+  )?.statusCode.toString()
+  const isError = statusCode
+    ? statusCode?.startsWith('4') || statusCode?.startsWith('5')
+    : true
   onNewLog({
     status: error ? 'error' : isError ? 'warning' : 'success',
     description: isError