X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fregistrationview.py;h=c24fda68091dd6a5b15d3bef76aafc18e40ed0ca;hb=cb3a40dfdc1c79ca57458d1c18732334d58734fd;hp=a8a2f9eb1d75d71af5fa12ac10ae42713950e1e1;hpb=e4689ef9dc5e7730c169528721e79909ae524674;p=unfold.git diff --git a/portal/registrationview.py b/portal/registrationview.py index a8a2f9eb..c24fda68 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -5,6 +5,7 @@ from hashlib import md5 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 django.contrib.sites.models import Site @@ -21,6 +22,8 @@ from portal.actions import create_pending_user from myslice.theme import ThemeView +import activity.user + # since we inherit from FreeAccessView we cannot redefine 'dispatch' # so let's override 'get' and 'post' instead # @@ -37,18 +40,19 @@ class RegistrationView (FreeAccessView, ThemeView): """ """ errors = [] - + authority_hrn = None authorities_query = Query.get('authority').select('name', 'authority_hrn') authorities = execute_admin_query(wsgi_request, authorities_query) if authorities is not None: authorities = sorted(authorities) + print "############ BREAKPOINT 1 #################" # Page rendering page = Page(wsgi_request) - page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js", "js/jquery.qtip.min.js", "js/jquery-ui.js" ] ) + page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js", "js/jquery.qtip.min.js","js/jquery-ui.js" ] ) page.add_css_files ( [ "css/onelab.css", "css/registration.css", "css/jquery.qtip.min.css" ] ) page.add_css_files ( [ "https://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" ] ) - + print "############ BREAKPOINT 2 #################" if method == 'POST': reg_form = {} # The form has been submitted @@ -56,14 +60,19 @@ class RegistrationView (FreeAccessView, ThemeView): # get the domain url current_site = Site.objects.get_current() current_site = current_site.domain - - authorities_query = Query.get('authority').select('name', 'authority_hrn') - authorities = execute_admin_query(wsgi_request, authorities_query) - + + print "############ BREAKPOINT 3 #################" + for authority in authorities: if authority['name'] == wsgi_request.POST.get('org_name', ''): authority_hrn = authority['authority_hrn'] + # Handle the case when the template uses only hrn and not name + if authority_hrn is None: + authority_hrn = wsgi_request.POST.get('org_name', '') + + print "############ BREAKPOINT 4 #################" + post_email = wsgi_request.POST.get('email','').lower() salt = randint(1,100000) email_hash = md5(str(salt)+post_email).hexdigest() @@ -77,21 +86,26 @@ class RegistrationView (FreeAccessView, ThemeView): 'password' : wsgi_request.POST.get('password', ''), 'current_site' : current_site, 'email_hash' : email_hash, + 'pi' : '', 'validation_link': 'http://' + current_site + '/portal/email_activation/'+ email_hash } - + + print "############ BREAKPOINT 5 #################" + # Construct user_hrn from email (XXX Should use common code) split_email = user_request['email'].split("@")[0] split_email = split_email.replace(".", "_") + # Replace + by _ => more convenient for testing and validate with a real email + split_email = split_email.replace("+", "_") user_request['user_hrn'] = user_request['authority_hrn'] \ + '.' + split_email # Validate input UserModel = get_user_model() if (re.search(r'^[\w+\s.@+-]+$', user_request['first_name']) == None): - errors.append('First Name may contain only letters, numbers, spaces and @/./+/-/_ characters.') + errors.append('First name may contain only letters, numbers, spaces and @/./+/-/_ characters.') if (re.search(r'^[\w+\s.@+-]+$', user_request['last_name']) == None): - errors.append('Last Name may contain only letters, numbers, spaces and @/./+/-/_ characters.') + errors.append('Last name may contain only letters, numbers, spaces and @/./+/-/_ characters.') # checking in django_db !! if PendingUser.objects.filter(email__iexact = user_request['email']): errors.append('Email is pending for validation. Please provide a new email address.') @@ -118,6 +132,8 @@ class RegistrationView (FreeAccessView, ThemeView): + '.' + split_email + str(randint(1,1000000)) # XXX TODO: Factorize with portal/accountview.py + # XXX TODO: Factorize with portal/registrationview.py + # XXX TODO: Factorize with portal/joinview.py if 'generate' in wsgi_request.POST['question']: user_request['auth_type'] = 'managed' @@ -142,16 +158,19 @@ class RegistrationView (FreeAccessView, ThemeView): ALLOWED_EXTENSIONS = ['.pub','.txt'] if file_extension not in ALLOWED_EXTENSIONS or not re.search(r'ssh-rsa',file_content): errors.append('Please upload a valid RSA public key.') - - user_request['private_key'] = None + # user_request['private_key'] can't be Null because all db fields are set as NOT NULL + user_request['private_key'] = "" user_request['public_key'] = file_content if not errors: create_pending_user(wsgi_request, user_request, user_detail) self.template_name = 'user_register_complete.html' + # log user activity + activity.user.register(self.request) return render(wsgi_request, self.template, {'theme': self.theme}) else: + print "############ BREAKPOINT A #################" user_request = {} ## this is coming from onelab website onelab.eu reg_form = { @@ -159,6 +178,9 @@ class RegistrationView (FreeAccessView, ThemeView): 'last_name': wsgi_request.GET.get('last_name', ''), 'email': wsgi_request.GET.get('email', ''), } + # log user activity + activity.user.signup(self.request) + print "############ BREAKPOINT B #################" template_env = { 'topmenu_items': topmenu_items_live('Register', page), @@ -169,4 +191,5 @@ class RegistrationView (FreeAccessView, ThemeView): template_env.update(user_request) template_env.update(reg_form) template_env.update(page.prelude_env ()) + print "############ BREAKPOINT C #################" return render(wsgi_request, self.template,template_env)