From 718e5b0865a0d871f01b12c22a15757dc1fcc66b Mon Sep 17 00:00:00 2001 From: Tiago Botelho Date: Tue, 12 Sep 2017 10:50:28 +0100 Subject: Attempt to link saml users to ldap by email --- lib/gitlab/ldap/person.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/gitlab/ldap') diff --git a/lib/gitlab/ldap/person.rb b/lib/gitlab/ldap/person.rb index 4d6f8ac79de..be64cc3991b 100644 --- a/lib/gitlab/ldap/person.rb +++ b/lib/gitlab/ldap/person.rb @@ -17,6 +17,10 @@ module Gitlab adapter.user('dn', dn) end + def self.find_by_email(email, adapter) + Array(adapter.config.attributes['email']).find { |attr| adapter.user(attr, email) } + end + def self.disabled_via_active_directory?(dn, adapter) adapter.dn_matches_filter?(dn, AD_USER_DISABLED) end -- cgit v1.2.1