Added combined Vars for prepareGqlIntrospectionRequest for all interp…

packages/bruno-electron/src/ipc/network/index.js

@@ -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,19 @@ 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);
+
+      const collectionRunTimeVars = collection.runtimeVariables;
+      const globalEnvironmentVars = collection.globalEnvironmentVariables;
+      const requestRunTimeVars = _request.vars;
+
+      //NOTE: precedence is requestRunTimeVars < collectionRunTimeVars < envVars < globalEnvironmentVars
+      //NOTE: for more details https://www.geeksforgeeks.org/lodash-_-merge-method/
+      const combinedVars = merge(requestRunTimeVars, collectionRunTimeVars, envVars, globalEnvironmentVars);
+
       const collectionRoot = get(collection, 'root', {});
-      const request = prepareGqlIntrospectionRequest(endpoint, envVars, _request, collectionRoot);
+      const request = prepareGqlIntrospectionRequest(endpoint, combinedVars, _request, collectionRoot);
 
       request.timeout = preferencesUtil.getRequestTimeout();
 

packages/bruno-electron/src/ipc/network/prepare-gql-introspection-request.js

@@ -3,9 +3,9 @@ const { interpolate } = require('@usebruno/common');
 const { getIntrospectionQuery } = require('graphql');
 const { setAuthHeaders } = require('./prepare-request');
 
-const prepareGqlIntrospectionRequest = (endpoint, envVars, request, collectionRoot) => {
+const prepareGqlIntrospectionRequest = (endpoint, combinedVars, request, collectionRoot) => {
   if (endpoint && endpoint.length) {
-    endpoint = interpolate(endpoint, envVars);
+    endpoint = interpolate(endpoint, combinedVars);
   }
 
   const queryParams = {

packages/bruno-electron/tests/utils/common.spec.js

@@ -1,4 +1,4 @@
-const { flattenDataForDotNotation } = require('../../src/utils/common');
+const { flattenDataForDotNotation, mergeEnvironmentVariables } = require('../../src/utils/common');
 
 describe('utils: flattenDataForDotNotation', () => {
   test('Flatten a simple object with dot notation', () => {