Merge branch '336895-decode-square-brackets-with-querytoobject-where-present' into 'master'

Decode square brackets with "queryToObject" [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!66846

app/assets/javascripts/lib/utils/url_utility.js

@@ -474,19 +474,17 @@ export function queryToObject(query, { gatherArrays = false, legacySpacesDecode
     }
 
     const decodedValue = legacySpacesDecode ? decodeURIComponent(value) : decodeUrlParameter(value);
+    const decodedKey = legacySpacesDecode ? decodeURIComponent(key) : decodeUrlParameter(key);
 
-    if (gatherArrays && key.endsWith('[]')) {
-      const decodedKey = legacySpacesDecode
-        ? decodeURIComponent(key.slice(0, -2))
-        : decodeUrlParameter(key.slice(0, -2));
+    if (gatherArrays && decodedKey.endsWith('[]')) {
+      const decodedArrayKey = decodedKey.slice(0, -2);
 
-      if (!Array.isArray(accumulator[decodedKey])) {
-        accumulator[decodedKey] = [];
+      if (!Array.isArray(accumulator[decodedArrayKey])) {
+        accumulator[decodedArrayKey] = [];
       }
-      accumulator[decodedKey].push(decodedValue);
-    } else {
-      const decodedKey = legacySpacesDecode ? decodeURIComponent(key) : decodeUrlParameter(key);
 
+      accumulator[decodedArrayKey].push(decodedValue);
+    } else {
       accumulator[decodedKey] = decodedValue;
     }
 

spec/frontend/lib/utils/url_utility_spec.js

@@ -683,6 +683,8 @@ describe('URL utility', () => {
       ${'ignores plus symbols when gathering arrays'}                           | ${'?search[]=a+b'}                  | ${{ gatherArrays: true, legacySpacesDecode: true }} | ${{ search: ['a+b'] }}
       ${'replaces plus symbols with spaces'}                                    | ${'?search=a+b'}                    | ${undefined}                                        | ${{ search: 'a b' }}
       ${'replaces plus symbols in keys with spaces'}                            | ${'?search+term=a'}                 | ${undefined}                                        | ${{ 'search term': 'a' }}
+      ${'preserves square brackets in array params'}                            | ${'?search[]=a&search[]=b'}         | ${{ gatherArrays: true }}                           | ${{ search: ['a', 'b'] }}
+      ${'decodes encoded square brackets in array params'}                      | ${'?search%5B%5D=a&search%5B%5D=b'} | ${{ gatherArrays: true }}                           | ${{ search: ['a', 'b'] }}
       ${'replaces plus symbols when gathering arrays'}                          | ${'?search[]=a+b'}                  | ${{ gatherArrays: true }}                           | ${{ search: ['a b'] }}
       ${'replaces plus symbols when gathering arrays for values with same key'} | ${'?search[]=a+b&search[]=c+d'}     | ${{ gatherArrays: true }}                           | ${{ search: ['a b', 'c d'] }}
     `('$case', ({ query, options, result }) => {