From 92073e7573fef15e3c04b0b4b3048fbfb1eb51e4 Mon Sep 17 00:00:00 2001 From: Vincenzo De Petris <37916223+vincendep@users.noreply.github.com> Date: Tue, 6 Aug 2024 11:02:54 +0200 Subject: [PATCH] fix: draft variables and headers (#2651) * fix: extract variables and headers from the provided request * fix: handling draft headers and vars * fix: handling draft headers and vars --------- Co-authored-by: Vincenzo De Petris Co-authored-by: Anoop M D --- .../src/ipc/network/prepare-request.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/bruno-electron/src/ipc/network/prepare-request.js b/packages/bruno-electron/src/ipc/network/prepare-request.js index 7777253a7..8a747f5d8 100644 --- a/packages/bruno-electron/src/ipc/network/prepare-request.js +++ b/packages/bruno-electron/src/ipc/network/prepare-request.js @@ -18,8 +18,8 @@ const mergeFolderLevelHeaders = (request, requestTreePath) => { folderHeaders.set(header.name, header.value); } }); - } else { - let headers = get(i, 'request.headers', []); + } else if (i.uid === request.uid) { + const headers = i?.draft ? get(i, 'draft.request.headers', []) : get(i, 'request.headers', []); headers.forEach((header) => { if (header.enabled) { folderHeaders.set(header.name, header.value); @@ -55,8 +55,8 @@ const mergeFolderLevelVars = (request, requestTreePath) => { folderReqVars.set(_var.name, _var.value); } }); - } else { - let vars = get(i, 'request.vars.req', []); + } else if (i.uid === request.uid) { + const vars = i?.draft ? get(i, 'draft.request.vars.req', []) : get(i, 'request.vars.req', []); vars.forEach((_var) => { if (_var.enabled) { folderReqVars.set(_var.name, _var.value); @@ -91,8 +91,8 @@ const mergeFolderLevelVars = (request, requestTreePath) => { folderResVars.set(_var.name, _var.value); } }); - } else { - let vars = get(i, 'request.vars.res', []); + } else if (i.uid === request.uid) { + const vars = i?.draft ? get(i, 'draft.request.vars.res', []) : get(i, 'request.vars.res', []); vars.forEach((_var) => { if (_var.enabled) { folderResVars.set(_var.name, _var.value);