doorkeeper 5.2.0 → 5.3.0

data/spec/lib/oauth/token_spec.rb

@@ -7,152 +7,150 @@ module Doorkeeper
     class AccessToken
     end
   end
+end
 
-  module OAuth
-    describe Token do
-      describe :from_request do
-        let(:request) { double.as_null_object }
+describe Doorkeeper::OAuth::Token do
+  describe ".from_request" do
+    let(:request) { double.as_null_object }
 
-        let(:method) do
-          ->(*) { "token-value" }
-        end
+    let(:method) do
+      ->(*) { "token-value" }
+    end
 
-        it "accepts anything that responds to #call" do
-          expect(method).to receive(:call).with(request)
-          Token.from_request request, method
-        end
+    it "accepts anything that responds to #call" do
+      expect(method).to receive(:call).with(request)
+      described_class.from_request request, method
+    end
 
-        it "delegates methods received as symbols to Token class" do
-          expect(Token).to receive(:from_params).with(request)
-          Token.from_request request, :from_params
-        end
+    it "delegates methods received as symbols to described_class class" do
+      expect(described_class).to receive(:from_params).with(request)
+      described_class.from_request request, :from_params
+    end
 
-        it "stops at the first credentials found" do
-          not_called_method = double
-          expect(not_called_method).not_to receive(:call)
-          Token.from_request request, ->(_r) {}, method, not_called_method
-        end
+    it "stops at the first credentials found" do
+      not_called_method = double
+      expect(not_called_method).not_to receive(:call)
+      described_class.from_request request, ->(_r) {}, method, not_called_method
+    end
 
-        it "returns the credential from extractor method" do
-          credentials = Token.from_request request, method
-          expect(credentials).to eq("token-value")
-        end
-      end
+    it "returns the credential from extractor method" do
+      credentials = described_class.from_request request, method
+      expect(credentials).to eq("token-value")
+    end
+  end
 
-      describe :from_access_token_param do
-        it "returns token from access_token parameter" do
-          request = double parameters: { access_token: "some-token" }
-          token   = Token.from_access_token_param(request)
-          expect(token).to eq("some-token")
-        end
-      end
+  describe ".from_access_token_param" do
+    it "returns token from access_token parameter" do
+      request = double parameters: { access_token: "some-token" }
+      token   = described_class.from_access_token_param(request)
+      expect(token).to eq("some-token")
+    end
+  end
 
-      describe :from_bearer_param do
-        it "returns token from bearer_token parameter" do
-          request = double parameters: { bearer_token: "some-token" }
-          token   = Token.from_bearer_param(request)
-          expect(token).to eq("some-token")
-        end
-      end
+  describe ".from_bearer_param" do
+    it "returns token from bearer_token parameter" do
+      request = double parameters: { bearer_token: "some-token" }
+      token   = described_class.from_bearer_param(request)
+      expect(token).to eq("some-token")
+    end
+  end
 
-      describe :from_bearer_authorization do
-        it "returns token from capitalized authorization bearer" do
-          request = double authorization: "Bearer SomeToken"
-          token   = Token.from_bearer_authorization(request)
-          expect(token).to eq("SomeToken")
-        end
+  describe ".from_bearer_authorization" do
+    it "returns token from capitalized authorization bearer" do
+      request = double authorization: "Bearer SomeToken"
+      token   = described_class.from_bearer_authorization(request)
+      expect(token).to eq("SomeToken")
+    end
 
-        it "returns token from lowercased authorization bearer" do
-          request = double authorization: "bearer SomeToken"
-          token   = Token.from_bearer_authorization(request)
-          expect(token).to eq("SomeToken")
-        end
+    it "returns token from lowercased authorization bearer" do
+      request = double authorization: "bearer SomeToken"
+      token   = described_class.from_bearer_authorization(request)
+      expect(token).to eq("SomeToken")
+    end
 
-        it "does not return token if authorization is not bearer" do
-          request = double authorization: "MAC SomeToken"
-          token   = Token.from_bearer_authorization(request)
-          expect(token).to be_blank
-        end
-      end
+    it "does not return token if authorization is not bearer" do
+      request = double authorization: "MAC SomeToken"
+      token   = described_class.from_bearer_authorization(request)
+      expect(token).to be_blank
+    end
+  end
 
-      describe :from_basic_authorization do
-        it "returns token from capitalized authorization basic" do
-          request = double authorization: "Basic #{Base64.encode64 "SomeToken:"}"
-          token   = Token.from_basic_authorization(request)
-          expect(token).to eq("SomeToken")
-        end
+  describe ".from_basic_authorization" do
+    it "returns token from capitalized authorization basic" do
+      request = double authorization: "Basic #{Base64.encode64 "SomeToken:"}"
+      token   = described_class.from_basic_authorization(request)
+      expect(token).to eq("SomeToken")
+    end
 
-        it "returns token from lowercased authorization basic" do
-          request = double authorization: "basic #{Base64.encode64 "SomeToken:"}"
-          token   = Token.from_basic_authorization(request)
-          expect(token).to eq("SomeToken")
-        end
+    it "returns token from lowercased authorization basic" do
+      request = double authorization: "basic #{Base64.encode64 "SomeToken:"}"
+      token   = described_class.from_basic_authorization(request)
+      expect(token).to eq("SomeToken")
+    end
 
-        it "does not return token if authorization is not basic" do
-          request = double authorization: "MAC #{Base64.encode64 "SomeToken:"}"
-          token   = Token.from_basic_authorization(request)
-          expect(token).to be_blank
+    it "does not return token if authorization is not basic" do
+      request = double authorization: "MAC #{Base64.encode64 "SomeToken:"}"
+      token   = described_class.from_basic_authorization(request)
+      expect(token).to be_blank
+    end
+  end
+
+  describe ".authenticate" do
+    context "refresh tokens are disabled (default)" do
+      context "refresh tokens are enabled" do
+        it "does not revoke previous refresh_token if token was found" do
+          token = ->(_r) { "token" }
+          expect(
+            Doorkeeper::AccessToken,
+          ).to receive(:by_token).with("token").and_return(token)
+          expect(token).not_to receive(:revoke_previous_refresh_token!)
+          described_class.authenticate double, token
         end
       end
 
-      describe :authenticate do
-        context "refresh tokens are disabled (default)" do
-          context "refresh tokens are enabled" do
-            it "does not revoke previous refresh_token if token was found" do
-              token = ->(_r) { "token" }
-              expect(
-                AccessToken
-              ).to receive(:by_token).with("token").and_return(token)
-              expect(token).not_to receive(:revoke_previous_refresh_token!)
-              Token.authenticate double, token
-            end
-          end
-
-          it "calls the finder if token was returned" do
-            token = ->(_r) { "token" }
-            expect(AccessToken).to receive(:by_token).with("token")
-            Token.authenticate double, token
-          end
-        end
+      it "calls the finder if token was returned" do
+        token = ->(_r) { "token" }
+        expect(Doorkeeper::AccessToken).to receive(:by_token).with("token")
+        described_class.authenticate double, token
+      end
+    end
 
-        context "token hashing is enabled" do
-          include_context "with token hashing enabled"
+    context "token hashing is enabled" do
+      include_context "with token hashing enabled"
 
-          let(:hashed_token) { hashed_or_plain_token_func.call("token") }
-          let(:token) { ->(_r) { "token" } }
+      let(:hashed_token) { hashed_or_plain_token_func.call("token") }
+      let(:token) { ->(_r) { "token" } }
 
-          it "searches with the hashed token" do
-            expect(
-              AccessToken
-            ).to receive(:find_by).with(token: hashed_token).and_return(token)
-            Token.authenticate double, token
-          end
-        end
+      it "searches with the hashed token" do
+        expect(
+          Doorkeeper::AccessToken,
+        ).to receive(:find_by).with(token: hashed_token).and_return(token)
+        described_class.authenticate double, token
+      end
+    end
 
-        context "refresh tokens are enabled" do
-          before do
-            Doorkeeper.configure do
-              orm DOORKEEPER_ORM
-              use_refresh_token
-            end
-          end
-
-          it "revokes previous refresh_token if token was found" do
-            token = ->(_r) { "token" }
-            expect(
-              AccessToken
-            ).to receive(:by_token).with("token").and_return(token)
-            expect(token).to receive(:revoke_previous_refresh_token!)
-            Token.authenticate double, token
-          end
-
-          it "calls the finder if token was returned" do
-            token = ->(_r) { "token" }
-            expect(AccessToken).to receive(:by_token).with("token")
-            Token.authenticate double, token
-          end
+    context "refresh tokens are enabled" do
+      before do
+        Doorkeeper.configure do
+          orm DOORKEEPER_ORM
+          use_refresh_token
         end
       end
+
+      it "revokes previous refresh_token if token was found" do
+        token = ->(_r) { "token" }
+        expect(
+          Doorkeeper::AccessToken,
+        ).to receive(:by_token).with("token").and_return(token)
+        expect(token).to receive(:revoke_previous_refresh_token!)
+        described_class.authenticate double, token
+      end
+
+      it "calls the finder if token was returned" do
+        token = ->(_r) { "token" }
+        expect(Doorkeeper::AccessToken).to receive(:by_token).with("token")
+        described_class.authenticate double, token
+      end
     end
   end
 end

data/spec/models/doorkeeper/access_grant_spec.rb

@@ -61,10 +61,27 @@ describe Doorkeeper::AccessGrant do
         it "upgrades a plain token when falling back to it" do
           # Side-effect: This will automatically upgrade the token
           expect(clazz).to receive(:upgrade_fallback_value).and_call_original
-          expect(clazz.by_token(plain_text_token)).to eq(grant)
+          expect(clazz.by_token(plain_text_token))
+            .to have_attributes(
+              resource_owner_id: grant.resource_owner_id,
+              application_id: grant.application_id,
+              redirect_uri: grant.redirect_uri,
+              expires_in: grant.expires_in,
+              scopes: grant.scopes,
+            )
 
           # Will find subsequently by hashing the token
-          expect(clazz.by_token(plain_text_token)).to eq(grant)
+          expect(clazz.by_token(plain_text_token))
+            .to have_attributes(
+              resource_owner_id: grant.resource_owner_id,
+              application_id: grant.application_id,
+              redirect_uri: grant.redirect_uri,
+              expires_in: grant.expires_in,
+              scopes: grant.scopes,
+            )
+
+          # Not all the ORM support :id PK
+          expect(clazz.by_token(plain_text_token).id).to eq(grant.id) if grant.respond_to?(:id)
 
           # And it modifies the token value
           grant.reload
@@ -122,7 +139,7 @@ describe Doorkeeper::AccessGrant do
     it "matches application" do
       access_grant_for_different_app = FactoryBot.create(
         :access_grant,
-        default_attributes.merge(application: FactoryBot.create(:application))
+        default_attributes.merge(application: FactoryBot.create(:application)),
       )
 
       described_class.revoke_all_for(application.id, resource_owner)
@@ -133,7 +150,7 @@ describe Doorkeeper::AccessGrant do
     it "matches resource owner" do
       access_grant_for_different_owner = FactoryBot.create(
         :access_grant,
-        default_attributes.merge(resource_owner_id: 90)
+        default_attributes.merge(resource_owner_id: 90),
       )
 
       described_class.revoke_all_for application.id, resource_owner

data/spec/models/doorkeeper/access_token_spec.rb

@@ -73,10 +73,25 @@ module Doorkeeper
             it "upgrades a plain token when falling back to it" do
               # Side-effect: This will automatically upgrade the token
               expect(clazz).to receive(:upgrade_fallback_value).and_call_original
-              expect(clazz.by_token(plain_text_token)).to eq(access_token)
+              expect(clazz.by_token(plain_text_token))
+                .to have_attributes(
+                  resource_owner_id: access_token.resource_owner_id,
+                  application_id: access_token.application_id,
+                  scopes: access_token.scopes,
+                )
 
               # Will find subsequently by hashing the token
-              expect(clazz.by_token(plain_text_token)).to eq(access_token)
+              expect(clazz.by_token(plain_text_token))
+                .to have_attributes(
+                  resource_owner_id: access_token.resource_owner_id,
+                  application_id: access_token.application_id,
+                  scopes: access_token.scopes,
+                )
+
+              # Not all the ORM support :id PK
+              if access_token.respond_to?(:id)
+                expect(clazz.by_token(plain_text_token).id).to eq(access_token.id)
+              end
 
               # And it modifies the token value
               access_token.reload
@@ -113,6 +128,7 @@ module Doorkeeper
         eigenclass.class_eval do
           remove_method :generate
         end
+
         module CustomGeneratorArgs
           def self.generate(opts = {})
             "custom_generator_token_#{opts[:application].name}"
@@ -196,7 +212,7 @@ module Doorkeeper
         end
 
         expect { FactoryBot.create :access_token }.to(
-          raise_error(Doorkeeper::Errors::UnableToGenerateToken)
+          raise_error(Doorkeeper::Errors::UnableToGenerateToken),
         )
       end
 
@@ -218,7 +234,7 @@ module Doorkeeper
         end
 
         expect { FactoryBot.create :access_token }.to(
-          raise_error(LoadError)
+          raise_error(LoadError),
         )
       end
 
@@ -229,7 +245,7 @@ module Doorkeeper
         end
 
         expect { FactoryBot.create :access_token }.to(
-          raise_error(Doorkeeper::Errors::TokenGeneratorNotFound, /NotReal/)
+          raise_error(Doorkeeper::Errors::TokenGeneratorNotFound, /NotReal/),
         )
       end
     end
@@ -307,10 +323,25 @@ module Doorkeeper
             it "upgrades a plain token when falling back to it" do
               # Side-effect: This will automatically upgrade the token
               expect(clazz).to receive(:upgrade_fallback_value).and_call_original
-              expect(clazz.by_refresh_token(plain_refresh_token)).to eq(access_token)
+              expect(clazz.by_refresh_token(plain_refresh_token))
+                .to have_attributes(
+                  token: access_token.token,
+                  resource_owner_id: access_token.resource_owner_id,
+                  application_id: access_token.application_id,
+                )
 
               # Will find subsequently by hashing the token
-              expect(clazz.by_refresh_token(plain_refresh_token)).to eq(access_token)
+              expect(clazz.by_refresh_token(plain_refresh_token))
+                .to have_attributes(
+                  token: access_token.token,
+                  resource_owner_id: access_token.resource_owner_id,
+                  application_id: access_token.application_id,
+                )
+
+              # Not all the ORM support :id PK
+              if access_token.respond_to?(:id)
+                expect(clazz.by_refresh_token(plain_refresh_token).id).to eq(access_token.id)
+              end
 
               # And it modifies the token value
               access_token.reload
@@ -437,7 +468,7 @@ module Doorkeeper
       it "matches application" do
         access_token_for_different_app = FactoryBot.create(
           :access_token,
-          default_attributes.merge(application: FactoryBot.create(:application))
+          default_attributes.merge(application: FactoryBot.create(:application)),
         )
 
         AccessToken.revoke_all_for application.id, resource_owner
@@ -448,7 +479,7 @@ module Doorkeeper
       it "matches resource owner" do
         access_token_for_different_owner = FactoryBot.create(
           :access_token,
-          default_attributes.merge(resource_owner_id: 90)
+          default_attributes.merge(resource_owner_id: 90),
         )
 
         AccessToken.revoke_all_for application.id, resource_owner
@@ -530,7 +561,7 @@ module Doorkeeper
 
       it "excludes tokens with scopes that are not present in server scopes" do
         FactoryBot.create :access_token, default_attributes.merge(
-          application: application, scopes: "public read"
+          application: application, scopes: "public read",
         )
         last_token = AccessToken.matching_token_for(application, resource_owner_id, scopes)
         expect(last_token).to be_nil
@@ -539,7 +570,7 @@ module Doorkeeper
       it "excludes tokens with scopes that are not present in application scopes" do
         application = FactoryBot.create :application, scopes: "private read"
         FactoryBot.create :access_token, default_attributes.merge(
-          application: application
+          application: application,
         )
         last_token = AccessToken.matching_token_for(application, resource_owner_id, scopes)
         expect(last_token).to be_nil