doorkeeper 5.0.2 → 5.1.0.rc2

data/spec/requests/flows/revoke_token_spec.rb

@@ -26,30 +26,28 @@ describe 'Revoke Token Flow' do
       it 'should revoke the access token provided' do
         post revocation_token_endpoint_url, params: { token: access_token.token }, headers: headers
 
-        access_token.reload
-
         expect(response).to be_successful
-        expect(access_token.revoked?).to be_truthy
+        expect(access_token.reload.revoked?).to be_truthy
       end
 
       it 'should revoke the refresh token provided' do
         post revocation_token_endpoint_url, params: { token: access_token.refresh_token }, headers: headers
 
-        access_token.reload
-
         expect(response).to be_successful
-        expect(access_token.revoked?).to be_truthy
+        expect(access_token.reload.revoked?).to be_truthy
       end
 
       context 'with invalid token to revoke' do
         it 'should not revoke any tokens and respond successfully' do
-          num_prev_revoked_tokens = Doorkeeper::AccessToken.where(revoked_at: nil).count
-          post revocation_token_endpoint_url, params: { token: 'I_AM_AN_INVALID_TOKEN' }, headers: headers
+          expect do
+            post revocation_token_endpoint_url,
+              params: { token: 'I_AM_AN_INVALID_TOKEN' },
+              headers: headers
+            end.not_to(change { Doorkeeper::AccessToken.where(revoked_at: nil).count })
 
           # The authorization server responds with HTTP status code 200 even if
           # token is invalid
           expect(response).to be_successful
-          expect(Doorkeeper::AccessToken.where(revoked_at: nil).count).to eq(num_prev_revoked_tokens)
         end
       end
 
@@ -62,10 +60,8 @@ describe 'Revoke Token Flow' do
         it 'should not revoke any tokens and respond successfully' do
           post revocation_token_endpoint_url, params: { token: access_token.token }, headers: headers
 
-          access_token.reload
-
           expect(response).to be_successful
-          expect(access_token.revoked?).to be_falsey
+          expect(access_token.reload.revoked?).to be_falsey
         end
       end
 
@@ -73,10 +69,8 @@ describe 'Revoke Token Flow' do
         it 'should not revoke any tokens and respond successfully' do
           post revocation_token_endpoint_url, params: { token: access_token.token }
 
-          access_token.reload
-
           expect(response).to be_successful
-          expect(access_token.revoked?).to be_falsey
+          expect(access_token.reload.revoked?).to be_falsey
         end
       end
 
@@ -92,10 +86,8 @@ describe 'Revoke Token Flow' do
         it 'should not revoke the token as its unauthorized' do
           post revocation_token_endpoint_url, params: { token: access_token.token }, headers: headers
 
-          access_token.reload
-
           expect(response).to be_successful
-          expect(access_token.revoked?).to be_falsey
+          expect(access_token.reload.revoked?).to be_falsey
         end
       end
     end
@@ -111,19 +103,15 @@ describe 'Revoke Token Flow' do
       it 'should revoke the access token provided' do
         post revocation_token_endpoint_url, params: { token: access_token.token }
 
-        access_token.reload
-
         expect(response).to be_successful
-        expect(access_token.revoked?).to be_truthy
+        expect(access_token.reload.revoked?).to be_truthy
       end
 
       it 'should revoke the refresh token provided' do
         post revocation_token_endpoint_url, params: { token: access_token.refresh_token }
 
-        access_token.reload
-
         expect(response).to be_successful
-        expect(access_token.revoked?).to be_truthy
+        expect(access_token.reload.revoked?).to be_truthy
       end
 
       context 'with a valid token issued for a confidential client' do
@@ -137,19 +125,15 @@ describe 'Revoke Token Flow' do
         it 'should not revoke the access token provided' do
           post revocation_token_endpoint_url, params: { token: access_token.token }
 
-          access_token.reload
-
           expect(response).to be_successful
-          expect(access_token.revoked?).to be_falsey
+          expect(access_token.reload.revoked?).to be_falsey
         end
 
         it 'should not revoke the refresh token provided' do
           post revocation_token_endpoint_url, params: { token: access_token.token }
 
-          access_token.reload
-
           expect(response).to be_successful
-          expect(access_token.revoked?).to be_falsey
+          expect(access_token.reload.revoked?).to be_falsey
         end
       end
     end

data/spec/routing/custom_controller_routes_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 describe 'Custom controller for routes' do
   before :all do
+    Doorkeeper.configure do
+      orm DOORKEEPER_ORM
+    end
+
     Rails.application.routes.disable_clear_and_finalize = true
 
     Rails.application.routes.draw do

data/spec/spec_helper.rb

@@ -28,7 +28,8 @@ end
 Doorkeeper::RSpec.print_configuration_info
 
 # Remove after dropping support of Rails 4.2
-require "#{File.dirname(__FILE__)}/support/http_method_shim.rb"
+require "#{File.dirname(__FILE__)}/support/http_method_shim"
+require "#{File.dirname(__FILE__)}/support/ruby_2_6_rails_4_2_patch"
 
 require "support/orm/#{DOORKEEPER_ORM}"
 

data/spec/support/ruby_2_6_rails_4_2_patch.rb

@@ -0,0 +1,14 @@
+if RUBY_VERSION >= '2.6.0'
+  if Rails::VERSION::MAJOR < 5
+    class ActionController::TestResponse < ActionDispatch::TestResponse
+      def recycle!
+        # hack to avoid MonitorMixin double-initialize error:
+        @mon_mutex_owner_object_id = nil
+        @mon_mutex = nil
+        initialize
+      end
+    end
+  else
+    puts "Monkeypatch for ActionController::TestResponse no longer needed"
+  end
+end

data/spec/support/shared/hashing_shared_context.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+shared_context 'with token hashing enabled' do
+  let(:hashed_or_plain_token_func) do
+    Doorkeeper::SecretStoring::Sha256Hash.method(:transform_secret)
+  end
+
+  before do
+    Doorkeeper.configure do
+      hash_token_secrets
+    end
+  end
+end
+
+shared_context 'with token hashing and fallback lookup enabled' do
+  let(:hashed_or_plain_token_func) do
+    Doorkeeper::SecretStoring::Sha256Hash.method(:transform_secret)
+  end
+
+  before do
+    Doorkeeper.configure do
+      hash_token_secrets fallback: :plain
+    end
+  end
+end
+
+shared_context 'with application hashing enabled' do
+  let(:hashed_or_plain_token_func) do
+    Doorkeeper::SecretStoring::Sha256Hash.method(:transform_secret)
+  end
+  before do
+    Doorkeeper.configure do
+      hash_application_secrets
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.1.0.rc2
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -28,21 +28,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.18'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.18'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -56,33 +56,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: danger
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: grape
+  name: danger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +125,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.3
+- !ruby/object:Gem::Dependency
+  name: grape
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -205,12 +219,14 @@ files:
 - app/views/doorkeeper/authorized_applications/index.html.erb
 - app/views/layouts/doorkeeper/admin.html.erb
 - app/views/layouts/doorkeeper/application.html.erb
+- bin/console
 - config/locales/en.yml
 - doorkeeper.gemspec
 - gemfiles/rails_4_2.gemfile
 - gemfiles/rails_5_0.gemfile
 - gemfiles/rails_5_1.gemfile
 - gemfiles/rails_5_2.gemfile
+- gemfiles/rails_6_0.gemfile
 - gemfiles/rails_master.gemfile
 - lib/doorkeeper.rb
 - lib/doorkeeper/config.rb
@@ -226,8 +242,10 @@ files:
 - lib/doorkeeper/models/concerns/expirable.rb
 - lib/doorkeeper/models/concerns/orderable.rb
 - lib/doorkeeper/models/concerns/ownership.rb
+- lib/doorkeeper/models/concerns/reusable.rb
 - lib/doorkeeper/models/concerns/revocable.rb
 - lib/doorkeeper/models/concerns/scopes.rb
+- lib/doorkeeper/models/concerns/secret_storable.rb
 - lib/doorkeeper/oauth.rb
 - lib/doorkeeper/oauth/authorization/code.rb
 - lib/doorkeeper/oauth/authorization/context.rb
@@ -279,6 +297,10 @@ files:
 - lib/doorkeeper/request/refresh_token.rb
 - lib/doorkeeper/request/strategy.rb
 - lib/doorkeeper/request/token.rb
+- lib/doorkeeper/secret_storing/base.rb
+- lib/doorkeeper/secret_storing/bcrypt.rb
+- lib/doorkeeper/secret_storing/plain.rb
+- lib/doorkeeper/secret_storing/sha256_hash.rb
 - lib/doorkeeper/server.rb
 - lib/doorkeeper/stale_records_cleaner.rb
 - lib/doorkeeper/validations.rb
@@ -358,8 +380,10 @@ files:
 - spec/lib/config_spec.rb
 - spec/lib/doorkeeper_spec.rb
 - spec/lib/models/expirable_spec.rb
+- spec/lib/models/reusable_spec.rb
 - spec/lib/models/revocable_spec.rb
 - spec/lib/models/scopes_spec.rb
+- spec/lib/models/secret_storable_spec.rb
 - spec/lib/oauth/authorization/uri_builder_spec.rb
 - spec/lib/oauth/authorization_code_request_spec.rb
 - spec/lib/oauth/base_request_spec.rb
@@ -388,6 +412,10 @@ files:
 - spec/lib/oauth/token_response_spec.rb
 - spec/lib/oauth/token_spec.rb
 - spec/lib/request/strategy_spec.rb
+- spec/lib/secret_storing/base_spec.rb
+- spec/lib/secret_storing/bcrypt_spec.rb
+- spec/lib/secret_storing/plain_spec.rb
+- spec/lib/secret_storing/sha256_hash_spec.rb
 - spec/lib/server_spec.rb
 - spec/lib/stale_records_cleaner_spec.rb
 - spec/models/doorkeeper/access_grant_spec.rb
@@ -423,7 +451,9 @@ files:
 - spec/support/helpers/url_helper.rb
 - spec/support/http_method_shim.rb
 - spec/support/orm/active_record.rb
+- spec/support/ruby_2_6_rails_4_2_patch.rb
 - spec/support/shared/controllers_shared_context.rb
+- spec/support/shared/hashing_shared_context.rb
 - spec/support/shared/models_shared_examples.rb
 - spec/validators/redirect_uri_validator_spec.rb
 - spec/version/version_spec.rb
@@ -443,12 +473,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: OAuth 2 provider for Rails and Grape
@@ -514,8 +543,10 @@ test_files:
 - spec/lib/config_spec.rb
 - spec/lib/doorkeeper_spec.rb
 - spec/lib/models/expirable_spec.rb
+- spec/lib/models/reusable_spec.rb
 - spec/lib/models/revocable_spec.rb
 - spec/lib/models/scopes_spec.rb
+- spec/lib/models/secret_storable_spec.rb
 - spec/lib/oauth/authorization/uri_builder_spec.rb
 - spec/lib/oauth/authorization_code_request_spec.rb
 - spec/lib/oauth/base_request_spec.rb
@@ -544,6 +575,10 @@ test_files:
 - spec/lib/oauth/token_response_spec.rb
 - spec/lib/oauth/token_spec.rb
 - spec/lib/request/strategy_spec.rb
+- spec/lib/secret_storing/base_spec.rb
+- spec/lib/secret_storing/bcrypt_spec.rb
+- spec/lib/secret_storing/plain_spec.rb
+- spec/lib/secret_storing/sha256_hash_spec.rb
 - spec/lib/server_spec.rb
 - spec/lib/stale_records_cleaner_spec.rb
 - spec/models/doorkeeper/access_grant_spec.rb
@@ -579,7 +614,9 @@ test_files:
 - spec/support/helpers/url_helper.rb
 - spec/support/http_method_shim.rb
 - spec/support/orm/active_record.rb
+- spec/support/ruby_2_6_rails_4_2_patch.rb
 - spec/support/shared/controllers_shared_context.rb
+- spec/support/shared/hashing_shared_context.rb
 - spec/support/shared/models_shared_examples.rb
 - spec/validators/redirect_uri_validator_spec.rb
 - spec/version/version_spec.rb