From 13c51f61d940ba978e09b723a0bcf6fd78dfe425 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 15 Feb 2021 19:57:49 +0000
Subject: [PATCH] ensure JSON parsed correctly

---
 packages/server/src/api/controllers/query.js | 10 ++++++++--
 packages/server/src/integrations/rest.js     |  8 ++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/api/controllers/query.js b/packages/server/src/api/controllers/query.js
index 71835ce8f6..04ff019a38 100644
--- a/packages/server/src/api/controllers/query.js
+++ b/packages/server/src/api/controllers/query.js
@@ -67,10 +67,16 @@ async function enrichQueryFields(fields, parameters) {
     }
   }
 
-  if (enrichedQuery.json || enrichedQuery.customData) {
+  if (
+    enrichedQuery.json ||
+    enrichedQuery.customData ||
+    enrichedQuery.requestBody
+  ) {
     try {
       enrichedQuery.json = JSON.parse(
-        enrichedQuery.json || enrichedQuery.customData
+        enrichedQuery.json ||
+          enrichedQuery.customData ||
+          enrichedQuery.requestBody
       )
     } catch (err) {
       throw { message: `JSON Invalid - error: ${err}` }
diff --git a/packages/server/src/integrations/rest.js b/packages/server/src/integrations/rest.js
index 6b56303c51..1496ae764b 100644
--- a/packages/server/src/integrations/rest.js
+++ b/packages/server/src/integrations/rest.js
@@ -72,11 +72,11 @@ class RestIntegration {
     this.config = config
   }
 
-  async create({ path, headers = {}, requestBody }) {
+  async create({ path, headers = {}, json }) {
     const response = await fetch(this.config.url + path, {
       method: "POST",
       headers,
-      body: requestBody,
+      body: JSON.stringify(json),
     })
 
     return await response.json()
@@ -90,11 +90,11 @@ class RestIntegration {
     return await response.json()
   }
 
-  async update({ path, headers = {}, requestBody }) {
+  async update({ path, headers = {}, json }) {
     const response = await fetch(this.config.url + path, {
       method: "POST",
       headers,
-      body: requestBody,
+      body: JSON.stringify(json),
     })
 
     return await response.json()