blsmedia/bot
2
0
Fork 0
Code Activity

🐛 Fix http req body type issue

Browse Source
This commit is contained in:
Baptiste Arnaud
2024-07-11 11:49:19 +02:00
parent c5794a0461
commit d838c2c816
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/bot-engine/blocks/integrations/webhook/executeWebhookBlock.ts
View File

@@ -197,13 +197,11 @@ export const executeWebhook = async (
if (isFormData && isJson) body = parseFormDataBody(body as object) if (isFormData && isJson) body = parseFormDataBody(body as object)
const request = { const baseRequest = {
url, url,
method, method,
headers: headers ?? {}, headers: headers ?? {},
...(basicAuth ?? {}), ...(basicAuth ?? {}),
json: !isFormData && body && isJson ? body : undefined,
body: body && (isFormData || !isJson) ? body : undefined,
timeout: isNotDefined(env.CHAT_API_TIMEOUT) timeout: isNotDefined(env.CHAT_API_TIMEOUT)
? false ? false
: params.timeout && params.timeout !== defaultTimeout : params.timeout && params.timeout !== defaultTimeout
@@ -211,7 +209,13 @@ export const executeWebhook = async (
: isLongRequest : isLongRequest
? maxTimeout * 1000 ? maxTimeout * 1000
: defaultTimeout * 1000, : defaultTimeout * 1000,
} satisfies Options & { url: string; body: any } } satisfies Options & { url: string }
const request = body
? !isFormData && isJson
? { ...baseRequest, json: body }
: { ...baseRequest, body }
: baseRequest
try { try {
const response = await ky(request.url, omit(request, 'url')) const response = await ky(request.url, omit(request, 'url'))