add decomment step in a try catch block (#2485)

* add decomment step in a try catch block * request params validation - fix unit tests
usebruno · Jun 21, 2024 · b031e1f · b031e1f
1 parent 929d2b5
commit b031e1f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/packages/bruno-cli/src/runner/prepare-request.js b/packages/bruno-cli/src/runner/prepare-request.js
@@ -76,10 +76,15 @@ const prepareRequest = (request, collectionRoot) => {
  if (!contentTypeDefined) {
  axiosRequest.headers['content-type'] = 'application/json';
  }
- const jsonBody = decomment(request.body.json);
+ let jsonBody;
+ try {
+ jsonBody = decomment(request?.body?.json);
+ } catch (error) {
+ jsonBody = request?.body?.json;
+ }
  try {
  axiosRequest.data = JSONbig.parse(jsonBody);
- } catch (ex) {
+ } catch (error) {
  axiosRequest.data = jsonBody;
  }
  }

diff --git a/packages/bruno-electron/src/ipc/network/prepare-request.js b/packages/bruno-electron/src/ipc/network/prepare-request.js
@@ -172,11 +172,16 @@ const prepareRequest = (request, collectionRoot, collectionPath) => {
  if (!contentTypeDefined) {
  axiosRequest.headers['content-type'] = 'application/json';
  }
- const body = decomment(request.body.json);
+ let jsonBody;
  try {
- axiosRequest.data = JSONbig.parse(body);
- } catch (ex) {
- axiosRequest.data = body;
+ jsonBody = decomment(request?.body?.json);
+ } catch (error) {
+ jsonBody = request?.body?.json;
+ }
+ try {
+ axiosRequest.data = JSONbig.parse(jsonBody);
+ } catch (error) {
+ axiosRequest.data = jsonBody;
  }
  }