MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't encode twice (#13138)

This commit is contained in:
melohagan 2024-02-27 11:26:45 +00:00 committed by GitHub
parent b1dd8999cb
commit 3d48a8f7f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/builder/src/helpers/data/utils.js
View File

@ -17,6 +17,10 @@ export function breakQueryString(qs) {
return paramObj return paramObj
} }
function isEncoded(str) {
return typeof str == "string" && decodeURIComponent(str) !== str
}
export function buildQueryString(obj) { export function buildQueryString(obj) {
let str = "" let str = ""
if (obj) { if (obj) {
@ -35,7 +39,7 @@ export function buildQueryString(obj) {
value = value.replace(binding, marker) value = value.replace(binding, marker)
bindingMarkers[marker] = binding bindingMarkers[marker] = binding
}) })
let encoded = encodeURIComponent(value || "") let encoded = isEncoded(value) ? value : encodeURIComponent(value || "")
Object.entries(bindingMarkers).forEach(([marker, binding]) => { Object.entries(bindingMarkers).forEach(([marker, binding]) => {
encoded = encoded.replace(marker, binding) encoded = encoded.replace(marker, binding)
}) })

7
packages/builder/src/helpers/tests/dataUtils.test.js
View File

@ -39,4 +39,11 @@ describe("check query string utils", () => {
expect(broken.key1).toBe(obj2.key1) expect(broken.key1).toBe(obj2.key1)
expect(broken.key2).toBe(obj2.key2) expect(broken.key2).toBe(obj2.key2)
}) })
it("should not encode a URL more than once when building the query string", () => {
const queryString = buildQueryString({
values: "a%2Cb%2Cc",
})
expect(queryString).toBe("values=a%2Cb%2Cc")
})
}) })