diff --git a/package-lock.json b/package-lock.json index e8f35901b..a39d0c028 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16717,7 +16717,7 @@ }, "packages/bruno-electron": { "name": "bruno", - "version": "v0.24.0", + "version": "v0.25.0", "dependencies": { "@aws-sdk/credential-providers": "^3.425.0", "@usebruno/js": "0.8.0", diff --git a/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js b/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js index 29c46de77..98845b55b 100644 --- a/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js +++ b/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js @@ -36,12 +36,7 @@ const GraphQLRequestPane = ({ item, collection, leftPaneWidth, onSchemaLoad, tog const request = item.draft ? item.draft.request : item.request; - let { - schema, - loadSchema, - isLoading: isSchemaLoading, - error: schemaError - } = useGraphqlSchema(url, environment, request, collection); + let { schema, loadSchema, isLoading: isSchemaLoading } = useGraphqlSchema(url, environment, request, collection); const loadGqlSchema = () => { if (!isSchemaLoading) { diff --git a/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/useGraphqlSchema.js b/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/useGraphqlSchema.js index e28ea5bc4..c824c5751 100644 --- a/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/useGraphqlSchema.js +++ b/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/useGraphqlSchema.js @@ -26,7 +26,12 @@ const useGraphqlSchema = (endpoint, environment, request, collection) => { const loadSchema = () => { setIsLoading(true); fetchGqlSchema(endpoint, environment, request, collection) - .then((res) => res.data) + .then((res) => { + if (!res || res.status !== 200) { + return Promise.reject(new Error(res.statusText)); + } + return res.data; + }) .then((s) => { if (s && s.data) { setSchema(buildClientSchema(s.data)); @@ -40,7 +45,7 @@ const useGraphqlSchema = (endpoint, environment, request, collection) => { .catch((err) => { setIsLoading(false); setError(err); - toast.error('Error occurred while loading GraphQL Schema'); + toast.error(`Error occurred while loading GraphQL Schema: ${err.message}`); }); }; diff --git a/packages/bruno-electron/src/ipc/network/index.js b/packages/bruno-electron/src/ipc/network/index.js index 7d4cff91f..9c9ada3f2 100644 --- a/packages/bruno-electron/src/ipc/network/index.js +++ b/packages/bruno-electron/src/ipc/network/index.js @@ -486,7 +486,14 @@ const registerNetworkIpc = (mainWindow) => { const processEnvVars = getProcessEnvVars(collection.uid); interpolateVars(preparedRequest, envVars, collection.collectionVariables, processEnvVars); - const response = await axios(preparedRequest); + const axiosInstance = await configureRequest( + collection.uid, + preparedRequest, + envVars, + collection.collectionVariables, + processEnvVars + ); + const response = await axiosInstance(preparedRequest); return { status: response.status,