doorkeeper 4.3.2 → 5.0.0.rc1

data/spec/lib/doorkeeper_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_integration'
+require 'spec_helper'
 
 describe Doorkeeper do
   describe "#authenticate" do
@@ -22,129 +22,4 @@ describe Doorkeeper do
       Doorkeeper.authenticate(request, token_strategies)
     end
   end
-
-  describe "#configured?" do
-    after do
-      Doorkeeper.remove_instance_variable(:@config)
-    end
-
-    context "@config is set" do
-      it "returns true" do
-        Doorkeeper.instance_variable_set(:@config, "hi")
-
-        expect(Doorkeeper.configured?).to eq(true)
-      end
-    end
-
-    context "@config is not set" do
-      it "returns false" do
-        Doorkeeper.instance_variable_set(:@config, nil)
-
-        expect(Doorkeeper.configured?).to eq(false)
-      end
-    end
-
-    it "is deprecated" do
-      expect(ActiveSupport::Deprecation).to receive(:warn).
-        with("Method `Doorkeeper#configured?` has been deprecated without replacement.")
-
-      Doorkeeper.configured?
-    end
-  end
-
-  describe "#database_installed?" do
-    before do
-      ["AccessToken", "AccessGrant", "Application"].each do |klass|
-        @original_classes ||= {}
-        @original_classes[klass] = Doorkeeper.const_get(klass)
-        Doorkeeper.send(:remove_const, klass)
-      end
-    end
-
-    after do
-      ["AccessToken", "AccessGrant", "Application"].each do |klass|
-        Doorkeeper.send(:remove_const, klass)
-        Doorkeeper.const_set(klass, @original_classes[klass])
-      end
-    end
-
-    context "all tables exist" do
-      before do
-        klass = double table_exists?: true
-
-        Doorkeeper.const_set(:AccessToken, klass)
-        Doorkeeper.const_set(:AccessGrant, klass)
-        Doorkeeper.const_set(:Application, klass)
-      end
-
-      it "returns true" do
-        expect(Doorkeeper.database_installed?).to eq(true)
-      end
-
-      it "is deprecated" do
-        expect(ActiveSupport::Deprecation).to receive(:warn).
-          with("Method `Doorkeeper#database_installed?` has been deprecated without replacement.")
-
-        Doorkeeper.database_installed?
-      end
-    end
-
-    context "all tables do not exist" do
-      before do
-        klass = double table_exists?: false
-
-        Doorkeeper.const_set(:AccessToken, klass)
-        Doorkeeper.const_set(:AccessGrant, klass)
-        Doorkeeper.const_set(:Application, klass)
-      end
-
-      it "returns false" do
-        expect(Doorkeeper.database_installed?).to eq(false)
-      end
-
-      it "is deprecated" do
-        expect(ActiveSupport::Deprecation).to receive(:warn).
-          with("Method `Doorkeeper#database_installed?` has been deprecated without replacement.")
-
-        Doorkeeper.database_installed?
-      end
-    end
-  end
-
-  describe "#installed?" do
-    context "methods return true" do
-      before do
-        allow(Doorkeeper).to receive(:configured?).and_return(true).once
-        allow(Doorkeeper).to receive(:database_installed?).and_return(true).once
-      end
-
-      it "returns true" do
-        expect(Doorkeeper.installed?).to eq(true)
-      end
-    end
-
-    context "methods return false" do
-      before do
-        allow(Doorkeeper).to receive(:configured?).and_return(false).once
-        allow(Doorkeeper).to receive(:database_installed?).and_return(false).once
-      end
-
-      it "returns false" do
-        expect(Doorkeeper.installed?).to eq(false)
-      end
-    end
-
-    it "is deprecated" do
-      expect(ActiveSupport::Deprecation).to receive(:warn).
-        with("Method `Doorkeeper#configured?` has been deprecated without replacement.")
-
-      expect(ActiveSupport::Deprecation).to receive(:warn).
-        with("Method `Doorkeeper#database_installed?` has been deprecated without replacement.")
-
-      expect(ActiveSupport::Deprecation).to receive(:warn).
-        with("Method `Doorkeeper#installed?` has been deprecated without replacement.")
-
-      Doorkeeper.installed?
-    end
-  end
 end

data/spec/lib/models/expirable_spec.rb

@@ -1,6 +1,4 @@
 require 'spec_helper'
-require 'active_support/time'
-require 'doorkeeper/models/concerns/expirable'
 
 describe 'Expirable' do
   subject do
@@ -45,6 +43,5 @@ describe 'Expirable' do
       allow(subject).to receive(:expires_in).and_return(nil)
       expect(subject.expires_in_seconds).to be_nil
     end
-
   end
 end

data/spec/lib/models/revocable_spec.rb

@@ -1,6 +1,4 @@
 require 'spec_helper'
-require 'active_support/core_ext/object/blank'
-require 'doorkeeper/models/concerns/revocable'
 
 describe 'Revocable' do
   subject do

data/spec/lib/models/scopes_spec.rb

@@ -1,8 +1,4 @@
 require 'spec_helper'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/object/blank'
-require 'doorkeeper/oauth/scopes'
-require 'doorkeeper/models/concerns/scopes'
 
 describe 'Doorkeeper::Models::Scopes' do
   subject do

data/spec/lib/oauth/authorization/uri_builder_spec.rb

@@ -1,8 +1,4 @@
 require 'spec_helper'
-require 'active_support/core_ext/string'
-require 'uri'
-require 'rack/utils'
-require 'doorkeeper/oauth/authorization/uri_builder'
 
 module Doorkeeper::OAuth::Authorization
   describe URIBuilder do

data/spec/lib/oauth/authorization_code_request_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_integration'
+require 'spec_helper'
 
 module Doorkeeper::OAuth
   describe AuthorizationCodeRequest do
@@ -6,7 +6,9 @@ module Doorkeeper::OAuth
       double :server,
              access_token_expires_in: 2.days,
              refresh_token_enabled?: false,
-             custom_access_token_expires_in: ->(_app) { nil }
+             custom_access_token_expires_in: lambda { |context|
+               context.grant_type == Doorkeeper::OAuth::AUTHORIZATION_CODE ? 1234 : nil
+             }
     end
 
     let(:grant)  { FactoryBot.create :access_grant }
@@ -22,6 +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)
     end
 
     it "issues the token with same grant's scopes" do
@@ -70,9 +74,12 @@ module Doorkeeper::OAuth
     end
 
     it 'skips token creation if there is a matching one' do
+      scopes = grant.scopes
+
       Doorkeeper.configure do
         orm DOORKEEPER_ORM
         reuse_access_token
+        default_scopes(*scopes)
       end
 
       FactoryBot.create(:access_token, application_id: client.id,
@@ -104,5 +111,20 @@ module Doorkeeper::OAuth
         expect(subject.error).to eq(:invalid_grant)
       end
     end
+
+    context "when redirect_uri is the native one" do
+      let(:redirect_uri) { 'urn:ietf:wg:oauth:2.0:oob' }
+
+      it "invalidates when redirect_uri of the grant is not native" do
+        subject.validate
+        expect(subject.error).to eq(:invalid_grant)
+      end
+
+      it "validates when redirect_uri of the grant is also native" do
+        allow(grant).to receive(:redirect_uri) { redirect_uri }
+        subject.validate
+        expect(subject.error).to eq(nil)
+      end
+    end
   end
 end

data/spec/lib/oauth/base_request_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_integration'
+require 'spec_helper'
 
 module Doorkeeper::OAuth
   describe BaseRequest do
@@ -20,7 +20,7 @@ module Doorkeeper::OAuth
     let(:server) do
       double :server,
         access_token_expires_in: 100,
-        custom_access_token_expires_in: ->(_) { nil },
+        custom_access_token_expires_in: ->(_context) { nil },
         refresh_token_enabled?: false
     end
 
@@ -105,6 +105,20 @@ module Doorkeeper::OAuth
 
         expect(result).to be_an_instance_of(Doorkeeper::AccessToken)
       end
+
+      it "respects custom_access_token_expires_in" do
+        server = double(:server,
+                        access_token_expires_in: 100,
+                        custom_access_token_expires_in: ->(context) { context.scopes == "public" ? 500 : nil },
+                        refresh_token_enabled?: false)
+        result = subject.find_or_create_access_token(
+          client,
+          "1",
+          "public",
+          server
+        )
+        expect(result.expires_in).to eql(500)
+      end
     end
 
     describe "#scopes" do

data/spec/lib/oauth/base_response_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_integration'
+require 'spec_helper'
 
 module Doorkeeper::OAuth
   describe BaseResponse do

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

@@ -1,22 +1,22 @@
 require 'spec_helper'
-require 'active_support/core_ext/string'
-require 'doorkeeper/oauth/client'
 
 class Doorkeeper::OAuth::Client
   describe Credentials do
     let(:client_id) { 'some-uid' }
     let(:client_secret) { 'some-secret' }
 
-    it 'is blank when any of the credentials is blank' do
+    it 'is blank when the uid in credentials is blank' do
+      expect(Credentials.new(nil, nil)).to be_blank
       expect(Credentials.new(nil, 'something')).to be_blank
-      expect(Credentials.new('something', nil)).to be_blank
+      expect(Credentials.new('something', nil)).to be_present
+      expect(Credentials.new('something', 'something')).to be_present
     end
 
     describe :from_request do
       let(:request) { double.as_null_object }
 
       let(:method) do
-        ->(_request) { return 'uid', 'secret' }
+        ->(_request) { ['uid', 'secret'] }
       end
 
       it 'accepts anything that responds to #call' do

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

@@ -1,10 +1,14 @@
-require 'spec_helper_integration'
+require 'spec_helper'
 
 class Doorkeeper::OAuth::ClientCredentialsRequest
   describe Creator do
     let(:client) { FactoryBot.create :application }
     let(:scopes) { Doorkeeper::OAuth::Scopes.from_string('public') }
 
+    before do
+      default_scopes_exist :public
+    end
+
     it 'creates a new token' do
       expect do
         subject.call(client, scopes)

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

@@ -1,6 +1,4 @@
 require 'spec_helper'
-require 'active_support/all'
-require 'doorkeeper/oauth/client_credentials/issuer'
 
 class Doorkeeper::OAuth::ClientCredentialsRequest
   describe Issuer do
@@ -9,7 +7,7 @@ class Doorkeeper::OAuth::ClientCredentialsRequest
       double(
         :server,
         access_token_expires_in: 100,
-        custom_access_token_expires_in: ->(_app) { nil }
+        custom_access_token_expires_in: ->(_context) { nil }
       )
     end
     let(:validation) { double :validation, valid?: true }
@@ -63,23 +61,44 @@ class Doorkeeper::OAuth::ClientCredentialsRequest
       end
 
       context 'with custom expirations' do
-        let(:custom_ttl) { 1233 }
+        let(:custom_ttl_grant) { 1234 }
+        let(:custom_ttl_scope) { 1235 }
+        let(:custom_scope) { 'special' }
         let(:server) do
           double(
             :server,
-            custom_access_token_expires_in: ->(_app) { custom_ttl }
+            custom_access_token_expires_in: lambda { |context|
+              # scopes is normally an object but is a string in this test
+              if context.scopes == custom_scope
+                custom_ttl_scope
+              elsif context.grant_type == Doorkeeper::OAuth::CLIENT_CREDENTIALS
+                custom_ttl_grant
+              else
+                nil
+              end
+            }
           )
         end
 
-        it 'creates with correct token parameters' do
+        it 'respects grant based rules' do
           expect(creator).to receive(:call).with(
             client,
             scopes,
-            expires_in: custom_ttl,
+            expires_in: custom_ttl_grant,
             use_refresh_token: false
           )
           subject.create client, scopes, creator
         end
+
+        it 'respects scope based rules' do
+          expect(creator).to receive(:call).with(
+            client,
+            custom_scope,
+            expires_in: custom_ttl_scope,
+            use_refresh_token: false
+          )
+          subject.create client, custom_scope, creator
+        end
       end
     end
   end

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

@@ -1,6 +1,4 @@
 require 'spec_helper'
-require 'active_support/all'
-require 'doorkeeper/oauth/client_credentials/validation'
 
 class Doorkeeper::OAuth::ClientCredentialsRequest
   describe Validation do
@@ -45,7 +43,8 @@ class Doorkeeper::OAuth::ClientCredentialsRequest
           allow(application).to receive(:scopes).and_return(application_scopes)
           allow(server).to receive(:scopes).and_return(server_scopes)
           allow(request).to receive(:scopes).and_return(
-            Doorkeeper::OAuth::Scopes.from_string 'email')
+            Doorkeeper::OAuth::Scopes.from_string('email')
+          )
           expect(subject).not_to be_valid
         end
       end

data/spec/lib/oauth/client_credentials_integration_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_integration'
+require 'spec_helper'
 
 module Doorkeeper::OAuth
   describe ClientCredentialsRequest do

data/spec/lib/oauth/client_credentials_request_spec.rb

@@ -1,18 +1,16 @@
 require 'spec_helper'
-require 'active_support/all'
-require 'active_model'
-require 'doorkeeper/oauth/client_credentials_request'
 
 module Doorkeeper::OAuth
   describe ClientCredentialsRequest do
     let(:server) do
       double(
         default_scopes: nil,
-        custom_access_token_expires_in: ->(_app) { nil }
+        access_token_expires_in: 2.hours,
+        custom_access_token_expires_in: ->(_context) { nil }
       )
     end
 
-    let(:application)   { double :application, scopes: Scopes.from_string('') }
+    let(:application)   { FactoryBot.create(:application, scopes: '') }
     let(:client)        { double :client, application: application }
     let(:token_creator) { double :issuer, create: true, token: double }
 

data/spec/lib/oauth/client_spec.rb

@@ -1,7 +1,4 @@
 require 'spec_helper'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/string'
-require 'doorkeeper/oauth/client'
 
 module Doorkeeper::OAuth
   describe Client do

data/spec/lib/oauth/code_request_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_integration'
+require 'spec_helper'
 
 module Doorkeeper::OAuth
   describe CodeRequest do
@@ -10,7 +10,9 @@ module Doorkeeper::OAuth
         scopes: nil,
         state: nil,
         error: nil,
-        authorizable?: true
+        authorizable?: true,
+        code_challenge: nil,
+        code_challenge_method: nil,
       )
     end
 

data/spec/lib/oauth/error_response_spec.rb

@@ -1,7 +1,4 @@
 require 'spec_helper'
-require 'active_model'
-require 'doorkeeper/oauth/error'
-require 'doorkeeper/oauth/error_response'
 
 module Doorkeeper::OAuth
   describe ErrorResponse do

data/spec/lib/oauth/error_spec.rb

@@ -1,6 +1,4 @@
 require 'spec_helper'
-require 'active_support/i18n'
-require 'doorkeeper/oauth/error'
 
 module Doorkeeper::OAuth
   describe Error do

data/spec/lib/oauth/forbidden_token_response_spec.rb

@@ -1,12 +1,9 @@
 require 'spec_helper'
-require 'active_model'
-require 'doorkeeper'
-require 'doorkeeper/oauth/forbidden_token_response'
 
 module Doorkeeper::OAuth
   describe ForbiddenTokenResponse do
     describe '#name' do
-      it  { expect(subject.name).to eq(:invalid_scope) }
+      it { expect(subject.name).to eq(:invalid_scope) }
     end
 
     describe '#status' do

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

@@ -1,7 +1,4 @@
 require 'spec_helper'
-require 'active_support/core_ext/string'
-require 'doorkeeper/oauth/helpers/scope_checker'
-require 'doorkeeper/oauth/scopes'
 
 module Doorkeeper::OAuth::Helpers
   describe ScopeChecker, '.valid?' do

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

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'doorkeeper/oauth/helpers/unique_token'
 
 module Doorkeeper::OAuth::Helpers
   describe UniqueToken do

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

@@ -1,6 +1,4 @@
 require 'spec_helper'
-require 'uri'
-require 'doorkeeper/oauth/helpers/uri_checker'
 
 module Doorkeeper::OAuth::Helpers
   describe URIChecker do
@@ -44,6 +42,11 @@ module Doorkeeper::OAuth::Helpers
         uri = '   '
         expect(URIChecker.valid?(uri)).to be_falsey
       end
+
+      it 'is valid for native uris' do
+        uri = 'urn:ietf:wg:oauth:2.0:oob'
+        expect(URIChecker.valid?(uri)).to be_truthy
+      end
     end
 
     describe '.matches?' do

data/spec/lib/oauth/invalid_token_response_spec.rb

@@ -1,12 +1,9 @@
 require 'spec_helper'
-require 'active_model'
-require 'doorkeeper'
-require 'doorkeeper/oauth/invalid_token_response'
 
 module Doorkeeper::OAuth
   describe InvalidTokenResponse do
     describe "#name" do
-      it  { expect(subject.name).to eq(:invalid_token) }
+      it { expect(subject.name).to eq(:invalid_token) }
     end
 
     describe "#status" do

data/spec/lib/oauth/password_access_token_request_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper_integration'
+require 'spec_helper'
 
 module Doorkeeper::OAuth
   describe PasswordAccessTokenRequest do
@@ -8,7 +8,9 @@ module Doorkeeper::OAuth
         default_scopes: Doorkeeper::OAuth::Scopes.new,
         access_token_expires_in: 2.hours,
         refresh_token_enabled?: false,
-        custom_access_token_expires_in: ->(_app) { nil }
+        custom_access_token_expires_in: lambda { |context|
+          context.grant_type == Doorkeeper::OAuth::PASSWORD ? 1234 : nil
+        }
       )
     end
     let(:client) { FactoryBot.create(:application) }
@@ -22,6 +24,7 @@ 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)
     end
 
     it 'issues a new token without a client' do
@@ -92,5 +95,37 @@ module Doorkeeper::OAuth
         expect(Doorkeeper::AccessToken.last.scopes).to include('public')
       end
     end
+
+    describe 'with custom expiry' do
+      let(:server) do
+        double(
+          :server,
+          default_scopes: Doorkeeper::OAuth::Scopes.new,
+          access_token_expires_in: 2.hours,
+          refresh_token_enabled?: false,
+          custom_access_token_expires_in: lambda { |context|
+            context.scopes.exists?('public') ? 222 : nil
+          }
+        )
+      end
+
+      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
   end
 end

data/spec/lib/oauth/pre_authorization_spec.rb

@@ -1,13 +1,13 @@
-require 'spec_helper_integration'
+require 'spec_helper'
 
 module Doorkeeper::OAuth
   describe PreAuthorization do
-    let(:server) {
+    let(:server) do
       server = Doorkeeper.configuration
       allow(server).to receive(:default_scopes).and_return(Scopes.new)
       allow(server).to receive(:scopes).and_return(Scopes.from_string('public profile'))
       server
-    }
+    end
 
     let(:application) do
       application = double :application
@@ -123,9 +123,19 @@ module Doorkeeper::OAuth
       expect(subject.scopes).to eq(Scopes.from_string('default'))
     end
 
-    it 'accepts test uri' do
-      subject.redirect_uri = 'urn:ietf:wg:oauth:2.0:oob'
-      expect(subject).to be_authorizable
+    context 'with native redirect uri' do
+      let(:native_redirect_uri) { 'urn:ietf:wg:oauth:2.0:oob' }
+
+      it 'accepts redirect_uri when it matches with the client' do
+        subject.redirect_uri = native_redirect_uri
+        allow(subject.client).to receive(:redirect_uri) { native_redirect_uri }
+        expect(subject).to be_authorizable
+      end
+
+      it 'invalidates redirect_uri when it does\'n match with the client' do
+        subject.redirect_uri = 'urn:ietf:wg:oauth:2.0:oob'
+        expect(subject).not_to be_authorizable
+      end
     end
 
     it 'matches the redirect uri against client\'s one' do
@@ -151,5 +161,29 @@ module Doorkeeper::OAuth
       subject.redirect_uri = nil
       expect(subject).not_to be_authorizable
     end
+
+    describe "as_json" do
+      let(:client_id) { "client_uid_123" }
+      let(:client_name) { "Acme Co." }
+
+      before do
+        allow(client).to receive(:uid).and_return client_id
+        allow(client).to receive(:name).and_return client_name
+      end
+
+      let(:json) { subject.as_json({}) }
+
+      it { is_expected.to respond_to :as_json }
+
+      it "returns correct values" do
+        expect(json[:client_id]).to eq client_id
+        expect(json[:redirect_uri]).to eq subject.redirect_uri
+        expect(json[:state]).to eq subject.state
+        expect(json[:response_type]).to eq subject.response_type
+        expect(json[:scope]).to eq subject.scope
+        expect(json[:client_name]).to eq client_name
+        expect(json[:status]).to eq I18n.t('doorkeeper.pre_authorization.status')
+      end
+    end
   end
 end