Merge pull request #93 from nov/feature/custom_header_support

Feature/custom header support

Author: nov

lib/rack/oauth2/access_token.rb

@@ -5,7 +5,7 @@ class AccessToken
       attr_required :access_token, :token_type
       attr_optional :refresh_token, :expires_in, :scope
       attr_accessor :raw_attributes
-      delegate :get, :patch, :post, :put, :delete, to: :httpclient
+      delegate :get, :patch, :post, :put, :delete, to: :http_client
 
       alias_method :to_s, :access_token
 
@@ -18,8 +18,8 @@ def initialize(attributes = {})
         attr_missing!
       end
 
-      def httpclient
-        @httpclient ||= Rack::OAuth2.http_client("#{self.class} (#{VERSION})") do |faraday|
+      def http_client
+        @http_client ||= Rack::OAuth2.http_client("#{self.class} (#{VERSION})") do |faraday|
           Authenticator.new(self).authenticate(faraday)
         end
       end

lib/rack/oauth2/access_token/mtls.rb

@@ -7,8 +7,8 @@ class MTLS < Bearer
         def initialize(attributes = {})
           super
           self.token_type = :bearer
-          httpclient.ssl.client_key = private_key
-          httpclient.ssl.client_cert = certificate
+          http_client.ssl.client_key = private_key
+          http_client.ssl.client_cert = certificate
         end
       end
     end

lib/rack/oauth2/client.rb

@@ -68,8 +68,8 @@ def force_token_type!(token_type)
         @forced_token_type = token_type.to_s
       end
 
-      def access_token!(*args)
-        headers, params, http_client, options = authenticated_context_from(*args)
+      def access_token!(*args, &local_http_config)
+        headers, params, http_client, options = authenticated_context_from(*args, &local_http_config)
         params[:scope] = Array(options.delete(:scope)).join(' ') if options[:scope].present?
         params.merge! @grant.as_json
         params.merge! options
@@ -82,8 +82,8 @@ def access_token!(*args)
         end
       end
 
-      def revoke!(*args)
-        headers, params, http_client, options = authenticated_context_from(*args)
+      def revoke!(*args, &local_http_config)
+        headers, params, http_client, options = authenticated_context_from(*args, &local_http_config)
 
         params.merge! case
         when access_token = options.delete(:access_token)
@@ -126,9 +126,9 @@ def absolute_uri_for(endpoint)
         _endpoint_.to_s
       end
 
-      def authenticated_context_from(*args)
+      def authenticated_context_from(*args, &local_http_config)
         headers, params = {}, {}
-        http_client = Rack::OAuth2.http_client
+        http_client = Rack::OAuth2.http_client(&local_http_config)
 
         # NOTE:
         #  Using Array#extract_options! for backward compatibility.

spec/rack/oauth2/client_spec.rb

@@ -309,6 +309,23 @@
       end
     end
 
+    context 'local_http_config handling' do
+      it do
+        mock_response(
+          :post,
+          'https://server.example.com/oauth2/token',
+          'tokens/bearer.json',
+          request_header: {
+            'Authorization' => 'Basic Y2xpZW50X2lkOmNsaWVudF9zZWNyZXQ=',
+            'X-Foo' => 'bar'
+          }
+        )
+        client.access_token! do |request|
+          request.headers.merge! 'X-Foo' => 'bar'
+        end
+      end
+    end
+
     context 'when bearer token is given' do
       before do
         client.authorization_code = 'code'
@@ -433,6 +450,28 @@
   end
 
   describe '#revoke!' do
+    context 'local_http_config handling' do
+      it do
+        mock_response(
+          :post,
+          'https://server.example.com/oauth2/revoke',
+          'blank',
+          status: 200,
+          body: {
+            token: 'access_token',
+            token_type_hint: 'access_token'
+          },
+          request_header: {
+            'Authorization' => 'Basic Y2xpZW50X2lkOmNsaWVudF9zZWNyZXQ=',
+            'X-Foo' => 'bar'
+          }
+        )
+        client.revoke!(access_token: 'access_token') do |request|
+          request.headers.merge! 'X-Foo' => 'bar'
+        end
+      end
+    end
+
     context 'when access_token given' do
       before do
         mock_response(