X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=auth%2Fmanifoldbackend.py;h=ab224a35b44ea3831c88198459b745763fb98211;hb=254eb62e6dd744a3cf08fe530c404a88d00c5bef;hp=73ba446a030e9cb8dc7c5b5d854e10290f370e43;hpb=7002ccffe21d8f40bc0ad363c775dc9cdac7635b;p=myslice.git

diff --git a/auth/manifoldbackend.py b/auth/manifoldbackend.py
index 73ba446a..ab224a35 100644
--- a/auth/manifoldbackend.py
+++ b/auth/manifoldbackend.py
@@ -2,7 +2,8 @@ import time
 
 from django.contrib.auth.models import User
 
-from manifold.manifoldapi import ManifoldAPI, ManifoldResult
+from manifold.manifoldapi import ManifoldAPI, ManifoldException, ManifoldResult
+from manifold.core.query        import Query
 
 # Name my backend 'ManifoldBackend'
 class ManifoldBackend:
@@ -20,34 +21,38 @@ class ManifoldBackend:
 
             auth = {'AuthMethod': 'password', 'Username': username, 'AuthString': password}
             api = ManifoldAPI(auth)
-            # Authenticate user and get session key
-            # the new API would expect Get('local:session') instead
-            session_result = api.GetSession()
-            session = session_result.ok_value()
-            if not session:
-                print "GetSession failed",session_result.error()
+            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()
                 return
-            
-            print 'DEALING with session',session
-            #self.session = session
-            # Change GetSession() at some point to return expires as well
-            expires = time.time() + (24 * 60 * 60)
+            print "first", sessions
+            session = sessions[0]
 
             # Change to session authentication
-            api.auth = {'AuthMethod': 'session', 'session': session}
+            api.auth = {'AuthMethod': 'session', 'session': session['session']}
             self.api = api
 
             # Get account details
             # the new API would expect Get('local:user') instead
-            persons_result = api.GetPersons(auth)
+            persons_result = api.forward(Query.get('local:user').to_dict())
             persons = persons_result.ok_value()
             if not persons:
                 print "GetPersons failed",persons_result.error()
                 return
             person = persons[0]
+            print "PERSON=", person
 
-            request.session['manifold'] = {'auth': api.auth, 'person': person, 'expires': expires}
-        except:
+            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
+        except Exception, e:
+            print "E: manifoldbackend", e
+            import traceback
+            traceback.print_exc()
             return None
 
         try:
@@ -56,8 +61,8 @@ class ManifoldBackend:
         except User.DoesNotExist:
             # Create a user in Django's local database
             user = User.objects.create_user(username, username, 'passworddoesntmatter')
-            user.first_name = person['first_name']
-            user.last_name = person['last_name']
+            user.first_name = "DUMMY_FIRST_NAME" #person['first_name']
+            user.last_name = "DUMMY LAST NAME" # person['last_name']
             user.email = person['email']
         return user