From 65dbf9c8baf603819a79b9f9f2d89d2218c11f52 Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Tue, 9 Apr 2024 05:24:44 -0500 Subject: [PATCH] fix population of data when data-urlencode flag is used with G flag in curl import (#2025) --- packages/bruno-app/src/utils/curl/parse-curl.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/bruno-app/src/utils/curl/parse-curl.js b/packages/bruno-app/src/utils/curl/parse-curl.js index 0ae97a1fb..77426da83 100644 --- a/packages/bruno-app/src/utils/curl/parse-curl.js +++ b/packages/bruno-app/src/utils/curl/parse-curl.js @@ -33,7 +33,7 @@ const parseCurlCommand = (curlCommand) => { curlCommand = curlCommand.trim(); const parsedArguments = yargs(curlCommand, { - boolean: ['I', 'head', 'compressed', 'L', 'k', 'silent', 's'], + boolean: ['I', 'head', 'compressed', 'L', 'k', 'silent', 's', 'G', 'get'], alias: { H: 'header', A: 'user-agent' @@ -153,7 +153,10 @@ const parseCurlCommand = (curlCommand) => { // NB: the -G flag does not change the http verb. It just moves the data into the url. if (parsedArguments.G || parsedArguments.get) { urlObject.query = urlObject.query ? urlObject.query : ''; - const option = 'd' in parsedArguments ? 'd' : 'data' in parsedArguments ? 'data' : null; + let option = null; + if ('d' in parsedArguments) option = 'd'; + if ('data' in parsedArguments) option = 'data'; + if ('data-urlencode' in parsedArguments) option = 'data-urlencode'; if (option) { let urlQueryString = ''; @@ -219,6 +222,8 @@ const parseCurlCommand = (curlCommand) => { } else if (parsedArguments['data-raw']) { request.data = parsedArguments['data-raw']; request.isDataRaw = true; + } else if (parsedArguments['data-urlencode']) { + request.data = parsedArguments['data-urlencode']; } if (parsedArguments.u) {