Added combined variable object for gqlIntrospectionRequest

This commit is contained in:
devendra-bruno
2025-05-13 17:05:37 +05:30
parent 2de7ba0d0c
commit ad3f5de99a

View File

@@ -9,7 +9,7 @@ const contentDispositionParser = require('content-disposition');
const mime = require('mime-types');
const FormData = require('form-data');
const { ipcMain } = require('electron');
const { each, get, extend, cloneDeep } = require('lodash');
const { each, get, extend, cloneDeep, merge } = require('lodash');
const { NtlmClient } = require('axios-ntlm');
const { VarsRuntime, AssertRuntime, ScriptRuntime, TestRuntime } = require('@usebruno/js');
const { interpolateString } = require('./interpolate-string');
@@ -800,9 +800,23 @@ const registerNetworkIpc = (mainWindow) => {
ipcMain.handle('fetch-gql-schema', async (event, endpoint, environment, _request, collection) => {
try {
// selected environment variables on collection level
const envVars = getEnvVars(environment);
// collection runtime variables
const collectionrunTimeVars = collection.runtimeVariables;
// global environment variables
const globalEnvironmentVariables = collection.globalEnvironmentVariables;
// request runtime variables
const requestRunTimeVariables = _request.vars;
const combinedVars = merge(
{},
envVars || {},
collectionrunTimeVars || {},
globalEnvironmentVariables || {},
requestRunTimeVariables || {}
);
const collectionRoot = get(collection, 'root', {});
const request = prepareGqlIntrospectionRequest(endpoint, envVars, _request, collectionRoot);
const request = prepareGqlIntrospectionRequest(endpoint, combinedVars, _request, collectionRoot);
request.timeout = preferencesUtil.getRequestTimeout();