Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

[myslice.git] / localauth / manifoldbackend.py

diff --git a/localauth/manifoldbackend.py b/localauth/manifoldbackend.py
index e52b175..504a85b 100644 (file)
--- a/localauth/manifoldbackend.py
+++ b/localauth/manifoldbackend.py
@@ -7,6 +7,8 @@ from manifold.core.query        import Query
 
 from myslice.settings import config, logger, DEBUG
 
+from portal.actions import authority_check_pis
+
 # from unfold.sessioncache import SessionCache
 
 # Name my backend 'ManifoldBackend'
@@ -31,7 +33,7 @@ class ManifoldBackend:
             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.keys()))
             
@@ -46,7 +48,7 @@ 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))
             
@@ -78,6 +80,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