User model should not have to clean up LDAP attributes.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3488 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2010-02-26 08:29:20 +00:00
parent 3de1f2e157
commit aa521c5a5a
2 changed files with 2 additions and 3 deletions

View File

@ -37,7 +37,7 @@ class AuthSourceLdap < AuthSource
if attrs.first && attrs.first[:dn] && authenticate_dn(attrs.first[:dn], password)
logger.debug "Authentication successful for '#{login}'" if logger && logger.debug?
return attrs
return [] << attrs.first.except(:dn)
end
rescue Net::LDAP::LdapError => text
raise "LdapError: " + text

View File

@ -111,8 +111,7 @@ class User < Principal
# user is not yet registered, try to authenticate with available sources
attrs = AuthSource.authenticate(login, password)
if attrs
attributes = *attrs
user = new(attributes.symbolize_keys.except(:dn))
user = new(*attrs)
user.login = login
user.language = Setting.default_language
if user.save