effective_resources 2.43.0 → 2.44.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9822c0ccd8c4f40015db2c2dc53d66dfa389598a2b3bd7107a83c512b2ac885b
4
- data.tar.gz: 9deec203839ffee37e989d6269845b1c97300d9157c26573b25692627de50db6
3
+ metadata.gz: 230f1319172f4e65e05a5dae2446bf8ede99272ba39e1195b67c77d27efc028a
4
+ data.tar.gz: 815fc04917f16a6f556b865d8e886c9a097cb272d3a320dfae652bca2b3d7793
5
5
  SHA512:
6
- metadata.gz: cd1ee67d96e1d6455cef7725a831cab2de85fff98dc6e7eb70ddb85f84a675f01347bf8ab87ed7eb8ba0681a7a56fe89072a7d80b56393f8de4402a981b13e59
7
- data.tar.gz: d23f1e7f12439df619f86fd15d721a18d2f58617efa33869e8ada60aafa98760ed27f5507307a127bf16c0c8591d7628ffb5b5389856f436aa3a6aa8e1915a58
6
+ metadata.gz: 16f0497fa19c57ff34abb0d52ed4eec9a924bd62c94494e54204be0d0344621d27ca9c1f8591675d72956e502217dd431a55941f3a741a1b0ae6180a625a904b
7
+ data.tar.gz: b89b4269ce2ee1924b03c8475c183f48a4fac146a0e768a8080a8a00c92f041ba1aaa93d664a240b3be67adf9446df12bf14c545d9dcfc21105d45f2cfc2ad62
@@ -181,7 +181,10 @@ module EffectiveDeviseUser
181
181
  user = to_adapter.find_first(conditions)
182
182
  return user if user.present? && user.persisted?
183
183
 
184
- to_adapter.find_first(alternate_email: conditions[:email]) if has_alternate_email?
184
+ email = conditions[:email]
185
+ return unless has_alternate_email? && email.present?
186
+
187
+ to_adapter.find_first(conditions.except(:email).merge(alternate_email: email))
185
188
  end
186
189
 
187
190
  # https://github.com/heartcombo/devise/blob/f6e73e5b5c8f519f4be29ac9069c6ed8a2343ce4/lib/devise/models/database_authenticatable.rb#L216
@@ -1,3 +1,3 @@
1
1
  module EffectiveResources
2
- VERSION = '2.43.0'.freeze
2
+ VERSION = '2.44.0'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_resources
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.43.0
4
+ version: 2.44.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect