fix(array): Fix decoding of array-type query parameters

Closes ui-router/angular#867
ui-router · Dec 17, 2020 · 44ebfae · 44ebfae
1 parent 04a117f
commit 44ebfae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/url/urlMatcher.ts b/src/url/urlMatcher.ts
@@ -341,8 +341,12 @@ export class UrlMatcher {
 
   private _getDecodedParamValue(value: any, param: Param): any {
     if (isDefined(value)) {
-      if (this.config.decodeParams && !param.type.raw && !isArray(value)) {
-        value = decodeURIComponent(value);
+      if (this.config.decodeParams && !param.type.raw) {
+        if (isArray(value)) {
+          value = value.map((paramValue) => decodeURIComponent(paramValue));
+        } else {
+          value = decodeURIComponent(value);
+        }
       }
 
       value = param.type.decode(value);

diff --git a/test/urlMatcherFactorySpec.ts b/test/urlMatcherFactorySpec.ts
@@ -449,6 +449,12 @@ describe('UrlMatcher', function () {
       expect(m.exec($location.path(), $location.search())).toEqual({ param1: 'bar,baz' }); // coerced to string
       expect(m.format({ param1: ['bar', 'baz'] })).toBe('/foo?param1=bar%2Cbaz'); // coerced to string
     });
+
+    it('should decode query parameter values', function () {
+      const m = $umf.compile('/foo?param1', { state: {} });
+      $location.url('/foo?param1=%25&param1=%2F');
+      expect(m.exec($location.path(), $location.search())).toEqual({ param1: ['%', '/'] });
+    });
   });
 
   describe('multivalue-path-parameters', function () {