From 9c16ebcda3bfab49394ff89efe59a4f69472d84a Mon Sep 17 00:00:00 2001
From: Pooja <pooja@usebruno.com>
Date: Fri, 22 Aug 2025 14:15:52 +0530
Subject: [PATCH] add: global env var in codegen url interpolation (#5397)

---
 .../CollectionItem/GenerateCodeItem/index.js   |  4 +++-
 .../bruno-app/src/utils/codegenerator/har.js   | 18 ++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/index.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/index.js
index 9f04daa9b..fbef672eb 100644
--- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/index.js
+++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/GenerateCodeItem/index.js
@@ -37,7 +37,9 @@ const GenerateCodeItem = ({ collectionUid, item, onClose }) => {
   const requestUrl =
     get(item, 'draft.request.url') !== undefined ? get(item, 'draft.request.url') : get(item, 'request.url');
 
-  const variables = getAllVariables(collection, item);
+  const variables = useMemo(() => {
+    return getAllVariables({ ...collection, globalEnvironmentVariables }, item);
+  }, [collection, globalEnvironmentVariables, item]);
 
   const interpolatedUrl = interpolateUrl({
     url: requestUrl,
diff --git a/packages/bruno-app/src/utils/codegenerator/har.js b/packages/bruno-app/src/utils/codegenerator/har.js
index 5ee08cac6..dbe1d1349 100644
--- a/packages/bruno-app/src/utils/codegenerator/har.js
+++ b/packages/bruno-app/src/utils/codegenerator/har.js
@@ -53,14 +53,7 @@ const createQuery = (queryParams = []) => {
     }));
 };
 
-const createPostData = (body, type) => {
-  if (type === 'graphql-request') {
-    return {
-      mimeType: 'application/json',
-      text: JSON.stringify(body[body.mode])
-    };
-  }
-
+const createPostData = (body) => {
   const contentType = createContentType(body.mode);
 
   switch (body.mode) {
@@ -112,6 +105,11 @@ const createPostData = (body, type) => {
           : []
       };
     }
+    case 'graphql':
+      return {
+        mimeType: contentType,
+        text: JSON.stringify(body[body.mode])
+      };
     default:
       return {
         mimeType: contentType,
@@ -120,7 +118,7 @@ const createPostData = (body, type) => {
   }
 };
 
-export const buildHarRequest = ({ request, headers, type }) => {
+export const buildHarRequest = ({ request, headers }) => { 
   return {
     method: request.method,
     url: encodeURI(request.url),
@@ -128,7 +126,7 @@ export const buildHarRequest = ({ request, headers, type }) => {
     cookies: [],
     headers: createHeaders(request, headers),
     queryString: createQuery(request.params),
-    postData: createPostData(request.body, type),
+    postData: createPostData(request.body),
     headersSize: 0,
     bodySize: 0,
     binary: true