doorkeeper 5.2.6 → 5.3.3

data/spec/controllers/authorizations_controller_spec.rb

@@ -27,8 +27,8 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
       end)
     end
 
-    allow(Doorkeeper.configuration).to receive(:grant_flows).and_return(["implicit"])
-    allow(Doorkeeper.configuration).to receive(:authenticate_resource_owner).and_return(->(_) { authenticator_method })
+    allow(Doorkeeper.config).to receive(:grant_flows).and_return(["implicit"])
+    allow(Doorkeeper.config).to receive(:authenticate_resource_owner).and_return(->(_) { authenticator_method })
     allow(controller).to receive(:authenticator_method).and_return(user)
     expect(controller).to receive(:authenticator_method).at_most(:once)
   end
@@ -69,7 +69,7 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
 
   describe "POST #create in API mode" do
     before do
-      allow(Doorkeeper.configuration).to receive(:api_only).and_return(true)
+      allow(Doorkeeper.config).to receive(:api_only).and_return(true)
       post :create, params: { client_id: client.uid, response_type: "token", redirect_uri: client.redirect_uri }
     end
 
@@ -127,7 +127,7 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
 
       it "includes error description" do
         expect(response_json_body["error_description"]).to eq(
-          translated_invalid_request_error_message(:missing_param, :client_id)
+          translated_invalid_request_error_message(:missing_param, :client_id),
         )
       end
 
@@ -177,7 +177,7 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
   describe "POST #create in API mode with errors" do
     context "when missing client_id" do
       before do
-        allow(Doorkeeper.configuration).to receive(:api_only).and_return(true)
+        allow(Doorkeeper.config).to receive(:api_only).and_return(true)
 
         post :create, params: {
           client_id: "",
@@ -198,7 +198,7 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
 
       it "includes error description" do
         expect(response_json_body["error_description"]).to eq(
-          translated_invalid_request_error_message(:missing_param, :client_id)
+          translated_invalid_request_error_message(:missing_param, :client_id),
         )
       end
 
@@ -209,7 +209,7 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
 
     context "when other error happens" do
       before do
-        allow(Doorkeeper.configuration).to receive(:api_only).and_return(true)
+        allow(Doorkeeper.config).to receive(:api_only).and_return(true)
         default_scopes_exist :public
 
         post :create, params: {
@@ -251,7 +251,7 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
 
   describe "POST #create with application already authorized" do
     before do
-      allow(Doorkeeper.configuration).to receive(:reuse_access_token).and_return(true)
+      allow(Doorkeeper.config).to receive(:reuse_access_token).and_return(true)
 
       access_token.save!
 
@@ -286,12 +286,12 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
       end
 
       it "should call :before_successful_authorization callback" do
-        expect(Doorkeeper.configuration)
+        expect(Doorkeeper.config)
           .to receive_message_chain(:before_successful_authorization, :call).with(instance_of(described_class))
       end
 
       it "should call :after_successful_authorization callback" do
-        expect(Doorkeeper.configuration)
+        expect(Doorkeeper.config)
           .to receive_message_chain(:after_successful_authorization, :call).with(instance_of(described_class))
       end
     end
@@ -302,18 +302,18 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
       end
 
       it "should not call :before_successful_authorization callback" do
-        expect(Doorkeeper.configuration).not_to receive(:before_successful_authorization)
+        expect(Doorkeeper.config).not_to receive(:before_successful_authorization)
       end
 
       it "should not call :after_successful_authorization callback" do
-        expect(Doorkeeper.configuration).not_to receive(:after_successful_authorization)
+        expect(Doorkeeper.config).not_to receive(:after_successful_authorization)
       end
     end
   end
 
   describe "GET #new token request with native url and skip_authorization true" do
     before do
-      allow(Doorkeeper.configuration).to receive(:skip_authorization).and_return(proc do
+      allow(Doorkeeper.config).to receive(:skip_authorization).and_return(proc do
         true
       end)
 
@@ -342,8 +342,8 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
 
   describe "GET #new code request with native url and skip_authorization true" do
     before do
-      allow(Doorkeeper.configuration).to receive(:grant_flows).and_return(%w[authorization_code])
-      allow(Doorkeeper.configuration).to receive(:skip_authorization).and_return(proc do
+      allow(Doorkeeper.config).to receive(:grant_flows).and_return(%w[authorization_code])
+      allow(Doorkeeper.config).to receive(:skip_authorization).and_return(proc do
         true
       end)
 
@@ -373,7 +373,7 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
 
   describe "GET #new with skip_authorization true" do
     before do
-      allow(Doorkeeper.configuration).to receive(:skip_authorization).and_return(proc do
+      allow(Doorkeeper.config).to receive(:skip_authorization).and_return(proc do
         true
       end)
 
@@ -412,7 +412,7 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
 
   describe "GET #new in API mode" do
     before do
-      allow(Doorkeeper.configuration).to receive(:api_only).and_return(true)
+      allow(Doorkeeper.config).to receive(:api_only).and_return(true)
 
       get :new, params: {
         client_id: client.uid,
@@ -468,7 +468,7 @@ describe Doorkeeper::AuthorizationsController, "implicit grant flow" do
       expect(redirect_uri.match(/token_type=(\w+)&?/)[1]).to eq "Bearer"
       expect(redirect_uri.match(/expires_in=(\d+)&?/)[1].to_i).to eq 1234
       expect(
-        redirect_uri.match(/access_token=([a-zA-Z0-9\-_]+)&?/)[1]
+        redirect_uri.match(/access_token=([a-zA-Z0-9\-_]+)&?/)[1],
       ).to eq Doorkeeper::AccessToken.first.token
     end
 

data/spec/controllers/protected_resources_controller_spec.rb

@@ -28,9 +28,11 @@ describe "doorkeeper authorize filter" do
 
     let(:token_string) { "1A2BC3" }
     let(:token) do
-      double(Doorkeeper::AccessToken,
-             acceptable?: true, previous_refresh_token: "",
-             revoke_previous_refresh_token!: true)
+      double(
+        Doorkeeper::AccessToken,
+        acceptable?: true, previous_refresh_token: "",
+        revoke_previous_refresh_token!: true,
+      )
     end
 
     it "access_token param" do
@@ -108,13 +110,15 @@ describe "doorkeeper authorize filter" do
     let(:token_string) { "1A2DUWE" }
 
     it "allows if the token has particular scopes" do
-      token = double(Doorkeeper::AccessToken,
-                     accessible?: true, scopes: %w[write public],
-                     previous_refresh_token: "",
-                     revoke_previous_refresh_token!: true)
+      token = double(
+        Doorkeeper::AccessToken,
+        accessible?: true, scopes: %w[write public],
+        previous_refresh_token: "",
+        revoke_previous_refresh_token!: true,
+      )
       expect(token).to receive(:acceptable?).with([:write]).and_return(true)
       expect(
-        Doorkeeper::AccessToken
+        Doorkeeper::AccessToken,
       ).to receive(:by_token).with(token_string).and_return(token)
 
       get :index, params: { access_token: token_string }
@@ -122,12 +126,14 @@ describe "doorkeeper authorize filter" do
     end
 
     it "does not allow if the token does not include given scope" do
-      token = double(Doorkeeper::AccessToken,
-                     accessible?: true, scopes: ["public"], revoked?: false,
-                     expired?: false, previous_refresh_token: "",
-                     revoke_previous_refresh_token!: true)
+      token = double(
+        Doorkeeper::AccessToken,
+        accessible?: true, scopes: ["public"], revoked?: false,
+        expired?: false, previous_refresh_token: "",
+        revoke_previous_refresh_token!: true,
+      )
       expect(
-        Doorkeeper::AccessToken
+        Doorkeeper::AccessToken,
       ).to receive(:by_token).with(token_string).and_return(token)
       expect(token).to receive(:acceptable?).with([:write]).and_return(false)
 
@@ -224,10 +230,12 @@ describe "doorkeeper authorize filter" do
     end
 
     let(:token) do
-      double(Doorkeeper::AccessToken,
-             accessible?: true, scopes: ["public"], revoked?: false,
-             expired?: false, previous_refresh_token: "",
-             revoke_previous_refresh_token!: true)
+      double(
+        Doorkeeper::AccessToken,
+        accessible?: true, scopes: ["public"], revoked?: false,
+        expired?: false, previous_refresh_token: "",
+        revoke_previous_refresh_token!: true,
+      )
     end
 
     let(:token_string) { "1A2DUWE" }

data/spec/controllers/token_info_controller_spec.rb

@@ -42,7 +42,7 @@ describe Doorkeeper::TokenInfoController do
         get :show
 
         expect(response.body).to eq(
-          Doorkeeper::OAuth::InvalidTokenResponse.new.body.to_json
+          Doorkeeper::OAuth::InvalidTokenResponse.new.body.to_json,
         )
       end
     end

data/spec/controllers/tokens_controller_spec.rb

@@ -142,7 +142,7 @@ describe Doorkeeper::TokensController do
       allow(I18n).to receive(:translate)
         .with(
           custom_message,
-          hash_including(scope: %i[doorkeeper errors messages])
+          hash_including(scope: %i[doorkeeper errors messages]),
         )
         .and_return("Authorization custom message")
 

data/spec/dummy/db/migrate/20151223192035_create_doorkeeper_tables.rb

@@ -25,14 +25,14 @@ class CreateDoorkeeperTables < ActiveRecord::Migration[4.2]
       t.text     :redirect_uri,      null: false
       t.datetime :created_at,        null: false
       t.datetime :revoked_at
-      t.string   :scopes,            null: false, default: ""
+      t.string   :scopes, null: false, default: ""
     end
 
     add_index :oauth_access_grants, :token, unique: true
     add_foreign_key(
       :oauth_access_grants,
       :oauth_applications,
-      column: :application_id
+      column: :application_id,
     )
 
     create_table :oauth_access_tokens do |t|
@@ -59,7 +59,7 @@ class CreateDoorkeeperTables < ActiveRecord::Migration[4.2]
     add_foreign_key(
       :oauth_access_tokens,
       :oauth_applications,
-      column: :application_id
+      column: :application_id,
     )
 
     # Uncomment below to ensure a valid reference to the resource owner's table

data/spec/dummy/db/migrate/20160320211015_add_previous_refresh_token_to_access_tokens.rb

@@ -7,7 +7,7 @@ class AddPreviousRefreshTokenToAccessTokens < ActiveRecord::Migration[4.2]
       :previous_refresh_token,
       :string,
       default: "",
-      null: false
+      null: false,
     )
   end
 end

data/spec/dummy/db/migrate/20180210183654_add_confidential_to_applications.rb

@@ -7,7 +7,7 @@ class AddConfidentialToApplications < ActiveRecord::Migration[5.1]
       :confidential,
       :boolean,
       null: false,
-      default: true # maintaining backwards compatibility: require secrets
+      default: true, # maintaining backwards compatibility: require secrets
     )
   end
 end

data/spec/generators/install_generator_spec.rb

@@ -16,7 +16,7 @@ describe "Doorkeeper::InstallGenerator" do
       FileUtils.mkdir(::File.expand_path("db", Pathname(destination_root)))
       FileUtils.copy_file(
         ::File.expand_path("../templates/routes.rb", __FILE__),
-        ::File.expand_path("config/routes.rb", Pathname.new(destination_root))
+        ::File.expand_path("config/routes.rb", Pathname.new(destination_root)),
       )
       run_generator
     end

data/spec/generators/previous_refresh_token_generator_spec.rb

@@ -14,7 +14,7 @@ describe "Doorkeeper::PreviousRefreshTokenGenerator" do
       prepare_destination
 
       allow_any_instance_of(Doorkeeper::PreviousRefreshTokenGenerator).to(
-        receive(:no_previous_refresh_token_column?).and_return(true)
+        receive(:no_previous_refresh_token_column?).and_return(true),
       )
     end
 
@@ -32,7 +32,7 @@ describe "Doorkeeper::PreviousRefreshTokenGenerator" do
     context "already exist" do
       it "does not create a migration" do
         allow_any_instance_of(Doorkeeper::PreviousRefreshTokenGenerator).to(
-          receive(:no_previous_refresh_token_column?).and_call_original
+          receive(:no_previous_refresh_token_column?).and_call_original,
         )
 
         run_generator

data/spec/helpers/doorkeeper/dashboard_helper_spec.rb

@@ -11,7 +11,7 @@ describe Doorkeeper::DashboardHelper do
       it "returns error messages" do
         messages.each do |message|
           expect(helper.doorkeeper_errors_for(object, :method)).to include(
-            message.capitalize
+            message.capitalize,
           )
         end
       end

data/spec/lib/config_spec.rb

@@ -22,7 +22,7 @@ describe Doorkeeper, "configuration" do
       end
 
       expect(Rails.logger).to receive(:warn).with(
-        I18n.t("doorkeeper.errors.messages.resource_owner_authenticator_not_configured")
+        I18n.t("doorkeeper.errors.messages.resource_owner_authenticator_not_configured"),
       )
       subject.authenticate_resource_owner.call(nil)
     end
@@ -45,7 +45,7 @@ describe Doorkeeper, "configuration" do
       end
 
       expect(Rails.logger).to receive(:warn).with(
-        I18n.t("doorkeeper.errors.messages.credential_flow_not_configured")
+        I18n.t("doorkeeper.errors.messages.credential_flow_not_configured"),
       )
       subject.resource_owner_from_credentials.call(nil)
     end
@@ -471,7 +471,7 @@ describe Doorkeeper, "configuration" do
   describe "access_token_generator" do
     it "is 'Doorkeeper::OAuth::Helpers::UniqueToken' by default" do
       expect(Doorkeeper.configuration.access_token_generator).to(
-        eq("Doorkeeper::OAuth::Helpers::UniqueToken")
+        eq("Doorkeeper::OAuth::Helpers::UniqueToken"),
       )
     end
 
@@ -549,6 +549,8 @@ describe Doorkeeper, "configuration" do
   end
 
   if DOORKEEPER_ORM == :active_record
+    class FakeCustomModel; end
+
     describe "active_record_options" do
       let(:models) { [Doorkeeper::AccessGrant, Doorkeeper::AccessToken, Doorkeeper::Application] }
 
@@ -566,11 +568,62 @@ describe Doorkeeper, "configuration" do
         Doorkeeper.configure do
           orm DOORKEEPER_ORM
           active_record_options(
-            establish_connection: Rails.configuration.database_configuration[Rails.env]
+            establish_connection: Rails.configuration.database_configuration[Rails.env],
           )
         end
       end
     end
+
+    describe "access_token_class" do
+      it "uses default doorkeeper value" do
+        expect(subject.access_token_class).to eq("Doorkeeper::AccessToken")
+        expect(subject.access_token_model).to be(Doorkeeper::AccessToken)
+      end
+
+      it "can change the value" do
+        Doorkeeper.configure do
+          orm DOORKEEPER_ORM
+          access_token_class "FakeCustomModel"
+        end
+
+        expect(subject.access_token_class).to eq("FakeCustomModel")
+        expect(subject.access_token_model).to be(FakeCustomModel)
+      end
+    end
+
+    describe "access_grant_class" do
+      it "uses default doorkeeper value" do
+        expect(subject.access_grant_class).to eq("Doorkeeper::AccessGrant")
+        expect(subject.access_grant_model).to be(Doorkeeper::AccessGrant)
+      end
+
+      it "can change the value" do
+        Doorkeeper.configure do
+          orm DOORKEEPER_ORM
+          access_grant_class "FakeCustomModel"
+        end
+
+        expect(subject.access_grant_class).to eq("FakeCustomModel")
+        expect(subject.access_grant_model).to be(FakeCustomModel)
+      end
+    end
+
+    describe "application_class" do
+      it "uses default doorkeeper value" do
+        expect(subject.application_class).to eq("Doorkeeper::Application")
+        expect(subject.application_model).to be(Doorkeeper::Application)
+      end
+
+      it "can change the value" do
+        Doorkeeper.configure do
+          orm DOORKEEPER_ORM
+          application_class "FakeCustomModel"
+        end
+
+        expect(subject.application_class).to eq("FakeCustomModel")
+        expect(subject.application_model).to be(FakeCustomModel)
+      end
+    end
   end
 
   describe "api_only" do
@@ -666,8 +719,10 @@ describe Doorkeeper, "configuration" do
           Doorkeeper.configure do
             hash_token_secrets using: "Doorkeeper::SecretStoring::BCrypt"
           end
-        end.to raise_error(ArgumentError,
-                           /can only be used for storing application secrets/)
+        end.to raise_error(
+          ArgumentError,
+          /can only be used for storing application secrets/,
+        )
       end
     end
 
@@ -744,7 +799,7 @@ describe Doorkeeper, "configuration" do
   describe "options deprecation" do
     it "prints a warning message when an option is deprecated" do
       expect(Kernel).to receive(:warn).with(
-        "[DOORKEEPER] native_redirect_uri has been deprecated and will soon be removed"
+        "[DOORKEEPER] native_redirect_uri has been deprecated and will soon be removed",
       )
       Doorkeeper.configure do
         native_redirect_uri "urn:ietf:wg:oauth:2.0:oob"

data/spec/lib/doorkeeper_spec.rb

@@ -7,7 +7,7 @@ describe Doorkeeper do
     let(:request) { double }
 
     it "calls OAuth::Token#authenticate" do
-      token_strategies = Doorkeeper.configuration.access_token_methods
+      token_strategies = Doorkeeper.config.access_token_methods
 
       expect(Doorkeeper::OAuth::Token).to receive(:authenticate)
         .with(request, *token_strategies)

data/spec/lib/models/revocable_spec.rb

@@ -40,15 +40,15 @@ describe "Revocable" do
       `previous_refresh_token` attribute" do
       previous_token = FactoryBot.create(
         :access_token,
-        refresh_token: "refresh_token"
+        refresh_token: "refresh_token",
       )
       current_token = FactoryBot.create(
         :access_token,
-        previous_refresh_token: previous_token.refresh_token
+        previous_refresh_token: previous_token.refresh_token,
       )
 
       expect_any_instance_of(
-        Doorkeeper::AccessToken
+        Doorkeeper::AccessToken,
       ).to receive(:revoke).and_call_original
       current_token.revoke_previous_refresh_token!