X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=auth%2Fmanifoldbackend.py;h=afb87821930813087c98d5793e21ea3cef8b1018;hb=2842fc88e027493dd9ae00e0f8a69a86f3d50680;hp=14abb748a2be6c91319b44b5cfffd6360af5ea51;hpb=6a8cd8d5f11411cdb4bf2510c9be5fd60d72cb50;p=myslice.git diff --git a/auth/manifoldbackend.py b/auth/manifoldbackend.py index 14abb748..afb87821 100644 --- a/auth/manifoldbackend.py +++ b/auth/manifoldbackend.py @@ -2,7 +2,7 @@ import time from django.contrib.auth.models import User -from manifold.manifoldapi import ManifoldAPI, ManifoldException, ManifoldResult +from manifoldapi.manifoldapi import ManifoldAPI, ManifoldException, ManifoldResult from manifold.core.query import Query # Name my backend 'ManifoldBackend' @@ -47,7 +47,7 @@ class ManifoldBackend: request.session['manifold'] = {'auth': api.auth, 'person': person, 'expires': session['expires']} except ManifoldException, e: - print "Caught ManifoldException, returning corresponding ManifoldResult" + print "ManifoldBackend.authenticate caught ManifoldException, returning corresponding ManifoldResult" return e.manifold_result except Exception, e: print "E: manifoldbackend", e @@ -61,9 +61,13 @@ class ManifoldBackend: except User.DoesNotExist: # Create a user in Django's local database user = User.objects.create_user(username, username, 'passworddoesntmatter') - user.first_name = "DUMMY_FIRST_NAME" #person['first_name'] - user.last_name = "DUMMY LAST NAME" # person['last_name'] user.email = person['email'] + + 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