refactor redirecting specifically for the old query string key (#23749)

* refactor redirecting specifically for the old query string key

* fix tests

Author: Peter Bengtsson

middleware/redirects/handle-redirects.js

@@ -35,12 +35,16 @@ export default function handleRedirects(req, res, next) {
   let redirect = req.path
   let queryParams = req._parsedUrl.query
 
+  // update old-style query params (#9467)
+  if ('q' in req.query) {
+    const newQueryParams = new URLSearchParams(queryParams)
+    newQueryParams.set('query', newQueryParams.get('q'))
+    newQueryParams.delete('q')
+    return res.redirect(301, `${req.path}?${newQueryParams.toString()}`)
+  }
+
   // have to do this now because searchPath replacement changes the path as well as the query params
   if (queryParams) {
-    // update old-style query params (#9467)
-    if ('q' in req.query) {
-      queryParams = queryParams.replace('q=', 'query=')
-    }
     queryParams = '?' + queryParams
     redirect = (redirect + queryParams).replace(patterns.searchPath, '$1')
   }

tests/routing/redirects.js

@@ -76,7 +76,7 @@ describe('redirects', () => {
     test('have q= converted to query=', async () => {
       const res = await get('/en/enterprise/admin?q=pulls')
       expect(res.statusCode).toBe(301)
-      const expected = `/en/enterprise-server@${enterpriseServerReleases.latest}/admin?query=pulls`
+      const expected = '/en/enterprise/admin?query=pulls'
       expect(res.headers.location).toBe(expected)
     })
 
@@ -104,7 +104,8 @@ describe('redirects', () => {
 
     test('work on deprecated versions', async () => {
       const res = await get('/enterprise/2.12/admin/search?utf8=%E2%9C%93&q=pulls')
-      expect(res.statusCode).toBe(200)
+      expect(res.statusCode).toBe(301)
+      expect(res.headers.location).toBe('/enterprise/2.12/admin/search?utf8=%E2%9C%93&query=pulls')
     })
   })