Commit 73a3df4d authored by Douwe Maan's avatar Douwe Maan

Fix LDAP attribute mapping

parent cfe66340
...@@ -6,7 +6,7 @@ module Gitlab ...@@ -6,7 +6,7 @@ module Gitlab
private private
def get_info(key) def get_info(key)
attributes = ldap_config.attributes[key] attributes = ldap_config.attributes[key.to_s]
return super unless attributes return super unless attributes
attributes = Array(attributes) attributes = Array(attributes)
...@@ -14,6 +14,7 @@ module Gitlab ...@@ -14,6 +14,7 @@ module Gitlab
value = nil value = nil
attributes.each do |attribute| attributes.each do |attribute|
value = get_raw(attribute) value = get_raw(attribute)
value = value.first if value
break if value.present? break if value.present?
end end
......
...@@ -24,10 +24,10 @@ describe Gitlab::LDAP::AuthHash do ...@@ -24,10 +24,10 @@ describe Gitlab::LDAP::AuthHash do
let(:raw_info) do let(:raw_info) do
{ {
uid: '123456', uid: ['123456'],
email: 'johnsmith@example.com', email: ['johnsmith@example.com'],
cn: 'Smith, J.', cn: ['Smith, J.'],
fullName: 'John Smith' fullName: ['John Smith']
} }
end end
...@@ -45,8 +45,8 @@ describe Gitlab::LDAP::AuthHash do ...@@ -45,8 +45,8 @@ describe Gitlab::LDAP::AuthHash do
context "with overridden attributes" do context "with overridden attributes" do
let(:attributes) do let(:attributes) do
{ {
username: ['mail', 'email'], 'username' => ['mail', 'email'],
name: 'fullName' 'name' => 'fullName'
} }
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment