Merge branch 'master' of ssh://git.onelab.eu/git/myslice

[myslice.git] / portal / accountview.py

diff --git a/portal/accountview.py b/portal/accountview.py
index 4292ca3..d97126f 100644 (file)
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -4,7 +4,7 @@ from manifold.core.query                import Query
 from manifold.manifoldapi               import execute_query
 from portal.actions                     import manifold_update_user, manifold_update_account
 #
-from myslice.viewutils                  import topmenu_items, the_user
+from ui.topmenu                         import topmenu_items, the_user
 #
 from django.http                        import HttpResponse, HttpResponseRedirect
 from django.contrib                     import messages
@@ -236,14 +236,22 @@ def account_process(request):
                     if 'myslice' in platform_detail['platform']:
                         account_config = json.loads(account_detail['config'])
                         if 'user_private_key' in account_config:
-                            pass
+                            for key in account_config.keys():
+                                if key== 'user_private_key':    
+                                    del account_config[key]
+                                
+                            updated_config = json.dumps(account_config)
+                            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.')
+                            return HttpResponseRedirect("/portal/account/")
                         else:
                             messages.error(request, 'Delete error: Private key is not stored in the server')
                             return HttpResponseRedirect("/portal/account/")
                            
-
-        #messages.success(request, 'delete key en cours')
-        #return HttpResponseRedirect("/portal/account/")
+        else:
+            messages.error(request, 'Account error: You need an account in myslice platform to perform this action')    
+            return HttpResponseRedirect("/portal/account/")
            
        
     else: