doorkeeper 5.2.6 → 5.3.0

data/spec/models/doorkeeper/access_grant_spec.rb

@@ -81,9 +81,7 @@ describe Doorkeeper::AccessGrant do
             )
 
           # Not all the ORM support :id PK
-          if grant.respond_to?(:id)
-            expect(clazz.by_token(plain_text_token).id).to eq(grant.id)
-          end
+          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
@@ -141,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)
@@ -152,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

@@ -212,7 +212,7 @@ module Doorkeeper
         end
 
         expect { FactoryBot.create :access_token }.to(
-          raise_error(Doorkeeper::Errors::UnableToGenerateToken)
+          raise_error(Doorkeeper::Errors::UnableToGenerateToken),
         )
       end
 
@@ -234,7 +234,7 @@ module Doorkeeper
         end
 
         expect { FactoryBot.create :access_token }.to(
-          raise_error(LoadError)
+          raise_error(LoadError),
         )
       end
 
@@ -245,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
@@ -468,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
@@ -479,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
@@ -561,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
@@ -570,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

data/spec/models/doorkeeper/application_spec.rb

@@ -3,480 +3,402 @@
 require "spec_helper"
 require "bcrypt"
 
-describe Doorkeeper::Application do
-  let(:require_owner) { Doorkeeper.configuration.instance_variable_set("@confirm_application_owner", true) }
-  let(:unset_require_owner) { Doorkeeper.configuration.instance_variable_set("@confirm_application_owner", false) }
-  let(:new_application) { FactoryBot.build(:application) }
+module Doorkeeper
+  describe Application do
+    let(:clazz) { Doorkeeper::Application }
+    let(:require_owner) { Doorkeeper.configuration.instance_variable_set("@confirm_application_owner", true) }
+    let(:unset_require_owner) { Doorkeeper.configuration.instance_variable_set("@confirm_application_owner", false) }
+    let(:new_application) { FactoryBot.build(:application) }
 
-  let(:uid) { SecureRandom.hex(8) }
-  let(:secret) { SecureRandom.hex(8) }
+    let(:uid) { SecureRandom.hex(8) }
+    let(:secret) { SecureRandom.hex(8) }
 
-  it "is invalid without a name" do
-    new_application.name = nil
-    expect(new_application).not_to be_valid
-  end
-
-  it "is invalid without determining confidentiality" do
-    new_application.confidential = nil
-    expect(new_application).not_to be_valid
-  end
-
-  it "generates uid on create" do
-    expect(new_application.uid).to be_nil
-    new_application.save
-    expect(new_application.uid).not_to be_nil
-  end
-
-  it "generates uid on create if an empty string" do
-    new_application.uid = ""
-    new_application.save
-    expect(new_application.uid).not_to be_blank
-  end
+    it "is invalid without a name" do
+      new_application.name = nil
+      expect(new_application).not_to be_valid
+    end
 
-  it "generates uid on create unless one is set" do
-    new_application.uid = uid
-    new_application.save
-    expect(new_application.uid).to eq(uid)
-  end
+    it "is invalid without determining confidentiality" do
+      new_application.confidential = nil
+      expect(new_application).not_to be_valid
+    end
 
-  it "is invalid without uid" do
-    new_application.save
-    new_application.uid = nil
-    expect(new_application).not_to be_valid
-  end
+    it "generates uid on create" do
+      expect(new_application.uid).to be_nil
+      new_application.save
+      expect(new_application.uid).not_to be_nil
+    end
 
-  it "checks uniqueness of uid" do
-    app1 = FactoryBot.create(:application)
-    app2 = FactoryBot.create(:application)
-    app2.uid = app1.uid
-    expect(app2).not_to be_valid
-  end
+    it "generates uid on create if an empty string" do
+      new_application.uid = ""
+      new_application.save
+      expect(new_application.uid).not_to be_blank
+    end
 
-  it "expects database to throw an error when uids are the same" do
-    app1 = FactoryBot.create(:application)
-    app2 = FactoryBot.create(:application)
-    app2.uid = app1.uid
-    expect { app2.save!(validate: false) }.to raise_error(uniqueness_error)
-  end
+    it "generates uid on create unless one is set" do
+      new_application.uid = uid
+      new_application.save
+      expect(new_application.uid).to eq(uid)
+    end
 
-  it "generate secret on create" do
-    expect(new_application.secret).to be_nil
-    new_application.save
-    expect(new_application.secret).not_to be_nil
-  end
+    it "is invalid without uid" do
+      new_application.save
+      new_application.uid = nil
+      expect(new_application).not_to be_valid
+    end
 
-  it "generate secret on create if is blank string" do
-    new_application.secret = ""
-    new_application.save
-    expect(new_application.secret).not_to be_blank
-  end
+    it "checks uniqueness of uid" do
+      app1 = FactoryBot.create(:application)
+      app2 = FactoryBot.create(:application)
+      app2.uid = app1.uid
+      expect(app2).not_to be_valid
+    end
 
-  it "generate secret on create unless one is set" do
-    new_application.secret = secret
-    new_application.save
-    expect(new_application.secret).to eq(secret)
-  end
+    it "expects database to throw an error when uids are the same" do
+      app1 = FactoryBot.create(:application)
+      app2 = FactoryBot.create(:application)
+      app2.uid = app1.uid
+      expect { app2.save!(validate: false) }.to raise_error(uniqueness_error)
+    end
 
-  it "is invalid without secret" do
-    new_application.save
-    new_application.secret = nil
-    expect(new_application).not_to be_valid
-  end
+    it "generate secret on create" do
+      expect(new_application.secret).to be_nil
+      new_application.save
+      expect(new_application.secret).not_to be_nil
+    end
 
-  context "application_owner is enabled" do
-    before do
-      Doorkeeper.configure do
-        orm DOORKEEPER_ORM
-        enable_application_owner
-      end
+    it "generate secret on create if is blank string" do
+      new_application.secret = ""
+      new_application.save
+      expect(new_application.secret).not_to be_blank
     end
 
-    context "application owner is not required" do
-      before(:each) do
-        unset_require_owner
-      end
+    it "generate secret on create unless one is set" do
+      new_application.secret = secret
+      new_application.save
+      expect(new_application.secret).to eq(secret)
+    end
 
-      it "is valid given valid attributes" do
-        expect(new_application).to be_valid
-      end
+    it "is invalid without secret" do
+      new_application.save
+      new_application.secret = nil
+      expect(new_application).not_to be_valid
     end
 
-    context "application owner is required" do
+    context "application_owner is enabled" do
       before do
-        require_owner
-        @owner = FactoryBot.build_stubbed(:doorkeeper_testing_user)
+        Doorkeeper.configure do
+          orm DOORKEEPER_ORM
+          enable_application_owner
+        end
       end
 
-      it "is invalid without an owner" do
-        expect(new_application).not_to be_valid
-      end
+      context "application owner is not required" do
+        before(:each) do
+          unset_require_owner
+        end
 
-      it "is valid with an owner" do
-        new_application.owner = @owner
-        expect(new_application).to be_valid
+        it "is valid given valid attributes" do
+          expect(new_application).to be_valid
+        end
       end
-    end
-  end
 
-  context "redirect URI" do
-    context "when grant flows allow blank redirect URI" do
-      before do
-        Doorkeeper.configure do
-          grant_flows %w[password client_credentials]
+      context "application owner is required" do
+        before(:each) do
+          require_owner
+          @owner = FactoryBot.build_stubbed(:doorkeeper_testing_user)
         end
-      end
 
-      it "is valid without redirect_uri" do
-        new_application.save
-        new_application.redirect_uri = nil
-        expect(new_application).to be_valid
+        it "is invalid without an owner" do
+          expect(new_application).not_to be_valid
+        end
+
+        it "is valid with an owner" do
+          new_application.owner = @owner
+          expect(new_application).to be_valid
+        end
       end
     end
 
-    context "when grant flows require redirect URI" do
-      before do
-        Doorkeeper.configure do
-          grant_flows %w[password client_credentials authorization_code]
+    context "redirect URI" do
+      context "when grant flows allow blank redirect URI" do
+        before do
+          Doorkeeper.configure do
+            grant_flows %w[password client_credentials]
+          end
         end
-      end
 
-      it "is invalid without redirect_uri" do
-        new_application.save
-        new_application.redirect_uri = nil
-        expect(new_application).not_to be_valid
+        it "is valid without redirect_uri" do
+          new_application.save
+          new_application.redirect_uri = nil
+          expect(new_application).to be_valid
+        end
       end
-    end
 
-    context "when blank URI option disabled" do
-      before do
-        Doorkeeper.configure do
-          grant_flows %w[password client_credentials]
-          allow_blank_redirect_uri false
+      context "when grant flows require redirect URI" do
+        before do
+          Doorkeeper.configure do
+            grant_flows %w[password client_credentials authorization_code]
+          end
+        end
+
+        it "is invalid without redirect_uri" do
+          new_application.save
+          new_application.redirect_uri = nil
+          expect(new_application).not_to be_valid
         end
       end
 
-      it "is invalid without redirect_uri" do
-        new_application.save
-        new_application.redirect_uri = nil
-        expect(new_application).not_to be_valid
+      context "when blank URI option disabled" do
+        before do
+          Doorkeeper.configure do
+            grant_flows %w[password client_credentials]
+            allow_blank_redirect_uri false
+          end
+        end
+
+        it "is invalid without redirect_uri" do
+          new_application.save
+          new_application.redirect_uri = nil
+          expect(new_application).not_to be_valid
+        end
       end
     end
-  end
 
-  context "with hashing enabled" do
-    include_context "with application hashing enabled"
-    let(:app) { FactoryBot.create :application }
-    let(:default_strategy) { Doorkeeper::SecretStoring::Sha256Hash }
+    context "with hashing enabled" do
+      include_context "with application hashing enabled"
+      let(:app) { FactoryBot.create :application }
+      let(:default_strategy) { Doorkeeper::SecretStoring::Sha256Hash }
 
-    it "uses SHA256 to avoid additional dependencies" do
-      # Ensure token was generated
-      app.validate
-      expect(app.secret).to eq(default_strategy.transform_secret(app.plaintext_secret))
-    end
+      it "uses SHA256 to avoid additional dependencies" do
+        # Ensure token was generated
+        app.validate
+        expect(app.secret).to eq(default_strategy.transform_secret(app.plaintext_secret))
+      end
 
-    context "when bcrypt strategy is configured" do
-      # In this text context, we have bcrypt loaded so `bcrypt_present?`
-      # will always be true
-      before do
-        Doorkeeper.configure do
-          hash_application_secrets using: "Doorkeeper::SecretStoring::BCrypt"
+      context "when bcrypt strategy is configured" do
+        # In this text context, we have bcrypt loaded so `bcrypt_present?`
+        # will always be true
+        before do
+          Doorkeeper.configure do
+            hash_application_secrets using: "Doorkeeper::SecretStoring::BCrypt"
+          end
         end
-      end
 
-      it "holds a volatile plaintext and BCrypt secret" do
-        expect(app.secret_strategy).to eq Doorkeeper::SecretStoring::BCrypt
-        expect(app.plaintext_secret).to be_a(String)
-        expect(app.secret).not_to eq(app.plaintext_secret)
-        expect { ::BCrypt::Password.create(app.secret) }.not_to raise_error
+        it "holds a volatile plaintext and BCrypt secret" do
+          expect(app.secret_strategy).to eq Doorkeeper::SecretStoring::BCrypt
+          expect(app.plaintext_secret).to be_a(String)
+          expect(app.secret).not_to eq(app.plaintext_secret)
+          expect { ::BCrypt::Password.create(app.secret) }.not_to raise_error
+        end
       end
-    end
 
-    it "does not fallback to plain lookup by default" do
-      lookup = described_class.by_uid_and_secret(app.uid, app.secret)
-      expect(lookup).to eq(nil)
+      it "does not fallback to plain lookup by default" do
+        lookup = clazz.by_uid_and_secret(app.uid, app.secret)
+        expect(lookup).to eq(nil)
 
-      lookup = described_class.by_uid_and_secret(app.uid, app.plaintext_secret)
-      expect(lookup).to eq(app)
-    end
+        lookup = clazz.by_uid_and_secret(app.uid, app.plaintext_secret)
+        expect(lookup).to eq(app)
+      end
 
-    context "with fallback enabled" do
-      include_context "with token hashing and fallback lookup enabled"
+      context "with fallback enabled" do
+        include_context "with token hashing and fallback lookup enabled"
 
-      it "provides plain and hashed lookup" do
-        lookup = described_class.by_uid_and_secret(app.uid, app.secret)
-        expect(lookup).to eq(app)
+        it "provides plain and hashed lookup" do
+          lookup = clazz.by_uid_and_secret(app.uid, app.secret)
+          expect(lookup).to eq(app)
 
-        lookup = described_class.by_uid_and_secret(app.uid, app.plaintext_secret)
-        expect(lookup).to eq(app)
+          lookup = clazz.by_uid_and_secret(app.uid, app.plaintext_secret)
+          expect(lookup).to eq(app)
+        end
       end
-    end
 
-    it "does not provide access to secret after loading" do
-      lookup = described_class.by_uid_and_secret(app.uid, app.plaintext_secret)
-      expect(lookup.plaintext_secret).to be_nil
-    end
-  end
-
-  describe "destroy related models on cascade" do
-    before(:each) do
-      new_application.save
+      it "does not provide access to secret after loading" do
+        lookup = clazz.by_uid_and_secret(app.uid, app.plaintext_secret)
+        expect(lookup.plaintext_secret).to be_nil
+      end
     end
 
-    let(:resource_owner) { FactoryBot.create(:doorkeeper_testing_user) }
-
-    it "should destroy its access grants" do
-      FactoryBot.create(
-        :access_grant,
-        application: new_application,
-        resource_owner_id: resource_owner.id,
-      )
+    describe "destroy related models on cascade" do
+      before(:each) do
+        new_application.save
+      end
 
-      expect { new_application.destroy }.to change { Doorkeeper::AccessGrant.count }.by(-1)
-    end
+      it "should destroy its access grants" do
+        FactoryBot.create(:access_grant, application: new_application)
+        expect { new_application.destroy }.to change { Doorkeeper::AccessGrant.count }.by(-1)
+      end
 
-    it "should destroy its access tokens" do
-      FactoryBot.create(:access_token, application: new_application)
-      FactoryBot.create(:access_token, application: new_application, revoked_at: Time.now.utc)
-      expect do
-        new_application.destroy
-      end.to change { Doorkeeper::AccessToken.count }.by(-2)
+      it "should destroy its access tokens" do
+        FactoryBot.create(:access_token, application: new_application)
+        FactoryBot.create(:access_token, application: new_application, revoked_at: Time.now.utc)
+        expect do
+          new_application.destroy
+        end.to change { Doorkeeper::AccessToken.count }.by(-2)
+      end
     end
-  end
 
-  describe "#ordered_by" do
-    let(:applications) { FactoryBot.create_list(:application, 5) }
+    describe "#ordered_by" do
+      let(:applications) { FactoryBot.create_list(:application, 5) }
 
-    context "when a direction is not specified" do
-      it "calls order with a default order of asc" do
-        names = applications.map(&:name).sort
-        expect(described_class.ordered_by(:name).map(&:name)).to eq(names)
+      context "when a direction is not specified" do
+        it "calls order with a default order of asc" do
+          names = applications.map(&:name).sort
+          expect(Application.ordered_by(:name).map(&:name)).to eq(names)
+        end
       end
-    end
 
-    context "when a direction is specified" do
-      it "calls order with specified direction" do
-        names = applications.map(&:name).sort.reverse
-        expect(described_class.ordered_by(:name, :desc).map(&:name)).to eq(names)
+      context "when a direction is specified" do
+        it "calls order with specified direction" do
+          names = applications.map(&:name).sort.reverse
+          expect(Application.ordered_by(:name, :desc).map(&:name)).to eq(names)
+        end
       end
     end
-  end
 
-  describe "#redirect_uri=" do
-    context "when array of valid redirect_uris" do
-      it "should join by newline" do
-        new_application.redirect_uri = ["http://localhost/callback1", "http://localhost/callback2"]
-        expect(new_application.redirect_uri).to eq("http://localhost/callback1\nhttp://localhost/callback2")
+    describe "#redirect_uri=" do
+      context "when array of valid redirect_uris" do
+        it "should join by newline" do
+          new_application.redirect_uri = ["http://localhost/callback1", "http://localhost/callback2"]
+          expect(new_application.redirect_uri).to eq("http://localhost/callback1\nhttp://localhost/callback2")
+        end
       end
-    end
-    context "when string of valid redirect_uris" do
-      it "should store as-is" do
-        new_application.redirect_uri = "http://localhost/callback1\nhttp://localhost/callback2"
-        expect(new_application.redirect_uri).to eq("http://localhost/callback1\nhttp://localhost/callback2")
+      context "when string of valid redirect_uris" do
+        it "should store as-is" do
+          new_application.redirect_uri = "http://localhost/callback1\nhttp://localhost/callback2"
+          expect(new_application.redirect_uri).to eq("http://localhost/callback1\nhttp://localhost/callback2")
+        end
       end
     end
-  end
 
-  describe "#renew_secret" do
-    let(:app) { FactoryBot.create :application }
+    describe "#renew_secret" do
+      let(:app) { FactoryBot.create :application }
 
-    it "should generate a new secret" do
-      old_secret = app.secret
-      app.renew_secret
-      expect(old_secret).not_to eq(app.secret)
+      it "should generate a new secret" do
+        old_secret = app.secret
+        app.renew_secret
+        expect(old_secret).not_to eq(app.secret)
+      end
     end
-  end
 
-  describe "#authorized_for" do
-    let(:resource_owner) { FactoryBot.create(:doorkeeper_testing_user) }
-    let(:other_resource_owner) { FactoryBot.create(:doorkeeper_testing_user) }
+    describe "#authorized_for" do
+      let(:resource_owner) { double(:resource_owner, id: 10) }
 
-    it "is empty if the application is not authorized for anyone" do
-      expect(described_class.authorized_for(resource_owner)).to be_empty
-    end
+      it "is empty if the application is not authorized for anyone" do
+        expect(Application.authorized_for(resource_owner)).to be_empty
+      end
 
-    it "returns only application for a specific resource owner" do
-      FactoryBot.create(
-        :access_token,
-        resource_owner_id: other_resource_owner.id,
-      )
-      token = FactoryBot.create(
-        :access_token,
-        resource_owner_id: resource_owner.id,
-      )
-      expect(described_class.authorized_for(resource_owner)).to eq([token.application])
-    end
+      it "returns only application for a specific resource owner" do
+        FactoryBot.create(:access_token, resource_owner_id: resource_owner.id + 1)
+        token = FactoryBot.create(:access_token, resource_owner_id: resource_owner.id)
+        expect(Application.authorized_for(resource_owner)).to eq([token.application])
+      end
 
-    it "excludes revoked tokens" do
-      FactoryBot.create(
-        :access_token,
-        resource_owner_id: resource_owner.id,
-        revoked_at: 2.days.ago,
-      )
-      expect(described_class.authorized_for(resource_owner)).to be_empty
-    end
+      it "excludes revoked tokens" do
+        FactoryBot.create(:access_token, resource_owner_id: resource_owner.id, revoked_at: 2.days.ago)
+        expect(Application.authorized_for(resource_owner)).to be_empty
+      end
 
-    it "returns all applications that have been authorized" do
-      token1 = FactoryBot.create(
-        :access_token,
-        resource_owner_id: resource_owner.id,
-      )
-      token2 = FactoryBot.create(
-        :access_token,
-        resource_owner_id: resource_owner.id,
-      )
-      expect(described_class.authorized_for(resource_owner))
-        .to eq([token1.application, token2.application])
-    end
+      it "returns all applications that have been authorized" do
+        token1 = FactoryBot.create(:access_token, resource_owner_id: resource_owner.id)
+        token2 = FactoryBot.create(:access_token, resource_owner_id: resource_owner.id)
+        expect(Application.authorized_for(resource_owner)).to eq([token1.application, token2.application])
+      end
 
-    it "returns only one application even if it has been authorized twice" do
-      application = FactoryBot.create(:application)
-      FactoryBot.create(
-        :access_token,
-        resource_owner_id: resource_owner.id,
-        application: application,
-      )
-      FactoryBot.create(
-        :access_token,
-        resource_owner_id: resource_owner.id,
-        application: application,
-      )
-      expect(described_class.authorized_for(resource_owner)).to eq([application])
+      it "returns only one application even if it has been authorized twice" do
+        application = FactoryBot.create(:application)
+        FactoryBot.create(:access_token, resource_owner_id: resource_owner.id, application: application)
+        FactoryBot.create(:access_token, resource_owner_id: resource_owner.id, application: application)
+        expect(Application.authorized_for(resource_owner)).to eq([application])
+      end
     end
-  end
 
-  describe "#revoke_tokens_and_grants_for" do
-    it "revokes all access tokens and access grants" do
-      application_id = 42
-      resource_owner = double
-      expect(Doorkeeper::AccessToken)
-        .to receive(:revoke_all_for).with(application_id, resource_owner)
-      expect(Doorkeeper::AccessGrant)
-        .to receive(:revoke_all_for).with(application_id, resource_owner)
+    describe "#revoke_tokens_and_grants_for" do
+      it "revokes all access tokens and access grants" do
+        application_id = 42
+        resource_owner = double
+        expect(Doorkeeper::AccessToken)
+          .to receive(:revoke_all_for).with(application_id, resource_owner)
+        expect(Doorkeeper::AccessGrant)
+          .to receive(:revoke_all_for).with(application_id, resource_owner)
 
-      described_class.revoke_tokens_and_grants_for(application_id, resource_owner)
+        Application.revoke_tokens_and_grants_for(application_id, resource_owner)
+      end
     end
-  end
 
-  describe "#by_uid_and_secret" do
-    context "when application is private/confidential" do
-      it "finds the application via uid/secret" do
-        app = FactoryBot.create :application
-        authenticated = described_class.by_uid_and_secret(app.uid, app.secret)
-        expect(authenticated).to eq(app)
-      end
-      context "when secret is wrong" do
-        it "should not find the application" do
+    describe "#by_uid_and_secret" do
+      context "when application is private/confidential" do
+        it "finds the application via uid/secret" do
           app = FactoryBot.create :application
-          authenticated = described_class.by_uid_and_secret(app.uid, "bad")
-          expect(authenticated).to eq(nil)
+          authenticated = Application.by_uid_and_secret(app.uid, app.secret)
+          expect(authenticated).to eq(app)
+        end
+        context "when secret is wrong" do
+          it "should not find the application" do
+            app = FactoryBot.create :application
+            authenticated = Application.by_uid_and_secret(app.uid, "bad")
+            expect(authenticated).to eq(nil)
+          end
         end
       end
-    end
 
-    context "when application is public/non-confidential" do
-      context "when secret is blank" do
-        it "should find the application" do
-          app = FactoryBot.create :application, confidential: false
-          authenticated = described_class.by_uid_and_secret(app.uid, nil)
-          expect(authenticated).to eq(app)
+      context "when application is public/non-confidential" do
+        context "when secret is blank" do
+          it "should find the application" do
+            app = FactoryBot.create :application, confidential: false
+            authenticated = Application.by_uid_and_secret(app.uid, nil)
+            expect(authenticated).to eq(app)
+          end
         end
-      end
-      context "when secret is wrong" do
-        it "should not find the application" do
-          app = FactoryBot.create :application, confidential: false
-          authenticated = described_class.by_uid_and_secret(app.uid, "bad")
-          expect(authenticated).to eq(nil)
+        context "when secret is wrong" do
+          it "should not find the application" do
+            app = FactoryBot.create :application, confidential: false
+            authenticated = Application.by_uid_and_secret(app.uid, "bad")
+            expect(authenticated).to eq(nil)
+          end
         end
       end
     end
-  end
-
-  describe "#confidential?" do
-    subject { FactoryBot.create(:application, confidential: confidential).confidential? }
 
-    context "when application is private/confidential" do
-      let(:confidential) { true }
-      it { expect(subject).to eq(true) }
-    end
+    describe "#confidential?" do
+      subject { FactoryBot.create(:application, confidential: confidential).confidential? }
 
-    context "when application is public/non-confidential" do
-      let(:confidential) { false }
-      it { expect(subject).to eq(false) }
-    end
-  end
-
-  describe "#as_json" do
-    let(:app) { FactoryBot.create :application, secret: "123123123" }
-
-    before do
-      allow(Doorkeeper.configuration)
-        .to receive(:application_secret_strategy).and_return(Doorkeeper::SecretStoring::Plain)
-    end
+      context "when application is private/confidential" do
+        let(:confidential) { true }
+        it { expect(subject).to eq(true) }
+      end
 
-    # AR specific feature
-    if DOORKEEPER_ORM == :active_record
-      it "correctly works with #to_json" do
-        ActiveRecord::Base.include_root_in_json = true
-        expect(app.to_json(include_root_in_json: true)).to match(/application.+?:\{/)
-        ActiveRecord::Base.include_root_in_json = false
+      context "when application is public/non-confidential" do
+        let(:confidential) { false }
+        it { expect(subject).to eq(false) }
       end
     end
 
-    context "when called without authorized resource owner" do
-      it "includes minimal set of attributes" do
-        expect(app.as_json).to match(
-          "id" => app.id,
-          "name" => app.name,
-          "created_at" => an_instance_of(String),
-        )
-      end
+    describe "#as_json" do
+      let(:app) { FactoryBot.create :application, secret: "123123123" }
 
-      it "includes application UID if it's public" do
-        app = FactoryBot.create :application, secret: "123123123", confidential: false
+      before do
+        allow(Doorkeeper.configuration)
+          .to receive(:application_secret_strategy).and_return(Doorkeeper::SecretStoring::Plain)
+      end
 
-        expect(app.as_json).to match(
-          "id" => app.id,
-          "name" => app.name,
-          "created_at" => an_instance_of(String),
-          "uid" => app.uid,
-        )
+      it "includes plaintext secret" do
+        expect(app.as_json).to include("secret" => "123123123")
       end
 
       it "respects custom options" do
-        expect(app.as_json(except: :id)).not_to include("id")
-        expect(app.as_json(only: %i[name created_at secret]))
-          .to match(
-            "name" => app.name,
-            "created_at" => an_instance_of(String),
-          )
+        expect(app.as_json(except: :secret)).not_to include("secret")
+        expect(app.as_json(only: :id)).to match("id" => app.id)
       end
-    end
 
-    context "when called with authorized resource owner" do
-      let(:owner) { FactoryBot.create(:doorkeeper_testing_user) }
-      let(:other_owner) { FactoryBot.create(:doorkeeper_testing_user) }
-      let(:app) { FactoryBot.create(:application, secret: "123123123", owner: owner) }
-
-      before do
-        Doorkeeper.configure do
-          orm DOORKEEPER_ORM
-          enable_application_owner confirmation: false
+      # AR specific
+      if DOORKEEPER_ORM == :active_record
+        it "correctly works with #to_json" do
+          ActiveRecord::Base.include_root_in_json = true
+          expect(app.to_json(include_root_in_json: true)).to match(/application.+?:\{/)
+          ActiveRecord::Base.include_root_in_json = false
         end
       end
-
-      it "includes all the attributes" do
-        expect(app.as_json(current_resource_owner: owner))
-          .to include(
-            "secret" => "123123123",
-            "redirect_uri" => app.redirect_uri,
-            "uid" => app.uid,
-          )
-      end
-
-      it "doesn't include unsafe attributes if current owner isn't the same as owner" do
-        expect(app.as_json(current_resource_owner: other_owner))
-          .not_to include("redirect_uri")
-      end
     end
   end
 end