updtate authorize_url method, add extra test

Author: alzheltkovskiy-hubspot

lib/hubspot/oauth_helper.rb

@@ -2,18 +2,19 @@ module Hubspot
   class OAuthHelper
     AUTHORIZE_URL = 'https://app.hubspot.com/oauth/authorize'.freeze
     class << self
-      def authorize_url(client_id, redirect_uri, scopes = nil, optional_scopes = nil, state = "")
+      def authorize_url(client_id, redirect_uri, scopes = nil, optional_scopes = nil, state = nil)
         query_params = {
           "client_id" => client_id,
           "redirect_uri" => redirect_uri
         }
 
         query_params["scope"] = scopes.join(' ') if scopes
         query_params["optional_scope"] = optional_scopes.join(' ') if optional_scopes
+        query_params['state'] ||= state if state
 
         params = URI.encode_www_form(query_params)
 
-        "#{AUTHORIZE_URL}?#{params}&state=#{state}"
+        "#{AUTHORIZE_URL}?#{params}"
       end
     end
   end

spec/helpers/authorize_url_spec.rb

@@ -20,7 +20,7 @@
       client_id: data[:client_id],
       redirect_uri: data[:redirect_uri]
     }
-    expected_url = "#{AUTHORIZE_URL}?#{URI.encode_www_form(expected_params)}&state="
+    expected_url = "#{AUTHORIZE_URL}?#{URI.encode_www_form(expected_params)}"
 
     result = Hubspot::OAuthHelper.authorize_url(data[:client_id], data[:redirect_uri])
 
@@ -33,7 +33,7 @@
       redirect_uri: data[:redirect_uri],
       scope: data[:scope].join(' ')
     }
-    expected_url = "#{AUTHORIZE_URL}?#{URI.encode_www_form(expected_params)}&state="
+    expected_url = "#{AUTHORIZE_URL}?#{URI.encode_www_form(expected_params)}"
 
     result = Hubspot::OAuthHelper.authorize_url(data[:client_id], data[:redirect_uri], data[:scope])
 
@@ -46,10 +46,30 @@
       redirect_uri: data[:redirect_uri],
       scope: data[:optional_scope].join(' ')
     }
-    expected_url = "#{AUTHORIZE_URL}?#{URI.encode_www_form(expected_params)}&state="
+    expected_url = "#{AUTHORIZE_URL}?#{URI.encode_www_form(expected_params)}"
 
     result = Hubspot::OAuthHelper.authorize_url(data[:client_id], data[:redirect_uri], data[:optional_scope])
 
+    expect(result).to eq(expected_url)
+  end
+  it 'returns the correct URL' do
+    expected_params = {
+      client_id: data[:client_id],
+      redirect_uri: data[:redirect_uri],
+      scope: data[:scope].join(' '),
+      optional_scope: data[:optional_scope].join(' '),
+      state: "test_state"
+    }
+    expected_url = "#{AUTHORIZE_URL}?#{URI.encode_www_form(expected_params)}"
+
+    result = Hubspot::OAuthHelper.authorize_url(
+      data[:client_id],
+      data[:redirect_uri],
+      data[:scope],
+      data[:optional_scope],
+      "test_state"
+    )
+
     expect(result).to eq(expected_url)
   end
 end