extern/bruno
1
0
Fork 1
mirror of https://github.com/usebruno/bruno.git synced 2025-02-01 18:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

interpolate collection vars in Generate Code URL

Browse Source
This commit is contained in:
bhaugeea 2025-01-16 17:15:57 -06:00
parent 3c8cb702f5
commit a23b38a8a0
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/index.js
View File

@ -25,6 +25,13 @@ const GenerateCodeItem = ({ collection, item, onClose }) => {
return acc;
}, {});
}
let collectionVars = {};
let collectionRequestVars = get(collection, 'root.request.vars.req', []);
collectionRequestVars.forEach((_var) => {
if (_var.enabled) {
collectionVars[_var.name] = _var.value;
}
});
const requestUrl =
get(item, 'draft.request.url') !== undefined ? get(item, 'draft.request.url') : get(item, 'request.url');
@ -32,6 +39,7 @@ const GenerateCodeItem = ({ collection, item, onClose }) => {
// interpolate the url
const interpolatedUrl = interpolateUrl({
url: requestUrl,
collectionVars,
globalEnvironmentVariables,
envVars,
runtimeVariables: collection.runtimeVariables,

3
packages/bruno-app/src/utils/url/index.js
View File

@ -108,12 +108,13 @@ export const isValidUrl = (url) => {
}
};
export const interpolateUrl = ({ url, globalEnvironmentVariables = {}, envVars, runtimeVariables, processEnvVars }) => {
export const interpolateUrl = ({ url, globalEnvironmentVariables = {}, envVars, collectionVars = {}, runtimeVariables, processEnvVars }) => {
if (!url || !url.length || typeof url !== 'string') {
return;
}
return interpolate(url, {
...collectionVars,
...globalEnvironmentVariables,
...envVars,
...runtimeVariables,