X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=auth%2Fmanifoldbackend.py;h=b1e3c943958638010541b4212df8259adfc7cbfb;hb=ef1519837383e5f9bd6918deddb1ebd43514f240;hp=f548b4340a6ea16f74292481ae438ca5c91e2f8b;hpb=a222cef0a10a5517349f05cea0e382b35e3a14a6;p=myslice.git

diff --git a/auth/manifoldbackend.py b/auth/manifoldbackend.py
index f548b434..b1e3c943 100644
--- a/auth/manifoldbackend.py
+++ b/auth/manifoldbackend.py
@@ -1,49 +1,76 @@
-# import the User object
-from django.contrib.auth.models import User
-from engine.manifoldapi import ManifoldAPI
+import time
 
+from django.contrib.auth.models import User
 
-# import time - this is used to create Django's internal username
-import time
+from manifold.manifoldapi import ManifoldAPI, ManifoldResult
+from manifold.core.query        import Query
 
 # Name my backend 'ManifoldBackend'
 class ManifoldBackend:
 
     # Create an authentication method
     # This is called by the standard Django login procedure
-    def authenticate(self, username=None, password=None):
-        if not username or not password:
+    def authenticate(self, token=None):
+        if not token:
             return None
 
         try:
+            username = token['username']
+            password = token['password']
+            request = token['request']
+
             auth = {'AuthMethod': 'password', 'Username': username, 'AuthString': password}
             api = ManifoldAPI(auth)
-            # Authenticate user and get session key
-            session = api.GetSession()
-            if not session : 
-                return None
+#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)
 
-            #self.session = session
-            # Change GetSession() at some point to return expires as well
-            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"
+            session = sessions[0]
+            print "SESSION=", session
 
             # Change to session authentication
-            api.auth = {'AuthMethod': 'session', 'session': session}
-            #self.api = api
+            api.auth = {'AuthMethod': 'session', 'session': session['session']}
+            self.api = api
 
             # Get account details
-            person = api.GetPersons(auth)
-            #self.person = person[0]
-        except:
+            # the new API would expect Get('local:user') instead
+            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': session['expires']}
+        except Exception, e:
+            print "E: manifoldbackend", e
             return None
 
         try:
             # Check if the user exists in Django's local database
-            user = User.objects.get(email=username)
+            user = User.objects.get(username=username)
         except User.DoesNotExist:
             # Create a user in Django's local database
-            user = User.objects.create_user(time.time(), username, 'passworddoesntmatter')
-
+            user = User.objects.create_user(username, username, 'passworddoesntmatter')
+            user.first_name = person['first_name']
+            user.last_name = person['last_name']
+            user.email = person['email']
         return user
 
     # Required for your backend to work properly - unchanged in most scenarios