Replace query-string with qs (#11425)

Author: PyvesB

core/base-service/redirector.js

@@ -1,7 +1,7 @@
 import camelcase from 'camelcase'
 import emojic from 'emojic'
 import Joi from 'joi'
-import queryString from 'query-string'
+import qs from 'qs'
 import BaseService from './base.js'
 import {
   serverHasBeenUpSinceResourceCached,
@@ -92,12 +92,16 @@ export default function redirector(attrs) {
         let urlSuffix = ask.uri.search || ''
 
         if (transformQueryParams) {
-          const specifiedParams = queryString.parse(urlSuffix)
+          const specifiedParams = qs.parse(urlSuffix, {
+            ignoreQueryPrefix: true,
+          })
           const transformedParams = transformQueryParams(namedParams)
           const redirectParams = overrideTransformedQueryParams
             ? Object.assign(transformedParams, specifiedParams)
             : Object.assign(specifiedParams, transformedParams)
-          const outQueryString = queryString.stringify(redirectParams)
+          const outQueryString = qs.stringify(redirectParams, {
+            strictNullHandling: true,
+          })
           urlSuffix = `?${outQueryString}`
         }
 

core/base-service/redirector.spec.js

@@ -216,7 +216,7 @@ describe('Redirector', function () {
 
         expect(statusCode).to.equal(301)
         expect(headers.location).to.equal(
-          '/new/service/hello-world.svg?style=flat-square&token=def456',
+          '/new/service/hello-world.svg?token=def456&style=flat-square',
         )
       })
     })