fix: URL encode formParamsToString values (#1115)

intershop · May 2, 2022 · 269bf72 · 269bf72
1 parent a8c75ac
commit 269bf72
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/app/core/utils/url-form-params.spec.ts b/src/app/core/utils/url-form-params.spec.ts
@@ -107,6 +107,18 @@ describe('Url Form Params', () => {
         )
       ).toMatchInlineSnapshot(`"bar=d_or_e&foo=c"`);
     });
+
+    it('should url-encode the incoming val', () => {
+      expect(formParamsToString({ test: ['Laptops & Convertibles'] })).toMatchInlineSnapshot(
+        `"test=Laptops%20%26%20Convertibles"`
+      );
+    });
+
+    it('should not url-encode the given seperator', () => {
+      expect(formParamsToString({ test: ['Laptops & Convertibles', 'Desktop Computers'] })).toMatchInlineSnapshot(
+        `"test=Laptops%20%26%20Convertibles,Desktop%20Computers"`
+      );
+    });
   });
 
   describe('appendFormParamsToHttpParams', () => {

diff --git a/src/app/core/utils/url-form-params.ts b/src/app/core/utils/url-form-params.ts
@@ -8,7 +8,7 @@ export function formParamsToString(object: URLFormParams, separator = ','): stri
   return object
     ? Object.entries(object)
         .filter(([, value]) => Array.isArray(value) && value.length)
-        .map(([key, val]) => `${key}=${val.join(separator)}`)
+        .map(([key, val]) => `${key}=${val.map(encodeURIComponent).join(separator)}`)
         .join('&')
     : '';
 }