X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=auth%2Fmanifoldbackend.py;h=c7ac7faacc1336db4caacf3993786de80294c5d0;hb=651b812504c6dd8967667954ca5342eb1a237336;hp=eb87ab8796ae0fc869607ca9a0f48299b8347e54;hpb=da0b290c0d86afe3d388f4b1a8be60a70b39ed92;p=unfold.git

diff --git a/auth/manifoldbackend.py b/auth/manifoldbackend.py
index eb87ab87..c7ac7faa 100644
--- a/auth/manifoldbackend.py
+++ b/auth/manifoldbackend.py
@@ -5,6 +5,8 @@ from django.contrib.auth.models import User
 from manifoldapi.manifoldapi    import ManifoldAPI, ManifoldException, ManifoldResult
 from manifold.core.query        import Query
 
+from myslice.settings import config, logger, DEBUG
+
 # Name my backend 'ManifoldBackend'
 class ManifoldBackend:
 
@@ -13,6 +15,8 @@ class ManifoldBackend:
     def authenticate(self, token=None):
         if not token:
             return None
+        
+        person = {}
 
         try:
             username = token['username']
@@ -22,15 +26,13 @@ class ManifoldBackend:
             auth = {'AuthMethod': 'password', 'Username': username, 'AuthString': password}
             api = ManifoldAPI(auth)
             sessions_result = api.forward(Query.create('local:session').to_dict())
-            print "result"
             sessions = sessions_result.ok_value()
-            print "ok"
             if not sessions:
-                print "GetSession failed", sessions_result.error()
+                logger.error("GetSession failed", sessions_result.error())
                 return
-            print "first", sessions
             session = sessions[0]
-
+            logger.debug("SESSION : %s" % session)
+            
             # Change to session authentication
             api.auth = {'AuthMethod': 'session', 'session': session['session']}
             self.api = api
@@ -40,19 +42,19 @@ class ManifoldBackend:
             persons_result = api.forward(Query.get('local:user').to_dict())
             persons = persons_result.ok_value()
             if not persons:
-                print "GetPersons failed",persons_result.error()
+                logger.error("GetPersons failed",persons_result.error())
                 return
             person = persons[0]
-            print "PERSON=", person
+            logger.debug("PERSON : %s" % person)
+            #logger.info("%s %s <%s> logged in" % (person['config']['first_name'], person['config']['last_name'], person['config']['email']))
 
             request.session['manifold'] = {'auth': api.auth, 'person': person, 'expires': session['expires']}
         except ManifoldException, e:
-            print "ManifoldBackend.authenticate caught ManifoldException, returning corresponding ManifoldResult"
-            return e.manifold_result
+            logger.error("Manifold Auth Backend: %s" % e.manifold_result)
         except Exception, e:
-            print "E: manifoldbackend", e
-            import traceback
-            traceback.print_exc()
+            logger.error("Manifold Auth Backend: %s" % e)
+            #import traceback
+            #traceback.print_exc()
             return None
 
         try:
@@ -61,9 +63,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