fix(curlify): replace all occurrences of $ (#6354)
* replace all occurrences instead of only first occurrence
This commit is contained in:
@@ -27,7 +27,7 @@ export default function curl( request ){
|
||||
for( let p of request.get("headers").entries() ){
|
||||
let [ h,v ] = p
|
||||
curlified.push( "-H " )
|
||||
curlified.push( `"${h}: ${v.replace("$", "\\$")}"` )
|
||||
curlified.push( `"${h}: ${v.replace(/\$/g, "\\$")}"` )
|
||||
isMultipartFormDataRequest = isMultipartFormDataRequest || /^content-type$/i.test(h) && /^multipart\/form-data$/i.test(v)
|
||||
}
|
||||
}
|
||||
@@ -47,7 +47,7 @@ export default function curl( request ){
|
||||
curlified.push( "-d" )
|
||||
let reqBody = request.get("body")
|
||||
if (!Map.isMap(reqBody)) {
|
||||
curlified.push( JSON.stringify( request.get("body") ).replace(/\\n/g, "").replace("$", "\\$") )
|
||||
curlified.push( JSON.stringify( request.get("body") ).replace(/\\n/g, "").replace(/\$/g, "\\$") )
|
||||
} else {
|
||||
let curlifyToJoin = []
|
||||
for (let [k, v] of request.get("body").entrySeq()) {
|
||||
|
||||
@@ -351,4 +351,17 @@ describe("curlify", function () {
|
||||
|
||||
expect(curlified).toEqual("curl -X POST \"http://example.com\" -H \"X-DOLLAR: token/123\\$\" -d \"CREATE (\\$props)\"")
|
||||
})
|
||||
|
||||
it("should escape multiple dollar signs", function () {
|
||||
let req = {
|
||||
url: "http://example.com",
|
||||
method: "POST",
|
||||
headers: { },
|
||||
body: "RETURN $x + $y"
|
||||
}
|
||||
|
||||
let curlified = curl(Im.fromJS(req))
|
||||
|
||||
expect(curlified).toEqual("curl -X POST \"http://example.com\" -d \"RETURN \\$x + \\$y\"")
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user