Proxy. (+1 squashed commit)

Squashed commits:
[cd4fa45] Default oauth2 options.

Author: marlinpierce

lib/jira/oauth2_client.rb

@@ -107,20 +107,15 @@ class Oauth2Client < RequestClient
     OAUTH2_CLIENT_OPTIONS_KEYS =
       %i[auth_scheme authorize_url redirect_uri token_url max_redirects site
          use_ssl ssl_verify_mode ssl_version]
-    # @private
-    DEFAULT_AUTHORIZE_OPTIONS = {
-      authorize_url: '/rest/oauth2/latest/authorize',
-      auth_scheme: 'request_body'
-    }.freeze
+
     # @private
     DEFAULT_OAUTH2_CLIENT_OPTIONS = {
+      use_ssl: true,
       auth_scheme: 'request_body',
       authorize_url: '/rest/oauth2/latest/authorize',
-      token_url: '/rest/oauth2/latest/token'
-    }.freeze
-    DEFAULT_OPTIONS = {
       token_url: '/rest/oauth2/latest/token',
     }.freeze
+
     attr_reader :prior_grant_type, :access_token
     # attr_reader :options
     attr_reader :oauth2_client_options, :client_id, :client_secret, :csrf_state
@@ -137,31 +132,25 @@ class Oauth2Client < RequestClient
     # @option options [String] :proxy_user Proxy user
     # @option options [String] :proxy_password Proxy Password
     def initialize(options = {})
-      @options = init_oauth2_options(options)
+      # @options = init_oauth2_options(options)
+      init_oauth2_options(options)
       if options.has_key?(:access_token_options)
         @access_token = access_token_from_options(options[:access_token_options])
       end
     end
 
     # @private
     private def init_oauth2_options(options)
-      # byebug
-      options_local = options.dup
-      @client_id = options_local.delete(:client_id)
-      @client_secret = options_local.delete(:client_secret)
+      @client_id = options[:client_id]
+      @client_secret = options[:client_secret]
 
-      options_local = DEFAULT_OAUTH2_CLIENT_OPTIONS.merge(options)
-      # @oauth2_client_options = DEFAULT_AUTHORIZE_OPTIONS.merge(options_local.delete(:oauth2_client_options) || {})
-      # @oauth2_client_options = DEFAULT_AUTHORIZE_OPTIONS.merge(options_local.delete(:oauth2_client_options) || {})
-      @oauth2_client_options = options_local.slice(*OAUTH2_CLIENT_OPTIONS_KEYS)
+      @oauth2_client_options = DEFAULT_OAUTH2_CLIENT_OPTIONS.merge(options).slice(*OAUTH2_CLIENT_OPTIONS_KEYS)
 
 
       @oauth2_client_options[:connection_opts] ||= {}
 
-
       @oauth2_client_options[:connection_opts][:headers] ||= options[:default_headers] if options[:default_headers]
 
-
       if options[:use_ssl]
         @oauth2_client_options[:connection_opts][:ssl] ||= {}
         @oauth2_client_options[:connection_opts][:ssl][:version] = options[:ssl_version] if options[:ssl_version]
@@ -171,10 +160,9 @@ def initialize(options = {})
         @oauth2_client_options[:connection_opts][:ssl][:client_key] = options[:ssl_client_key] if options[:ssl_client_key]
       end
 
-
-      proxy_uri = oauth2_client_options.delete(:proxy_uri)
-      proxy_user = oauth2_client_options.delete(:proxy_user)
-      proxy_password = oauth2_client_options.delete(:proxy_password)
+      proxy_uri = options[:proxy_uri]
+      proxy_user = options[:proxy_user]
+      proxy_password = options[:proxy_password]
       if proxy_uri
         @oauth2_client_options[:connection_opts][:proxy] ||= {}
         proxy_opts = @oauth2_client_options[:connection_opts][:proxy]
@@ -186,13 +174,6 @@ def initialize(options = {})
       @oauth2_client_options
     end
 
-    # @private
-    # private def init_oauth2_client(oauth2_client_options)
-    #   OAuth2::Client.new(client_id,
-    #                      client_secret,
-    #                      oauth2_client_options)
-    # end
-
     def oauth2_client
       @oauth2_client ||=
         OAuth2::Client.new(client_id,

spec/jira/oauth2_client_spec.rb

@@ -30,20 +30,19 @@ def query_params_to_h(uri)
   let(:client_key) { 'jira_client.key' }
   let(:minimum_options) do
     {
-
+      site: site,
+      client_id: client_id,
+      client_secret: client_secret,
+      redirect_uri: redirect_uri,
     }
   end
   let(:full_options) do
     minimum_options.merge(
       {
-        client_id: client_id,
-        client_secret: client_secret,
-        site: site,
         use_ssl: ssl_flag,
         auth_scheme: auth_scheme,
         authorize_site: auth_site,
         authorize_url: authorize_url,
-        redirect_uri: redirect_uri,
         token_url: token_url,
         max_redirects: max_redirects,
         default_headers: headers,
@@ -70,13 +69,12 @@ def query_params_to_h(uri)
     describe '.new' do
       context 'setting options' do
         subject(:request_client) do
-          # JIRA::Oauth2Client.new(client_id: client_id, client_secret: client_secret, site: site,
-          #                        oauth2_client_options: { site: auth_site })
           JIRA::Oauth2Client.new(full_options)
         end
 
         it 'sets oauth2 client options' do
-          # expect(request_client.options[:site]).to eq(site)
+          expect(request_client.class).to eq(JIRA::Oauth2Client)
+          expect(request_client.oauth2_client.class).to eq(OAuth2::Client)
           expect(request_client.client_id).to eq(client_id)
           expect(request_client.client_secret).to eq(client_secret)
           expect(request_client.oauth2_client_options[:site]).to eq(site)
@@ -92,6 +90,9 @@ def query_params_to_h(uri)
           expect(request_client.oauth2_client_options.dig(:connection_opts, :ssl, :client_cert)).to eq(client_cert)
           expect(request_client.oauth2_client_options.dig(:connection_opts, :ssl, :client_key)).to eq(client_key)
           expect(request_client.oauth2_client_options.dig(:connection_opts, :headers)).to eq(headers)
+          expect(request_client.oauth2_client.site).to eq(site)
+          expect(request_client.oauth2_client.id).to eq(client_id)
+          expect(request_client.oauth2_client.secret).to eq(client_secret)
           #         authorize_url: 'oauth/authorize',
           # redirect_uri: ?
           # authorize_url: ?
@@ -129,48 +130,64 @@ def query_params_to_h(uri)
 
       context 'using default options' do
         subject(:request_client) do
-          # JIRA::Oauth2Client.new(client_id: client_id, client_secret: client_secret, site: site,
-          #                        oauth2_client_options: { site: auth_site })
           JIRA::Oauth2Client.new(minimum_options)
         end
 
         it 'uses default oauth2 client options' do
-
-        end
-      end
-
-      context 'initialize oauth2 request client' do
-        it 'creates a Oauth2::Client on initialize' do
+          expect(request_client.class).to eq(JIRA::Oauth2Client)
           expect(request_client.oauth2_client.class).to eq(OAuth2::Client)
-          expect(request_client.oauth2_client.site).to eq(auth_site)
+          expect(request_client.client_id).to eq(client_id)
+          expect(request_client.client_secret).to eq(client_secret)
+          expect(request_client.oauth2_client_options[:site]).to eq(site)
+          expect(request_client.oauth2_client_options[:use_ssl]).to eq(JIRA::Oauth2Client::DEFAULT_OAUTH2_CLIENT_OPTIONS[:use_ssl])
+          expect(request_client.oauth2_client_options[:auth_scheme]).to eq(JIRA::Oauth2Client::DEFAULT_OAUTH2_CLIENT_OPTIONS[:auth_scheme])
+          expect(request_client.oauth2_client_options[:authorize_url]).to eq(JIRA::Oauth2Client::DEFAULT_OAUTH2_CLIENT_OPTIONS[:authorize_url])
+          expect(request_client.oauth2_client_options[:token_url]).to eq(JIRA::Oauth2Client::DEFAULT_OAUTH2_CLIENT_OPTIONS[:token_url])
+          expect(request_client.oauth2_client_options[:redirect_uri]).to eq(redirect_uri)
+          expect(request_client.oauth2_client_options.dig(:connection_opts, :ssl, :version)).to be_nil
+          expect(request_client.oauth2_client_options.dig(:connection_opts, :ssl, :verify)).to be_nil
+          expect(request_client.oauth2_client_options.dig(:connection_opts, :ssl, :ca_path)).to be_nil
+          expect(request_client.oauth2_client_options.dig(:connection_opts, :ssl, :client_cert)).to be_nil
+          expect(request_client.oauth2_client_options.dig(:connection_opts, :ssl, :client_key)).to be_nil
+          expect(request_client.oauth2_client_options.dig(:connection_opts, :headers)).to be_nil
+          expect(request_client.oauth2_client.site).to eq(site)
           expect(request_client.oauth2_client.id).to eq(client_id)
           expect(request_client.oauth2_client.secret).to eq(client_secret)
-          expect(request_client.oauth2_client.options[:auth_scheme]).to eq(JIRA::Oauth2Client::DEFAULT_AUTHORIZE_OPTIONS[:auth_scheme])
-          expect(request_client.oauth2_client.options[:authorize_url]).to eq(JIRA::Oauth2Client::DEFAULT_AUTHORIZE_OPTIONS[:authorize_url])
         end
       end
 
       context 'using a proxy' do
-        let(:proxy_site) { 'https://auth_server' }
+        let(:proxy_site) { 'https://proxy_server' }
         let(:proxy_user) { 'ironman' }
         let(:proxy_password) { 'iamironman' }
-        subject(:proxy_request_client) do
-          JIRA::Oauth2Client.new(client_id: client_id, client_secret: client_secret, site: site,
-                                 oauth2_client_options: { site: auth_site,
-                                              proxy_uri: proxy_site,
-                                              proxy_user: proxy_user,
-                                              proxy_password: proxy_password })
+        subject(:request_client) do
+          JIRA::Oauth2Client.new(proxy_options)
         end
 
         it 'creates a proxy configured Oauth2::Client on initialize' do
+          expect(request_client.class).to eq(JIRA::Oauth2Client)
           expect(request_client.oauth2_client.class).to eq(OAuth2::Client)
-          expect(request_client.oauth2_client.site).to eq(auth_site)
+          expect(request_client.client_id).to eq(client_id)
+          expect(request_client.client_secret).to eq(client_secret)
+          expect(request_client.oauth2_client_options[:site]).to eq(site)
+          expect(request_client.oauth2_client_options[:use_ssl]).to eq(ssl_flag)
+          expect(request_client.oauth2_client_options[:auth_scheme]).to eq(auth_scheme)
+          expect(request_client.oauth2_client_options[:authorize_url]).to eq(authorize_url)
+          expect(request_client.oauth2_client_options[:redirect_uri]).to eq(redirect_uri)
+          expect(request_client.oauth2_client_options[:token_url]).to eq(token_url)
+          expect(request_client.oauth2_client_options[:max_redirects]).to eq(max_redirects)
+          expect(request_client.oauth2_client_options.dig(:connection_opts, :ssl, :version)).to eq(ssl_version)
+          expect(request_client.oauth2_client_options.dig(:connection_opts, :ssl, :verify)).to eq(ssl_verify)
+          expect(request_client.oauth2_client_options.dig(:connection_opts, :ssl, :ca_path)).to eq(ca_path)
+          expect(request_client.oauth2_client_options.dig(:connection_opts, :ssl, :client_cert)).to eq(client_cert)
+          expect(request_client.oauth2_client_options.dig(:connection_opts, :ssl, :client_key)).to eq(client_key)
+          expect(request_client.oauth2_client_options.dig(:connection_opts, :headers)).to eq(headers)
+          expect(request_client.oauth2_client.site).to eq(site)
           expect(request_client.oauth2_client.id).to eq(client_id)
           expect(request_client.oauth2_client.secret).to eq(client_secret)
-          # expect(request_client.oauth2_client.options[:token_url]).to eq(JIRA::Oauth2Client::DEFAULT_OPTIONS[:token_url])
-          expect(proxy_request_client.oauth2_client.options.dig(:connection_opts, :proxy, :uri)).to eq(proxy_site)
-          expect(proxy_request_client.oauth2_client.options.dig(:connection_opts, :proxy, :user)).to eq(proxy_user)
-          expect(proxy_request_client.oauth2_client.options.dig(:connection_opts, :proxy, :password)).to eq(proxy_password)
+          expect(request_client.oauth2_client.options.dig(:connection_opts, :proxy, :uri)).to eq(proxy_site)
+          expect(request_client.oauth2_client.options.dig(:connection_opts, :proxy, :user)).to eq(proxy_user)
+          expect(request_client.oauth2_client.options.dig(:connection_opts, :proxy, :password)).to eq(proxy_password)
         end
       end