Merge pull request #8 from zakkudo/makeCopyingUnsafeQueryStringStayUn…

…safe Make copying an unsafe query string stay unsafe
zakkudo · Sep 28, 2018 · f73a1b4 · f73a1b4
2 parents 4e6da70 + aa2b87d
commit f73a1b4
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 2 deletions.
diff --git a/src/index.js b/src/index.js
@@ -183,10 +183,11 @@ class QueryString {
      * @param {String|Object|QueryString} [data] - Initial data.  A url `String`
      * will be parsed, and `Object`/`QueryString` instances will be copied.
      * @param {Object} [options] - Modifiers for how the query string object is contructed
-     * @param {Boolean} [options.unsafe = false] - Disable url escaping of key/value pairs. Useful for servers that use unsafe characters as delimiters
+     * @param {Boolean} [options.unsafe = false] - Disable url escaping of
+     * key/value pairs. Useful for servers that use unsafe characters as delimiters
     */
     constructor(data, options = {}) {
-        if (options.unsafe) {
+        if (options.unsafe || (data instanceof UnsafeQueryString && options.unsafe !== false)) {
             return new UnsafeQueryString(data);
         }
 

diff --git a/src/test.js b/src/test.js
@@ -416,6 +416,79 @@ describe('UnsafeQueryString', () => {
         );
     });
 
+    it('parsing a QueryString instance without explicitly setting unsafe', () => {
+        const original = new QueryString({
+            testString: 'test value',
+            testNumber: 1,
+            testBoolean: false,
+            testJSON: {'test': 'value'},
+            testUndefined: undefined,
+            testDuplicateKeys: ['test value 1', 'test value 2'],
+            testNull: null,
+        }, {unsafe: true});
+        const query = new QueryString(original);
+
+        original.monkeyPatch = 'test';
+
+        expect(String(query)).toEqual(
+            '?' +
+            'testString=test value&' +
+            'testNumber=1&' +
+            'testBoolean=false&' +
+            'testJSON={"test":"value"}&' +
+            'testDuplicateKeys=test value 1&' +
+            'testDuplicateKeys=test value 2&' +
+            'testNull=null'
+        );
+
+        expect(JSON.stringify(query)).toEqual(
+            '{' +
+                '"testString":"test value",' +
+                '"testNumber":1,' +
+                '"testBoolean":false,' +
+                '"testJSON":{"test":"value"},' +
+                '"testDuplicateKeys":["test value 1","test value 2"],' +
+                '"testNull":null' +
+            '}'
+        );
+    });
+
+    it('parsing a UnsafeQueryString can be coerced to safe', () => {
+        const original = new QueryString({
+            testString: 'test value',
+            testNumber: 1,
+            testBoolean: false,
+            testJSON: {'test': 'value'},
+            testUndefined: undefined,
+            testDuplicateKeys: ['test value 1', 'test value 2'],
+            testNull: null,
+        }, {unsafe: true});
+        const query = new QueryString(original, {unsafe: false});
+
+        original.monkeyPatch = 'test';
+
+        expect(String(query)).toEqual(
+            '?' +
+            'testString=test%20value&' +
+            'testNumber=1&' +
+            'testBoolean=false&' +
+            'testJSON=%7B%22test%22%3A%22value%22%7D&' +
+            'testDuplicateKeys=test%20value%201&' +
+            'testDuplicateKeys=test%20value%202&' +
+            'testNull=null'
+        );
+
+        expect(JSON.stringify(query)).toEqual(
+            '{' +
+                '"testString":"test value",' +
+                '"testNumber":1,' +
+                '"testBoolean":false,' +
+                '"testJSON":{"test":"value"},' +
+                '"testDuplicateKeys":["test value 1","test value 2"],' +
+                '"testNull":null' +
+            '}'
+        );
+    });
 
     it('allows you to update the query string after construction', () => {
         const query = new QueryString({