fix: Object variables not being correctly included in json body

Interpolate will now fallback to the original object to collect
variable values. Objets will automaticly json encoded. And if
intererpolate is executed for the json body all variables will
be json encoded so strings get double quoted.

This should fix:
- usebruno#1910
- usebruno#1635

packages/bruno-cli/src/runner/interpolate-vars.js

@@ -29,7 +29,7 @@ const interpolateVars = (request, envVars = {}, collectionVariables = {}, proces
     });
   });
 
-  const _interpolate = (str) => {
+  const _interpolate = (str, isJsonBody = false) => {
     if (!str || !str.length || typeof str !== 'string') {
       return str;
     }
@@ -45,7 +45,7 @@ const interpolateVars = (request, envVars = {}, collectionVariables = {}, proces
       }
     };
 
-    return interpolate(str, combinedVars);
+    return interpolate(str, combinedVars, isJsonBody);
   };
 
   request.url = _interpolate(request.url);
@@ -61,14 +61,14 @@ const interpolateVars = (request, envVars = {}, collectionVariables = {}, proces
     if (typeof request.data === 'object') {
       try {
         let parsed = JSON.stringify(request.data);
-        parsed = _interpolate(parsed);
+        parsed = _interpolate(parsed, true);
         request.data = JSON.parse(parsed);
       } catch (err) {}
     }
 
     if (typeof request.data === 'string') {
       if (request.data.length) {
-        request.data = _interpolate(request.data);
+        request.data = _interpolate(request.data, true);
       }
     }
   } else if (contentType === 'application/x-www-form-urlencoded') {

packages/bruno-common/src/interpolate/index.ts

@@ -13,19 +13,26 @@
 
 import { flattenObject } from '../utils';
 
-const interpolate = (str: string, obj: Record<string, any>): string => {
+const interpolate = (str: string, obj: Record<string, any>, isJsonBody = false): string => {
   if (!str || typeof str !== 'string' || !obj || typeof obj !== 'object') {
     return str;
   }
 
   const patternRegex = /\{\{([^}]+)\}\}/g;
   const flattenedObj = flattenObject(obj);
-  const result = str.replace(patternRegex, (match, placeholder) => {
-    const replacement = flattenedObj[placeholder];
-    return replacement !== undefined ? replacement : match;
-  });
+  return str.replace(patternRegex, (match, placeholder) => {
+    const replacement = flattenedObj[placeholder] || obj[placeholder];
+    // Return the original string so nothing gets replaced
+    if (replacement === undefined) {
+      return match;
+    }
 
-  return result;
+    // When inside json body everything must be encoded so string get double quotes
+    if (isJsonBody || typeof replacement === 'object') {
+      return JSON.stringify(replacement);
+    }
+    return replacement;
+  });
 };
 
 export default interpolate;

packages/bruno-electron/src/ipc/network/interpolate-vars.js

@@ -29,7 +29,7 @@ const interpolateVars = (request, envVars = {}, collectionVariables = {}, proces
     });
   });
 
-  const _interpolate = (str) => {
+  const _interpolate = (str, isJsonBody = false) => {
     if (!str || !str.length || typeof str !== 'string') {
       return str;
     }
@@ -45,7 +45,7 @@ const interpolateVars = (request, envVars = {}, collectionVariables = {}, proces
       }
     };
 
-    return interpolate(str, combinedVars);
+    return interpolate(str, combinedVars, isJsonBody);
   };
 
   request.url = _interpolate(request.url);
@@ -61,14 +61,14 @@ const interpolateVars = (request, envVars = {}, collectionVariables = {}, proces
     if (typeof request.data === 'object') {
       try {
         let parsed = JSON.stringify(request.data);
-        parsed = _interpolate(parsed);
+        parsed = _interpolate(parsed, true);
         request.data = JSON.parse(parsed);
       } catch (err) {}
     }
 
     if (typeof request.data === 'string') {
       if (request.data.length) {
-        request.data = _interpolate(request.data);
+        request.data = _interpolate(request.data, true);
       }
     }
   } else if (contentType === 'application/x-www-form-urlencoded') {