Merge branch '351685-a-utility-to-append-param-to-query-string-uri' into 'master'

Resolve "A utility to append param to query string  URI"

See merge request gitlab-org/gitlab!79758

ee/app/controllers/trial_registrations_controller.rb

@@ -35,10 +35,8 @@ class TrialRegistrationsController < RegistrationsController
     stored_url = stored_location_for(:user)
     return unless stored_url.present?
 
-    redirect_uri = URI.parse(stored_url)
-    new_query = URI.decode_www_form(String(redirect_uri.query)) << ['onboarding', true]
-    redirect_uri.query = URI.encode_www_form(new_query)
-    store_location_for(:user, redirect_uri.to_s)
+    redirect_uri = Gitlab::Utils.add_url_parameters(stored_url, onboarding: true)
+    store_location_for(:user, redirect_uri)
   end
 
   def sign_up_params

lib/gitlab/utils.rb

@@ -203,6 +203,13 @@ module Gitlab
     rescue Addressable::URI::InvalidURIError, TypeError
     end
 
+    def add_url_parameters(url, params)
+      uri = parse_url(url.to_s)
+      uri.query_values = uri.query_values.to_h.merge(params.to_h.stringify_keys)
+      uri.query_values = nil if uri.query_values.empty?
+      uri.to_s
+    end
+
     def removes_sensitive_data_from_url(uri_string)
       uri = parse_url(uri_string)
 

spec/lib/gitlab/utils_spec.rb

@@ -439,6 +439,23 @@ RSpec.describe Gitlab::Utils do
     end
   end
 
+  describe '.add_url_parameters' do
+    subject { described_class.add_url_parameters(url, params) }
+
+    where(:url, :params, :expected_url) do
+      nil                          | nil                | ''
+      nil                          | { b: 3, a: 2 }     | '?a=2&b=3'
+      'https://gitlab.com'         | nil                | 'https://gitlab.com'
+      'https://gitlab.com'         | { b: 3, a: 2 }     | 'https://gitlab.com?a=2&b=3'
+      'https://gitlab.com?a=1#foo' | { b: 3, 'a': 2 }   | 'https://gitlab.com?a=2&b=3#foo'
+      'https://gitlab.com?a=1#foo' | [[:b, 3], [:a, 2]] | 'https://gitlab.com?a=2&b=3#foo'
+    end
+
+    with_them do
+      it { is_expected.to eq(expected_url) }
+    end
+  end
+
   describe '.removes_sensitive_data_from_url' do
     it 'returns string object' do
       expect(described_class.removes_sensitive_data_from_url('http://gitlab.com')).to be_instance_of(String)