X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Faccountview.py;h=50483839eef037800956ac5989fc1b1d2689be52;hb=refs%2Fheads%2Ffibre;hp=c88ac0e167834ae712018c8a7a835baa5537ebbc;hpb=d81f5f5ca87b6eba05adb93cd27ac3c9952cc294;p=unfold.git diff --git a/portal/accountview.py b/portal/accountview.py index c88ac0e1..50483839 100644 --- a/portal/accountview.py +++ b/portal/accountview.py @@ -5,7 +5,7 @@ from sfa.trust.certificate import Keypair # from manifold.core.query import Query from manifoldapi.manifoldapi import execute_query -from portal.actions import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account, sfa_update_user, sfa_get_user +from portal.actions import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account, sfa_update_user, sfa_get_user, clear_user_creds # from unfold.page import Page from ui.topmenu import topmenu_items_live, the_user @@ -31,9 +31,11 @@ class AccountView(LoginRequiredAutoLogoutView, ThemeView): def get_context_data(self, **kwargs): self.template_name = self.template page = Page(self.request) - page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js", "js/my_account.edit_profile.js" ] ) - page.add_css_files ( [ "css/onelab.css", "css/account_view.css","css/plugin.css" ] ) + metadata = page.get_metadata() + page.expose_js_metadata() + page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js", "js/my_account.edit_profile.js","js/jquery-ui.js" ] ) + page.add_css_files ( [ "css/onelab.css", "css/account_view.css","css/plugin.css" ] ) user_query = Query().get('local:user').select('config','email','status') user_details = execute_query(self.request, user_query) @@ -187,29 +189,36 @@ class AccountView(LoginRequiredAutoLogoutView, ThemeView): ## check user is pi or not - platform_query = Query().get('local:platform').select('platform_id','platform','gateway_type','disabled') - account_query = Query().get('local:account').select('user_id','platform_id','auth_type','config') - platform_details = execute_query(self.request, platform_query) - account_details = execute_query(self.request, account_query) - for platform_detail in platform_details: - for account_detail in account_details: - if platform_detail['platform_id'] == account_detail['platform_id']: - if 'config' in account_detail and account_detail['config'] is not '': - account_config = json.loads(account_detail['config']) - if 'myslice' in platform_detail['platform']: - acc_auth_cred = account_config.get('delegated_authority_credentials','N/A') + # platform_query = Query().get('local:platform').select('platform_id','platform','gateway_type','disabled') + # account_query = Query().get('local:account').select('user_id','platform_id','auth_type','config') + # platform_details = execute_query(self.request, platform_query) + # account_details = execute_query(self.request, account_query) + # for platform_detail in platform_details: + # for account_detail in account_details: + # if platform_detail['platform_id'] == account_detail['platform_id']: + # if 'config' in account_detail and account_detail['config'] is not '': + # account_config = json.loads(account_detail['config']) + # if 'myslice' in platform_detail['platform']: + # acc_auth_cred = account_config.get('delegated_authority_credentials','N/A') # assigning values if acc_auth_cred == {} or acc_auth_cred == 'N/A': pi = "is_not_pi" else: pi = "is_pi" + # check if the user has creds or not + if acc_user_cred == {} or acc_user_cred == 'N/A': + user_cred = 'no_creds' + else: + user_cred = 'has_creds' + context = super(AccountView, self).get_context_data(**kwargs) context['principal_acc'] = principal_acc_list context['ref_acc'] = ref_acc_list context['platform_list'] = platform_list context['my_users'] = my_users context['pi'] = pi + context['user_cred'] = user_cred context['my_slices'] = my_slices context['my_auths'] = my_auths context['user_status'] = user_status @@ -250,6 +259,7 @@ def account_process(request): # getting the user_id from the session for user_detail in user_details: user_id = user_detail['user_id'] + user_email = user_detail['email'] for account_detail in account_details: for platform_detail in platform_details: @@ -346,6 +356,8 @@ def account_process(request): return HttpResponseRedirect("/portal/account/") # XXX TODO: Factorize with portal/registrationview.py +# XXX TODO: Factorize with portal/registrationview.py +# XXX TODO: Factorize with portal/joinview.py elif 'generate' in request.POST: for account_detail in account_details: @@ -505,28 +517,16 @@ def account_process(request): #clear all creds elif 'clear_cred' in request.POST: - for account_detail in account_details: - for platform_detail in platform_details: - if platform_detail['platform_id'] == account_detail['platform_id']: - if 'myslice' in platform_detail['platform']: - account_config = json.loads(account_detail['config']) - user_cred = account_config.get('delegated_user_credential','N/A') - if 'N/A' not in user_cred: - user_hrn = account_config.get('user_hrn','N/A') - user_pub_key = json.dumps(account_config.get('user_public_key','N/A')) - 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_id, user_params) - messages.success(request, 'All Credentials cleared') - return HttpResponseRedirect("/portal/account/") - else: - messages.error(request, 'Delete error: Credentials are not stored in the server') - return HttpResponseRedirect("/portal/account/") - else: + try: + result = clear_user_creds(request, user_email) + if result is not None: + messages.success(request, 'All Credentials cleared') + else: + messages.error(request, 'Delete error: Credentials are not stored in the server') + except Exception,e: + print "Exception in accountview.py in clear_user_creds %s" % e messages.error(request, 'Account error: You need an account in myslice platform to perform this action') - return HttpResponseRedirect("/portal/account/") - + return HttpResponseRedirect("/portal/account/") # Download delegated_user_cred elif 'dl_user_cred' in request.POST: