import os.path, re
import json
-from random import randint
+from random import randint
+from hashlib import md5
-from django.core.mail import send_mail
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
from unfold.page import Page
from unfold.loginrequired import FreeAccessView
from portal.models import PendingUser
from portal.actions import create_pending_user
-from theme import ThemeView
+from myslice.theme import ThemeView
# since we inherit from FreeAccessView we cannot redefine 'dispatch'
# so let's override 'get' and 'post' instead
authorities = execute_admin_query(wsgi_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)
-
- # Who am I ?
- user_query = Query().get('local:user').select('user_id','email')
- user_details = execute_admin_query(wsgi_request, user_query)
-
+
# Page rendering
page = Page(wsgi_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" ] )
+ page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js", "js/jquery.qtip.min.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" ] )
if method == 'POST':
# The form has been submitted
+
+ # 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)
+
+ for authority in authorities:
+ if authority['name'] == wsgi_request.POST.get('org_name', ''):
+ authority_hrn = authority['authority_hrn']
+
+ post_email = wsgi_request.POST.get('email','').lower()
+ salt = randint(1,100000)
+ email_hash = md5(str(salt)+post_email).hexdigest()
+ #email_hash = md5(post_email).digest().encode('base64')[:-1]
user_request = {
'first_name' : wsgi_request.POST.get('firstname', ''),
'last_name' : wsgi_request.POST.get('lastname', ''),
- 'authority_hrn' : wsgi_request.POST.get('authority_hrn', ''),
- 'email' : wsgi_request.POST.get('email', '').lower(),
+ 'organization' : wsgi_request.POST.get('org_name', ''),
+ 'authority_hrn' : authority_hrn,
+ 'email' : post_email,
'password' : wsgi_request.POST.get('password', ''),
+ 'current_site' : current_site,
+ 'email_hash' : email_hash,
+ 'validation_link': 'http://' + current_site + '/portal/email_activation/'+ email_hash
}
# Construct user_hrn from email (XXX Should use common code)
split_email = user_request['email'].split("@")[0]
split_email = split_email.replace(".", "_")
user_request['user_hrn'] = user_request['authority_hrn'] \
- + '.' + split_email + str(randint(1,1000000))
+ + '.' + split_email
# Validate input
UserModel = get_user_model()
errors.append('Email is pending for validation. Please provide a new email address.')
if UserModel._default_manager.filter(email__iexact = user_request['email']):
errors.append('This email is not usable. Please contact the administrator or try with another email.')
+ # Does the user exist in Manifold?
+ user_query = Query().get('local:user').select('user_id','email')
+ user_details = execute_admin_query(wsgi_request, user_query)
for user_detail in user_details:
if user_detail['email'] == user_request['email']:
errors.append('Email already registered in Manifold. Please provide a new email address.')
-
+ # Does the user exist in sfa? [query is very slow!!]
+ #user_query = Query().get('user').select('user_hrn','user_email')
+ # XXX Test based on the user_hrn is quick
+ user_query = Query().get('user').select('user_hrn','user_email').filter_by('user_hrn','==',user_request['user_hrn'])
+ user_details_sfa = execute_admin_query(wsgi_request, user_query)
+
+ for user in user_details_sfa:
+ if user['user_email'] == user_request['email']:
+ errors.append('Email already registered in SFA registry. Please use another email.')
+ if user['user_hrn'] == user_request['user_hrn']:
+ # add random number if user_hrn already exists in the registry
+ user_request['user_hrn'] = user_request['authority_hrn'] \
+ + '.' + split_email + str(randint(1,1000000))
+
# XXX TODO: Factorize with portal/accountview.py
if 'generate' in wsgi_request.POST['question']:
user_request['auth_type'] = 'managed'