from django.shortcuts import render
from unfold.page import Page
+from unfold.loginrequired import FreeAccessView
from ui.topmenu import topmenu_items
from manifold.manifoldapi import execute_admin_query
from manifold.core.query import Query
from portal.models import PendingUser
-from portal.actions import authority_get_pi_emails
+from portal.actions import authority_get_pi_emails, manifold_add_user,manifold_add_account
-# This is a rough porting from views.py
-# the former function-based view is now made a class
-# we redefine dispatch as it is simple
-# and coincidentally works since we do not need LoginRequiredAutoLogoutView
-# a second stab should redefine post and get instead
-# also this was not thoroughly tested either, might miss some imports
-# to be continued...
+# since we inherit from FreeAccessView we cannot redefine 'dispatch'
+# so let's override 'get' and 'post' instead
+#
+class RegistrationView (FreeAccessView):
-class RegistrationView (View):
+ def post (self, request):
+ return self.get_or_post (request, 'POST')
- def dispatch (self, request):
+ def get (self, request):
+ return self.get_or_post (request, 'GET')
+
+ def get_or_post (self, request, method):
errors = []
- authorities_query = Query.get('authority').\
- select('name', 'authority_hrn')
+ #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:
+ #onelab_enabled = not not execute_admin_query(request, onelab_enabled_query)
+ #if onelab_enabled:
+ if True:
print "ONELAB ENABLED"
- authorities_query = authorities_query.filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple'])
+ 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"
page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js" ] )
page.add_css_files ( [ "css/onelab.css", "css/registration.css" ] )
- print 'registration view, method',request.method
+ 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 request.method == 'POST':
+ if method == 'POST':
# We shall use a form here
#get_email = PendingUser.objects.get(email)
reg_auth = request.POST.get('authority_hrn', '')
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
+
#POST value validation
if (re.search(r'^[\w+\s.@+-]+$', reg_fname)==None):
errors.append('First Name may contain only letters, numbers, spaces and @/./+/-/_ characters.')
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']:
# 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 + '}'
+ keypair = '{"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)
#keypair = keypair.rstrip('\r\n')
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 +'"}'
+ 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())
+ auth_type = 'user'
# for sending email
public_key = file_content
else:
#b = PendingUser(first_name=reg_fname, last_name=reg_lname, affiliation=reg_aff,
# email=reg_email, password=request.POST['password'], keypair=keypair)
#b.save()
+ #saving to django db 'portal_pendinguser' table
if not errors:
b = PendingUser(
first_name = reg_fname,
keypair = keypair,
)
b.save()
-
+ #saving to manifold
+ 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)
# Send email
ctx = {
'first_name' : reg_fname,
'last_name' : reg_lname,
'authority_hrn' : reg_auth,
- 'email' : reg_email,
+ 'email' : reg_email,
+ 'user_hrn' : user_hrn,
'keypair' : 'Public Key :' + public_key,
'cc_myself' : True # form.cleaned_data['cc_myself']
}
-
recipients = authority_get_pi_emails(request,reg_auth)
if ctx['cc_myself']:
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
+ for user_detail in user_details:
+ if user_detail['email']==reg_email:
+ user_id = user_detail['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')
template_env = {
'topmenu_items': topmenu_items('Register', request),
git://git.onelab.eu / myslice.git / blobdiff