MyAcc: adapted new function parameter (manifold_delete_account)

[myslice.git] / portal / accountview.py

diff --git a/portal/accountview.py b/portal/accountview.py
index c06f578..4091a6c 100644 (file)
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -185,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',"?")
@@ -235,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/")
 
@@ -327,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')
@@ -335,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}
@@ -366,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:
@@ -423,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/")
@@ -449,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: