Consolidate account scopes for LOWER (index using) username/domain queries (#30451)

2024-05-28 10:11:31 -04:00 · 2024-05-28 10:11:31 -04:00 · 4a77e477ee
commit 4a77e477ee
parent 32c30bf0fd
6 changed files with 14 additions and 48 deletions
--- a/app/models/concerns/user/ldap_authenticable.rb
+++ b/app/models/concerns/user/ldap_authenticable.rb
@ -22,7 +22,7 @@ module User::LdapAuthenticable
        safe_username = safe_username.gsub(keys, replacement)
      end

-      resource = joins(:account).merge(Account.where(Account.arel_table[:username].lower.eq safe_username.downcase)).take
+      resource = joins(:account).merge(Account.with_username(safe_username)).take

      if resource.blank?
        resource = new(