doorkeeper 5.0.0 → 5.0.1

data/spec/lib/oauth/client/credentials_spec.rb

@@ -16,7 +16,7 @@ class Doorkeeper::OAuth::Client
       let(:request) { double.as_null_object }
 
       let(:method) do
-        ->(_request) { ['uid', 'secret'] }
+        ->(_request) { %w[uid secret] }
       end
 
       it 'accepts anything that responds to #call' do
@@ -77,7 +77,7 @@ class Doorkeeper::OAuth::Client
       end
 
       it 'is blank if Authorization is not Basic' do
-        request     = double authorization: "#{credentials}"
+        request     = double authorization: credentials.to_s
         uid, secret = Credentials.from_basic(request)
 
         expect(uid).to    be_blank

data/spec/lib/oauth/client_credentials/issuer_spec.rb

@@ -73,8 +73,6 @@ class Doorkeeper::OAuth::ClientCredentialsRequest
                 custom_ttl_scope
               elsif context.grant_type == Doorkeeper::OAuth::CLIENT_CREDENTIALS
                 custom_ttl_grant
-              else
-                nil
               end
             }
           )

data/spec/lib/oauth/client_credentials/validation_spec.rb

@@ -23,7 +23,8 @@ class Doorkeeper::OAuth::ClientCredentialsRequest
         server_scopes = Doorkeeper::OAuth::Scopes.from_string 'email'
         allow(server).to receive(:scopes).and_return(server_scopes)
         allow(request).to receive(:scopes).and_return(
-          Doorkeeper::OAuth::Scopes.from_string 'invalid')
+          Doorkeeper::OAuth::Scopes.from_string('invalid')
+        )
         expect(subject).not_to be_valid
       end
 

data/spec/lib/oauth/client_credentials_integration_spec.rb

@@ -20,7 +20,7 @@ module Doorkeeper::OAuth
         request = ClientCredentialsRequest.new(server, nil, {})
         expect do
           request.authorize
-        end.to_not change { Doorkeeper::AccessToken.count }
+        end.to_not(change { Doorkeeper::AccessToken.count })
       end
     end
   end

data/spec/lib/oauth/code_request_spec.rb

@@ -12,7 +12,7 @@ module Doorkeeper::OAuth
         error: nil,
         authorizable?: true,
         code_challenge: nil,
-        code_challenge_method: nil,
+        code_challenge_method: nil
       )
     end
 
@@ -34,7 +34,7 @@ module Doorkeeper::OAuth
 
     it 'does not create grant when not authorizable' do
       allow(pre_auth).to receive(:authorizable?).and_return(false)
-      expect { subject.authorize }.not_to change { Doorkeeper::AccessGrant.count }
+      expect { subject.authorize }.not_to(change { Doorkeeper::AccessGrant.count })
     end
 
     it 'returns a error response' do

data/spec/lib/oauth/code_response_spec.rb

@@ -11,7 +11,7 @@ module Doorkeeper
               client: double(:application, id: 1),
               redirect_uri: 'http://tst.com/cb',
               state: nil,
-              scopes: Scopes.from_string('public'),
+              scopes: Scopes.from_string('public')
             )
           end
 

data/spec/lib/oauth/helpers/scope_checker_spec.rb

@@ -43,18 +43,18 @@ module Doorkeeper::OAuth::Helpers
 
       it 'is valid if scope is included in the application scope list' do
         expect(ScopeChecker.valid?(
-          'app123',
-          server_scopes,
-          application_scopes
-        )).to be_truthy
+                 'app123',
+                 server_scopes,
+                 application_scopes
+               )).to be_truthy
       end
 
       it 'is invalid if any scope is not included in the application' do
         expect(ScopeChecker.valid?(
-          'svr',
-          server_scopes,
-          application_scopes
-        )).to be_falsey
+                 'svr',
+                 server_scopes,
+                 application_scopes
+               )).to be_falsey
       end
     end
   end

data/spec/lib/oauth/helpers/uri_checker_spec.rb

@@ -116,6 +116,22 @@ module Doorkeeper::OAuth::Helpers
       it 'is true if valid and matches' do
         uri = client_uri = 'http://app.co/aaa'
         expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be_truthy
+
+        uri = client_uri = 'http://app.co/aaa?b=c'
+        expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be_truthy
+      end
+
+      it 'is true if uri includes blank query' do
+        uri = client_uri = 'http://app.co/aaa?'
+        expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be_truthy
+
+        uri = 'http://app.co/aaa?'
+        client_uri = 'http://app.co/aaa'
+        expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be_truthy
+
+        uri = 'http://app.co/aaa'
+        client_uri = 'http://app.co/aaa?'
+        expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be_truthy
       end
 
       it 'is false if valid and mismatches' do
@@ -136,12 +152,7 @@ module Doorkeeper::OAuth::Helpers
         expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be_falsey
       end
 
-      it 'is true if valid and matches' do
-        uri = client_uri = 'http://app.co/aaa'
-        expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be true
-      end
-
-      it 'is false if invalid' do
+      it 'is false if queries does not match' do
         uri = 'http://app.co/aaa?pankcakes=abc'
         client_uri = 'http://app.co/aaa?waffles=abc'
         expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be false

data/spec/lib/oauth/password_access_token_request_spec.rb

@@ -24,7 +24,8 @@ module Doorkeeper::OAuth
       expect do
         subject.authorize
       end.to change { client.reload.access_tokens.count }.by(1)
-      expect(client.reload.access_tokens.sort_by(&:created_at).last.expires_in).to eq(1234)
+
+      expect(client.reload.access_tokens.max_by(&:created_at).expires_in).to eq(1234)
     end
 
     it 'issues a new token without a client' do
@@ -39,7 +40,7 @@ module Doorkeeper::OAuth
         subject.client = nil
         subject.parameters = { client_id: 'bad_id' }
         subject.authorize
-      end.to_not change { Doorkeeper::AccessToken.count }
+      end.not_to(change { Doorkeeper::AccessToken.count })
 
       expect(subject.error).to eq(:invalid_client)
     end
@@ -57,6 +58,7 @@ module Doorkeeper::OAuth
 
     it 'creates token even when there is already one (default)' do
       FactoryBot.create(:access_token, application_id: client.id, resource_owner_id: owner.id)
+
       expect do
         subject.authorize
       end.to change { Doorkeeper::AccessToken.count }.by(1)
@@ -65,14 +67,19 @@ module Doorkeeper::OAuth
     it 'skips token creation if there is already one' do
       allow(Doorkeeper.configuration).to receive(:reuse_access_token).and_return(true)
       FactoryBot.create(:access_token, application_id: client.id, resource_owner_id: owner.id)
+
       expect do
         subject.authorize
-      end.to_not change { Doorkeeper::AccessToken.count }
+      end.not_to(change { Doorkeeper::AccessToken.count })
     end
 
     it "calls configured request callback methods" do
-      expect(Doorkeeper.configuration.before_successful_strategy_response).to receive(:call).with(subject).once
-      expect(Doorkeeper.configuration.after_successful_strategy_response).to receive(:call).with(subject, instance_of(Doorkeeper::OAuth::TokenResponse)).once
+      expect(Doorkeeper.configuration.before_successful_strategy_response)
+        .to receive(:call).with(subject).once
+
+      expect(Doorkeeper.configuration.after_successful_strategy_response)
+        .to receive(:call).with(subject, instance_of(Doorkeeper::OAuth::TokenResponse)).once
+
       subject.authorize
     end
 
@@ -92,6 +99,7 @@ module Doorkeeper::OAuth
         expect do
           subject.authorize
         end.to change { Doorkeeper::AccessToken.count }.by(1)
+
         expect(Doorkeeper::AccessToken.last.scopes).to include('public')
       end
     end
@@ -112,18 +120,22 @@ module Doorkeeper::OAuth
       it 'checks scopes' do
         subject = PasswordAccessTokenRequest.new(server, client, owner, scope: 'public')
         allow(server).to receive(:scopes).and_return(Doorkeeper::OAuth::Scopes.from_string('public'))
+
         expect do
           subject.authorize
         end.to change { Doorkeeper::AccessToken.count }.by(1)
+
         expect(Doorkeeper::AccessToken.last.expires_in).to eq(222)
       end
 
       it 'falls back to the default otherwise' do
         subject = PasswordAccessTokenRequest.new(server, client, owner, scope: 'private')
         allow(server).to receive(:scopes).and_return(Doorkeeper::OAuth::Scopes.from_string('private'))
+
         expect do
           subject.authorize
         end.to change { Doorkeeper::AccessToken.count }.by(1)
+
         expect(Doorkeeper::AccessToken.last.expires_in).to eq(2.hours)
       end
     end

data/spec/lib/oauth/refresh_token_request_spec.rb

@@ -24,7 +24,7 @@ module Doorkeeper::OAuth
     it 'issues a new token for the client' do
       expect { subject.authorize }.to change { client.reload.access_tokens.count }.by(1)
       # #sort_by used for MongoDB ORM extensions for valid ordering
-      expect(client.reload.access_tokens.sort_by(&:created_at).last.expires_in).to eq(120)
+      expect(client.reload.access_tokens.max_by(&:created_at).expires_in).to eq(120)
     end
 
     it 'issues a new token for the client with custom expires_in' do
@@ -39,7 +39,7 @@ module Doorkeeper::OAuth
       RefreshTokenRequest.new(server, refresh_token, credentials).authorize
 
       # #sort_by used for MongoDB ORM extensions for valid ordering
-      expect(client.reload.access_tokens.sort_by(&:created_at).last.expires_in).to eq(1234)
+      expect(client.reload.access_tokens.max_by(&:created_at).expires_in).to eq(1234)
     end
 
     it 'revokes the previous token' do
@@ -47,8 +47,12 @@ module Doorkeeper::OAuth
     end
 
     it "calls configured request callback methods" do
-      expect(Doorkeeper.configuration.before_successful_strategy_response).to receive(:call).with(subject).once
-      expect(Doorkeeper.configuration.after_successful_strategy_response).to receive(:call).with(subject, instance_of(Doorkeeper::OAuth::TokenResponse)).once
+      expect(Doorkeeper.configuration.before_successful_strategy_response)
+        .to receive(:call).with(subject).once
+
+      expect(Doorkeeper.configuration.after_successful_strategy_response)
+        .to receive(:call).with(subject, instance_of(Doorkeeper::OAuth::TokenResponse)).once
+
       subject.authorize
     end
 
@@ -109,7 +113,7 @@ module Doorkeeper::OAuth
         subject.authorize
         expect(
           # #sort_by used for MongoDB ORM extensions for valid ordering
-          client.access_tokens.sort_by(&:created_at).last.previous_refresh_token
+          client.access_tokens.max_by(&:created_at).previous_refresh_token
         ).to eq(refresh_token.refresh_token)
       end
     end
@@ -127,8 +131,8 @@ module Doorkeeper::OAuth
     context 'with scopes' do
       let(:refresh_token) do
         FactoryBot.create :access_token,
-                           use_refresh_token: true,
-                           scopes: 'public write'
+                          use_refresh_token: true,
+                          scopes: 'public write'
       end
       let(:parameters) { {} }
       subject { RefreshTokenRequest.new server, refresh_token, credentials, parameters }

data/spec/lib/oauth/token_request_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Doorkeeper::OAuth
   describe TokenRequest do
     let :application do
-      FactoryBot.create(:application, scopes: "public")
+      FactoryBot.create(:application, scopes: 'public')
     end
 
     let :pre_auth do
@@ -38,7 +38,7 @@ module Doorkeeper::OAuth
 
     it 'does not create token when not authorizable' do
       allow(pre_auth).to receive(:authorizable?).and_return(false)
-      expect { subject.authorize }.not_to change { Doorkeeper::AccessToken.count }
+      expect { subject.authorize }.not_to(change { Doorkeeper::AccessToken.count })
     end
 
     it 'returns a error response' do
@@ -74,7 +74,7 @@ module Doorkeeper::OAuth
       it 'creates a new token if scopes do not match' do
         allow(Doorkeeper.configuration).to receive(:reuse_access_token).and_return(true)
         FactoryBot.create(:access_token, application_id: pre_auth.client.id,
-                           resource_owner_id: owner.id, scopes: '')
+                                         resource_owner_id: owner.id, scopes: '')
         expect do
           subject.authorize
         end.to change { Doorkeeper::AccessToken.count }.by(1)
@@ -86,9 +86,9 @@ module Doorkeeper::OAuth
         allow(application.scopes).to receive(:all?).and_return(true)
 
         FactoryBot.create(:access_token, application_id: pre_auth.client.id,
-                           resource_owner_id: owner.id, scopes: 'public')
+                                         resource_owner_id: owner.id, scopes: 'public')
 
-        expect { subject.authorize }.not_to change { Doorkeeper::AccessToken.count }
+        expect { subject.authorize }.not_to(change { Doorkeeper::AccessToken.count })
       end
     end
   end

data/spec/lib/oauth/token_spec.rb

@@ -115,7 +115,10 @@ module Doorkeeper
 
         context 'refresh tokens are enabled' do
           before do
-            Doorkeeper.configure { use_refresh_token }
+            Doorkeeper.configure do
+              orm DOORKEEPER_ORM
+              use_refresh_token
+            end
           end
 
           it 'revokes previous refresh_token if token was found' do

data/spec/lib/server_spec.rb

@@ -22,9 +22,9 @@ describe Doorkeeper::Server do
 
     context 'when only Authorization Code strategy is enabled' do
       before do
-        allow(Doorkeeper.configuration).
-          to receive(:grant_flows).
-          and_return(['authorization_code'])
+        allow(Doorkeeper.configuration)
+          .to receive(:grant_flows)
+          .and_return(['authorization_code'])
       end
 
       it 'raises error when using the disabled Implicit strategy' do
@@ -47,9 +47,9 @@ describe Doorkeeper::Server do
     end
 
     it 'builds the request with composite strategy name' do
-      allow(Doorkeeper.configuration).
-        to receive(:authorization_response_types).
-        and_return(['id_token token'])
+      allow(Doorkeeper.configuration)
+        .to receive(:authorization_response_types)
+        .and_return(['id_token token'])
 
       stub_const 'Doorkeeper::Request::IdTokenToken', fake_class
       expect(fake_class).to receive(:new).with(subject)

data/spec/lib/{orm/active_record/stale_records_cleaner_spec.rb → stale_records_cleaner_spec.rb}

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Doorkeeper::Orm::ActiveRecord::StaleRecordsCleaner do
+describe Doorkeeper::StaleRecordsCleaner do
   let(:cleaner) { described_class.new(model) }
   let(:models_by_name) do
     {
@@ -11,6 +11,16 @@ describe Doorkeeper::Orm::ActiveRecord::StaleRecordsCleaner do
     }
   end
 
+  context 'when ORM has no cleaner class' do
+    it 'raises an error' do
+      allow_any_instance_of(Doorkeeper::Config).to receive(:orm).and_return('hibernate')
+
+      expect do
+        described_class.for(Doorkeeper::AccessToken)
+      end.to raise_error(Doorkeeper::Errors::NoOrmCleaner, /has no cleaner/)
+    end
+  end
+
   %i[access_token access_grant].each do |model_name|
     context "(#{model_name})" do
       let(:model) { models_by_name.fetch(model_name) }
@@ -34,7 +44,7 @@ describe Doorkeeper::Orm::ActiveRecord::StaleRecordsCleaner do
           end
 
           it 'keeps the record' do
-            expect { subject }.not_to change { model.count }
+            expect { subject }.not_to(change { model.count })
           end
         end
 
@@ -44,7 +54,7 @@ describe Doorkeeper::Orm::ActiveRecord::StaleRecordsCleaner do
           end
 
           it 'keeps the record' do
-            expect { subject }.not_to change { model.count }
+            expect { subject }.not_to(change { model.count })
           end
         end
       end
@@ -70,7 +80,7 @@ describe Doorkeeper::Orm::ActiveRecord::StaleRecordsCleaner do
           end
 
           it 'keeps the record' do
-            expect { subject }.not_to change { model.count }
+            expect { subject }.not_to(change { model.count })
           end
         end
       end

data/spec/models/doorkeeper/access_token_spec.rb

@@ -13,8 +13,7 @@ module Doorkeeper
     end
 
     module CustomGeneratorArgs
-      def self.generate
-      end
+      def self.generate; end
     end
 
     describe :generate_token do
@@ -42,7 +41,7 @@ module Doorkeeper
         end
 
         token = FactoryBot.create :access_token
-        expect(token.token).to match(%r{custom_generator_token_\d+})
+        expect(token.token).to match(/custom_generator_token_\d+/)
       end
 
       it 'allows the custom generator to access the application details' do
@@ -62,7 +61,7 @@ module Doorkeeper
         end
 
         token = FactoryBot.create :access_token
-        expect(token.token).to match(%r{custom_generator_token_Application \d+})
+        expect(token.token).to match(/custom_generator_token_Application \d+/)
       end
 
       it 'allows the custom generator to access the scopes' do
@@ -214,9 +213,7 @@ module Doorkeeper
     end
 
     describe '#same_credential?' do
-
       context 'with default parameters' do
-
         let(:resource_owner_id) { 100 }
         let(:application) { FactoryBot.create :application }
         let(:default_attributes) do
@@ -233,7 +230,11 @@ module Doorkeeper
 
         context 'the second token has same owner and different app' do
           let(:other_application) { FactoryBot.create :application }
-          let(:access_token2) { FactoryBot.create :access_token, application: other_application, resource_owner_id: resource_owner_id }
+          let(:access_token2) do
+            FactoryBot.create :access_token,
+                              application: other_application,
+                              resource_owner_id: resource_owner_id
+          end
 
           it 'fail' do
             expect(access_token1.same_credential?(access_token2)).to be_falsey
@@ -241,9 +242,10 @@ module Doorkeeper
         end
 
         context 'the second token has different owner and different app' do
-
           let(:other_application) { FactoryBot.create :application }
-          let(:access_token2) { FactoryBot.create :access_token, application: other_application, resource_owner_id: 42 }
+          let(:access_token2) do
+            FactoryBot.create :access_token, application: other_application, resource_owner_id: 42
+          end
 
           it 'fail' do
             expect(access_token1.same_credential?(access_token2)).to be_falsey
@@ -251,7 +253,9 @@ module Doorkeeper
         end
 
         context 'the second token has different owner and same app' do
-          let(:access_token2) { FactoryBot.create :access_token, application: application, resource_owner_id: 42 }
+          let(:access_token2) do
+            FactoryBot.create :access_token, application: application, resource_owner_id: 42
+          end
 
           it 'fail' do
             expect(access_token1.same_credential?(access_token2)).to be_falsey