X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifoldapi%2Fmanifoldproxy.py;h=0f700bf7c3f5cfc14c24144bdba15a6e3a7542f0;hb=ddcdaf8d61df7f4a2a0da11c23190b56ed914464;hp=a5bc20da5736110daaf907df1eb3e74954b2101e;hpb=f75124b277498b3d4ea090d8f6d59c681d6f4163;p=myslice.git

diff --git a/manifoldapi/manifoldproxy.py b/manifoldapi/manifoldproxy.py
index a5bc20da..0f700bf7 100644
--- a/manifoldapi/manifoldproxy.py
+++ b/manifoldapi/manifoldproxy.py
@@ -10,9 +10,8 @@ from manifold.core.query        import Query
 from manifold.core.result_value import ResultValue
 from manifoldapi                import ManifoldAPI
 from manifoldresult             import ManifoldException
-from manifold.util.log          import Log
 
-from unfold.sessioncache import SessionCache
+# from unfold.sessioncache import SessionCache
 
 from myslice.settings import config, logger
 
@@ -61,8 +60,11 @@ def proxy (request,format):
             admin_user, admin_password = config.manifold_admin_user_password()
             manifold_api_session_auth = {'AuthMethod': 'password', 'Username': admin_user, 'AuthString': admin_password}
         else:
-            manifold_api_session_auth = SessionCache().get_auth(request)
-            if not manifold_api_session_auth:
+            if 'manifold' in request.session:
+                manifold_api_session_auth = request.session['manifold']['auth']
+            else:
+            #manifold_api_session_auth = SessionCache().get_auth(request)
+            #if not manifold_api_session_auth:
                 return HttpResponse (json.dumps({'code':0,'value':[]}), content_type="application/json")
                 
         if debug_empty and manifold_query.action.lower()=='get':