[fixed] Double-encoding of query strings

Also, don't use indices in array query string values. Fixes remix-run#721
danieljuhl · Jan 25, 2015 · fe5ec39 · fe5ec39
1 parent cc5490e
commit fe5ec39
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/modules/utils/Path.js b/modules/utils/Path.js
@@ -144,10 +144,10 @@ var Path = {
     if (existingQuery)
       query = query ? merge(existingQuery, query) : existingQuery;
 
-    var queryString = query && qs.stringify(query);
+    var queryString = qs.stringify(query, { indices: false });
 
     if (queryString)
-      return Path.withoutQuery(path) + '?' + queryString;
+      return Path.withoutQuery(path) + '?' + decodeURIComponent(queryString);
 
     return path;
   },

diff --git a/modules/utils/__tests__/Path-test.js b/modules/utils/__tests__/Path-test.js
@@ -322,7 +322,7 @@ describe('Path.withQuery', function () {
   });
 
   it('merges two query strings', function () {
-    expect(Path.withQuery('/path?a=b', { c: [ 'd', 'e' ]})).toEqual('/path?a=b&c%5B0%5D=d&c%5B1%5D=e');
+    expect(Path.withQuery('/path?a=b', { c: [ 'd', 'e' ] })).toEqual('/path?a=b&c=d&c=e');
   });
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -322,7 +322,7 @@ describe('Path.withQuery', function () { @@
       });
       it('merges two query strings', function () {
-        expect(Path.withQuery('/path?a=b', { c: [ 'd', 'e' ]})).toEqual('/path?a=b&c%5B0%5D=d&c%5B1%5D=e');
+        expect(Path.withQuery('/path?a=b', { c: [ 'd', 'e' ] })).toEqual('/path?a=b&c=d&c=e');
       });
     });
@@ Expand Down @@