doorkeeper 5.3.3 → 5.4.0.rc1

data/spec/support/helpers/access_token_request_helper.rb

@@ -5,6 +5,7 @@ module AccessTokenRequestHelper
     attributes = {
       application: client,
       resource_owner_id: resource_owner.id,
+      resource_owner_type: resource_owner.class.name,
     }.merge(access_token_attributes)
     FactoryBot.create(:access_token, attributes)
   end

data/spec/support/helpers/authorization_request_helper.rb

@@ -3,19 +3,19 @@
 module AuthorizationRequestHelper
   def resource_owner_is_authenticated(resource_owner = nil)
     resource_owner ||= User.create!(name: "Joe", password: "sekret")
-    Doorkeeper.configuration.instance_variable_set(:@authenticate_resource_owner, proc { resource_owner })
+    Doorkeeper.config.instance_variable_set(:@authenticate_resource_owner, proc { resource_owner })
   end
 
   def resource_owner_is_not_authenticated
-    Doorkeeper.configuration.instance_variable_set(:@authenticate_resource_owner, proc { redirect_to("/sign_in") })
+    Doorkeeper.config.instance_variable_set(:@authenticate_resource_owner, proc { redirect_to("/sign_in") })
   end
 
   def default_scopes_exist(*scopes)
-    Doorkeeper.configuration.instance_variable_set(:@default_scopes, Doorkeeper::OAuth::Scopes.from_array(scopes))
+    Doorkeeper.config.instance_variable_set(:@default_scopes, Doorkeeper::OAuth::Scopes.from_array(scopes))
   end
 
   def optional_scopes_exist(*scopes)
-    Doorkeeper.configuration.instance_variable_set(:@optional_scopes, Doorkeeper::OAuth::Scopes.from_array(scopes))
+    Doorkeeper.config.instance_variable_set(:@optional_scopes, Doorkeeper::OAuth::Scopes.from_array(scopes))
   end
 
   def client_should_be_authorized(client)

data/spec/support/helpers/config_helper.rb

@@ -4,7 +4,7 @@ module ConfigHelper
   def config_is_set(setting, value = nil, &block)
     setting_ivar = "@#{setting}"
     value = block_given? ? block : value
-    Doorkeeper.configuration.instance_variable_set(setting_ivar, value)
+    Doorkeeper.config.instance_variable_set(setting_ivar, value)
   end
 end
 

data/spec/support/shared/controllers_shared_context.rb

@@ -40,13 +40,13 @@ end
 shared_context "authenticated resource owner" do
   before do
     user = double(:resource, id: 1)
-    allow(Doorkeeper.configuration).to receive(:authenticate_resource_owner) { proc { user } }
+    allow(Doorkeeper.config).to receive(:authenticate_resource_owner) { proc { user } }
   end
 end
 
 shared_context "not authenticated resource owner" do
   before do
-    allow(Doorkeeper.configuration).to receive(:authenticate_resource_owner) { proc { redirect_to "/" } }
+    allow(Doorkeeper.config).to receive(:authenticate_resource_owner) { proc { redirect_to "/" } }
   end
 end
 

data/spec/support/shared/models_shared_examples.rb

@@ -31,20 +31,22 @@ end
 
 shared_examples "a unique token" do
   describe :token do
+    let(:owner) { FactoryBot.create(:resource_owner) }
+
     it "is generated before validation" do
       expect { subject.valid? }.to change { subject.token }.from(nil)
     end
 
     it "is not valid if token exists" do
-      token1 = FactoryBot.create factory_name
-      token2 = FactoryBot.create factory_name
+      token1 = FactoryBot.create factory_name, resource_owner_id: owner.id, resource_owner_type: owner.class.name
+      token2 = FactoryBot.create factory_name, resource_owner_id: owner.id, resource_owner_type: owner.class.name
       token2.token = token1.token
       expect(token2).not_to be_valid
     end
 
     it "expects database to throw an error when tokens are the same" do
-      token1 = FactoryBot.create factory_name
-      token2 = FactoryBot.create factory_name
+      token1 = FactoryBot.create factory_name, resource_owner_id: owner.id, resource_owner_type: owner.class.name
+      token2 = FactoryBot.create factory_name, resource_owner_id: owner.id, resource_owner_type: owner.class.name
       token2.token = token1.token
       expect do
         token2.save!(validate: false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 5.3.3
+  version: 5.4.0.rc1
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -221,6 +221,7 @@ files:
 - gemfiles/rails_master.gemfile
 - lib/doorkeeper.rb
 - lib/doorkeeper/config.rb
+- lib/doorkeeper/config/abstract_builder.rb
 - lib/doorkeeper/config/option.rb
 - lib/doorkeeper/engine.rb
 - lib/doorkeeper/errors.rb
@@ -234,6 +235,7 @@ files:
 - lib/doorkeeper/models/concerns/expirable.rb
 - lib/doorkeeper/models/concerns/orderable.rb
 - lib/doorkeeper/models/concerns/ownership.rb
+- lib/doorkeeper/models/concerns/resource_ownerable.rb
 - lib/doorkeeper/models/concerns/reusable.rb
 - lib/doorkeeper/models/concerns/revocable.rb
 - lib/doorkeeper/models/concerns/scopes.rb
@@ -260,6 +262,7 @@ files:
 - lib/doorkeeper/oauth/helpers/scope_checker.rb
 - lib/doorkeeper/oauth/helpers/unique_token.rb
 - lib/doorkeeper/oauth/helpers/uri_checker.rb
+- lib/doorkeeper/oauth/hooks/context.rb
 - lib/doorkeeper/oauth/invalid_request_response.rb
 - lib/doorkeeper/oauth/invalid_token_response.rb
 - lib/doorkeeper/oauth/nonstandard.rb
@@ -282,8 +285,10 @@ files:
 - lib/doorkeeper/orm/active_record/stale_records_cleaner.rb
 - lib/doorkeeper/rails/helpers.rb
 - lib/doorkeeper/rails/routes.rb
+- lib/doorkeeper/rails/routes/abstract_router.rb
 - lib/doorkeeper/rails/routes/mapper.rb
 - lib/doorkeeper/rails/routes/mapping.rb
+- lib/doorkeeper/rails/routes/registry.rb
 - lib/doorkeeper/rake.rb
 - lib/doorkeeper/rake/db.rake
 - lib/doorkeeper/rake/setup.rake
@@ -305,6 +310,7 @@ files:
 - lib/doorkeeper/version.rb
 - lib/generators/doorkeeper/application_owner_generator.rb
 - lib/generators/doorkeeper/confidential_applications_generator.rb
+- lib/generators/doorkeeper/enable_polymorphic_resource_owner_generator.rb
 - lib/generators/doorkeeper/install_generator.rb
 - lib/generators/doorkeeper/migration_generator.rb
 - lib/generators/doorkeeper/pkce_generator.rb
@@ -314,6 +320,7 @@ files:
 - lib/generators/doorkeeper/templates/add_owner_to_application_migration.rb.erb
 - lib/generators/doorkeeper/templates/add_previous_refresh_token_to_access_tokens.rb.erb
 - lib/generators/doorkeeper/templates/enable_pkce_migration.rb.erb
+- lib/generators/doorkeeper/templates/enable_polymorphic_resource_owner_migration.rb.erb
 - lib/generators/doorkeeper/templates/initializer.rb
 - lib/generators/doorkeeper/templates/migration.rb.erb
 - lib/generators/doorkeeper/views_generator.rb
@@ -366,6 +373,7 @@ files:
 - spec/factories.rb
 - spec/generators/application_owner_generator_spec.rb
 - spec/generators/confidential_applications_generator_spec.rb
+- spec/generators/enable_polymorphic_resource_owner_generator_spec.rb
 - spec/generators/install_generator_spec.rb
 - spec/generators/migration_generator_spec.rb
 - spec/generators/pkce_generator_spec.rb
@@ -409,6 +417,7 @@ files:
 - spec/lib/oauth/token_request_spec.rb
 - spec/lib/oauth/token_response_spec.rb
 - spec/lib/oauth/token_spec.rb
+- spec/lib/option_spec.rb
 - spec/lib/request/strategy_spec.rb
 - spec/lib/secret_storing/base_spec.rb
 - spec/lib/secret_storing/bcrypt_spec.rb
@@ -474,11 +483,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: OAuth 2 provider for Rails and Grape
@@ -532,6 +541,7 @@ test_files:
 - spec/factories.rb
 - spec/generators/application_owner_generator_spec.rb
 - spec/generators/confidential_applications_generator_spec.rb
+- spec/generators/enable_polymorphic_resource_owner_generator_spec.rb
 - spec/generators/install_generator_spec.rb
 - spec/generators/migration_generator_spec.rb
 - spec/generators/pkce_generator_spec.rb
@@ -575,6 +585,7 @@ test_files:
 - spec/lib/oauth/token_request_spec.rb
 - spec/lib/oauth/token_response_spec.rb
 - spec/lib/oauth/token_spec.rb
+- spec/lib/option_spec.rb
 - spec/lib/request/strategy_spec.rb
 - spec/lib/secret_storing/base_spec.rb
 - spec/lib/secret_storing/bcrypt_spec.rb