devise-doorkeeper 1.1.0 → 1.1.2.ci.45.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4b64812bca11084c10439cfe6377381921d8d6b8
-  data.tar.gz: 0b004f998bb7d52e3deaf239e9379f8bf422502f
+SHA256:
+  metadata.gz: ae9fb3fb4f5678c2985f9dbd51d3b2ac0fa0285ee33ca77e1dbd2e451bc35b46
+  data.tar.gz: 5151e1c305427f6d8d71a225ee97e8c6abd191ac788ad4f3033e2ddd0a7e94a6
 SHA512:
-  metadata.gz: c7530c5824b1d5f514eb0b925d824e19131a8d3835eb926e4947bd768c0f762e576d7e226d2dafe770ca910ac6a3eae0df402edf802ce8041a58374a8364bdd6
-  data.tar.gz: 44401f062a0dcf5ee444648a93572a719569d8c1e3158c82909870a5bc8aab536cf1efcc29a391cd736ad9a6d5e170fcc5c2c2974b957f0e648345a490f50f68
+  metadata.gz: 9ee81784339ff60f99c51ffb208a908cd82898229770bf952e319b47166539fd8eb1371cd0ee220cc39074c0fe49fdc993869ec7d00ca7f644b99995ee793e31
+  data.tar.gz: a329c1864a964721e4898059e935f0ec03e79c238358b2efb5b41b29feca5916302a933a7b7b391245bdc1e98e6b106c5659d2676fe1c75b9187f21a6abbad1f

data/.ruby-version

@@ -1 +1 @@
-2.1.5
+2.5.8

data/.travis.yml

@@ -1 +1,8 @@
 language: ruby
+deploy:
+  provider: rubygems
+  api_key:
+    secure: fZeFXgr6w8I4/eLDVtiUd4dMI0h3ZcORssPPQGsbIc4Fybd7jeBMUIkY8lY6U3R2efktqMbgecwEgwmmjMQerFKH3Xw/BSu9XShl3xWlS3BTyCiyezAyB3KApPVOoam8AeHj5YnPkVTHQRvRyPUAptFaPrQTx5y4APsonONJciI=
+  gem: devise-doorkeeper
+  on:
+    repo: betterup/devise-doorkeeper

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,18 +18,24 @@ 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.2.0'
+  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 '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', '~> 11.2.2'
+  spec.add_development_dependency 'travis', '~> 1.8.2'
+
+  # configure gem version for continuous integration builds
+  if ENV['TRAVIS_JOB_NUMBER']
+    spec.version = "#{spec.version}.ci.#{ENV['TRAVIS_JOB_NUMBER']}"
+  end
 end

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.0'
+    VERSION = '1.1.2'
   end
 end

data/lib/devise/strategies/doorkeeper.rb

@@ -16,6 +16,7 @@ module Devise
       def authenticate!
         resource = resource_from_token
         if validate(resource)
+          request.env['devise.skip_trackable'] = true
           success!(resource)
         else
           invalid_token

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

@@ -11,12 +11,17 @@ RSpec.describe 'OAuth bearer token requests', type: :request do
     end
     let(:params) { {} }
     before do
+      @original_timestamp = User.find(access_token.resource_owner_id).last_sign_in_at
       get request_path, params, headers
     end
     it { expect(response.status).to eq 200 }
     it 'does not send Set-Cookie headers' do
       expect(response.headers).to_not include 'Set-Cookie'
     end
+    it 'does not update the user last_signin_at timestamp' do
+      new_timestamp = User.find(access_token.resource_owner_id).last_sign_in_at
+      expect(new_timestamp).to eq @original_timestamp
+    end
   end
   context 'with expired access token' do
     with :access_token, expires_in: 0
@@ -30,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,201 +1,215 @@
 --- !ruby/object:Gem::Specification
 name: devise-doorkeeper
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2.ci.45.1
 platform: ruby
 authors:
-- Ryan Sonnek
+- BetterUp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-26 00:00:00.000000000 Z
+date: 2021-02-27 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.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.0
 - !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: 11.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 11.2.2
+- !ruby/object:Gem::Dependency
+  name: travis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        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: []
@@ -215,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
@@ -227,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
@@ -291,12 +307,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Integrate Doorkeeper OAuth2 tokens into Devise applications
@@ -304,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
@@ -316,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