#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_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 '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
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']:
# public_key = "ssh-rsa " + public_key
# Saving to DB
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')
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:
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),