X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Faccountview.py;h=73b55fdc1c04ae2ff66afdf9596c58f3f7274b93;hp=c7affb94e7c38c1e1c3e3a32663ee5c512788f2d;hb=caafec9916ce3ca86106a7bc8aa167b53309e072;hpb=f61296343dc3270ccbc271dab5c79eb883c1d610 diff --git a/portal/accountview.py b/portal/accountview.py index c7affb94..73b55fdc 100644 --- a/portal/accountview.py +++ b/portal/accountview.py @@ -2,7 +2,7 @@ from unfold.loginrequired import LoginRequiredAutoLogoutView # from manifold.core.query import Query from manifold.manifoldapi import execute_query -from portal.actions import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account +from portal.actions import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account, sfa_update_user # from unfold.page import Page from ui.topmenu import topmenu_items_live, the_user @@ -26,7 +26,7 @@ class AccountView(LoginRequiredAutoLogoutView): 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" ] ) + page.add_css_files ( [ "css/onelab.css", "css/account_view.css","css/plugin.css" ] ) user_query = Query().get('local:user').select('config','email') @@ -74,7 +74,7 @@ class AccountView(LoginRequiredAutoLogoutView): pub_key_list = [] for platform_detail in platform_details: - if 'sfa' in platform_detail['gateway_type'] and platform_detail['disabled']==0: + if 'sfa' in platform_detail['gateway_type']: total_platform = platform_detail['platform'] total_platform_list.append(total_platform) @@ -211,11 +211,29 @@ def account_process(request): for account_detail in account_details: for platform_detail in platform_details: + # Add reference account to the platforms + if 'add_'+platform_detail['platform'] in request.POST: + platform_id = platform_detail['platform_id'] + user_params = {'platform_id': platform_id, 'user_id': user_id, 'auth_type': "reference", 'config': '{"reference_platform": "myslice"}'} + manifold_add_account(request,user_params) + messages.info(request, 'Reference Account is added to the selected platform successfully!') + return HttpResponseRedirect("/portal/account/") + + # Delete reference account from the platforms + 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) + messages.info(request, 'Reference Account is removed from the selected platform') + return HttpResponseRedirect("/portal/account/") + if platform_detail['platform_id'] == account_detail['platform_id']: if 'myslice' in platform_detail['platform']: account_config = json.loads(account_detail['config']) acc_slice_cred = account_config.get('delegated_slice_credentials','N/A') acc_auth_cred = account_config.get('delegated_authority_credentials','N/A') + + # adding the slices and corresponding credentials to list @@ -225,7 +243,7 @@ def account_process(request): for key, value in acc_slice_cred.iteritems(): slice_list.append(key) slice_cred.append(value) - # special case: download each slice credentials separately -- too complicated + # special case: download each slice credentials separately for i in range(0, len(slice_list)): if 'dl_'+slice_list[i] in request.POST: slice_detail = "Slice name: " + slice_list[i] +"\nSlice Credentials: \n"+ slice_cred[i] @@ -240,7 +258,7 @@ def account_process(request): for key, value in acc_auth_cred.iteritems(): auth_list.append(key) auth_cred.append(value) - # special case: download each slice credentials separately -- too complicated + # special case: download each slice credentials separately for i in range(0, len(auth_list)): if 'dl_'+auth_list[i] in request.POST: auth_detail = "Authority: " + auth_list[i] +"\nAuthority Credentials: \n"+ auth_cred[i] @@ -267,7 +285,7 @@ def account_process(request): user_config['config']= '{"firstname":"' + edited_first_name + '", "lastname":"'+ edited_last_name + '", "authority": "Unknown Authority"}' user_params = {'config': user_config['config']} # updating config local:user in manifold - manifold_update_user(request,user_params) + manifold_update_user(request, request.user.email,user_params) # this will be depricated, we will show the success msg in same page # Redirect to same page with success message messages.success(request, 'Sucess: First Name and Last Name Updated.') @@ -280,7 +298,7 @@ def account_process(request): user_pass['password'] = edited_password #updating password in local:user user_params = { 'password': user_pass['password']} - manifold_update_user(request,user_params) + manifold_update_user(request,request.user.email,user_params) # return HttpResponse('Success: Password Changed!!') messages.success(request, 'Sucess: Password Updated.') return HttpResponseRedirect("/portal/account/") @@ -303,9 +321,13 @@ def account_process(request): user_hrn = account_config.get('user_hrn','N/A') keypair = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + ', "user_hrn":"'+ user_hrn + '"}' updated_config = json.dumps(account_config) - + # updating manifold user_params = { 'config': keypair, 'auth_type':'managed'} manifold_update_account(request,user_params) + # updating sfa + public_key = public_key.replace('"', ''); + user_pub_key = {'keys': public_key} + sfa_update_user(request, user_hrn, user_pub_key) messages.success(request, 'Sucess: New Keypair Generated!') return HttpResponseRedirect("/portal/account/") else: @@ -437,102 +459,6 @@ def account_process(request): messages.error(request, 'Download error: User credential is not stored in the server') return HttpResponseRedirect("/portal/account/") - # add reference platforms - elif 'add_fuseco' in request.POST: - for platform_detail in platform_details: - if platform_detail['platform'] == "fuseco": - platform_id = platform_detail['platform_id'] - - user_params = {'platform_id': platform_id, 'user_id': user_id, 'auth_type': "reference", 'config': '{"reference_platform": "myslice"}'} - manifold_add_account(request,user_params) - - messages.info(request, 'Reference Account added on Fuseco platform. You have now access to Fuseco resources.') - return HttpResponseRedirect("/portal/account/") - - elif 'add_ple' in request.POST: - for platform_detail in platform_details: - if platform_detail['platform'] == "ple": - platform_id = platform_detail['platform_id'] - user_params = {'platform_id': platform_id, 'user_id': user_id, 'auth_type': "reference", 'config': '{"reference_platform": "myslice"}'} - manifold_add_account(request,user_params) - messages.info(request, 'Reference Account added on PLE platform. You have now access to PLE resources.') - return HttpResponseRedirect("/portal/account/") - - elif 'add_omf' in request.POST: - for platform_detail in platform_details: - if platform_detail['platform'] == "omf": - platform_id = platform_detail['platform_id'] - user_params = {'platform_id': platform_id, 'user_id': user_id, 'auth_type': "reference", 'config': '{"reference_platform": "myslice"}'} - manifold_add_account(request,user_params) - messages.info(request, 'Reference Account added on OMF:Nitos platform. You have now access to OMF:Nitos resources.') - return HttpResponseRedirect("/portal/account/") - - elif 'add_wilab' in request.POST: - for platform_detail in platform_details: - if platform_detail['platform'] == "wilab": - platform_id = platform_detail['platform_id'] - user_params = {'platform_id': platform_id, 'user_id': user_id, 'auth_type': "reference", 'config': '{"reference_platform": "myslice"}'} - manifold_add_account(request,user_params) - messages.info(request, 'Reference Account added on Wilab platform. You have now access to Wilab resources.') - return HttpResponseRedirect("/portal/account/") - - elif 'iotlab' in request.POST: - for platform_detail in platform_details: - if platform_detail['platform'] == "iotlab": - platform_id = platform_detail['platform_id'] - user_params = {'platform_id': platform_id, 'user_id': user_id, 'auth_type': "reference", 'config': '{"reference_platform": "myslice"}'} - manifold_add_account(request,user_params) - messages.info(request, 'Reference Account added on IOTLab platform. You have now access to IOTLab resources.') - return HttpResponseRedirect("/portal/account/") - - # delete reference platforms - elif 'delete_fuseco' in request.POST: - for platform_detail in platform_details: - if platform_detail['platform'] == "fuseco": - platform_id = platform_detail['platform_id'] - user_params = {'user_id':user_id} - manifold_delete_account(request,platform_id,user_params) - messages.info(request, 'Reference Account is removed from Fuseco platform. You have no access to Fuseco resources anymore.') - return HttpResponseRedirect("/portal/account/") - - elif 'delete_ple' in request.POST: - for platform_detail in platform_details: - if platform_detail['platform'] == "ple": - platform_id = platform_detail['platform_id'] - user_params = {'user_id':user_id} - manifold_delete_account(request,platform_id,user_params) - messages.info(request, 'Reference Account is removed from PLE platform. You have no access to PLE resources anymore.') - return HttpResponseRedirect("/portal/account/") - - elif 'delete_omf' in request.POST: - for platform_detail in platform_details: - if platform_detail['platform'] == "omf": - platform_id = platform_detail['platform_id'] - user_params = {'user_id':user_id} - manifold_delete_account(request,platform_id,user_params) - messages.info(request, 'Reference Account is removed from OMF:Nitos platform. You have no access to OMF:Nitos resources anymore.') - return HttpResponseRedirect("/portal/account/") - - elif 'delete_wilab' in request.POST: - for platform_detail in platform_details: - if platform_detail['platform'] == "wilab": - platform_id = platform_detail['platform_id'] - user_params = {'user_id':user_id} - manifold_delete_account(request,platform_id,user_params) - query = Query.delete('local:account').filter_by('platform_id','==',platform_id) - results = execute_query(request,query) - messages.info(request, 'Reference Account is removed from Wilab platform. You have no access to Wilab resources anymore.') - return HttpResponseRedirect("/portal/account/") - - elif 'delete_iotlab' in request.POST: - for platform_detail in platform_details: - if platform_detail['platform'] == "iotlab": - platform_id = platform_detail['platform_id'] - user_params = {'user_id':user_id} - manifold_delete_account(request,platform_id,user_params) - messages.info(request, 'Reference Account is removed from IOTLab platform. You have no access to IOTLab resources anymore.') - return HttpResponseRedirect("/portal/account/") - else: messages.info(request, 'Under Construction. Please try again later!') return HttpResponseRedirect("/portal/account/")