rayan/bruno
1
0
Fork 0
mirror of https://github.com/usebruno/bruno.git synced 2026-06-22 20:25:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added mergeEnvironmentVariables method for gql prep method

Browse Source
This commit is contained in:
devendra-bruno
2025-05-14 12:25:41 +05:30
parent 0ca2891166
commit 8e91640084
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/bruno-electron/src/ipc/network/index.js
View File

@@ -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);