Use uid as username when creating user with LDAP

Without that commit, each user created by a LDAP login would have the first part of their email address as nickname. This is not useful for LDAP, where a uid attribute is already set.

Use uid as username when creating user with LDAP
566badba · Julien Pivotto · 3b34084b · 566badba
Commit 566badba authored May 09, 2014 by Julien Pivotto
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

user.rb lib/gitlab/oauth/user.rb +3 -1

No files found.
--- a/lib/gitlab/oauth/user.rb
+++ b/lib/gitlab/oauth/user.rb
@@ -34,9 +34,11 @@ module Gitlab
          # In this case we generate temporary email and force user to fill it later
          if user.email.blank?
            user.generate_tmp_oauth_email
-          else
+          elsif provider != "ldap"
            # Google oauth returns email but dont return nickname
            # So we use part of email as username for new user
+            # For LDAP, username is already set to the user's
+            # uid/userid/sAMAccountName.
            user.username = email.match(/^[^@]*/)[0]
          end