Refactor: beter naming for active directory disabled users
This commit is contained in:
parent
26b14dd2d5
commit
c0323b40ee
|
|
@ -28,7 +28,7 @@ module Gitlab
|
|||
|
||||
def allowed?(user)
|
||||
if Gitlab::LDAP::Person.find_by_dn(user.extern_uid, adapter)
|
||||
!Gitlab::LDAP::Person.active_directory_disabled?(user.extern_uid, adapter)
|
||||
!Gitlab::LDAP::Person.disabled_via_active_directory?(user.extern_uid, adapter)
|
||||
else
|
||||
false
|
||||
end
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ module Gitlab
|
|||
adapter.user('dn', dn)
|
||||
end
|
||||
|
||||
def self.active_directory_disabled?(dn, adapter=nil)
|
||||
def self.disabled_via_active_directory?(dn, adapter=nil)
|
||||
adapter ||= Gitlab::LDAP::Adapter.new
|
||||
adapter.dn_matches_filter?(dn, AD_USER_DISABLED)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@ describe Gitlab::LDAP::Access do
|
|||
context 'when the user is found' do
|
||||
before { Gitlab::LDAP::Person.stub(find_by_dn: :ldap_user) }
|
||||
|
||||
context 'and the Active Directory disabled flag is set' do
|
||||
before { Gitlab::LDAP::Person.stub(active_directory_disabled?: true) }
|
||||
context 'and the user is diabled via active directory' do
|
||||
before { Gitlab::LDAP::Person.stub(disabled_via_active_directory?: true) }
|
||||
|
||||
it { should be_false }
|
||||
end
|
||||
|
||||
context 'and the Active Directory disabled flag is not set' do
|
||||
before { Gitlab::LDAP::Person.stub(active_directory_disabled?: false) }
|
||||
context 'and has no disabled flag in active diretory' do
|
||||
before { Gitlab::LDAP::Person.stub(disabled_via_active_directory?: false) }
|
||||
|
||||
it { should be_true }
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue