devise-doorkeeper 1.1.1.ci.22.1 → 1.1.2.ci.59.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWZjZGZiNWUxMDBlZjQxZWU0ZDA5NjczNzBlMWNlM2NjN2U3NjZmZQ==
-  data.tar.gz: !binary |-
-    MWY0M2FlNzlhNjMwMzk4OTViMTNhMmVhZjQ4MTY0MDhkMGVmYWNjOQ==
+SHA256:
+  metadata.gz: cd5ff52f157f14eb96ddcd90acb360d90a1cf3c3cdc9e40c04b6637b4a84e3a7
+  data.tar.gz: 16f1246cf223a725fd8a470e2735a114f2ead75e324cbbff032de52d05c6c7f6
 SHA512:
-  metadata.gz: !binary |-
-    NTA4Njk4M2ViMjdmODA1OWJhYjhkMGY1ZTY2OWNlOTBjMDE4MTlkMDhhYjU3
-    MzAxMTA5NDQzOWYyNWFhNWRkZTJkOGIyZjk1ZTY0M2Y5NTc3Y2IyZTZjODQy
-    MGFhMWRlNWVkM2ZiYzQxMGYxMDNjYjE0MjM1M2RmZWZkZTNkZWM=
-  data.tar.gz: !binary |-
-    MmNkMjVlZmQ2N2UzZmMyMjAxOGI0NmNiNjEyNGUwOWYzYjdiYTI4Y2VmNmY1
-    MGQ4ZTczMTkxOTk2ZmI2ODM1YWM1MjZmZDNhMjI4MDBkZjMzMmY3Yzc2ODA0
-    ZGUxMDcxMjI1MzhkYzFmNGNhYTcxYTkyN2VhMDdiNjhjMGMyYzQ=
+  metadata.gz: e42602652626119e2f29b49bffd5cf0afd42ec00825e877c9d0945d297ecc2a23cac2a6b5b92217470f3a01794e6e208aa527de0253b47d8cbd91d714a6bf48e
+  data.tar.gz: 86ed9f37198218f31b9ed544efb99439958930c6e842d2d64187fe87bf414efdd7fe4d5959c79e8084d1f25f3ccbde0c66297f4ddb3676b8e40dd7d69f5d4ff2

data/.ruby-version

@@ -1 +1 @@
-2.2.2
+2.5.8

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2015 BetterUP, Inc.
+Copyright (c) 2015 BetterUp, Inc.
 
 MIT License
 

data/devise-doorkeeper.gemspec

@@ -6,8 +6,8 @@ require 'devise/doorkeeper/version'
 Gem::Specification.new do |spec|
   spec.name          = 'devise-doorkeeper'
   spec.version       = Devise::Doorkeeper::VERSION
-  spec.authors       = ['Ryan Sonnek']
-  spec.email         = ['ryan@codecrate.com']
+  spec.authors       = ['BetterUp']
+  spec.email         = ['developers@betterup.co']
   spec.summary       = %q{ Integrate Doorkeeper OAuth2 tokens into Devise applications }
   spec.description   = %q{ Support authentication via OAuth2 tokens dispensed from the Doorkeeper authorization flow }
   spec.homepage      = ''
@@ -18,21 +18,21 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rails'
-  spec.add_dependency 'devise'
-  spec.add_dependency 'doorkeeper'
+  spec.add_dependency 'rails', '~> 5.0.0'
+  spec.add_dependency 'devise', '~> 4.7.3'
+  spec.add_dependency 'doorkeeper', '~> 4.1.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'factory_girl_rails'
-  spec.add_development_dependency 'factory_girl_rspec'
-  spec.add_development_dependency 'faker'
-  spec.add_development_dependency 'json_spec'
-  spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'travis'
+  spec.add_development_dependency 'bundler', '~> 1.17.3'
+  spec.add_development_dependency 'rspec-rails', '~> 3.5.1'
+  spec.add_development_dependency 'factory_girl_rails', '~> 4.7.0'
+  spec.add_development_dependency 'factory_girl_rspec', '~> 2.1.0'
+  spec.add_development_dependency 'faker', '~> 1.6.6'
+  spec.add_development_dependency 'json_spec', '~> 1.1.4'
+  spec.add_development_dependency 'sqlite3', '~> 1.3.11'
+  spec.add_development_dependency 'coveralls', '~> 0.8.15'
+  spec.add_development_dependency 'pry', '~> 0.10.4'
+  spec.add_development_dependency 'rake', '~> 13.0.3'
+  spec.add_development_dependency 'travis', '~> 1.8.2'
 
   # configure gem version for continuous integration builds
   if ENV['TRAVIS_JOB_NUMBER']

data/lib/devise/doorkeeper.rb

@@ -1,15 +1,15 @@
 require 'devise/doorkeeper/version'
 require 'devise/strategies/doorkeeper'
+require 'devise/doorkeeper/doorkeeper_failure_app'
 
 module Devise
   module Doorkeeper
+    # configure devise to support doorkeeper error responses
     def self.configure_devise(config)
-      config.warden do |manager|
-        require 'devise/doorkeeper/doorkeeper_failure_app'
-        manager.failure_app = Devise::Doorkeeper::DoorkeeperFailureApp
-      end
+      Devise::FailureApp.prepend(Devise::Doorkeeper::DoorkeeperFailureApp)
     end
 
+    # configure doorkeeper to use devise authentication
     def self.configure_doorkeeper(base)
       base.instance_eval do
         resource_owner_authenticator do

data/lib/devise/doorkeeper/doorkeeper_failure_app.rb

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

data/lib/devise/doorkeeper/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Doorkeeper
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
   end
 end

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/dummy/app/services/custom_failure_app.rb

@@ -0,0 +1,7 @@
+class CustomFailureApp < Devise::FailureApp
+  # test that sublclassing FailureApp works properly
+  def respond
+    super
+    Rails.logger.info('Testing error flow')
+  end
+end

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

@@ -244,6 +244,9 @@ Devise.setup do |config|
   #   manager.intercept_401 = false
   #   manager.default_strategies(scope: :user).unshift :some_external_strategy
   # end
+  config.warden do |manager|
+    manager.failure_app = CustomFailureApp
+  end
 
   # ==> Mountable engine configurations
   # When using Devise inside an engine, let's call it `MyEngine`, and this engine

data/spec/requests/oauth/bearer_tokens_spec.rb

@@ -35,7 +35,8 @@ 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"') }
+    it { expect(response.headers['WWW-Authenticate']).to eq 'Bearer realm="DeviseDoorkeeperApp", error="invalid_token", error_description="The access token is invalid"' }
+    it { expect(response.body).to eq '{"error":"invalid_token","error_description":"The access token is invalid","state":"unauthorized"}' }
   end
   context 'with revoked access token' do
     with :access_token, revoked_at: 1.year.ago

metadata

@@ -1,222 +1,222 @@
 --- !ruby/object:Gem::Specification
 name: devise-doorkeeper
 version: !ruby/object:Gem::Version
-  version: 1.1.1.ci.22.1
+  version: 1.1.2.ci.59.1
 platform: ruby
 authors:
-- Ryan Sonnek
+- BetterUp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-06 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.3
 - !ruby/object:Gem::Dependency
   name: doorkeeper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.17.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.17.3
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: factory_girl_rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.6
 - !ruby/object:Gem::Dependency
   name: json_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.11
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.15
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.3
 - !ruby/object:Gem::Dependency
   name: travis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: ! ' Support authentication via OAuth2 tokens dispensed from the Doorkeeper
-  authorization flow '
+        version: 1.8.2
+description: " Support authentication via OAuth2 tokens dispensed from the Doorkeeper
+  authorization flow "
 email:
-- ryan@codecrate.com
+- developers@betterup.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -229,6 +229,7 @@ files:
 - spec/dummy/.rspec
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
@@ -241,6 +242,7 @@ files:
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/models/user.rb
+- spec/dummy/app/services/custom_failure_app.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/welcome/index.html.erb
 - spec/dummy/bin/bundle
@@ -300,17 +302,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Integrate Doorkeeper OAuth2 tokens into Devise applications
@@ -318,6 +319,7 @@ test_files:
 - spec/dummy/.rspec
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
@@ -330,6 +332,7 @@ test_files:
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/models/user.rb
+- spec/dummy/app/services/custom_failure_app.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/welcome/index.html.erb
 - spec/dummy/bin/bundle