X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=auth%2Fmanifoldbackend.py;h=ab224a35b44ea3831c88198459b745763fb98211;hb=253c727bf8b4f874ae9488a1393acc5bcbbeae37;hp=c58c09ebeb655558926b2f70d3147aba74445d0f;hpb=d0ac1170425c64337c521b673b88d75425b8adba;p=myslice.git

diff --git a/auth/manifoldbackend.py b/auth/manifoldbackend.py
index c58c09eb..ab224a35 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, ManifoldResult
+from manifold.manifoldapi import ManifoldAPI, ManifoldException, ManifoldResult
 from manifold.core.query        import Query
 
 # Name my backend 'ManifoldBackend'
@@ -21,27 +21,15 @@ class ManifoldBackend:
 
             auth = {'AuthMethod': 'password', 'Username': username, 'AuthString': password}
             api = ManifoldAPI(auth)
-#old            # Authenticate user and get session key
-#old            # the new API would expect Get('local:session') instead
-#old            session_result = api.GetSession()
-#old            session = session_result.ok_value()
-#old            if not session:
-#old                print "GetSession failed",session_result.error()
-#old                return
-#old            print 'DEALING with session',session
-#old            #self.session = session
-#old            # Change GetSession() at some point to return expires as well
-#old            expires = time.time() + (24 * 60 * 60)
-
             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()
-            print "first"
+                return
+            print "first", sessions
             session = sessions[0]
-            print "SESSION=", session
 
             # Change to session authentication
             api.auth = {'AuthMethod': 'session', 'session': session['session']}
@@ -58,8 +46,13 @@ class ManifoldBackend:
             print "PERSON=", person
 
             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: