X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=localauth%2Fmanifoldbackend.py;h=8c8f0f393ff060410fd07c998ad7b3cbf56bf9b6;hb=a948414844c79472807c5e66939a912a7b990433;hp=c2899e9ddc45592b1a8606c738d3520647527a76;hpb=6c38e861f92b75716f40ed9d8f15af824d1ec19c;p=myslice.git

diff --git a/localauth/manifoldbackend.py b/localauth/manifoldbackend.py
index c2899e9d..8c8f0f39 100644
--- a/localauth/manifoldbackend.py
+++ b/localauth/manifoldbackend.py
@@ -7,7 +7,9 @@ from manifold.core.query        import Query
 
 from myslice.settings import config, logger, DEBUG
 
-from unfold.sessioncache import SessionCache
+from portal.actions import authority_check_pis
+
+# from unfold.sessioncache import SessionCache
 
 # Name my backend 'ManifoldBackend'
 class ManifoldBackend:
@@ -21,23 +23,24 @@ class ManifoldBackend:
         person = {}
 
         try:
-            username = token['username']
+            email = token['username']
+            username = email.split('@')[-1]
             password = token['password']
             request = token['request']
 
-            auth = {'AuthMethod': 'password', 'Username': username, 'AuthString': password}
-            api = ManifoldAPI(auth)
+            auth = {'AuthMethod': 'password', 'Username': email, 'AuthString': password}
+            api = ManifoldAPI(config.manifold_url(), auth)
             sessions_result = api.forward(Query.create('local:session').to_dict())
             sessions = sessions_result.ok_value()
             if not sessions:
                 logger.error("GetSession failed: {}".format(sessions_result.error()))
-                return
+                return None
             session = sessions[0]
-            logger.debug("SESSION : {}".format(session))
+            logger.debug("SESSION : {}".format(session.keys()))
             
             # Change to session authentication
-            session_auth = {'AuthMethod': 'session', 'session': session['session']}
-            api.auth = session_auth
+            api.auth = {'AuthMethod': 'session', 'session': session['session']}
+            #api.auth = session_auth
             self.api = api
 
             # Get account details
@@ -46,13 +49,16 @@ class ManifoldBackend:
             persons = persons_result.ok_value()
             if not persons:
                 logger.error("GetPersons failed: {}".format(persons_result.error()))
-                return
+                return None
             person = persons[0]
             logger.debug("PERSON : {}".format(person))
+            
+            request.session['manifold'] = {'auth': api.auth, 'person': person, 'expires': session['expires']}
+
             #logger.info("{} {} <{}> logged in"\
             #    .format(person['config']['first_name'], person['config']['last_name'], person['config']['email']))
 
-            SessionCache().store_auth(request, session_auth)
+            #SessionCache().store_auth(request, session_auth)
 
         except ManifoldException as e:
             logger.error("ManifoldException in Auth Backend: {}".format(e.manifold_result))
@@ -64,10 +70,10 @@ class ManifoldBackend:
 
         try:
             # Check if the user exists in Django's local database
-            user = User.objects.get(username=username)
+            user = User.objects.get(email=email)
         except User.DoesNotExist:
             # Create a user in Django's local database
-            user = User.objects.create_user(username, username, 'passworddoesntmatter')
+            user = User.objects.create_user(username, email, 'passworddoesntmatter')
             user.email = person['email']
 
         if 'firstname' in person:
@@ -75,6 +81,8 @@ class ManifoldBackend:
         if 'lastname' in person:
             user.last_name = person['lastname']
 
+        user.pi = authority_check_pis (request, user.email)
+        request.session['user'] = {'email':user.email,'pi':user.pi,'firstname':user.first_name,'lastname':user.last_name}
         return user
 
     # Required for your backend to work properly - unchanged in most scenarios