effective_resources 2.11.0 → 2.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8000b25d219e4ce996d1c768682448fc912180f9d0b4808584182e94698255be
-  data.tar.gz: d1f99291b1a0072284c0432335541987b6e670b7e491d0e405befbcd42000282
+  metadata.gz: d7420e7773e862ace77933d82892a2536a3502a8e9780670e7951368a043b63e
+  data.tar.gz: f27995719216c1a0d9eeb4d0cacdf5591726322301a87b3f19ee8f8d0e9df450
 SHA512:
-  metadata.gz: 2e36bf1f67caf8510e570573621320ba328a311eebc60b8f764a0f811b5b49aedc713f615cb25ef5510786563e9b849a15efd1f4eef6dc86872bc4c26908af85
-  data.tar.gz: b6c593560fb53b762eee968c3d53dda47a208493155ef781089cddecc25771dbd18e748ca3336afdf29f187b2801c00ac07a2452457512c4c5788cba7777fb12
+  metadata.gz: fae042cbd0de9cacc8cac925db8339254ab7cd144076acac9f3464b2fe09e5572c8c0cd691766810a013ba92834ceda19522f70fcf6928065c7f268943e0b592
+  data.tar.gz: 5d50084e5ecf6c49c6861027e0240f8be521c43ea16327cd5e69f8fa22f46326b5c0b1af7e30fb4c5bba30c011053bf89cd2b2104348ec682921f988b13513f8

data/README.md

@@ -392,6 +392,43 @@ def to_select2
 end
 ```
 
+## Authentication
+Effective Resources is designed to work with Devise. It also adds support for an `alternate email`
+for authentication. You just need to add an `alternate_email` column to your `User` model table.
+
+After that column is added, any user would be able to log in with either their `email` or their
+`alternate_email`.
+
+You can also create another mailer for `devise` in order to send password reset emails to the both
+the primary `email` and also the `alternate_email`, like this:
+
+```ruby
+class DeviseMailer < Devise::Mailer
+  # Overriding Devise's #headers_for to support alternate_email when present
+  def headers_for(action, opts)
+    headers = super(action, opts)
+
+    if [:reset_password_instructions].include?(action)
+      headers.merge!(
+        to: [resource.email, resource.try(:alternate_email)].compact.uniq
+      )
+    end
+
+    headers
+  end
+end
+```
+
+and set this new mailer to be used by `devise` in `config/initializers/devise.rb`:
+
+```ruby
+Devise.setup do |config|
+  # ...
+  config.mailer = 'DeviseMailer'
+  # ...
+end
+```
+
 ## Testing
 
 Run tests by:

data/app/models/concerns/effective_devise_user.rb

@@ -187,41 +187,43 @@ module EffectiveDeviseUser
     # 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))
+      user = to_adapter.find_first(conditions)
       return user if user.present? && user.persisted?
 
-      to_adapter.find_first(conditions.merge(alternate_email: email)) if respond_to?(:alternate_email)
+      to_adapter.find_first(alternate_email: conditions[:email]) if has_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
+      email = conditions.delete(:email).to_s.strip.downcase
+      raise "Expected an email condition but got #{conditions} instead" unless email.present?
 
-      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
+      if has_alternate_email?
+        where(conditions).where('email = :email OR alternate_email = :email', email: email).first
+      else
+        where(conditions).where(email: email).first
+      end
+    end
 
-      all
-        .where(conditions)
-        .where(query, value: primary_or_alternate_email.strip.downcase)
-        .first
+    def has_alternate_email?
+      column_names.include?('alternate_email')
     end
 
+    def find_by_any_email(value)
+      email = value.to_s.strip.downcase
+
+      if has_alternate_email?
+        where(email: email).or(where(alternate_email: email)).first
+      else
+        where(email: email).first
+      end
+    end
   end
 
   # EffectiveDeviseUser Instance Methods
-
   def alternate_email=(value)
     super(value.to_s.strip.downcase.presence)
   end

data/lib/effective_resources/version.rb

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

metadata

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