X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Faccountview.py;h=70ec790fb1f2735f527380d97d7a36f6749fb40d;hb=88cc2d36009069514ab2c327a5c42a9e4592dc32;hp=6f1fba0b9207055c7428f1c44621fd3e4ef5023c;hpb=8914ff738d969ee43d95d7bd2aa23f6b4d6200f0;p=myslice.git

diff --git a/portal/accountview.py b/portal/accountview.py
index 6f1fba0b..70ec790f 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
@@ -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)
                 
@@ -285,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.')
@@ -298,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/")
@@ -321,10 +321,14 @@ 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)
-                        messages.success(request, 'Sucess: New Keypair Generated!')
+                        # 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! Delegation of your credentials will be automatic.')
                         return HttpResponseRedirect("/portal/account/")
         else:
             messages.error(request, 'Account error: You need an account in myslice platform to perform this action')
@@ -409,6 +413,7 @@ def account_process(request):
                             user_params = { 'config': updated_config, 'auth_type':'user'}
                             manifold_update_account(request,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/")
                         else:
                             messages.error(request, 'Delete error: Private key is not stored in the server')
@@ -428,10 +433,9 @@ def account_process(request):
                         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 = account_config.get('user_public_key','N/A')         
-                            user_priv_key = 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 + '"}'
-                            updated_config = ''.join(updated_config.split()) 
+                            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_params)
                             messages.success(request, 'All Credentials cleared')