From 3cdccaaace17bc8e24d977f02556f9c98dddc0f0 Mon Sep 17 00:00:00 2001 From: Dijkztra Date: Fri, 29 Nov 2019 18:35:00 +0700 Subject: [PATCH 1/2] User exists? instead of find_first --- lib/devise/models/rememberable.rb | 2 +- lib/devise/token_generator.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/devise/models/rememberable.rb b/lib/devise/models/rememberable.rb index 5a175013c1..04515df8a9 100644 --- a/lib/devise/models/rememberable.rb +++ b/lib/devise/models/rememberable.rb @@ -147,7 +147,7 @@ def serialize_from_cookie(*args) def remember_token #:nodoc: loop do token = Devise.friendly_token - break token unless to_adapter.find_first({ remember_token: token }) + break token unless to_adapter.exists?({ remember_token: token }) end end diff --git a/lib/devise/token_generator.rb b/lib/devise/token_generator.rb index 9eb74a046a..a9167dfbfd 100644 --- a/lib/devise/token_generator.rb +++ b/lib/devise/token_generator.rb @@ -19,7 +19,7 @@ def generate(klass, column) loop do raw = Devise.friendly_token enc = OpenSSL::HMAC.hexdigest(@digest, key, raw) - break [raw, enc] unless klass.to_adapter.find_first({ column => enc }) + break [raw, enc] unless klass.to_adapter.exists?({ column => enc }) end end From 61a26157429b04661e0573caf4824c1f2727cd16 Mon Sep 17 00:00:00 2001 From: Dijkztra Date: Fri, 29 Nov 2019 19:09:39 +0700 Subject: [PATCH 2/2] remove orm_adapter --- lib/devise/models/rememberable.rb | 2 +- lib/devise/token_generator.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/devise/models/rememberable.rb b/lib/devise/models/rememberable.rb index 04515df8a9..b90ba263a9 100644 --- a/lib/devise/models/rememberable.rb +++ b/lib/devise/models/rememberable.rb @@ -147,7 +147,7 @@ def serialize_from_cookie(*args) def remember_token #:nodoc: loop do token = Devise.friendly_token - break token unless to_adapter.exists?({ remember_token: token }) + break token unless exists?({ remember_token: token }) end end diff --git a/lib/devise/token_generator.rb b/lib/devise/token_generator.rb index a9167dfbfd..3bf1a0cdd8 100644 --- a/lib/devise/token_generator.rb +++ b/lib/devise/token_generator.rb @@ -19,7 +19,7 @@ def generate(klass, column) loop do raw = Devise.friendly_token enc = OpenSSL::HMAC.hexdigest(@digest, key, raw) - break [raw, enc] unless klass.to_adapter.exists?({ column => enc }) + break [raw, enc] unless klass.exists?({ column => enc }) end end