doorkeeper 5.1.0.rc2 → 5.1.0

data/spec/lib/oauth/authorization_code_request_spec.rb

@@ -1,4 +1,6 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 module Doorkeeper::OAuth
   describe AuthorizationCodeRequest do
@@ -16,11 +18,15 @@ module Doorkeeper::OAuth
     let(:redirect_uri) { client.redirect_uri }
     let(:params) { { redirect_uri: redirect_uri } }
 
+    before do
+      allow(server).to receive(:option_defined?).with(:custom_access_token_expires_in).and_return(true)
+    end
+
     subject do
       AuthorizationCodeRequest.new server, grant, client, params
     end
 
-    it 'issues a new token for the client' do
+    it "issues a new token for the client" do
       expect do
         subject.authorize
       end.to change { client.reload.access_tokens.count }.by(1)
@@ -33,36 +39,36 @@ module Doorkeeper::OAuth
       expect(Doorkeeper::AccessToken.last.scopes).to eq(grant.scopes)
     end
 
-    it 'revokes the grant' do
+    it "revokes the grant" do
       expect { subject.authorize }.to(change { grant.reload.accessible? })
     end
 
-    it 'requires the grant to be accessible' do
+    it "requires the grant to be accessible" do
       grant.revoke
       subject.validate
       expect(subject.error).to eq(:invalid_grant)
     end
 
-    it 'requires the grant' do
+    it "requires the grant" do
       subject.grant = nil
       subject.validate
       expect(subject.error).to eq(:invalid_grant)
     end
 
-    it 'requires the client' do
+    it "requires the client" do
       subject.client = nil
       subject.validate
       expect(subject.error).to eq(:invalid_client)
     end
 
-    it 'requires the redirect_uri' do
+    it "requires the redirect_uri" do
       subject.redirect_uri = nil
       subject.validate
       expect(subject.error).to eq(:invalid_request)
     end
 
     it "matches the redirect_uri with grant's one" do
-      subject.redirect_uri = 'http://other.com'
+      subject.redirect_uri = "http://other.com"
       subject.validate
       expect(subject.error).to eq(:invalid_grant)
     end
@@ -73,7 +79,7 @@ module Doorkeeper::OAuth
       expect(subject.error).to eq(:invalid_grant)
     end
 
-    it 'skips token creation if there is a matching one reusable' do
+    it "skips token creation if there is a matching one reusable" do
       scopes = grant.scopes
 
       Doorkeeper.configure do
@@ -88,7 +94,7 @@ module Doorkeeper::OAuth
       expect { subject.authorize }.to_not(change { Doorkeeper::AccessToken.count })
     end
 
-    it 'creates token if there is a matching one but non reusable' do
+    it "creates token if there is a matching one but non reusable" do
       scopes = grant.scopes
 
       Doorkeeper.configure do
@@ -124,7 +130,7 @@ module Doorkeeper::OAuth
     end
 
     context "when redirect_uri is not an URI" do
-      let(:redirect_uri) { '123d#!s' }
+      let(:redirect_uri) { "123d#!s" }
 
       it "responds with invalid_grant" do
         subject.validate
@@ -133,7 +139,7 @@ module Doorkeeper::OAuth
     end
 
     context "when redirect_uri is the native one" do
-      let(:redirect_uri) { 'urn:ietf:wg:oauth:2.0:oob' }
+      let(:redirect_uri) { "urn:ietf:wg:oauth:2.0:oob" }
 
       it "invalidates when redirect_uri of the grant is not native" do
         subject.validate

data/spec/lib/oauth/base_request_spec.rb

@@ -1,19 +1,21 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 module Doorkeeper::OAuth
   describe BaseRequest do
     let(:access_token) do
       double :access_token,
-             plaintext_token:         "some-token",
-             expires_in:              "3600",
-             expires_in_seconds:      "300",
-             scopes_string:           "two scopes",
+             plaintext_token: "some-token",
+             expires_in: "3600",
+             expires_in_seconds: "300",
+             scopes_string: "two scopes",
              plaintext_refresh_token: "some-refresh-token",
-             token_type:              "bearer",
-             created_at:              0
+             token_type: "bearer",
+             created_at: 0
     end
 
-    let(:client) { double :client, id: '1' }
+    let(:client) { double :client, id: "1" }
 
     let(:scopes_array) { %w[public write] }
 
@@ -24,6 +26,10 @@ module Doorkeeper::OAuth
              refresh_token_enabled?: false
     end
 
+    before do
+      allow(server).to receive(:option_defined?).with(:custom_access_token_expires_in).and_return(true)
+    end
+
     subject do
       BaseRequest.new
     end
@@ -111,6 +117,9 @@ module Doorkeeper::OAuth
                         access_token_expires_in: 100,
                         custom_access_token_expires_in: ->(context) { context.scopes == "public" ? 500 : nil },
                         refresh_token_enabled?: false)
+
+        allow(server).to receive(:option_defined?).with(:custom_access_token_expires_in).and_return(true)
+
         result = subject.find_or_create_access_token(
           client,
           "1",
@@ -127,6 +136,9 @@ module Doorkeeper::OAuth
                         refresh_token_enabled?: lambda { |context|
                           context.scopes == "public"
                         })
+
+        allow(server).to receive(:option_defined?).with(:custom_access_token_expires_in).and_return(true)
+
         result = subject.find_or_create_access_token(
           client,
           "1",

data/spec/lib/oauth/base_response_spec.rb

@@ -1,4 +1,6 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 module Doorkeeper::OAuth
   describe BaseResponse do

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

@@ -1,15 +1,17 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 class Doorkeeper::OAuth::Client
   describe Credentials do
-    let(:client_id) { 'some-uid' }
-    let(:client_secret) { 'some-secret' }
+    let(:client_id) { "some-uid" }
+    let(:client_secret) { "some-secret" }
 
-    it 'is blank when the uid in 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_present
-      expect(Credentials.new('something', 'something')).to be_present
+      expect(Credentials.new(nil, "something")).to be_blank
+      expect(Credentials.new("something", nil)).to be_present
+      expect(Credentials.new("something", "something")).to be_present
     end
 
     describe :from_request do
@@ -19,44 +21,44 @@ class Doorkeeper::OAuth::Client
         ->(_request) { %w[uid secret] }
       end
 
-      it 'accepts anything that responds to #call' do
+      it "accepts anything that responds to #call" do
         expect(method).to receive(:call).with(request)
         Credentials.from_request request, method
       end
 
-      it 'delegates methods received as symbols to Credentials class' do
+      it "delegates methods received as symbols to Credentials class" do
         expect(Credentials).to receive(:from_params).with(request)
         Credentials.from_request request, :from_params
       end
 
-      it 'stops at the first credentials found' do
+      it "stops at the first credentials found" do
         not_called_method = double
         expect(not_called_method).not_to receive(:call)
         Credentials.from_request request, ->(_) {}, method, not_called_method
       end
 
-      it 'returns new Credentials' do
+      it "returns new Credentials" do
         credentials = Credentials.from_request request, method
         expect(credentials).to be_a(Credentials)
       end
 
-      it 'returns uid and secret from extractor method' do
+      it "returns uid and secret from extractor method" do
         credentials = Credentials.from_request request, method
-        expect(credentials.uid).to    eq('uid')
-        expect(credentials.secret).to eq('secret')
+        expect(credentials.uid).to    eq("uid")
+        expect(credentials.secret).to eq("secret")
       end
     end
 
     describe :from_params do
-      it 'returns credentials from parameters when Authorization header is not available' do
+      it "returns credentials from parameters when Authorization header is not available" do
         request     = double parameters: { client_id: client_id, client_secret: client_secret }
         uid, secret = Credentials.from_params(request)
 
-        expect(uid).to    eq('some-uid')
-        expect(secret).to eq('some-secret')
+        expect(uid).to    eq("some-uid")
+        expect(secret).to eq("some-secret")
       end
 
-      it 'is blank when there are no credentials' do
+      it "is blank when there are no credentials" do
         request     = double parameters: {}
         uid, secret = Credentials.from_params(request)
 
@@ -68,15 +70,15 @@ class Doorkeeper::OAuth::Client
     describe :from_basic do
       let(:credentials) { Base64.encode64("#{client_id}:#{client_secret}") }
 
-      it 'decodes the credentials' do
+      it "decodes the credentials" do
         request     = double authorization: "Basic #{credentials}"
         uid, secret = Credentials.from_basic(request)
 
-        expect(uid).to    eq('some-uid')
-        expect(secret).to eq('some-secret')
+        expect(uid).to    eq("some-uid")
+        expect(secret).to eq("some-secret")
       end
 
-      it 'is blank if Authorization is not Basic' do
+      it "is blank if Authorization is not Basic" do
         request     = double authorization: credentials.to_s
         uid, secret = Credentials.from_basic(request)
 

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

@@ -1,23 +1,25 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 class Doorkeeper::OAuth::ClientCredentialsRequest
   describe Creator do
     let(:client) { FactoryBot.create :application }
-    let(:scopes) { Doorkeeper::OAuth::Scopes.from_string('public') }
+    let(:scopes) { Doorkeeper::OAuth::Scopes.from_string("public") }
 
     before do
       default_scopes_exist :public
     end
 
-    it 'creates a new token' do
+    it "creates a new token" do
       expect do
         subject.call(client, scopes)
       end.to change { Doorkeeper::AccessToken.count }.by(1)
     end
 
-    context 'when reuse_access_token is true' do
-      context 'when expiration is disabled' do
-        it 'returns the existing valid token' do
+    context "when reuse_access_token is true" do
+      context "when expiration is disabled" do
+        it "returns the existing valid token" do
           allow(Doorkeeper.configuration).to receive(:reuse_access_token).and_return(true)
           existing_token = subject.call(client, scopes)
 
@@ -28,8 +30,8 @@ class Doorkeeper::OAuth::ClientCredentialsRequest
         end
       end
 
-      context 'when existing token has not crossed token_reuse_limit' do
-        it 'returns the existing valid token' do
+      context "when existing token has not crossed token_reuse_limit" do
+        it "returns the existing valid token" do
           allow(Doorkeeper.configuration).to receive(:reuse_access_token).and_return(true)
           allow(Doorkeeper.configuration).to receive(:token_reuse_limit).and_return(50)
           existing_token = subject.call(client, scopes, expires_in: 1000)
@@ -42,7 +44,7 @@ class Doorkeeper::OAuth::ClientCredentialsRequest
         end
       end
 
-      context 'when existing token has crossed token_reuse_limit' do
+      context "when existing token has crossed token_reuse_limit" do
         it "returns a new token" do
           allow(Doorkeeper.configuration).to receive(:reuse_access_token).and_return(true)
           allow(Doorkeeper.configuration).to receive(:token_reuse_limit).and_return(50)
@@ -56,7 +58,7 @@ class Doorkeeper::OAuth::ClientCredentialsRequest
         end
       end
 
-      context 'when existing token has been expired' do
+      context "when existing token has been expired" do
         it "returns a new token" do
           allow(Doorkeeper.configuration).to receive(:reuse_access_token).and_return(true)
           allow(Doorkeeper.configuration).to receive(:token_reuse_limit).and_return(50)
@@ -83,7 +85,7 @@ class Doorkeeper::OAuth::ClientCredentialsRequest
       end
     end
 
-    it 'returns false if creation fails' do
+    it "returns false if creation fails" do
       expect(Doorkeeper::AccessToken).to receive(:find_or_create_for).and_return(false)
       created = subject.call(client, scopes)
       expect(created).to be_falsey

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

@@ -1,31 +1,36 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 class Doorkeeper::OAuth::ClientCredentialsRequest
   describe Issuer do
-    let(:creator) { double :acces_token_creator }
+    let(:creator) { double :access_token_creator }
     let(:server) do
       double(
         :server,
-        access_token_expires_in: 100,
-        custom_access_token_expires_in: ->(_context) { nil }
+        access_token_expires_in: 100
       )
     end
     let(:validation) { double :validation, valid?: true }
 
+    before do
+      allow(server).to receive(:option_defined?).with(:custom_access_token_expires_in).and_return(false)
+    end
+
     subject { Issuer.new(server, validation) }
 
     describe :create do
-      let(:client) { double :client, id: 'some-id' }
-      let(:scopes) { 'some scope' }
+      let(:client) { double :client, id: "some-id" }
+      let(:scopes) { "some scope" }
 
-      it 'creates and sets the token' do
-        expect(creator).to receive(:call).and_return('token')
+      it "creates and sets the token" do
+        expect(creator).to receive(:call).and_return("token")
         subject.create client, scopes, creator
 
-        expect(subject.token).to eq('token')
+        expect(subject.token).to eq("token")
       end
 
-      it 'creates with correct token parameters' do
+      it "creates with correct token parameters" do
         expect(creator).to receive(:call).with(
           client,
           scopes,
@@ -36,34 +41,34 @@ class Doorkeeper::OAuth::ClientCredentialsRequest
         subject.create client, scopes, creator
       end
 
-      it 'has error set to :server_error if creator fails' do
+      it "has error set to :server_error if creator fails" do
         expect(creator).to receive(:call).and_return(false)
         subject.create client, scopes, creator
 
         expect(subject.error).to eq(:server_error)
       end
 
-      context 'when validation fails' do
+      context "when validation fails" do
         before do
           allow(validation).to receive(:valid?).and_return(false)
           allow(validation).to receive(:error).and_return(:validation_error)
           expect(creator).not_to receive(:create)
         end
 
-        it 'has error set from validation' do
+        it "has error set from validation" do
           subject.create client, scopes, creator
           expect(subject.error).to eq(:validation_error)
         end
 
-        it 'returns false' do
+        it "returns false" do
           expect(subject.create(client, scopes, creator)).to be_falsey
         end
       end
 
-      context 'with custom expirations' do
+      context "with custom expirations" do
         let(:custom_ttl_grant) { 1234 }
         let(:custom_ttl_scope) { 1235 }
-        let(:custom_scope) { 'special' }
+        let(:custom_scope) { "special" }
         let(:server) do
           double(
             :server,
@@ -78,7 +83,11 @@ class Doorkeeper::OAuth::ClientCredentialsRequest
           )
         end
 
-        it 'respects grant based rules' do
+        before do
+          allow(server).to receive(:option_defined?).with(:custom_access_token_expires_in).and_return(true)
+        end
+
+        it "respects grant based rules" do
           expect(creator).to receive(:call).with(
             client,
             scopes,
@@ -88,7 +97,7 @@ class Doorkeeper::OAuth::ClientCredentialsRequest
           subject.create client, scopes, creator
         end
 
-        it 'respects scope based rules' do
+        it "respects scope based rules" do
           expect(creator).to receive(:call).with(
             client,
             custom_scope,

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

@@ -1,4 +1,6 @@
-require 'spec_helper'
+# frozen_string_literal: true
+
+require "spec_helper"
 
 class Doorkeeper::OAuth::ClientCredentialsRequest
   describe Validation do
@@ -9,30 +11,30 @@ class Doorkeeper::OAuth::ClientCredentialsRequest
 
     subject { Validation.new(server, request) }
 
-    it 'is valid with valid request' do
+    it "is valid with valid request" do
       expect(subject).to be_valid
     end
 
-    it 'is invalid when client is not present' do
+    it "is invalid when client is not present" do
       allow(request).to receive(:client).and_return(nil)
       expect(subject).not_to be_valid
     end
 
-    context 'with scopes' do
-      it 'is invalid when scopes are not included in the server' do
-        server_scopes = Doorkeeper::OAuth::Scopes.from_string 'email'
+    context "with scopes" do
+      it "is invalid when scopes are not included in the server" do
+        server_scopes = Doorkeeper::OAuth::Scopes.from_string "email"
         allow(request).to receive(:grant_type).and_return(Doorkeeper::OAuth::CLIENT_CREDENTIALS)
         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
 
-      context 'with application scopes' do
-        it 'is valid when scopes are included in the application' do
-          application_scopes = Doorkeeper::OAuth::Scopes.from_string 'app'
-          server_scopes = Doorkeeper::OAuth::Scopes.from_string 'email app'
+      context "with application scopes" do
+        it "is valid when scopes are included in the application" do
+          application_scopes = Doorkeeper::OAuth::Scopes.from_string "app"
+          server_scopes = Doorkeeper::OAuth::Scopes.from_string "email app"
           allow(application).to receive(:scopes).and_return(application_scopes)
           allow(server).to receive(:scopes).and_return(server_scopes)
           allow(request).to receive(:grant_type).and_return(Doorkeeper::OAuth::CLIENT_CREDENTIALS)
@@ -40,14 +42,14 @@ class Doorkeeper::OAuth::ClientCredentialsRequest
           expect(subject).to be_valid
         end
 
-        it 'is invalid when scopes are not included in the application' do
-          application_scopes = Doorkeeper::OAuth::Scopes.from_string 'app'
-          server_scopes = Doorkeeper::OAuth::Scopes.from_string 'email app'
+        it "is invalid when scopes are not included in the application" do
+          application_scopes = Doorkeeper::OAuth::Scopes.from_string "app"
+          server_scopes = Doorkeeper::OAuth::Scopes.from_string "email app"
           allow(application).to receive(:scopes).and_return(application_scopes)
           allow(request).to receive(:grant_type).and_return(Doorkeeper::OAuth::CLIENT_CREDENTIALS)
           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