X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=auth%2Fmanifoldbackend.py;h=eb87ab8796ae0fc869607ca9a0f48299b8347e54;hb=ed05804919d39c41003f2eac34d90e345cbf6aa6;hp=529ef0fcf5a694029fad881122293eda1f67ab11;hpb=8c8f04ea43ed69b7a81c90f456b1153a4167a72f;p=unfold.git

diff --git a/auth/manifoldbackend.py b/auth/manifoldbackend.py
index 529ef0fc..eb87ab87 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 manifoldapi.manifoldapi    import ManifoldAPI, ManifoldException, ManifoldResult
 from manifold.core.query        import Query
 
 # Name my backend 'ManifoldBackend'
@@ -30,7 +30,6 @@ class ManifoldBackend:
                 return
             print "first", sessions
             session = sessions[0]
-            print "SESSION=", session
 
             # Change to session authentication
             api.auth = {'AuthMethod': 'session', 'session': session['session']}
@@ -47,6 +46,9 @@ 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