devise-doorkeeper 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86671a2c38cb4de8ee35adcc31882b88fc3b4c24
-  data.tar.gz: d6e06702ab8a1b5c9cca0db54b163a05f39f1dad
+  metadata.gz: 4b64812bca11084c10439cfe6377381921d8d6b8
+  data.tar.gz: 0b004f998bb7d52e3deaf239e9379f8bf422502f
 SHA512:
-  metadata.gz: a0532a3a220ce25b987e937a49198e1035448647b2a85f870a39a99555e8ef88c7f919a839501755c1f2fc7ef358cad018985f8925cce4cc44989cd6336ad074
-  data.tar.gz: ce9de5eb268a458ce419bae539c0d7a2640bdde424feccb0c7704e72aa35f2f4db78f3483349998a92072615c0ec9f2b91384aa17c8394d59ac886f371cae90f
+  metadata.gz: c7530c5824b1d5f514eb0b925d824e19131a8d3835eb926e4947bd768c0f762e576d7e226d2dafe770ca910ac6a3eae0df402edf802ce8041a58374a8364bdd6
+  data.tar.gz: 44401f062a0dcf5ee444648a93572a719569d8c1e3158c82909870a5bc8aab536cf1efcc29a391cd736ad9a6d5e170fcc5c2c2974b957f0e648345a490f50f68

data/README.md

@@ -26,12 +26,25 @@ gem 'devise-doorkeeper'
 
 #### Update doorkeeper config
 Update your `config/initializers/doorkeeper.rb` to call
-`Devise::Doorkeeper.configure(self)`.
+`Devise::Doorkeeper.configure_doorkeeper(self)`.
 
 ```ruby
 # config/initializers/doorkeeper.rb
 Doorkeeper.configure do
-  Devise::Doorkeeper.configure(self)
+  Devise::Doorkeeper.configure_doorkeeper(self)
+
+  # extra configuration goes below
+end
+```
+
+#### Update devise config
+Update your `config/initializers/devise.rb` to call
+`Devise::Doorkeeper.configure_devise`.
+
+```ruby
+# config/initializers/devise.rb
+Devise.setup do |config|
+  Devise::Doorkeeper.configure_devise(config)
 
   # extra configuration goes below
 end

data/lib/devise/doorkeeper.rb

@@ -3,7 +3,14 @@ require 'devise/strategies/doorkeeper'
 
 module Devise
   module Doorkeeper
-    def self.configure(base)
+    def self.configure_devise(config)
+      config.warden do |manager|
+        require 'devise/doorkeeper/doorkeeper_failure_app'
+        manager.failure_app = Devise::Doorkeeper::DoorkeeperFailureApp
+      end
+    end
+
+    def self.configure_doorkeeper(base)
       base.instance_eval do
         resource_owner_authenticator do
           current_user || warden.authenticate!(scope: :user)

data/lib/devise/doorkeeper/doorkeeper_failure_app.rb

@@ -0,0 +1,25 @@
+require 'devise/failure_app'
+require 'devise/strategies/doorkeeper'
+
+module Devise
+  module Doorkeeper
+    class DoorkeeperFailureApp < ::Devise::FailureApp
+      def respond
+        if warden_message == Devise::Strategies::Doorkeeper::WARDEN_INVALID_TOKEN_MESSAGE
+          invalid_oauth_token
+        else
+          super
+        end
+      end
+
+      private
+
+      def invalid_oauth_token
+        error = ::Doorkeeper::OAuth::InvalidTokenResponse.new
+        headers.merge! error.headers
+        self.response_body = error.body.to_json
+        self.status        = error.status
+      end
+    end
+  end
+end

data/lib/devise/doorkeeper/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Doorkeeper
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

data/lib/devise/strategies/doorkeeper.rb

@@ -6,6 +6,8 @@ require 'devise/strategies/authenticatable'
 module Devise
   module Strategies
     class Doorkeeper < ::Devise::Strategies::Authenticatable
+      WARDEN_INVALID_TOKEN_MESSAGE = :invalid_token
+
       def valid?
         credentials = ::Doorkeeper::OAuth::Token.from_request(request, *access_token_methods)
         credentials.present?
@@ -46,7 +48,7 @@ module Devise
       end
 
       def invalid_token
-        fail!(:invalid_token)
+        fail!(WARDEN_INVALID_TOKEN_MESSAGE)
         throw :warden
       end
 
@@ -58,12 +60,3 @@ module Devise
 end
 Warden::Strategies.add(:doorkeeper, Devise::Strategies::Doorkeeper)
 Devise.add_module(:doorkeeper, strategy: true)
-
-
-# if ///
-#  error = OAuth::InvalidTokenResponse.from_access_token(doorkeeper_token)
-#   options = doorkeeper_unauthorized_render_options
-# else
-#   error = OAuth::ForbiddenTokenResponse.from_scopes(scopes)
-#   options = doorkeeper_forbidden_render_options
-# end

data/spec/dummy/config/initializers/devise.rb

@@ -1,6 +1,7 @@
 # Use this hook to configure devise mailer, warden hooks and so forth.
 # Many of these configuration options can be set straight in your model.
 Devise.setup do |config|
+  Devise::Doorkeeper.configure_devise(config)
   # The secret key used by Devise. Devise uses this key to generate
   # random tokens. Changing this key will render invalid all existing
   # confirmation, reset password and unlock tokens in the database.

data/spec/dummy/config/initializers/doorkeeper.rb

@@ -1,5 +1,5 @@
 Doorkeeper.configure do
-  Devise::Doorkeeper.configure(self)
+  Devise::Doorkeeper.configure_doorkeeper(self)
 
   # Change the ORM that doorkeeper will use.
   # Currently supported options are :active_record, :mongoid2, :mongoid3,
@@ -99,7 +99,7 @@ Doorkeeper.configure do
   # end
 
   # WWW-Authenticate Realm (default "Doorkeeper").
-  # realm "Doorkeeper"
+  realm 'DeviseDoorkeeperApp'
 
   # Allow dynamic query parameters (disabled by default)
   # Some applications require dynamic query parameters on their request_uri

data/spec/requests/oauth/bearer_tokens_spec.rb

@@ -30,6 +30,7 @@ RSpec.describe 'OAuth bearer token requests', type: :request do
       get request_path, params, headers
     end
     it { expect(response.status).to eq 401 }
+    it { expect(response.headers).to include('WWW-Authenticate' => 'Bearer realm="DeviseDoorkeeperApp", error="invalid_token", error_description="The access token is invalid"') }
   end
   context 'with revoked access token' do
     with :access_token, revoked_at: 1.year.ago

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise-doorkeeper
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -209,6 +209,7 @@ files:
 - Rakefile
 - devise-doorkeeper.gemspec
 - lib/devise/doorkeeper.rb
+- lib/devise/doorkeeper/doorkeeper_failure_app.rb
 - lib/devise/doorkeeper/version.rb
 - lib/devise/strategies/doorkeeper.rb
 - spec/dummy/.rspec