Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into fibre

[myslice.git] / auth / manifoldbackend.py

diff --git a/auth/manifoldbackend.py b/auth/manifoldbackend.py
index 69cbf21..0522653 100644 (file)
--- a/auth/manifoldbackend.py
+++ b/auth/manifoldbackend.py
@@ -209,10 +209,7 @@ class ManifoldBackend:
             except User.DoesNotExist:
                 # Create a user in Django's local database
                 user = User.objects.create_user(username, usernamep, 'passworddoesntmatter')
-                user.first_name = "DUMMY_FIRST_NAME" #person['first_name']
-                user.last_name = "DUMMY LAST NAME" # person['last_name']
                 user.email = person['email']
-            return user
         else:
             if checkldap:
                 try:
@@ -221,11 +218,14 @@ class ManifoldBackend:
                 except User.DoesNotExist:
                     # Create a user in Django's local database
                     user = User.objects.create_user(username, usernameldap, 'passworddoesntmatter')
-                    user.first_name = "DUMMY_FIRST_NAME" #person['first_name']
-                    user.last_name = "DUMMY LAST NAME" # person['last_name']
                     user.email = person['email']
-                return user
 
+        if 'firstname' in person:
+            user.first_name = person['firstname']
+        if 'lastname' in person:
+            user.last_name = person['lastname']
+
+        return user
     # Required for your backend to work properly - unchanged in most scenarios
     def get_user(self, user_id):
         try: