X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Factions.py;h=a0509dcf29bf14df3fb32bcd0277f9cfd3718324;hb=9705f5da9de332ff1a4f2964bc0f617c6982778a;hp=523a9e1ec54a94181d4c65f8545ea082b80348d1;hpb=f53df6493de6aa133220ea102b1ce42a3df87d11;p=myslice.git diff --git a/portal/actions.py b/portal/actions.py index 523a9e1e..a0509dcf 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -4,6 +4,7 @@ from manifoldapi.manifoldapi import execute_query,execute_admin_query from portal.models import PendingUser, PendingSlice, PendingAuthority, PendingProject, PendingJoin from unfold.page import Page +import hashlib import json from django.contrib.auth.models import User @@ -1114,7 +1115,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 +1286,8 @@ 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']) + # Django username must be less than 30 char so we use a hash + user = User.objects.create_user(hashlib.sha1(request['email'].hexdigest()), request['email'], request['password']) # Creating a manifold user user_id = manifold_add_user(wsgi_request, request)