diff --git a/packages/bruno-electron/src/ipc/network/index.js b/packages/bruno-electron/src/ipc/network/index.js index 0a5fee775..dfa9d7aca 100644 --- a/packages/bruno-electron/src/ipc/network/index.js +++ b/packages/bruno-electron/src/ipc/network/index.js @@ -255,6 +255,10 @@ const configureRequest = async ( request.headers['cookie'] = cookieString; } } + + // Remove pathParams, already in URL (Issue #2439) + delete request.pathParams; + return axiosInstance; }; diff --git a/packages/bruno-electron/src/ipc/network/interpolate-vars.js b/packages/bruno-electron/src/ipc/network/interpolate-vars.js index 40fe9faa6..138083e1d 100644 --- a/packages/bruno-electron/src/ipc/network/interpolate-vars.js +++ b/packages/bruno-electron/src/ipc/network/interpolate-vars.js @@ -82,11 +82,11 @@ const interpolateVars = (request, envVars = {}, collectionVariables = {}, proces request.data = _interpolate(request.data); } - each(request.params, (param) => { + each(request.pathParams, (param) => { param.value = _interpolate(param.value); }); - if (request?.params?.length) { + if (request?.pathParams?.length) { let url = request.url; if (!url.startsWith('http://') && !url.startsWith('https://')) { @@ -107,7 +107,7 @@ const interpolateVars = (request, envVars = {}, collectionVariables = {}, proces return '/' + path; } else { const name = path.slice(1); - const existingPathParam = request.params.find((param) => param.type === 'path' && param.name === name); + const existingPathParam = request.pathParams.find((param) => param.type === 'path' && param.name === name); return existingPathParam ? '/' + existingPathParam.value : ''; } }) diff --git a/packages/bruno-electron/src/ipc/network/prepare-request.js b/packages/bruno-electron/src/ipc/network/prepare-request.js index ed13eeb54..36e064919 100644 --- a/packages/bruno-electron/src/ipc/network/prepare-request.js +++ b/packages/bruno-electron/src/ipc/network/prepare-request.js @@ -162,7 +162,7 @@ const prepareRequest = (request, collectionRoot, collectionPath) => { method: request.method, url, headers, - params: request.params.filter((param) => param.type === 'path'), + pathParams: request.params.filter((param) => param.type === 'path'), responseType: 'arraybuffer' };