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

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
aa521c5a · Jean-Philippe Lang · 3de1f2e1 · aa521c5a · aa521c5a
Commit aa521c5a authored Feb 26, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

auth_source_ldap.rb app/models/auth_source_ldap.rb +1 -1

user.rb app/models/user.rb +1 -2

No files found.
--- a/app/models/auth_source_ldap.rb
+++ b/app/models/auth_source_ldap.rb
@@ -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

--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -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