From a5cff9ec7edf0ecacd26b1ea1019cd7c3744a467 Mon Sep 17 00:00:00 2001 From: Logan Cusano Date: Sat, 3 Jun 2023 15:42:23 -0400 Subject: [PATCH] Check if the returned data from HTTP is valid JSON and parse if so, return the string if not --- Server/utilities/httpRequests.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Server/utilities/httpRequests.js b/Server/utilities/httpRequests.js index fb035ed..3dea90e 100644 --- a/Server/utilities/httpRequests.js +++ b/Server/utilities/httpRequests.js @@ -3,6 +3,7 @@ const { DebugBuilder } = require("../utilities/debugBuilder.js"); const log = new DebugBuilder("server", "httpRequests"); // Modules const http = require("http"); +const { isJsonString } = require("./utils.js"); exports.requestOptions = class requestOptions { /** @@ -39,7 +40,7 @@ exports.sendHttpRequest = function sendHttpRequest(requestOptions, data, callbac res.on('data', (data) => { const responseObject = { "statusCode": res.statusCode, - "body": (requestOptions.method === "POST") ? JSON.parse(data) : data.toString() + "body": (isJsonString(data.toString)) ? JSON.parse(data) : data.toString() }; log.DEBUG("Response Object: ", responseObject); callback(responseObject);