X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Faccountview.py;h=4091a6c69379cdd0376455f2d78196c58c72b025;hb=f0f76a08ca9dc5d208e1521a73ba1ba60a3c0065;hp=bb77ed07170ede5238e423cd5814f97b13f57c7f;hpb=db29e23d289c0edd696b8c6445765a908d59058c;p=myslice.git diff --git a/portal/accountview.py b/portal/accountview.py index bb77ed07..4091a6c6 100644 --- a/portal/accountview.py +++ b/portal/accountview.py @@ -29,12 +29,21 @@ class AccountView(LoginRequiredAutoLogoutView): page.add_css_files ( [ "css/onelab.css", "css/account_view.css","css/plugin.css" ] ) - user_query = Query().get('local:user').select('config','email') + user_query = Query().get('local:user').select('config','email','status') user_details = execute_query(self.request, user_query) # not always found in user_details... config={} for user_detail in user_details: + # different significations of user_status + if user_detail['status'] == 0: + user_status = 'Disabled' + elif user_detail['status'] == 1: + user_status = 'Validation Pending' + elif user_detail['status'] == 2: + user_status = 'Enabled' + else: + user_status = 'N/A' #email = user_detail['email'] if user_detail['config']: config = json.loads(user_detail['config']) @@ -56,6 +65,7 @@ class AccountView(LoginRequiredAutoLogoutView): my_auths = '' ref_acc_list = '' principal_acc_list = '' + user_status_list = [] platform_name_list = [] platform_name_secondary_list = [] platform_access_list = [] @@ -149,9 +159,10 @@ class AccountView(LoginRequiredAutoLogoutView): delegation_type_list.append(delegation) usr_hrn_list.append(account_usr_hrn) pub_key_list.append(account_pub_key) + user_status_list.append(user_status) # combining 5 lists into 1 [to render in the template] - principal_acc_list = [{'platform_name': t[0], 'account_type': t[1], 'delegation_type': t[2], 'usr_hrn':t[3], 'usr_pubkey':t[4]} - for t in zip(platform_name_list, account_type_list, delegation_type_list, usr_hrn_list, pub_key_list)] + principal_acc_list = [{'platform_name': t[0], 'account_type': t[1], 'delegation_type': t[2], 'usr_hrn':t[3], 'usr_pubkey':t[4], 'user_status':t[5],} + for t in zip(platform_name_list, account_type_list, delegation_type_list, usr_hrn_list, pub_key_list, user_status_list)] # to hide private key row if it doesn't exist if 'myslice' in platform_detail['platform']: account_config = json.loads(account_detail['config']) @@ -174,6 +185,7 @@ class AccountView(LoginRequiredAutoLogoutView): context['my_users'] = my_users context['my_slices'] = my_slices context['my_auths'] = my_auths + context['user_status'] = user_status context['person'] = self.request.user context['firstname'] = config.get('firstname',"?") context['lastname'] = config.get('lastname',"?") @@ -224,7 +236,7 @@ def account_process(request): if 'delete_'+platform_detail['platform'] in request.POST: platform_id = platform_detail['platform_id'] user_params = {'user_id':user_id} - manifold_delete_account(request,platform_id,user_params) + manifold_delete_account(request,platform_id, user_id, user_params) messages.info(request, 'Reference Account is removed from the selected platform') return HttpResponseRedirect("/portal/account/") @@ -316,7 +328,7 @@ def account_process(request): private_key = json.dumps(private.exportKey()) public = private.publickey() public_key = json.dumps(public.exportKey(format='OpenSSH')) - # updating maniolf local:account table + # updating manifold local:account table account_config = json.loads(account_detail['config']) # preserving user_hrn user_hrn = account_config.get('user_hrn','N/A') @@ -324,7 +336,7 @@ def account_process(request): updated_config = json.dumps(account_config) # updating manifold user_params = { 'config': keypair, 'auth_type':'managed'} - manifold_update_account(request,user_params) + manifold_update_account(request, user_id, user_params) # updating sfa public_key = public_key.replace('"', ''); user_pub_key = {'keys': public_key} @@ -355,7 +367,10 @@ def account_process(request): file_content = ''.join(file_content.split()) #update manifold local:account table user_params = { 'config': file_content, 'auth_type':'user'} - manifold_update_account(request,user_params) + manifold_update_account(request, user_id, user_params) + # updating sfa + user_pub_key = {'keys': file_content} + sfa_update_user(request, user_hrn, user_pub_key) messages.success(request, 'Publickey uploaded! Please delegate your credentials using SFA: http://trac.myslice.info/wiki/DelegatingCredentials') return HttpResponseRedirect("/portal/account/") else: @@ -412,7 +427,7 @@ def account_process(request): updated_config = json.dumps(account_config) user_params = { 'config': updated_config, 'auth_type':'user'} - manifold_update_account(request,user_params) + manifold_update_account(request, user_id, user_params) messages.success(request, 'Private Key deleted. You need to delegate credentials manually once it expires.') messages.success(request, 'Once your credentials expire, Please delegate manually using SFA: http://trac.myslice.info/wiki/DelegatingCredentials') return HttpResponseRedirect("/portal/account/") @@ -438,7 +453,7 @@ def account_process(request): user_priv_key = json.dumps(account_config.get('user_private_key','N/A')) updated_config = '{"user_public_key":'+ user_pub_key + ', "user_private_key":'+ user_priv_key + ', "user_hrn":"'+ user_hrn + '"}' user_params = { 'config': updated_config} - manifold_update_account(request,user_params) + manifold_update_account(request,user_id, user_params) messages.success(request, 'All Credentials cleared') return HttpResponseRedirect("/portal/account/") else: