doorkeeper-mongodb 5.2.1 → 5.2.2

data/spec/support/helpers/url_helper.rb

@@ -23,7 +23,7 @@ module UrlHelper
       password: options[:resource_owner_password] || options[:resource_owner].try(:password),
       scope: options[:scope],
       grant_type: "password",
-    }
+    }.reject { |_, v| v.blank? }
     "/oauth/token?#{build_query(parameters)}"
   end
 
@@ -46,7 +46,7 @@ module UrlHelper
       client_id: options[:client_id] || options[:client].try(:uid),
       client_secret: options[:client_secret] || options[:client].try(:secret),
       grant_type: options[:grant_type] || "refresh_token",
-    }
+    }.reject { |_, v| v.blank? }
     "/oauth/token?#{build_query(parameters)}"
   end
 

data/spec/support/shared/controllers_shared_context.rb

@@ -11,7 +11,7 @@ shared_context "valid token", token: :valid do
     )
   end
 
-  before :each do
+  before do
     allow(
       Doorkeeper::AccessToken,
     ).to receive(:by_token).with(token_string).and_return(token)
@@ -30,46 +30,13 @@ shared_context "invalid token", token: :invalid do
     )
   end
 
-  before :each do
+  before do
     allow(
       Doorkeeper::AccessToken,
     ).to receive(:by_token).with(token_string).and_return(token)
   end
 end
 
-shared_context "authenticated resource owner" do
-  before do
-    user = double(:resource, id: 1)
-    allow(Doorkeeper.config).to receive(:authenticate_resource_owner) { proc { user } }
-  end
-end
-
-shared_context "not authenticated resource owner" do
-  before do
-    allow(Doorkeeper.config).to receive(:authenticate_resource_owner) { proc { redirect_to "/" } }
-  end
-end
-
-shared_context "valid authorization request" do
-  let :authorization do
-    double(:authorization, valid?: true, authorize: true, success_redirect_uri: "http://something.com/cb?code=token")
-  end
-
-  before do
-    allow(controller).to receive(:authorization) { authorization }
-  end
-end
-
-shared_context "invalid authorization request" do
-  let :authorization do
-    double(:authorization, valid?: false, authorize: false, redirect_on_error?: false)
-  end
-
-  before do
-    allow(controller).to receive(:authorization) { authorization }
-  end
-end
-
 shared_context "expired token", token: :expired do
   let :token_string do
     "1A2B3C4DEXP"
@@ -84,7 +51,7 @@ shared_context "expired token", token: :expired do
     )
   end
 
-  before :each do
+  before do
     allow(
       Doorkeeper::AccessToken,
     ).to receive(:by_token).with(token_string).and_return(token)
@@ -105,7 +72,7 @@ shared_context "revoked token", token: :revoked do
     )
   end
 
-  before :each do
+  before do
     allow(
       Doorkeeper::AccessToken,
     ).to receive(:by_token).with(token_string).and_return(token)
@@ -125,7 +92,7 @@ shared_context "forbidden token", token: :forbidden do
     )
   end
 
-  before :each do
+  before do
     allow(
       Doorkeeper::AccessToken,
     ).to receive(:by_token).with(token_string).and_return(token)

data/spec/support/shared/hashing_shared_context.rb

@@ -7,6 +7,7 @@ shared_context "with token hashing enabled" do
 
   before do
     Doorkeeper.configure do
+      orm DOORKEEPER_ORM
       hash_token_secrets
     end
   end
@@ -19,6 +20,7 @@ shared_context "with token hashing and fallback lookup enabled" do
 
   before do
     Doorkeeper.configure do
+      orm DOORKEEPER_ORM
       hash_token_secrets fallback: :plain
     end
   end
@@ -28,8 +30,10 @@ shared_context "with application hashing enabled" do
   let(:hashed_or_plain_token_func) do
     Doorkeeper::SecretStoring::Sha256Hash.method(:transform_secret)
   end
+
   before do
     Doorkeeper.configure do
+      orm DOORKEEPER_ORM
       hash_application_secrets
     end
   end

data/spec/support/shared/models_shared_examples.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
 shared_examples "an accessible token" do
-  describe :accessible? do
+  describe "#accessible?" do
     it "is accessible if token is not expired" do
       allow(subject).to receive(:expired?).and_return(false)
-      should be_accessible
+      expect(subject).to be_accessible
     end
 
     it "is not accessible if token is expired" do
       allow(subject).to receive(:expired?).and_return(true)
-      should_not be_accessible
+      expect(subject).not_to be_accessible
     end
   end
 end
 
 shared_examples "a revocable token" do
-  describe :accessible? do
+  describe "#accessible?" do
     before { subject.save! }
 
     it "is accessible if token is not revoked" do
@@ -30,11 +30,11 @@ shared_examples "a revocable token" do
 end
 
 shared_examples "a unique token" do
-  describe :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)
+      expect { subject.valid? }.to change(subject, :token).from(nil)
     end
 
     it "is not valid if token exists" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper-mongodb
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.2.2
 platform: ruby
 authors:
 - jasl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: doorkeeper
@@ -146,6 +146,7 @@ files:
 - lib/doorkeeper-mongodb/mixins/mongoid/access_token_mixin.rb
 - lib/doorkeeper-mongodb/mixins/mongoid/application_mixin.rb
 - lib/doorkeeper-mongodb/mixins/mongoid/base_mixin.rb
+- lib/doorkeeper-mongodb/mixins/mongoid/json_serializable.rb
 - lib/doorkeeper-mongodb/mixins/mongoid/stale_records_cleaner_mixin.rb
 - lib/doorkeeper-mongodb/shared/scopes.rb
 - lib/doorkeeper-mongodb/version.rb
@@ -177,6 +178,10 @@ files:
 - spec/controllers/protected_resources_controller_spec.rb
 - spec/controllers/token_info_controller_spec.rb
 - spec/controllers/tokens_controller_spec.rb
+- spec/doorkeeper/redirect_uri_validator_spec.rb
+- spec/doorkeeper/server_spec.rb
+- spec/doorkeeper/stale_records_cleaner_spec.rb
+- spec/doorkeeper/version_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js
 - spec/dummy/app/controllers/application_controller.rb
@@ -241,13 +246,13 @@ files:
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/Ma/MaK3K1AoZZ4xM5fOOifhROd73hfZJpP4yGbkGdoYtEk.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/PA/PAH_jI20wRw12tngeJ-V619c30avNLDu5U9Z-9Pc5SQ.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/Ph/Ph7RtH_NvG2I8XpTa8mA8SBQXZDzBPVIh4CH6g7OXJ0.cache
+- spec/dummy/tmp/cache/assets/sprockets/v4.0.0/Pm/PmheG0PGFqDws1qgFOxOyIL-gpMof3Ar9eSRKVLYuik.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/Pn/PnXU_mkG2fLZFm9BwiZ03BZdBTjKuInP-cRXjHS7yJo.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/Qs/QsVgO6vM5Yn9oeYTYlrqtyVnK6sdVDWDa083N7zpfHw.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/So/So59ksdx2dw-_A3-zFZ6Palr7fROjm7_0JDZb04temw.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/Wt/WtXL_iDofLeTH_v0Yf3PM421r9b1V0g-VBvMPeu9KA0.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/b6/b6QRH6ZdCc0e6bUWu4qni_kZmptaMgWciO8Jl9q6_p8.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/dX/dX6FDdUIy8yBCOoaoXcjf71rX9N_bpiXGJ4Urt32NTk.cache
-- spec/dummy/tmp/cache/assets/sprockets/v4.0.0/eS/eSL1QMz46gKLM0GR6S9fL6uyARPxOImcappZ9_ZtSyg.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/jC/jCTZ1jAldKBn4OTANBBmCKzxLrDgok1ur4meoTqlDNg.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/qT/qTQIQsmS0Wbbg2JxNn9rxdI5qVOTg5SfyQdaTvr9vLo.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/yN/yNOFGOsnHmxXNMkuEAWuL1u3jlmdvrdeoTx6DDJ1in8.cache
@@ -295,8 +300,6 @@ files:
 - spec/lib/secret_storing/bcrypt_spec.rb
 - spec/lib/secret_storing/plain_spec.rb
 - spec/lib/secret_storing/sha256_hash_spec.rb
-- spec/lib/server_spec.rb
-- spec/lib/stale_records_cleaner_spec.rb
 - spec/models/doorkeeper/access_grant_spec.rb
 - spec/models/doorkeeper/access_token_spec.rb
 - spec/models/doorkeeper/application_spec.rb
@@ -337,7 +340,6 @@ files:
 - spec/support/shared/controllers_shared_context.rb
 - spec/support/shared/hashing_shared_context.rb
 - spec/support/shared/models_shared_examples.rb
-- spec/version/version_spec.rb
 homepage: http://github.com/doorkeeper-gem/doorkeeper-mongodb
 licenses:
 - MIT
@@ -365,7 +367,6 @@ test_files:
 - spec/routing/default_routes_spec.rb
 - spec/routing/custom_controller_routes_spec.rb
 - spec/routing/scoped_routes_spec.rb
-- spec/lib/server_spec.rb
 - spec/lib/oauth/code_response_spec.rb
 - spec/lib/oauth/token_spec.rb
 - spec/lib/oauth/code_request_spec.rb
@@ -399,7 +400,6 @@ test_files:
 - spec/lib/secret_storing/plain_spec.rb
 - spec/lib/secret_storing/sha256_hash_spec.rb
 - spec/lib/config_spec.rb
-- spec/lib/stale_records_cleaner_spec.rb
 - spec/lib/models/secret_storable_spec.rb
 - spec/lib/models/revocable_spec.rb
 - spec/lib/models/expirable_spec.rb
@@ -408,7 +408,6 @@ test_files:
 - spec/lib/doorkeeper_spec.rb
 - spec/lib/option_spec.rb
 - spec/lib/request/strategy_spec.rb
-- spec/version/version_spec.rb
 - spec/spec_helper_integration.rb
 - spec/helpers/doorkeeper/dashboard_helper_spec.rb
 - spec/controllers/tokens_controller_spec.rb
@@ -440,6 +439,7 @@ test_files:
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/9x/9xjtGv-yKjj62x9uFwBZg8pTSh9ERPAgANwNo9uwIaA.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/-o/-ofn45zIfO5vx4VD6m6NXesLf6da5usA-Sbw2SVju3o.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/Bt/BtXO7f0PZ8DNt3TMLYM-zY7LkbWa_KgyB0v1V98M1CQ.cache
+- spec/dummy/tmp/cache/assets/sprockets/v4.0.0/Pm/PmheG0PGFqDws1qgFOxOyIL-gpMof3Ar9eSRKVLYuik.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/E0/E02f1Q2tutWumMulGCFNfqQNjvEP_hMAK_5E83eWepI.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/Lk/LklIq5hrBAPESXVUpFMwQ9L-1qTj90sPVi6U19_Xi-Q.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/MB/MBWRxa9S470ee8suxVKp0jYgv6K6FQOqKGV0kPGQNMs.cache
@@ -448,7 +448,6 @@ test_files:
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/7H/7HjRsym0tTpXFCVhWt6kteMs_-CozKVbr9s5syHm8es.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/FJ/FJlQpfMtpRbrM5P8A7d2FAelFKwo6GrVs2xks8z5GKU.cache
 - spec/dummy/tmp/cache/assets/sprockets/v4.0.0/qT/qTQIQsmS0Wbbg2JxNn9rxdI5qVOTg5SfyQdaTvr9vLo.cache
-- spec/dummy/tmp/cache/assets/sprockets/v4.0.0/eS/eSL1QMz46gKLM0GR6S9fL6uyARPxOImcappZ9_ZtSyg.cache
 - spec/dummy/log/test.log
 - spec/dummy/config/environment.rb
 - spec/dummy/config/mongoid4.yml
@@ -511,6 +510,10 @@ test_files:
 - spec/support/shared/models_shared_examples.rb
 - spec/support/shared/hashing_shared_context.rb
 - spec/support/shared/controllers_shared_context.rb
+- spec/doorkeeper/server_spec.rb
+- spec/doorkeeper/stale_records_cleaner_spec.rb
+- spec/doorkeeper/version_spec.rb
+- spec/doorkeeper/redirect_uri_validator_spec.rb
 - spec/factories.rb
 - spec/spec_helper.rb
 - spec/requests/flows/password_spec.rb