Merge pull request #91 from nov/feature/faraday_v2

replace httpclient with faraday v2 & remove MAC

Author: nov

README.rdoc

@@ -1,17 +1,14 @@
 = rack-oauth2
 
 OAuth 2.0 Server & Client Library.
-Both Bearer and MAC token type are supported.
+Both Bearer token type are supported.
 
 The OAuth 2.0 Authorization Framework (RFC 6749)
 http://www.rfc-editor.org/rfc/rfc6749.txt
 
 The OAuth 2.0 Authorization Framework: Bearer Token Usage (RFC 6750)
 http://tools.ietf.org/html/draft-ietf-oauth-v2-bearer-06
 
-HTTP Authentication: MAC Access Authentication (draft 01)
-http://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01
-
 == Installation
 
   gem install rack-oauth2
@@ -29,31 +26,17 @@ http://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01
 Source on GitHub
 https://github.com/nov/rack-oauth2-sample
 
-=== MAC
-
-Source on GitHub
-https://github.com/nov/rack-oauth2-sample-mac
-
 == Sample Client
 
-=== Common between Bearer and MAC
-
 Authorization Request (request_type: 'code' and 'token')
 https://gist.github.com/862393
 
 Token Request (grant_type: 'client_credentials', 'password', 'authorization_code' and 'refresh_token')
 https://gist.github.com/883541
 
-=== Bearer
-
 Resource Request (request both for resource owner resource and for client resource)
 https://gist.github.com/883575
 
-=== MAC
-
-Resource Request (request both for resource owner resource and for client resource)
-https://gist.github.com/933885
-
 == Note on Patches/Pull Requests
 
 * Fork the project.

VERSION

@@ -1 +1 @@
-1.21.3
+2.0.0.rc1

lib/rack/oauth2.rb

@@ -1,5 +1,6 @@
 require 'rack'
-require 'httpclient'
+require 'faraday'
+require 'faraday/follow_redirects'
 require 'logger'
 require 'active_support'
 require 'active_support/core_ext'
@@ -40,18 +41,12 @@ def self.debug(&block)
     self.debugging = false
 
     def self.http_client(agent_name = "Rack::OAuth2 (#{VERSION})", &local_http_config)
-      _http_client_ = HTTPClient.new(
-        agent_name: agent_name
-      )
-
-      # NOTE: httpclient gem seems stopped maintaining root certtificate set, use OS default.
-      _http_client_.ssl_config.clear_cert_store
-      _http_client_.ssl_config.cert_store.set_default_paths
-
-      http_config.try(:call, _http_client_)
-      local_http_config.try(:call, _http_client_) unless local_http_config.nil?
-      _http_client_.request_filter << Debugger::RequestFilter.new if debugging?
-      _http_client_
+      Faraday.new(headers: {user_agent: agent_name}) do |faraday|
+        faraday.response :logger, Rack::OAuth2.logger if debugging?
+        faraday.adapter Faraday.default_adapter
+        local_http_config&.call(faraday)
+        http_config&.call(faraday)
+      end
     end
 
     def self.http_config(&block)
@@ -70,4 +65,3 @@ def self.reset_http_config!
 require 'rack/oauth2/server'
 require 'rack/oauth2/client'
 require 'rack/oauth2/access_token'
-require 'rack/oauth2/debugger'

lib/rack/oauth2/access_token.rb

@@ -19,8 +19,8 @@ def initialize(attributes = {})
       end
 
       def httpclient
-        @httpclient ||= Rack::OAuth2.http_client("#{self.class} (#{VERSION})") do |config|
-          config.request_filter << Authenticator.new(self)
+        @httpclient ||= Rack::OAuth2.http_client("#{self.class} (#{VERSION})") do |faraday|
+          Authenticator.new(self).authenticate(faraday)
         end
       end
 
@@ -39,6 +39,5 @@ def token_response(options = {})
 
 require 'rack/oauth2/access_token/authenticator'
 require 'rack/oauth2/access_token/bearer'
-require 'rack/oauth2/access_token/mac'
 require 'rack/oauth2/access_token/legacy'
 require 'rack/oauth2/access_token/mtls'

lib/rack/oauth2/access_token/authenticator.rb

@@ -6,18 +6,9 @@ def initialize(token)
           @token = token
         end
 
-        # Callback called in HTTPClient (before sending a request)
-        # request:: HTTP::Message
-        def filter_request(request)
+        def authenticate(request)
           @token.authenticate(request)
         end
-
-        # Callback called in HTTPClient (after received a response)
-        # response:: HTTP::Message
-        # request::  HTTP::Message
-        def filter_response(response, request)
-          # nothing to do
-        end
       end
     end
   end

lib/rack/oauth2/access_token/bearer.rb

@@ -3,7 +3,7 @@ module OAuth2
     class AccessToken
       class Bearer < AccessToken
         def authenticate(request)
-          request.header["Authorization"] = "Bearer #{access_token}"
+          request.headers["Authorization"] = "Bearer #{access_token}"
         end
 
         def to_mtls(attributes = {})

lib/rack/oauth2/access_token/legacy.rb

@@ -11,7 +11,7 @@ def initialize(attributes = {})
         end
 
         def authenticate(request)
-          request.header["Authorization"] = "OAuth #{access_token}"
+          request.headers["Authorization"] = "OAuth #{access_token}"
         end
       end
     end