Fix encoding method in parseUrl util

mattmilburn · Nov 8, 2023 · aae115e · aae115e
1 parent f31b4c2
commit aae115e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/admin/src/utils/__tests__/parse-url.spec.js b/admin/src/utils/__tests__/parse-url.spec.js
@@ -51,7 +51,7 @@ describe('parseUrl', () => {
     expect(result).toEqual(output);
   });
 
-  it('should not double-encode query string params', () => {
+  it('should escape pre-existing % characters when encoding query string params', () => {
     const config = {
       url: 'https://www.example.com/{slug}',
       query: {
@@ -61,9 +61,9 @@ describe('parseUrl', () => {
     };
     const data = {
       slug: 'test',
-      foobar: 'foo%2Fbar%2Ftest',
+      foobar: 'foo%bar%test',
     };
-    const output = 'https://www.example.com/test?type=page&foobar=foo%2Fbar%2Ftest';
+    const output = 'https://www.example.com/test?type=page&foobar=foo%25bar%25test';
     const result = parseUrl(config, data, true);
 
     expect(result).toEqual(output);

diff --git a/admin/src/utils/parse-url.js b/admin/src/utils/parse-url.js
@@ -14,20 +14,19 @@ const parseUrl = (config, data) => {
       return acc;
     }
 
-    // We are decoding and encoding at the same time here to avoid double-encoding.
     return {
       ...acc,
-      [key]: encodeURIComponent(decodeURIComponent(val)),
+      [key]: val,
     };
   }, {});
   const params = Object.entries(config?.query ?? {}).reduce((acc, [key, val]) => {
     return {
       ...acc,
-      [key]: interpolate(val, replacements),
+      [key]: encodeURIComponent(interpolate(val, replacements)),
     };
   }, {});
 
-  const url = interpolate(trimSlashes(config.url), replacements);
+  const url = encodeURI(interpolate(trimSlashes(config.url), replacements));
   const query = qs.stringify(params, {
     addQueryPrefix: true,