Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'

Backport some recent changes related to LDAP from EE

See merge request !13119

app/controllers/sessions_controller.rb

@@ -23,12 +23,7 @@ class SessionsController < Devise::SessionsController
 
   def new
     set_minimum_password_length
-    @ldap_servers =
+    @ldap_servers = Gitlab::LDAP::Config.available_servers
-      if Gitlab.config.ldap.enabled
-        Gitlab::LDAP::Config.servers
-      else
-        []
-      end
 
     super
   end

config/initializers/omniauth.rb

@@ -1,13 +1,16 @@
 if Gitlab::LDAP::Config.enabled?
   module OmniAuth::Strategies
-    server = Gitlab.config.ldap.servers.values.first
+    Gitlab::LDAP::Config.available_servers.each do |server|
-    klass = server['provider_class']
+      # do not redeclare LDAP
-    const_set(klass, Class.new(LDAP)) unless klass == 'LDAP'
+      next if server['provider_name'] == 'ldap'
+      const_set(server['provider_class'], Class.new(LDAP))
+    end
   end
 
   OmniauthCallbacksController.class_eval do
-    server = Gitlab.config.ldap.servers.values.first
+    Gitlab::LDAP::Config.available_servers.each do |server|
-    alias_method server['provider_name'], :ldap
+      alias_method server['provider_name'], :ldap
+    end
   end
 end
 

lib/gitlab/ldap/config.rb

@@ -18,6 +18,12 @@ module Gitlab
         Gitlab.config.ldap.servers.values
       end
 
+      def self.available_servers
+        return [] unless enabled?
+
+        Array.wrap(servers.first)
+      end
+
       def self.providers
         servers.map { |server| server['provider_name'] }
       end