effective_resources 2.42.0 → 2.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c322710a6dffa4c2e384fd31e06b0226826e3bc364277abdaac8a71e6d9adfc6
-  data.tar.gz: cbf12a724542c9148a8ce95a0dadf5f9e86748af998faded9f912839dba43a5f
+  metadata.gz: 230f1319172f4e65e05a5dae2446bf8ede99272ba39e1195b67c77d27efc028a
+  data.tar.gz: 815fc04917f16a6f556b865d8e886c9a097cb272d3a320dfae652bca2b3d7793
 SHA512:
-  metadata.gz: 7f601bd8c2e4efb5d74e92f701a3b5288b83ed5e38924cb8ef548c868f9c1ec19edec48adea1c8ce78cf6b9e9551a0eab958bf804f0781477e2fd1b887e3c128
-  data.tar.gz: 5e84dc97c1ced2733f1981e5a8a23c9e142d217d1b604d08ff3624483e6df8368c302d2f17a43e67af178a59f1241476c3ce8f4fbad1b3ec890246aa07c119cb
+  metadata.gz: 16f0497fa19c57ff34abb0d52ed4eec9a924bd62c94494e54204be0d0344621d27ca9c1f8591675d72956e502217dd431a55941f3a741a1b0ae6180a625a904b
+  data.tar.gz: b89b4269ce2ee1924b03c8475c183f48a4fac146a0e768a8080a8a00c92f041ba1aaa93d664a240b3be67adf9446df12bf14c545d9dcfc21105d45f2cfc2ad62

data/app/helpers/effective_resources_wizard_helper.rb

@@ -38,7 +38,7 @@ module EffectiveResourcesWizardHelper
     if (current || disabled)
       content_tag(:a, label, class: klass)
     else
-      link_to(label, path || wizard_path(nav_step), class: klass, 'data-turbolinks': false)
+      link_to(label, path || wizard_path(nav_step), class: klass, 'data-turbolinks': false, 'data-turbo': false)
     end
   end
 

data/app/models/concerns/effective_devise_user.rb

@@ -55,10 +55,6 @@ module EffectiveDeviseUser
       errors.add(:alternate_email, 'cannot be the same as email') if email.strip.downcase == alternate_email.strip.downcase
     end
 
-    validate(if: -> { first_name.present? && last_name.present? }) do
-      errors.add(:last_name, "can't match first name") if first_name == last_name
-    end
-
     # Uniqueness validation of emails and alternate emails across all users
     validate(if: -> { respond_to?(:alternate_email) }) do
       records = self.class.where.not(id: id)
@@ -185,7 +181,10 @@ module EffectiveDeviseUser
       user = to_adapter.find_first(conditions)
       return user if user.present? && user.persisted?
 
-      to_adapter.find_first(alternate_email: conditions[:email]) if has_alternate_email?
+      email = conditions[:email]
+      return unless has_alternate_email? && email.present?
+
+      to_adapter.find_first(conditions.except(:email).merge(alternate_email: email))
     end
 
     # https://github.com/heartcombo/devise/blob/f6e73e5b5c8f519f4be29ac9069c6ed8a2343ce4/lib/devise/models/database_authenticatable.rb#L216

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.42.0'.freeze
+  VERSION = '2.44.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.42.0
+  version: 2.44.0
 platform: ruby
 authors:
 - Code and Effect