kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor: Extract method from AuthSourceLdap#authenticate 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3439 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis 2010-02-16 17:03:54 +00:00
parent 7b6b147761
commit b3330d3995
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/models/auth_source_ldap.rb
View File

@ -44,10 +44,8 @@ class AuthSourceLdap < AuthSource
# only ask for the DN if on-the-fly registration is disabled
:attributes=> (onthefly_register? ? ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail] : ['dn'])) do |entry|
dn = entry.dn
attrs = [:firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname),
:lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname),
:mail => AuthSourceLdap.get_attr(entry, self.attr_mail),
:auth_source_id => self.id ] if onthefly_register?
attrs = get_user_attributes_from_ldap_entry(entry) if onthefly_register?
end
return nil if dn.empty?
logger.debug "DN found for #{login}: #{dn}" if logger && logger.debug?
@ -90,6 +88,15 @@ class AuthSourceLdap < AuthSource
Net::LDAP.new options
end
def get_user_attributes_from_ldap_entry(entry)
[
:firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname),
:lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname),
:mail => AuthSourceLdap.get_attr(entry, self.attr_mail),
:auth_source_id => self.id
]
end
def self.get_attr(entry, attr_name)
if !attr_name.blank?
entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]

9
test/unit/auth_source_ldap_test.rb
View File

@ -52,19 +52,22 @@ class AuthSourceLdapTest < ActiveSupport::TestCase
context 'with a valid LDAP user' do
should 'return the firstname user attributes' do
response = @auth.authenticate('example1','123456')
assert response
assert response.is_a?(Array), "An array was not returned"
assert response.first.present?, "No user data returned"
assert_equal 'Example', response.first[:firstname]
end
should 'return the lastname user attributes' do
response = @auth.authenticate('example1','123456')
assert response
assert response.is_a?(Array), "An array was not returned"
assert response.first.present?, "No user data returned"
assert_equal 'One', response.first[:lastname]
end
should 'return mail user attributes' do
response = @auth.authenticate('example1','123456')
assert response
assert response.is_a?(Array), "An array was not returned"
assert response.first.present?, "No user data returned"
assert_equal 'example1@redmine.org', response.first[:mail]
end
end