blsmedia/bot
2
0
Fork 0
Code Activity

fix: remove json escape for single variable body

Browse Source 
Closes #110
This commit is contained in:
Baptiste Arnaud
2022-07-09 08:11:08 +02:00
parent 9839f5c132
commit d6aa6e7c75
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/viewer/pages/api/typebots/[typebotId]/blocks/[blockId]/executeWebhook.ts
View File

@ -84,6 +84,8 @@ const prepareWebhookAttributes = (
return webhook return webhook
} }
const bodyIsSingleVariable = (body: string) => /{{.+}}/.test(body)
export const executeWebhook = export const executeWebhook =
(typebot: Typebot) => (typebot: Typebot) =>
async ( async (
@ -143,13 +145,17 @@ export const executeWebhook =
json: json:
contentType !== 'x-www-form-urlencoded' && body contentType !== 'x-www-form-urlencoded' && body
? safeJsonParse( ? safeJsonParse(
parseVariables(variables, { escapeForJson: true })(body) parseVariables(variables, {
escapeForJson: !bodyIsSingleVariable(body),
})(body)
) )
: undefined, : undefined,
form: form:
contentType === 'x-www-form-urlencoded' && body contentType === 'x-www-form-urlencoded' && body
? safeJsonParse( ? safeJsonParse(
parseVariables(variables, { escapeForJson: true })(body) parseVariables(variables, {
escapeForJson: !bodyIsSingleVariable(body),
})(body)
) )
: undefined, : undefined,
} }