X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Fregistrationview.py;h=455b17543dc20cb5101a9aec69e47dac44bc81f3;hp=e85f7d5165491a3edf4654acc17dd11833ea4748;hb=0d118a5f600b06616c2841e92642a303d8785269;hpb=1f4552214795c19b8881c93a9b871a50c8e12056 diff --git a/portal/registrationview.py b/portal/registrationview.py index e85f7d51..455b1754 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -1,11 +1,13 @@ import os.path, re import json +from random import randint from django.core.mail import send_mail - +from django.contrib.auth.models import User from django.views.generic import View from django.template.loader import render_to_string from django.shortcuts import render +from django.contrib.auth import get_user_model from unfold.page import Page from unfold.loginrequired import FreeAccessView @@ -45,12 +47,15 @@ class RegistrationView (FreeAccessView): print "FIREXP ENABLED" authorities = execute_admin_query(request, authorities_query) + if authorities is not None: + authorities = sorted(authorities) # xxx tocheck - if authorities is empty, it's no use anyway # (users won't be able to validate the form anyway) page = Page(request) page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js" ] ) page.add_css_files ( [ "css/onelab.css", "css/registration.css" ] ) + page.add_css_files ( [ "http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] ) print 'registration view, method',method @@ -65,24 +70,28 @@ class RegistrationView (FreeAccessView): reg_lname = request.POST.get('lastname', '') #reg_aff = request.POST.get('affiliation','') reg_auth = request.POST.get('authority_hrn', '') - reg_login = request.POST.get('login', '') + #reg_login = request.POST.get('login', '') reg_email = request.POST.get('email','').lower() #prepare user_hrn split_email = reg_email.split("@")[0] split_email = split_email.replace(".", "_") - user_hrn = reg_auth + '.' + split_email + user_hrn = reg_auth + '.' + split_email+ str(randint(1,1000000)) + + UserModel = get_user_model() #POST value validation if (re.search(r'^[\w+\s.@+-]+$', reg_fname)==None): errors.append('First Name may contain only letters, numbers, spaces and @/./+/-/_ characters.') if (re.search(r'^[\w+\s.@+-]+$', reg_lname) == None): errors.append('Last Name may contain only letters, numbers, spaces and @/./+/-/_ characters.') - # XXX validate authority hrn !! + # checking in django_db !! if PendingUser.objects.filter(email__iexact=reg_email): errors.append('Email is pending for validation. Please provide a new email address.') + if UserModel._default_manager.filter(email__iexact=reg_email): + errors.append('This email is not usable. Please contact the administrator or try with another email.') for user_detail in user_details: if user_detail['email']==reg_email: - errors.append('Email already exists in Manifold. Please provide a new email address.') + errors.append('Email already registered in Manifold. Please provide a new email address.') # XXX TODO: Factorize with portal/accountview.py if 'generate' in request.POST['question']: @@ -100,7 +109,7 @@ class RegistrationView (FreeAccessView): # private_key = ''.join(private_key.split()) # public_key = "ssh-rsa " + public_key # Saving to DB - keypair = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + ', "user_hrn":"'+ user_hrn + '"}' + account_config = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + ', "user_hrn":"'+ user_hrn + '"}' auth_type = 'managed' #keypair = re.sub("\r", "", keypair) #keypair = re.sub("\n", "\\n", keypair) @@ -115,16 +124,16 @@ class RegistrationView (FreeAccessView): file_extension = os.path.splitext(file_name)[1] allowed_extension = ['.pub','.txt'] if file_extension in allowed_extension and re.search(r'ssh-rsa',file_content): - keypair = '{"user_public_key":"'+ file_content + '", "user_hrn":"'+ user_hrn +'"}' - keypair = re.sub("\r", "", keypair) - keypair = re.sub("\n", "\\n",keypair) - keypair = ''.join(keypair.split()) + account_config = '{"user_public_key":"'+ file_content + '", "user_hrn":"'+ user_hrn +'"}' + account_config = re.sub("\r", "", account_config) + account_config = re.sub("\n", "\\n",account_config) + account_config = ''.join(account_config.split()) auth_type = 'user' # for sending email public_key = file_content public_key = ''.join(public_key.split()) else: - errors.append('Please upload a valid RSA public key [.txt or .pub].') + errors.append('Please upload a valid RSA public key.') #b = PendingUser(first_name=reg_fname, last_name=reg_lname, affiliation=reg_aff, # email=reg_email, password=request.POST['password'], keypair=keypair) @@ -136,20 +145,23 @@ class RegistrationView (FreeAccessView): last_name = reg_lname, #affiliation = reg_aff, authority_hrn = reg_auth, - login = reg_login, + #login = reg_login, email = reg_email, password = request.POST['password'], - keypair = keypair, + keypair = account_config, + pi = '', ) b.save() + # saves the user to django auth_user table [needed for password reset] + user = User.objects.create_user(reg_email, reg_email, request.POST['password']) #creating user to manifold local:user - config = '{"firstname":"'+ reg_fname + '", "lastname":"'+ reg_lname + '", "authority":"'+ reg_auth + '"}' - user_params = {'email': reg_email, 'password': request.POST['password'], 'config': config} + user_config = '{"firstname":"'+ reg_fname + '", "lastname":"'+ reg_lname + '", "authority":"'+ reg_auth + '"}' + user_params = {'email': reg_email, 'password': request.POST['password'], 'config': user_config, 'status': 1} manifold_add_user(request,user_params) #creating local:account in manifold user_id = user_detail['user_id']+1 # the user_id for the newly created user in local:user - user_params = {'platform_id': 5, 'user_id': user_id, 'auth_type': auth_type, 'config': keypair} - manifold_add_account(request,user_params) + account_params = {'platform_id': 5, 'user_id': user_id, 'auth_type': auth_type, 'config': account_config} + manifold_add_account(request,account_params) # Send email ctx = { @@ -158,16 +170,17 @@ class RegistrationView (FreeAccessView): 'authority_hrn' : reg_auth, 'email' : reg_email, 'user_hrn' : user_hrn, - 'keypair' : 'Public Key: ' + public_key, - 'cc_myself' : True # form.cleaned_data['cc_myself'] + 'public_key' : public_key, } recipients = authority_get_pi_emails(request,reg_auth) - - if ctx['cc_myself']: - recipients.append(ctx['email']) + + # We don't need to send this email to user. + # it's for the PI only + #if ctx['cc_myself']: + # recipients.append(ctx['email']) msg = render_to_string('user_request_email.txt', ctx) - send_mail("Onelab New User request for %s submitted"%reg_email, msg, reg_email, recipients) + send_mail("Onelab New User request for %s submitted"%reg_email, msg, 'support@myslice.info', recipients) return render(request, 'user_register_complete.html') template_env = {