X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Fregistrationview.py;h=47c1cdce1b916ee99d5ae27568fc2204884eacfe;hp=b3633bf063388f1b0a6a45c89a2210b10bbce051;hb=864c51bf4c1330e2a1a1b5978b8a8dc5afe01763;hpb=7114aa9ee7ecf6e245c58b55c73eac455a6be53b

diff --git a/portal/registrationview.py b/portal/registrationview.py
index b3633bf0..47c1cdce 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,7 +47,8 @@ class RegistrationView (FreeAccessView):
             print "FIREXP ENABLED"
 
         authorities = execute_admin_query(request, authorities_query)
-        authorities = sorted(authorities)
+        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)
 
@@ -72,19 +75,23 @@ class RegistrationView (FreeAccessView):
             #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']:
@@ -126,7 +133,7 @@ class RegistrationView (FreeAccessView):
                     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)
@@ -142,13 +149,14 @@ class RegistrationView (FreeAccessView):
                     email         = reg_email, 
                     password      = request.POST['password'],
                     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
                 user_config = '{"firstname":"'+ reg_fname + '", "lastname":"'+ reg_lname + '", "authority":"'+ reg_auth + '"}'
-                user_params = {'email': reg_email, 'password': request.POST['password'], 'config': user_config}
+                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
@@ -162,16 +170,14 @@ 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'])
-
+                # backup email: if authority_get_pi_emails fails
+                recipients.append('support@myslice.info')
+                
                 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 = {