rayan/bruno
1
0
Fork 0
mirror of https://github.com/usebruno/bruno.git synced 2026-06-23 12:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4995 from pooja-bruno/fix/include-unsaved-changes-in-generate-code

Browse Source 
fix: include unsaved changes in generate code
This commit is contained in:
lohit
2025-06-27 19:11:28 +05:30
committed by GitHub
parent fab9d00566 bbdf514098
commit c76d99d1b0
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/auth-utils.js
View File

@@ -16,12 +16,16 @@ 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
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 +47,7 @@ export const resolveInheritedAuth = (item, collection) => {
}
return {
...request,
...mergedRequest,
auth: effectiveAuth
};
};

6
packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/utils/snippet-generator.js
View File

@@ -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 {
@@ -21,15 +20,14 @@ const generateSnippet = ({ language, item, collection, shouldInterpolate = false
processEnvVars: collection.processEnvVariables || {}
});
// Get the request with resolved auth
const request = resolveInheritedAuth(item, collection);
const request = item.request;
// Prepare headers
let headers = [...(request.headers || [])];
// 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];
}