diff --git a/packages/bruno-electron/src/ipc/network/index.js b/packages/bruno-electron/src/ipc/network/index.js index 2ac9acf39..5b5368e2c 100644 --- a/packages/bruno-electron/src/ipc/network/index.js +++ b/packages/bruno-electron/src/ipc/network/index.js @@ -20,7 +20,7 @@ const { prepareRequest } = require('./prepare-request'); const interpolateVars = require('./interpolate-vars'); const { makeAxiosInstance } = require('./axios-instance'); const { cancelTokens, saveCancelToken, deleteCancelToken } = require('../../utils/cancel-token'); -const { uuid, safeStringifyJSON, safeParseJSON, parseDataFromResponse, parseDataFromRequest } = require('../../utils/common'); +const { uuid, safeStringifyJSON, safeParseJSON, parseDataFromResponse, parseDataFromRequest, mergeEnvironmentVariables } = require('../../utils/common'); const { chooseFileToSave, writeBinaryFile, writeFile } = require('../../utils/filesystem'); const { addCookieToJar, getDomainsWithCookies, getCookieStringForUrl } = require('../../utils/cookies'); const { createFormData } = require('../../utils/form-data'); @@ -808,13 +808,14 @@ const registerNetworkIpc = (mainWindow) => { const globalEnvironmentVariables = collection.globalEnvironmentVariables; // request runtime variables const requestRunTimeVariables = _request.vars; - const combinedVars = merge( - {}, - envVars || {}, - collectionrunTimeVars || {}, - globalEnvironmentVariables || {}, - requestRunTimeVariables || {} + + const combinedVars = mergeEnvironmentVariables( + envVars, + collectionrunTimeVars, + globalEnvironmentVariables, + requestRunTimeVariables ); + const collectionRoot = get(collection, 'root', {}); const request = prepareGqlIntrospectionRequest(endpoint, combinedVars, _request, collectionRoot);