drapcode-utility 2.1.3 → 2.1.4

package/build/utils/rest-client.js

@@ -11,24 +11,14 @@ var FormData = require("form-data");
 var fs = require("fs");
 const qs = require("qs");
 const callCurlRequest = async (setting, user = {}, tenant = {}, userSetting = {}, subTenant = {}, data = {}, timeout = 0, timeoutMessage = "", envConstants = {}, downloadBytes = false, requestDataType = "", wrapJsonDataInArray = false, projectId = "", dataTransferObject = {}, isRawJSON = false, browserStorageData = {}) => {
-    let { url, params, methodType, authType, requestHeader, accessToken, headers = [], isMultipart, files, awsSignPluginConfig = null, } = setting;
+    let { url, params, methodType, authType, requestHeader, accessToken, headers = [], isMultipart, files, awsSignPluginConfig = null, body } = setting;
+    const { bodyRawJSONUrlEncoded, bodyDataFrom } = body || {};
     const { sessionValue, sessionFormValue, 
     // sessionStorageData: sessionStorageValue,
     localStorageData: localStorageValue, cookiesData: cookiesValue, } = browserStorageData || {};
     drapcode_logger_1.logger.info(`STEP 1 Replacing placeholder key values...`, {
         label: projectId,
     });
-    // Uncomment below only when needed for debugging
-    // logger.info(
-    //   `STEP 1 Replacing URL Session Value: ${sessionValue ? JSON.stringify(sessionValue) : ""
-    //   }, Session Form Value: ${sessionFormValue ? JSON.stringify(sessionFormValue) : ""
-    //   }, Browser Storage Data: ${browserStorageData ? JSON.stringify(browserStorageData) : ""
-    //   }, Session Storage: ${sessionStorageValue ? JSON.stringify(sessionStorageValue) : ""
-    //   }, Local Storage: ${localStorageValue ? JSON.stringify(localStorageValue) : ""
-    //   }, Session Cookies: ${cookiesValue ? JSON.stringify(cookiesValue) : ""
-    //   }, Headers: ${headers ? JSON.stringify(headers) : ""}`,
-    //   { label: projectId }
-    // );
     if (url.includes("{{current_user.") &&
         (!user || Object.keys(user).length == 0)) {
         drapcode_logger_1.logger.info("**2 Sending back", { label: projectId });
@@ -132,10 +122,20 @@ const callCurlRequest = async (setting, user = {}, tenant = {}, userSetting = {}
     }
     try {
         let result = null;
-        if (!isRawJSON) {
-            if (requestDataType === "FORM_URL_ENCODED" || isUrlEncoded) {
+        // console.log("🚀 ~ callCurlRequest ~ isRawJSON:", isRawJSON, "~ bodyRawJSONUrlEncoded:", bodyRawJSONUrlEncoded, "~ bodyDataFrom:", bodyDataFrom, "~ requestDataType:", requestDataType)
+        drapcode_logger_1.logger.info(`** isRawJSON: ${isRawJSON}, ~ bodyRawJSONUrlEncoded: ${bodyRawJSONUrlEncoded}, ~ bodyDataFrom: ${bodyDataFrom}, ~ requestDataType: ${requestDataType}`, { label: projectId });
+        if (isRawJSON) {
+            if (bodyDataFrom === "RAW_JSON" && bodyRawJSONUrlEncoded) {
                 data = qs.stringify(data);
-                drapcode_logger_1.logger.info("**17 Encoded data:", data, { label: projectId });
+                drapcode_logger_1.logger.info(`**17 Encoded data: ${data && JSON.stringify(data)}`, { label: projectId });
+            }
+            if (requestDataType === "NO_BODY_DATA")
+                data = {};
+        }
+        else if (!isRawJSON) {
+            if (requestDataType === "FORM_URL_ENCODED" || isUrlEncoded || bodyDataFrom === "formDataUrlEncoded") {
+                data = qs.stringify(data);
+                drapcode_logger_1.logger.info(`**18 Encoded data: ${data && JSON.stringify(data)}`, { label: projectId });
             }
             if (requestDataType === "NO_BODY_DATA")
                 data = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",