Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/gitlab/auth/ldap/auth_hash.rb b/lib/gitlab/auth/ldap/auth_hash.rb
index 5435355f136..6d1d1519fc2 100644
--- a/lib/gitlab/auth/ldap/auth_hash.rb
+++ b/lib/gitlab/auth/ldap/auth_hash.rb
@@ -6,6 +6,8 @@ module Gitlab
   module Auth
     module Ldap
       class AuthHash < Gitlab::Auth::OAuth::AuthHash
+        extend ::Gitlab::Utils::Override
+
         def uid
           @uid ||= Gitlab::Auth::Ldap::Person.normalize_dn(super)
         end
@@ -44,6 +46,12 @@ module Gitlab
         def ldap_config
           @ldap_config ||= Gitlab::Auth::Ldap::Config.new(self.provider)
         end
+
+        # Overrding this method as LDAP allows email as the username !
+        override :get_username
+        def get_username
+          username_claims.map { |claim| get_from_auth_hash_or_info(claim) }.find(&:presence)
+        end
       end
     end
   end