effective_resources 2.11.1 → 2.11.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/concerns/effective_devise_user.rb +17 -15
- data/lib/effective_resources/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d7420e7773e862ace77933d82892a2536a3502a8e9780670e7951368a043b63e
|
4
|
+
data.tar.gz: f27995719216c1a0d9eeb4d0cacdf5591726322301a87b3f19ee8f8d0e9df450
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: fae042cbd0de9cacc8cac925db8339254ab7cd144076acac9f3464b2fe09e5572c8c0cd691766810a013ba92834ceda19522f70fcf6928065c7f268943e0b592
|
7
|
+
data.tar.gz: 5d50084e5ecf6c49c6861027e0240f8be521c43ea16327cd5e69f8fa22f46326b5c0b1af7e30fb4c5bba30c011053bf89cd2b2104348ec682921f988b13513f8
|
@@ -197,31 +197,33 @@ module EffectiveDeviseUser
|
|
197
197
|
# https://github.com/heartcombo/devise/blob/f6e73e5b5c8f519f4be29ac9069c6ed8a2343ce4/lib/devise/models/database_authenticatable.rb#L216
|
198
198
|
def find_for_database_authentication(warden_conditions)
|
199
199
|
conditions = warden_conditions.dup.presence || {}
|
200
|
-
primary_or_alternate_email = conditions[:email]
|
201
|
-
conditions.delete(:email)
|
202
200
|
|
203
|
-
|
201
|
+
email = conditions.delete(:email).to_s.strip.downcase
|
202
|
+
raise "Expected an email condition but got #{conditions} instead" unless email.present?
|
204
203
|
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
all
|
212
|
-
.where(conditions)
|
213
|
-
.where(query, value: primary_or_alternate_email.strip.downcase)
|
214
|
-
.first
|
204
|
+
if has_alternate_email?
|
205
|
+
where(conditions).where('email = :email OR alternate_email = :email', email: email).first
|
206
|
+
else
|
207
|
+
where(conditions).where(email: email).first
|
208
|
+
end
|
215
209
|
end
|
216
210
|
|
217
211
|
def has_alternate_email?
|
218
|
-
'alternate_email'
|
212
|
+
column_names.include?('alternate_email')
|
219
213
|
end
|
220
214
|
|
215
|
+
def find_by_any_email(value)
|
216
|
+
email = value.to_s.strip.downcase
|
217
|
+
|
218
|
+
if has_alternate_email?
|
219
|
+
where(email: email).or(where(alternate_email: email)).first
|
220
|
+
else
|
221
|
+
where(email: email).first
|
222
|
+
end
|
223
|
+
end
|
221
224
|
end
|
222
225
|
|
223
226
|
# EffectiveDeviseUser Instance Methods
|
224
|
-
|
225
227
|
def alternate_email=(value)
|
226
228
|
super(value.to_s.strip.downcase.presence)
|
227
229
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: effective_resources
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.11.
|
4
|
+
version: 2.11.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Code and Effect
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-09-
|
11
|
+
date: 2023-09-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|