Commit 909a8443 authored by Douwe Maan's avatar Douwe Maan

Shuffle config around a bit

parent 9c6ed296
......@@ -3,17 +3,10 @@
module Gitlab
module LDAP
class AuthHash < Gitlab::OAuth::AuthHash
attr_accessor :config
def initialize(auth_hash, config)
super(auth_hash)
@config = config
end
private
def get_info(key)
raw_key = config.attributes[key]
raw_key = ldap_config.attributes[key]
return super unless raw_key
value =
......@@ -35,6 +28,10 @@ module Gitlab
def get_raw(key)
auth_hash.extra[:raw_info][key]
end
def ldap_config
@ldap_config ||= Gitlab::LDAP::Config.new(self.provider)
end
end
end
end
......@@ -68,13 +68,12 @@ module Gitlab
Gitlab::LDAP::Access.allowed?(gl_user)
end
def ldap_config(provider = auth_hash.provider)
Gitlab::LDAP::Config.new(provider)
def ldap_config
Gitlab::LDAP::Config.new(auth_hash.provider)
end
def auth_hash=(auth_hash)
config = ldap_config(auth_hash.provider)
@auth_hash = Gitlab::LDAP::AuthHash.new(auth_hash, config)
@auth_hash = Gitlab::LDAP::AuthHash.new(auth_hash)
end
end
end
......
......@@ -39,8 +39,6 @@ module Gitlab
end
def get_info(key)
key = :nickname if key == :username
value = info[key]
Gitlab::Utils.force_utf8(value) if value
value
......@@ -48,7 +46,7 @@ module Gitlab
def username_and_email
@username_and_email ||= begin
username = get_info(:username)
username = get_info(:username) || get_info(:nickname)
email = get_info(:email)
username ||= generate_username(email) if email
......
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