From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 4 Dec 2015 09:53:49 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=f9f854b970a22793c6fd2ede625f3891f05fd128;hp=59d17639bc6a96298bb12249ea3c9b09a298dc0b

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

diff --git a/localauth/manifoldbackend.py b/localauth/manifoldbackend.py
index 504a85be..3e235151 100644
--- a/localauth/manifoldbackend.py
+++ b/localauth/manifoldbackend.py
@@ -23,11 +23,12 @@ 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}
+            auth = {'AuthMethod': 'password', 'Username': email, 'AuthString': password}
             api = ManifoldAPI(auth)
             sessions_result = api.forward(Query.create('local:session').to_dict())
             sessions = sessions_result.ok_value()
@@ -69,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:
diff --git a/portal/actions.py b/portal/actions.py
index 523a9e1e..e0dc131f 100644
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -1114,7 +1114,6 @@ def manifold_add_reference_user_accounts(wsgi_request, request):
         .select('user_id', 'config', 'email', 'status') \
         .filter_by('email', '==', request['email'])
     user_details = execute_admin_query(wsgi_request, user_query)
-
     # USER MAIN ACCOUNT != reference
     #print 'USER MAIN ACCOUNT != reference'
     list_accounts_query = Query().get('local:account')              \
@@ -1286,7 +1285,7 @@ def create_pending_user(wsgi_request, request, user_detail):
     msg.send()
    
     # saves the user to django auth_user table [needed for password reset]
-    user = User.objects.create_user(request['email'], request['email'], request['password'])
+    user = User.objects.create_user(request['email'].split('@')[-1], request['email'], request['password'])
 
     # Creating a manifold user
     user_id = manifold_add_user(wsgi_request, request)
diff --git a/portal/static/img/servicedirectory/bonfire.png b/portal/static/img/servicedirectory/bonfire.png
new file mode 100755
index 00000000..ff0940f1
Binary files /dev/null and b/portal/static/img/servicedirectory/bonfire.png differ