interpolate collection vars in Generate Code URL

usebruno · Jan 16, 2025 · a23b38a · a23b38a
1 parent 3c8cb70
commit a23b38a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/...pp/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/index.js b/...pp/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/index.js
@@ -25,13 +25,21 @@ 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');
 
   // interpolate the url
   const interpolatedUrl = interpolateUrl({
     url: requestUrl,
+    collectionVars,
     globalEnvironmentVariables,
     envVars,
     runtimeVariables: collection.runtimeVariables,

diff --git a/packages/bruno-app/src/utils/url/index.js b/packages/bruno-app/src/utils/url/index.js
@@ -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,