From 1d6566679b3d9be6b1db346af174e430b5de3f87 Mon Sep 17 00:00:00 2001 From: pooja-bruno Date: Fri, 27 Jun 2025 12:56:21 +0530 Subject: [PATCH 1/5] fix: include unsaved changes in generate code --- .../GenerateCodeItem/utils/auth-utils.js | 18 +++++++++++++----- .../utils/snippet-generator.js | 3 +-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.js index 25a392e8c..2447b54b0 100644 --- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.js +++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.js @@ -16,12 +16,20 @@ export const getTreePathFromCollectionToItem = (collection, _itemUid) => { // Resolve inherited auth by traversing up the folder hierarchy export const resolveInheritedAuth = (item, collection) => { - const request = item.draft?.request || item.request; - const authMode = request?.auth?.mode; + const mergedRequest = { + ...(item.request || {}), + ...(item.draft?.request || {}) + }; - // If auth is not inherit or no auth defined, return the request as is + if (item.request?.url) { + mergedRequest.url = item.request.url; + } + + const authMode = mergedRequest?.auth?.mode; + + // If auth is not inherit or no auth defined, return the merged request as is if (!authMode || authMode !== 'inherit') { - return request; + return mergedRequest; } // Get the tree path from collection to item @@ -43,7 +51,7 @@ export const resolveInheritedAuth = (item, collection) => { } return { - ...request, + ...mergedRequest, auth: effectiveAuth }; }; \ No newline at end of file diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js index 6be76f170..59469590b 100644 --- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js +++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js @@ -2,7 +2,6 @@ import { buildHarRequest } from 'utils/codegenerator/har'; import { getAuthHeaders } from 'utils/codegenerator/auth'; import { getAllVariables } from 'utils/collections/index'; import { interpolateHeaders, interpolateBody, createVariablesObject } from './interpolation'; -import { resolveInheritedAuth } from './auth-utils'; const generateSnippet = ({ language, item, collection, shouldInterpolate = false }) => { try { @@ -22,7 +21,7 @@ const generateSnippet = ({ language, item, collection, shouldInterpolate = false }); // Get the request with resolved auth - const request = resolveInheritedAuth(item, collection); + const request = item.request; // Prepare headers let headers = [...(request.headers || [])]; From e6afbc75ff1f0a8dc1fba40eaad99303533d2f3f Mon Sep 17 00:00:00 2001 From: pooja-bruno Date: Fri, 27 Jun 2025 13:13:09 +0530 Subject: [PATCH 2/5] fix: authHeaders --- .../CollectionItem/GenerateCodeItem/utils/snippet-generator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js index 59469590b..3bd8a5a24 100644 --- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js +++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js @@ -28,7 +28,7 @@ const generateSnippet = ({ language, item, collection, shouldInterpolate = false // Add auth headers if needed if (request.auth && request.auth.mode !== 'none') { - const authHeaders = getAuthHeaders(request.auth, variables); + const authHeaders = getAuthHeaders(collection?.root?.request?.auth, request.auth); headers = [...headers, ...authHeaders]; } From d65ae78119001d8ab54a922fdf897ccefd933837 Mon Sep 17 00:00:00 2001 From: pooja-bruno Date: Fri, 27 Jun 2025 13:16:11 +0530 Subject: [PATCH 3/5] rm: comment --- .../CollectionItem/GenerateCodeItem/utils/snippet-generator.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js index 3bd8a5a24..1c15080ff 100644 --- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js +++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js @@ -20,7 +20,6 @@ const generateSnippet = ({ language, item, collection, shouldInterpolate = false processEnvVars: collection.processEnvVariables || {} }); - // Get the request with resolved auth const request = item.request; // Prepare headers From a0950dc4f3af05775f0ba8802f924bfaf295bdce Mon Sep 17 00:00:00 2001 From: pooja-bruno Date: Fri, 27 Jun 2025 13:32:41 +0530 Subject: [PATCH 4/5] rm: condition --- .../CollectionItem/GenerateCodeItem/utils/auth-utils.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.js index 2447b54b0..c1cbbe86b 100644 --- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.js +++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.js @@ -21,10 +21,6 @@ export const resolveInheritedAuth = (item, collection) => { ...(item.draft?.request || {}) }; - if (item.request?.url) { - mergedRequest.url = item.request.url; - } - const authMode = mergedRequest?.auth?.mode; // If auth is not inherit or no auth defined, return the merged request as is From bbdf51409835a91f0d4a0a6b0b0668918a5034b6 Mon Sep 17 00:00:00 2001 From: pooja-bruno Date: Fri, 27 Jun 2025 13:48:53 +0530 Subject: [PATCH 5/5] rm: optional chaining --- .../CollectionItem/GenerateCodeItem/utils/auth-utils.js | 2 +- .../CollectionItem/GenerateCodeItem/utils/snippet-generator.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.js index c1cbbe86b..6236ae72b 100644 --- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.js +++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.js @@ -21,7 +21,7 @@ export const resolveInheritedAuth = (item, collection) => { ...(item.draft?.request || {}) }; - const authMode = mergedRequest?.auth?.mode; + const authMode = mergedRequest.auth.mode; // If auth is not inherit or no auth defined, return the merged request as is if (!authMode || authMode !== 'inherit') { diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js index 1c15080ff..73e03fde6 100644 --- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js +++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js @@ -27,7 +27,7 @@ const generateSnippet = ({ language, item, collection, shouldInterpolate = false // Add auth headers if needed if (request.auth && request.auth.mode !== 'none') { - const authHeaders = getAuthHeaders(collection?.root?.request?.auth, request.auth); + const authHeaders = getAuthHeaders(collection.root.request.auth, request.auth); headers = [...headers, ...authHeaders]; }