btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

🐛 Fixed #1160

Browse Source
This commit is contained in:
Liyas Thomas
2020-09-11 14:12:10 +05:30
parent 005db4d0e8
commit 6dc906a604
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
assets/js/curlparser.js
View File

@@ -21,10 +21,11 @@ const joinDataArguments = (dataArguments) => {
} }
const parseCurlCommand = (curlCommand) => { const parseCurlCommand = (curlCommand) => {
let newlineFound = /\r?\n|\r/.exec(curlCommand) let newlineFound = /\\/gi.test(curlCommand)
if (newlineFound) { if (newlineFound) {
// remove newlines // remove '\' and newlines
curlCommand = curlCommand.replace(/\r?\n|\r/g, "") curlCommand = curlCommand.replace(/\\/gi, "")
curlCommand = curlCommand.replace(/\n/g, "")
} }
// yargs parses -XPOST as separate arguments. just prescreen for it. // yargs parses -XPOST as separate arguments. just prescreen for it.
curlCommand = curlCommand.replace(/ -XPOST/, " -X POST") curlCommand = curlCommand.replace(/ -XPOST/, " -X POST")
@@ -36,7 +37,7 @@ const parseCurlCommand = (curlCommand) => {
let parsedArguments = parser(curlCommand) let parsedArguments = parser(curlCommand)
let cookieString let cookieString
let cookies let cookies
let url = parsedArguments._[2] let url = parsedArguments._[1]
if (!url) { if (!url) {
for (let argName in parsedArguments) { for (let argName in parsedArguments) {
if (typeof parsedArguments[argName] === "string") { if (typeof parsedArguments[argName] === "string") {