rayan/bruno
1
0
Fork 0
mirror of https://github.com/usebruno/bruno.git synced 2026-07-08 06:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5713 from barelyhuman/fix/form-values-seq-5237

Browse Source 
fix: reimplement payload serialization for `x-www-form-encoded`
This commit is contained in:
Siddharth Gelera (reaper)
2025-10-09 18:25:28 +05:30
committed by GitHub
parent c2d40fe99f
commit 924bc2e79e
9 changed files with 33 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/bruno-cli/src/runner/interpolate-vars.js
View File

@@ -80,12 +80,11 @@ const interpolateVars = (request, envVariables = {}, runtimeVariables = {}, proc
}
}
} else if (contentType === 'application/x-www-form-urlencoded') {
if (typeof request.data === 'object') {
try {
forOwn(request?.data, (value, key) => {
request.data[key] = _interpolate(value);
});
} catch (err) {}
if (request.data && Array.isArray(request.data)) {
request.data = request.data.map((d) => ({
...d,
value: _interpolate(d?.value)
}));
}
} else if (contentType === 'multipart/form-data') {
if (Array.isArray(request?.data) && !(request.data instanceof FormData)) {

3
packages/bruno-cli/src/runner/prepare-request.js
View File

@@ -6,7 +6,6 @@ const decomment = require('decomment');
const crypto = require('node:crypto');
const fs = require('node:fs');
const { mergeHeaders, mergeScripts, mergeVars, mergeAuth, getTreePathFromCollectionToItem } = require('../utils/collection');
const { buildFormUrlEncodedPayload } = require('../utils/form-data');
const path = require('node:path');
const { isLargeFile } = require('../utils/filesystem');
const { getFormattedOauth2Credentials } = require('../utils/oauth2');
@@ -356,7 +355,7 @@ const prepareRequest = async (item = {}, collection = {}) => {
axiosRequest.headers['content-type'] = 'application/x-www-form-urlencoded';
}
const enabledParams = filter(request.body.formUrlEncoded, (p) => p.enabled);
axiosRequest.data = buildFormUrlEncodedPayload(enabledParams);
axiosRequest.data = enabledParams;
}
if (request.body.mode === 'multipartForm') {

6
packages/bruno-cli/src/runner/run-single-request.js
View File

@@ -19,7 +19,7 @@ const { shouldUseProxy, PatchedHttpsProxyAgent, getSystemProxyEnvVariables } = r
const path = require('path');
const { parseDataFromResponse } = require('../utils/common');
const { getCookieStringForUrl, saveCookies } = require('../utils/cookies');
const { createFormData } = require('../utils/form-data');
const { createFormData, buildFormUrlEncodedPayload } = require('../utils/form-data');
const protocolRegex = /^([-+\w]{1,25})(:?\/\/|:)/;
const { NtlmClient } = require('axios-ntlm');
const { addDigestInterceptor } = require('@usebruno/requests');
@@ -333,7 +333,7 @@ const runSingleRequest = async function (
name => name.toLowerCase() === 'content-type'
);
if (contentTypeHeader && request.headers[contentTypeHeader] === 'application/x-www-form-urlencoded') {
request.data = qs.stringify(request.data, { arrayFormat: 'repeat' });
request.data = buildFormUrlEncodedPayload(request.data);
}
if (contentTypeHeader && request.headers[contentTypeHeader] === 'multipart/form-data') {
@@ -406,7 +406,7 @@ const runSingleRequest = async function (
});
if (request.ntlmConfig) {
axiosInstance=NtlmClient(request.ntlmConfig,axiosInstance.defaults)
axiosInstance = NtlmClient(request.ntlmConfig, axiosInstance.defaults);
delete request.ntlmConfig;
}