Fix: Run Collection-Level Scripts During GraphQL Introspection

packages/bruno-app/src/components/RequestPane/GraphQLSchemaActions/index.js

@@ -6,7 +6,6 @@ import { findEnvironmentInCollection } from 'utils/collections';
 import Dropdown from '../../Dropdown';
 
 const GraphQLSchemaActions = ({ item, collection, onSchemaLoad, toggleDocs }) => {
-  const url = item.draft ? get(item, 'draft.request.url', '') : get(item, 'request.url', '');
   const environment = findEnvironmentInCollection(collection, collection.activeEnvironmentUid);
   const request = item.draft ? item.draft.request : item.request;
 
@@ -15,7 +14,7 @@ const GraphQLSchemaActions = ({ item, collection, onSchemaLoad, toggleDocs }) =>
     schemaSource,
     loadSchema,
     isLoading: isSchemaLoading
-  } = useGraphqlSchema(url, environment, request, collection);
+  } = useGraphqlSchema(environment, request, collection, item);
 
   useEffect(() => {
     if (onSchemaLoad) {

packages/bruno-app/src/components/RequestPane/GraphQLSchemaActions/useGraphqlSchema.js

@@ -3,11 +3,13 @@ import toast from 'react-hot-toast';
 import { buildClientSchema, buildSchema } from 'graphql';
 import { fetchGqlSchema } from 'utils/network';
 import { simpleHash, safeParseJSON } from 'utils/common';
+import { get } from 'lodash';
 
 const schemaHashPrefix = 'bruno.graphqlSchema';
 
-const useGraphqlSchema = (endpoint, environment, request, collection) => {
+const useGraphqlSchema = (environment, request, collection, item) => {
   const { ipcRenderer } = window;
+  const endpoint = item.draft ? get(item, 'draft.request.url', '') : get(item, 'request.url', '');
   const localStorageKey = `${schemaHashPrefix}.${simpleHash(endpoint)}`;
   const [error, setError] = useState(null);
   const [isLoading, setIsLoading] = useState(false);
@@ -31,7 +33,7 @@ const useGraphqlSchema = (endpoint, environment, request, collection) => {
   });
 
   const loadSchemaFromIntrospection = async () => {
-    const response = await fetchGqlSchema(endpoint, environment, request, collection);
+    const response = await fetchGqlSchema(environment, request, collection, item);
     if (!response) {
       throw new Error('Introspection query failed');
     }

packages/bruno-app/src/utils/network/index.js

@@ -50,11 +50,11 @@ export const clearOauth2Cache = async (uid) => {
   });
 };
 
-export const fetchGqlSchema = async (endpoint, environment, request, collection) => {
+export const fetchGqlSchema = async (environment, request, collection, item) => {
   return new Promise((resolve, reject) => {
     const { ipcRenderer } = window;
 
-    ipcRenderer.invoke('fetch-gql-schema', endpoint, environment, request, collection).then(resolve).catch(reject);
+    ipcRenderer.invoke('fetch-gql-schema', environment, request, collection, item).then(resolve).catch(reject);
   });
 };
 

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

@@ -860,11 +860,11 @@ const registerNetworkIpc = (mainWindow) => {
     });
   });
 
-  ipcMain.handle('fetch-gql-schema', async (event, endpoint, environment, _request, collection) => {
+  ipcMain.handle('fetch-gql-schema', async (event, environment, _request, collection, item) => {
     try {
       const envVars = getEnvVars(environment);
       const collectionRoot = get(collection, 'root', {});
-      const request = prepareGqlIntrospectionRequest(endpoint, envVars, _request, collectionRoot);
+      const request = prepareGqlIntrospectionRequest(envVars, _request, collection, item);
 
       request.timeout = preferencesUtil.getRequestTimeout();
 

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

@@ -2,8 +2,16 @@ const { get, each } = require('lodash');
 const { interpolate } = require('@usebruno/common');
 const { getIntrospectionQuery } = require('graphql');
 const { setAuthHeaders } = require('./prepare-request');
+const { getTreePathFromCollectionToItem, mergeScripts } = require('../../utils/collection');
+
+const prepareGqlIntrospectionRequest = (envVars, request, collection, item) => {
+  let endpoint = item.draft ? get(item, 'draft.request.url', '') : get(item, 'request.url', '');
+  const collectionRoot = get(collection, 'root', {});
+  const scriptFlow = collection.brunoConfig?.scripts?.flow ?? 'sandwich';
+  const requestTreePath = getTreePathFromCollectionToItem(collection, item);
+
+  mergeScripts(collection, request, requestTreePath, scriptFlow);
 
-const prepareGqlIntrospectionRequest = (endpoint, envVars, request, collectionRoot) => {
   if (endpoint && endpoint.length) {
     endpoint = interpolate(endpoint, envVars);
   }
@@ -23,7 +31,17 @@ const prepareGqlIntrospectionRequest = (endpoint, envVars, request, collectionRo
     data: JSON.stringify(queryParams)
   };
 
-  return setAuthHeaders(axiosRequest, request, collectionRoot);
+  axiosRequest = setAuthHeaders(axiosRequest, request, collectionRoot)
+
+  if(request?.script){
+    axiosRequest.script = request?.script;
+  }
+
+  if(request?.tests){
+    axiosRequest.tests = request?.tests;
+  }
+
+  return axiosRequest;
 };
 
 const mapHeaders = (requestHeaders, collectionHeaders) => {