doorkeeper 5.1.0 → 5.3.0

data/spec/models/doorkeeper/application_spec.rb

@@ -13,6 +13,78 @@ module Doorkeeper
     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 "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 uid" do
+      new_application.save
+      new_application.uid = nil
+      expect(new_application).not_to be_valid
+    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 "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 "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 "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 "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 invalid without secret" do
+      new_application.save
+      new_application.secret = nil
+      expect(new_application).not_to be_valid
+    end
+
     context "application_owner is enabled" do
       before do
         Doorkeeper.configure do
@@ -48,40 +120,6 @@ module Doorkeeper
       end
     end
 
-    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 "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 uid" do
-      new_application.save
-      new_application.uid = nil
-      expect(new_application).not_to be_valid
-    end
-
     context "redirect URI" do
       context "when grant flows allow blank redirect URI" do
         before do
@@ -127,44 +165,6 @@ module Doorkeeper
       end
     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 "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 "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 "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 "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 invalid without secret" do
-      new_application.save
-      new_application.secret = nil
-      expect(new_application).not_to be_valid
-    end
-
     context "with hashing enabled" do
       include_context "with application hashing enabled"
       let(:app) { FactoryBot.create :application }
@@ -238,7 +238,7 @@ module Doorkeeper
       end
     end
 
-    describe :ordered_by do
+    describe "#ordered_by" do
       let(:applications) { FactoryBot.create_list(:application, 5) }
 
       context "when a direction is not specified" do
@@ -271,7 +271,17 @@ module Doorkeeper
       end
     end
 
-    describe :authorized_for do
+    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)
+      end
+    end
+
+    describe "#authorized_for" do
       let(:resource_owner) { double(:resource_owner, id: 10) }
 
       it "is empty if the application is not authorized for anyone" do
@@ -303,7 +313,7 @@ module Doorkeeper
       end
     end
 
-    describe :revoke_tokens_and_grants_for do
+    describe "#revoke_tokens_and_grants_for" do
       it "revokes all access tokens and access grants" do
         application_id = 42
         resource_owner = double
@@ -316,7 +326,7 @@ module Doorkeeper
       end
     end
 
-    describe :by_uid_and_secret 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
@@ -350,7 +360,7 @@ module Doorkeeper
       end
     end
 
-    describe :confidential? do
+    describe "#confidential?" do
       subject { FactoryBot.create(:application, confidential: confidential).confidential? }
 
       context "when application is private/confidential" do
@@ -363,5 +373,32 @@ module Doorkeeper
         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
+
+      it "includes plaintext secret" do
+        expect(app.as_json).to include("secret" => "123123123")
+      end
+
+      it "respects custom options" do
+        expect(app.as_json(except: :secret)).not_to include("secret")
+        expect(app.as_json(only: :id)).to match("id" => app.id)
+      end
+
+      # 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
+    end
   end
 end

data/spec/requests/applications/applications_request_spec.rb

@@ -91,7 +91,7 @@ feature "Adding applications" do
       i_should_see "Whoops! Check your form for possible errors"
       i_should_see Regexp.new(
         I18n.t("activerecord.errors.models.doorkeeper/application.attributes.scopes.not_match_configured"),
-        true
+        true,
       )
     end
 

data/spec/requests/endpoints/authorization_spec.rb

@@ -4,6 +4,7 @@ require "spec_helper"
 
 feature "Authorization endpoint" do
   background do
+    default_scopes_exist :default
     config_is_set(:authenticate_resource_owner) { User.first || redirect_to("/sign_in") }
     client_exists(name: "MyApp")
   end
@@ -34,16 +35,31 @@ feature "Authorization endpoint" do
     end
   end
 
-  context "with a invalid request" do
+  context "with a invalid request's param" do
     background do
       create_resource_owner
       sign_in
     end
 
-    scenario "displays the related error" do
-      visit authorization_endpoint_url(client: @client, response_type: "")
-      i_should_not_see "Authorize"
-      i_should_see_translated_error_message :unsupported_response_type
+    context "when missing required param" do
+      scenario "displays invalid_request error when missing client" do
+        visit authorization_endpoint_url(client: nil, response_type: "code")
+        i_should_not_see "Authorize"
+        i_should_see_translated_invalid_request_error_message :missing_param, :client_id
+      end
+
+      scenario "displays invalid_request error when missing response_type param" do
+        visit authorization_endpoint_url(client: @client, response_type: "")
+        i_should_not_see "Authorize"
+        i_should_see_translated_invalid_request_error_message :missing_param, :response_type
+      end
+
+      scenario "displays invalid_request error when missing scope param and authorization server has no default scopes" do
+        config_is_set(:default_scopes, [])
+        visit authorization_endpoint_url(client: @client, response_type: "code", scope: "")
+        i_should_not_see "Authorize"
+        i_should_see_translated_invalid_request_error_message :missing_param, :scope
+      end
     end
 
     scenario "displays unsupported_response_type error when using a disabled response type" do
@@ -63,9 +79,11 @@ feature "Authorization endpoint" do
     scenario "raises exception on forged requests" do
       allowing_forgery_protection do
         expect do
-          page.driver.post authorization_endpoint_url(client_id: @client.uid,
-                                                      redirect_uri: @client.redirect_uri,
-                                                      response_type: "code")
+          page.driver.post authorization_endpoint_url(
+            client_id: @client.uid,
+            redirect_uri: @client.redirect_uri,
+            response_type: "code",
+          )
         end.to raise_error(ActionController::InvalidAuthenticityToken)
       end
     end

data/spec/requests/endpoints/token_spec.rb

@@ -70,6 +70,6 @@ describe "Token endpoint" do
 
     should_not_have_json "access_token"
     should_have_json "error", "invalid_request"
-    should_have_json "error_description", translated_error_message("invalid_request")
+    should_have_json "error_description", translated_invalid_request_error_message(:missing_param, :grant_type)
   end
 end

data/spec/requests/flows/authorization_code_errors_spec.rb

@@ -5,6 +5,7 @@ require "spec_helper"
 feature "Authorization Code Flow Errors" do
   let(:client_params) { {} }
   background do
+    default_scopes_exist :default
     config_is_set(:authenticate_resource_owner) { User.first || redirect_to("/sign_in") }
     client_exists client_params
     create_resource_owner