X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=auth%2Fmanifoldbackend.py;h=2b1bde59a93258b43d43a56582d7bc5944ee83f1;hb=57c5bcefb1eac66d1db27db28a0c6d3b3b52a407;hp=da3c23f93b545dee7e6b6d2e087ae67749148ecd;hpb=bbdf40b4dd1bebc81461f1c9294aca95323bf889;p=myslice.git

diff --git a/auth/manifoldbackend.py b/auth/manifoldbackend.py
index da3c23f9..2b1bde59 100644
--- a/auth/manifoldbackend.py
+++ b/auth/manifoldbackend.py
@@ -1,10 +1,8 @@
-# import the User object
+import time
+
 from django.contrib.auth.models import User
-from engine.manifoldapi import ManifoldAPI
 
-
-# import time - this is used to create Django's internal username
-import time
+from manifold.manifoldapi import ManifoldAPI, ManifoldResult
 
 # Name my backend 'ManifoldBackend'
 class ManifoldBackend:
@@ -23,23 +21,30 @@ class ManifoldBackend:
             auth = {'AuthMethod': 'password', 'Username': username, 'AuthString': password}
             api = ManifoldAPI(auth)
             # Authenticate user and get session key
-            session = api.GetSession()
-            if not session : 
-                return None
+            session_result = api.GetSession()
+            session = session_result.ok_value()
+            if not session:
+                print "GetSession failed",session_result.error()
+                return
             
-            request.session['manifold_session'] = session
+            print 'DEALING with session',session
             #self.session = session
             # Change GetSession() at some point to return expires as well
             expires = time.time() + (24 * 60 * 60)
 
             # Change to session authentication
             api.auth = {'AuthMethod': 'session', 'session': session}
-            #self.api = api
+            self.api = api
 
             # Get account details
-            person = api.GetPersons(auth)[0]
-            request.session['manifold_person'] = person
-            #self.person = person[0]
+            persons_result = api.GetPersons(auth)
+            persons = persons_result.ok_value()
+            if not persons:
+                print "GetPersons failed",persons_result.error()
+                return
+            person = persons[0]
+
+            request.session['manifold'] = {'auth': api.auth, 'person': person, 'expires': expires}
         except:
             return None