effective_resources 2.11.1 → 2.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70b3835f1e45128ade83d38d69adbcd8096fd5aecce4882028d0512dab970dae
-  data.tar.gz: 7c38e5cb62a55b4fa4924970aad1b0f45cf06b0dccedb41770f8df394e98a9c0
+  metadata.gz: 812cfa2dff0975f437ae27401f0514ffda1e9e0f63656ed9a108d36994e6f54e
+  data.tar.gz: 3abb1076d4711aacaeeec65dd3cc0c37d5e9c10d07ee254f6a8b870a626e115a
 SHA512:
-  metadata.gz: 50be7d9a989a25f8aa6777e85603c18b8ccc3be72e78aa35e4aa83814ca0fa74371de434c1138dc9a2331b57d79c1e032dbf987628c2b3b800b8b3819b26eb3d
-  data.tar.gz: 46e3229e7ecc0a7e989ac022afed029183b96e9a225f7a3d93edc3d9ff0a14a37682bf4d1685e1c3ebf3f8c8a5760e0cd09eafc7346eb940bf13d5aecd1752ad
+  metadata.gz: bd3bf2b4b9073a4097c86a4cc8ba7e9199080f4ce835431be533e20227728fc389b72d5fdf4aeccb2f71818bb312db477df0db42d2f3b4f5017ce527cb964b86
+  data.tar.gz: ab42b89c90b2bd741e325148dab189fc600e49da80dec0596dfeb238ada7daa5f9edef3a8bf497d7bdce0004edbcf98d9a06b8a03afcf1b62272da398e4f97f5

data/app/controllers/concerns/effective/crud_controller/actions.rb

@@ -242,7 +242,7 @@ module Effective
           successes = resources.select do |resource|
             begin
               resource.public_send("#{action}!") if EffectiveResources.authorized?(self, action, resource)
-            rescue => e
+            rescue Exception => e
               false
             end
           end.length

data/app/models/concerns/effective_devise_user.rb

@@ -197,31 +197,39 @@ module EffectiveDeviseUser
     # 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)
 
-      raise "Expected an email #{has_alternate_email? ? 'or alternate email' : ''} but got [#{primary_or_alternate_email}] instead" if primary_or_alternate_email.blank?
+      email = conditions.delete(:email).to_s.strip.downcase
+      raise "Expected an email condition but got #{conditions} instead" unless email.present?
 
-      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
+      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
 
     def has_alternate_email?
-      'alternate_email'.in? column_names
+      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
 
+  # The user's to_s when in an email
+  def email_to_s
+    to_s
+  end
+
   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.1'.freeze
+  VERSION = '2.11.3'.freeze
 end

metadata

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