summaryrefslogtreecommitdiff
path: root/lib/gitlab/auth/ldap
diff options
context:
space:
mode:
authorHoratiu Eugen Vlad <horatiu@vlad.eu>2018-03-05 22:26:40 +0000
committerDouwe Maan <douwe@gitlab.com>2018-03-05 22:26:40 +0000
commit6d3cb7e22ea3567887fa521d8056b7d5618aa699 (patch)
treebc74adccb8307a36671d53de503542d3f6e7ab0a /lib/gitlab/auth/ldap
parent62d6f1ed6648c5aa90cb43761ef8677957a6da83 (diff)
downloadgitlab-ce-6d3cb7e22ea3567887fa521d8056b7d5618aa699.tar.gz
Make oauth provider login generic
Diffstat (limited to 'lib/gitlab/auth/ldap')
-rw-r--r--lib/gitlab/auth/ldap/authentication.rb10
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/gitlab/auth/ldap/authentication.rb b/lib/gitlab/auth/ldap/authentication.rb
index cbb9cf4bb9c..e70c3ab6b46 100644
--- a/lib/gitlab/auth/ldap/authentication.rb
+++ b/lib/gitlab/auth/ldap/authentication.rb
@@ -7,7 +7,7 @@
module Gitlab
module Auth
module LDAP
- class Authentication
+ class Authentication < Gitlab::Auth::OAuth::Authentication
def self.login(login, password)
return unless Gitlab::Auth::LDAP::Config.enabled?
return unless login.present? && password.present?
@@ -28,11 +28,7 @@ module Gitlab
Gitlab::Auth::LDAP::Config.providers
end
- attr_accessor :provider, :ldap_user
-
- def initialize(provider)
- @provider = provider
- end
+ attr_accessor :ldap_user
def login(login, password)
@ldap_user = adapter.bind_as(
@@ -62,7 +58,7 @@ module Gitlab
end
def user
- return nil unless ldap_user
+ return unless ldap_user
Gitlab::Auth::LDAP::User.find_by_uid_and_provider(ldap_user.dn, provider)
end