X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=64eca81f08ffebaa40f1fe444b7f97acc38b3e9b;hb=136ec4d6c95beb2537cc5e61615cdee741529f60;hp=b9f35ffb53d3f0e63ca3f72f9f91c32729f89482;hpb=8be9b358a544e1ea9e53ad40495fa42e9d5edf9a;p=myslice.git diff --git a/portal/registrationview.py b/portal/registrationview.py index b9f35ffb..64eca81f 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -2,14 +2,14 @@ import os.path, re import json 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 unfold.page import Page from unfold.loginrequired import FreeAccessView -from ui.topmenu import topmenu_items +from ui.topmenu import topmenu_items_live from manifold.manifoldapi import execute_admin_query from manifold.core.query import Query @@ -31,19 +31,20 @@ class RegistrationView (FreeAccessView): def get_or_post (self, request, method): errors = [] - #authorities_query = Query.get('authority').\ - # select('name', 'authority_hrn') + # Using cache manifold-tables to get the list of authorities faster + authorities_query = Query.get('authority').select('name', 'authority_hrn') #onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple').filter_by('disabled', '==', 'False') #onelab_enabled = not not execute_admin_query(request, onelab_enabled_query) #if onelab_enabled: - #if True: - # print "ONELAB ENABLED" - # authorities_query = Query.get('ple:authority').select('name', 'authority_hrn').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple', 'ple.nitos']) - #else: - # print "FIREXP ENABLED" - - #authorities = execute_admin_query(request, authorities_query) + if True: + print "ONELAB ENABLED" + #authorities_query = Query.get('ple:authority').select('name', 'authority_hrn').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple', 'ple.nitos']) + # Now using Cache + else: + print "FIREXP ENABLED" + + authorities = execute_admin_query(request, authorities_query) # xxx tocheck - if authorities is empty, it's no use anyway # (users won't be able to validate the form anyway) @@ -53,6 +54,9 @@ class RegistrationView (FreeAccessView): print 'registration view, method',method + user_query = Query().get('local:user').select('user_id','email') + user_details = execute_admin_query(self.request, user_query) + if method == 'POST': # We shall use a form here @@ -75,7 +79,10 @@ class RegistrationView (FreeAccessView): errors.append('Last Name may contain only letters, numbers, spaces and @/./+/-/_ characters.') # XXX validate authority hrn !! if PendingUser.objects.filter(email__iexact=reg_email): - errors.append('Email already registered.Please provide a new email address.') + errors.append('Email is pending for validation. Please provide a new email address.') + 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.') # XXX TODO: Factorize with portal/accountview.py if 'generate' in request.POST['question']: @@ -99,6 +106,8 @@ class RegistrationView (FreeAccessView): #keypair = re.sub("\n", "\\n", keypair) #keypair = keypair.rstrip('\r\n') #keypair = ''.join(keypair.split()) + #for sending email: removing existing double qoute + public_key = public_key.replace('"', ''); else: up_file = request.FILES['user_public_key'] file_content = up_file.read() @@ -113,6 +122,7 @@ class RegistrationView (FreeAccessView): 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].') @@ -132,10 +142,17 @@ class RegistrationView (FreeAccessView): keypair = keypair, ) b.save() - #saving to manifold - config = '{"firstname":'+ reg_fname + ', "lastname":'+ reg_lname + ', "authority":"'+ reg_auth + '"}' + # 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} - manifold_add_user(request,user_params) + 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) + # Send email ctx = { 'first_name' : reg_fname, @@ -143,7 +160,7 @@ class RegistrationView (FreeAccessView): 'authority_hrn' : reg_auth, 'email' : reg_email, 'user_hrn' : user_hrn, - 'keypair' : 'Public Key :' + public_key, + 'keypair' : 'Public Key: ' + public_key, 'cc_myself' : True # form.cleaned_data['cc_myself'] } recipients = authority_get_pi_emails(request,reg_auth) @@ -153,24 +170,10 @@ class RegistrationView (FreeAccessView): msg = render_to_string('user_request_email.txt', ctx) send_mail("Onelab New User request for %s submitted"%reg_email, msg, reg_email, recipients) - - #return render(request, 'user_register_complete.html') - - #creating local:account in manifold - user_query = Query().get('local:user').select('user_id','email') - user_details = execute_admin_query(self.request, user_query) - - for user_detail in user_details: - if user_detail['email']==reg_email: - user_id = user_detail['user_id'] - #print "test" - #print user_id - user_params = {'platform_id': 5, 'user_id': user_id, 'auth_type': auth_type, 'config': keypair} - manifold_add_account(request,user_params) - return render(request, 'user_register_complete.html') + return render(request, 'user_register_complete.html') template_env = { - 'topmenu_items': topmenu_items('Register', request), + 'topmenu_items': topmenu_items_live('Register', page), 'errors': errors, 'firstname': request.POST.get('firstname', ''), 'lastname': request.POST.get('lastname', ''), @@ -178,7 +181,7 @@ class RegistrationView (FreeAccessView): 'authority_hrn': request.POST.get('authority_hrn', ''), 'email': request.POST.get('email', ''), 'password': request.POST.get('password', ''), - #'authorities': authorities, + 'authorities': authorities, } template_env.update(page.prelude_env ()) return render(request, 'registration_view.html',template_env)