summaryrefslogtreecommitdiff
path: root/lib/gitlab/auth/ldap/config.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/auth/ldap/config.rb')
-rw-r--r--lib/gitlab/auth/ldap/config.rb13
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/gitlab/auth/ldap/config.rb b/lib/gitlab/auth/ldap/config.rb
index f5931a1d5eb..97e4f921228 100644
--- a/lib/gitlab/auth/ldap/config.rb
+++ b/lib/gitlab/auth/ldap/config.rb
@@ -28,7 +28,7 @@ module Gitlab
end
def self.servers
- Gitlab.config.ldap['servers']&.values || []
+ Gitlab.config.ldap.servers&.values || []
end
def self.available_servers
@@ -42,9 +42,18 @@ module Gitlab
end
def self.providers
- servers.map { |server| server['provider_name'] }
+ provider_names_from_servers(servers)
end
+ def self.available_providers
+ provider_names_from_servers(available_servers)
+ end
+
+ def self.provider_names_from_servers(servers)
+ servers&.map { |server| server['provider_name'] } || []
+ end
+ private_class_method :provider_names_from_servers
+
def self.valid_provider?(provider)
providers.include?(provider)
end