effective_resources 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f405113f520922715e551829d9059c36e923291a35a7ae254898dcbc609d96a
-  data.tar.gz: 67e9d68e3b45d9173e14d51da7a6f8d8c6c1fdf35b8e74bc204f1a8261b47f6c
+  metadata.gz: 8000b25d219e4ce996d1c768682448fc912180f9d0b4808584182e94698255be
+  data.tar.gz: d1f99291b1a0072284c0432335541987b6e670b7e491d0e405befbcd42000282
 SHA512:
-  metadata.gz: 6ba2e27b1ef6e7ff8bdf4e154ef08b4b70687d8c5cae8e7907e4456c698769816bd70e4e2c9dd956f9197abccd225ca76b646bac0932ff72b70a8a1a32d754be
-  data.tar.gz: 697c1a6e458c761faeca1d96c527aba93d3814edd17169478828d6a9a56065ed917e98ed85e5419e15fd554eafadd8944efa48ca67d453f12ac6fce846f9c41c
+  metadata.gz: 2e36bf1f67caf8510e570573621320ba328a311eebc60b8f764a0f811b5b49aedc713f615cb25ef5510786563e9b849a15efd1f4eef6dc86872bc4c26908af85
+  data.tar.gz: b6c593560fb53b762eee968c3d53dda47a208493155ef781089cddecc25771dbd18e748ca3336afdf29f187b2801c00ac07a2452457512c4c5788cba7777fb12

data/app/controllers/concerns/effective/wizard_controller.rb

@@ -46,8 +46,10 @@ module Effective
       helper EffectiveResourcesWizardHelper
 
       rescue_from Wicked::Wizard::InvalidStepError do |exception|
-        flash[:danger] = "Unknown step. You have been moved to the #{resource_wizard_steps.first} step."
-        redirect_to wizard_path(resource_wizard_steps.first)
+        step = resource.required_steps.first || resource_wizard_steps.first
+
+        flash[:danger] = "Unknown step. You have been moved to the #{step} step."
+        redirect_to wizard_path(step)
       end
 
       # effective_resources on save callback

data/app/models/concerns/acts_as_wizard.rb

@@ -172,7 +172,8 @@ module ActsAsWizard
       existing = current_step
 
       begin
-        self.current_step = nil; yield
+        self.current_step = nil
+        yield
       ensure
         self.current_step = existing
       end
@@ -191,7 +192,4 @@ module ActsAsWizard
     end
 
   end
-
-
-
 end

data/app/models/concerns/effective_devise_user.rb

@@ -46,7 +46,7 @@ module EffectiveDeviseUser
     end
 
     # Devise invitable ignores model validations, so we manually check for duplicate email addresses.
-    before_save(if: -> { new_record? && invitation_sent_at.present? }) do
+    before_save(if: -> { new_record? && try(:invitation_sent_at).present? }) do
       if email.blank?
         self.errors.add(:email, "can't be blank")
         raise("email can't be blank")
@@ -62,6 +62,28 @@ module EffectiveDeviseUser
     before_save(if: -> { persisted? && encrypted_password_changed? }) do
       assign_attributes(provider: nil, access_token: nil, refresh_token: nil, token_expires_at: nil)
     end
+
+    # Uniqueness validation of emails and alternate emails across all users
+    validate(if: -> { respond_to?(:alternate_email) }) do
+      records = self.class.where.not(id: self.id) # exclude self
+      email_duplicates = records.where("lower(email) = :email OR lower(alternate_email) = :email", email: email.to_s.strip.downcase)
+      alternate_email_duplicates = records.where("lower(email) = :alternate_email OR lower(alternate_email) = :alternate_email", alternate_email: alternate_email.to_s.strip.downcase)
+
+      # Check if a uniqueness validation was already performed before triggering the exists query
+      if !self.errors.added?(:email, 'has already been taken') && email_duplicates.exists?
+        self.errors.add(:email, 'has already been taken')
+      end
+
+      # Check if the alternate email is set before triggering the exists query
+      if try(:alternate_email).present? && alternate_email_duplicates.exists?
+        self.errors.add(:alternate_email, 'has already been taken')
+      end
+    end
+
+    with_options(if: -> { respond_to?(:alternate_email) }) do
+      validates :alternate_email, email: true, allow_blank: true
+    end
+
   end
 
   module ClassMethods
@@ -162,10 +184,48 @@ module EffectiveDeviseUser
       recoverable
     end
 
+    # https://github.com/heartcombo/devise/blob/f6e73e5b5c8f519f4be29ac9069c6ed8a2343ce4/lib/devise/models/authenticatable.rb#L276
+    def find_first_by_auth_conditions(tainted_conditions, opts = {})
+      conditions = devise_parameter_filter.filter(tainted_conditions).merge(opts)
+      email = conditions[:email]
+      conditions.delete(:email)
+
+      user = to_adapter.find_first(conditions.merge(email: email))
+      return user if user.present? && user.persisted?
+
+      to_adapter.find_first(conditions.merge(alternate_email: email)) if respond_to?(:alternate_email)
+    end
+
+    # https://github.com/heartcombo/devise/blob/f6e73e5b5c8f519f4be29ac9069c6ed8a2343ce4/lib/devise/models/database_authenticatable.rb#L216
+    def find_for_database_authentication(warden_conditions)
+      conditions = warden_conditions.dup.presence || {}
+      primary_or_alternate_email = conditions[:email]
+      conditions.delete(:email)
+
+      has_alternate_email = 'alternate_email'.in? column_names
+
+      raise "Expected an email #{has_alternate_email ? 'or alternate email' : ''} but got [#{primary_or_alternate_email}] instead" if primary_or_alternate_email.blank?
+
+      query = if has_alternate_email
+                "lower(email) = :value OR lower(alternate_email) = :value"
+              else
+                "lower(email) = :value"
+              end
+
+      all
+        .where(conditions)
+        .where(query, value: primary_or_alternate_email.strip.downcase)
+        .first
+    end
+
   end
 
   # EffectiveDeviseUser Instance Methods
 
+  def alternate_email=(value)
+    super(value.to_s.strip.downcase.presence)
+  end
+
   def reinvite!
     invite!
   end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.10.0'.freeze
+  VERSION = '2.11.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2023-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails