doorkeeper 5.3.0 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13bf83a25959d2152f6508e2e3c07f393d2b13f78c9d1eacb0aa58aead6872bc
-  data.tar.gz: eb0ee49811f240ab19902d32a66d580fb8ea0d111cae312dbb207817d443034d
+  metadata.gz: bb82e22e68fdc6c80e3cb7b65d8a280e9893222a6bf3390f216f7bb534195682
+  data.tar.gz: 9299736f29bce52700adeb7dde05d9669294ce03457c683c0a80d6f98ac73346
 SHA512:
-  metadata.gz: 8618a5f367b118059aef8bb970237ce83ed8fd056419523e15d71a59bdadc0bba1630774b116ca50f0f3bcf5300015bfcc3d7ecc6400207750fa823a50f459a2
-  data.tar.gz: f377fe495a2414754dcfa7090743d16c7a908e32c316b122f7bb7d993eb81780910bd5d2661f63b94acdeed867bf1effdae3f636a859fa4e24d29e948aeccdb1
+  metadata.gz: 7e951c0a2ebaa747f03afb968fc8750c166beb8cb73600fcf1ce47546e25528daf815d424b85c8ac723f9ba83b100bbf9f55acf9e3240f21db43bd463ae0838f
+  data.tar.gz: f4e0bc0bf47e60407aae249b6d2eb7b485fe324e688caa43bb5db473c7b1393f973e00707edab007ddf5aee75007e1e6fcf4d2de8aa049ec16fa69cbbd082c7b

data/CHANGELOG.md

@@ -5,9 +5,9 @@ upgrade guides.
 
 User-visible changes worth mentioning.
 
-## master
+## 5.3.1
 
-- [#PR ID] Your PR short description here.
+- [#1360] Backport: Increase `matching_token_for` batch lookup size to 10 000 and make it configurable.
 
 ## 5.3.0
 
@@ -23,6 +23,10 @@ User-visible changes worth mentioning.
   If you were relying on access tokens being revoked once the same client
   requested a new access token, reenable it with `revoke_previous_client_credentials_token` in Doorkeeper
   initialization file.
+  
+## 5.2.4
+  
+- [#1360] Backport: Increase `matching_token_for` batch lookup size to 10 000 and make it configurable.
 
 ## 5.2.3
 

data/lib/doorkeeper/config.rb

@@ -268,6 +268,7 @@ module Doorkeeper
     option :active_record_options,          default: {}
     option :grant_flows,                    default: %w[authorization_code client_credentials]
     option :handle_auth_errors,             default: :render
+    option :token_lookup_batch_size,        default: 10_000
 
     # Allows to customize OAuth grant flows that +each+ application support.
     # You can configure a custom block (or use a class respond to `#call`) that must

data/lib/doorkeeper/models/access_token_mixin.rb

@@ -126,8 +126,9 @@ module Doorkeeper
         return nil unless relation
 
         matching_tokens = []
+        batch_size = Doorkeeper.configuration.token_lookup_batch_size
 
-        find_access_token_in_batches(relation) do |batch|
+        find_access_token_in_batches(relation, batch_size: batch_size) do |batch|
           tokens = batch.select do |token|
             scopes_match?(token.scopes, scopes, application.try(:scopes))
           end

data/lib/doorkeeper/version.rb

@@ -9,7 +9,7 @@ module Doorkeeper
     # Semantic versioning
     MAJOR = 5
     MINOR = 3
-    TINY = 0
+    TINY = 1
     PRE = nil
 
     # Full version number

data/lib/generators/doorkeeper/templates/initializer.rb

@@ -117,6 +117,14 @@ Doorkeeper.configure do
   #
   # reuse_access_token
 
+  # In case you enabled `reuse_access_token` option Doorkeeper will try to find matching
+  # token using `matching_token_for` Access Token API that searches for valid records
+  # in batches in order not to pollute the memory with all the database records. By default
+  # Doorkeeper uses batch size of 10 000 records. You can increase or decrease this value
+  # depending on your needs and server capabilities.
+  #
+  # token_lookup_batch_size 10_000
+
   # Set a limit for token_reuse if using reuse_access_token option
   #
   # This option limits token_reusability to some extent.

data/spec/lib/config_spec.rb

@@ -641,6 +641,21 @@ describe Doorkeeper, "configuration" do
     end
   end
 
+  describe "token_lookup_batch_size" do
+    it "uses default doorkeeper value" do
+      expect(subject.token_lookup_batch_size).to eq(10_000)
+    end
+
+    it "can change the value" do
+      Doorkeeper.configure do
+        orm DOORKEEPER_ORM
+        token_lookup_batch_size 100_000
+      end
+
+      expect(subject.token_lookup_batch_size).to eq(100_000)
+    end
+  end
+
   describe "strict_content_type" do
     it "is false by default" do
       expect(subject.enforce_content_type).to eq(false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.3.1
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties