From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Tue, 25 Feb 2014 17:49:07 +0000 (+0100)
Subject: Issue- 11 Fixed
X-Git-Tag: myslice-1.1~305^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=15efdd09cc54f7514240b8754b6d01a2ad48528c;p=myslice.git

Issue- 11 Fixed
---

diff --git a/portal/accountview.py b/portal/accountview.py
index 62c6305b..f2b3457c 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 manifoldapi.manifoldapi            import execute_query
-from portal.actions                     import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account, sfa_update_user
+from portal.actions                     import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account, sfa_update_user, sfa_get_user
 #
 from unfold.page                        import Page    
 from ui.topmenu                         import topmenu_items_live, the_user
@@ -336,15 +336,25 @@ def account_process(request):
                         # preserving user_hrn
                         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) 
+                        #updated_config = json.dumps(account_config) 
                         # updating manifold
-                        user_params = { 'config': keypair, 'auth_type':'managed'}
-                        manifold_update_account(request, user_id, user_params)
+                        #user_params = { 'config': keypair, 'auth_type':'managed'}
+                        #manifold_update_account(request, user_id, user_params)
                         # updating sfa
                         public_key = public_key.replace('"', '');
                         user_pub_key = {'keys': public_key}
+                        #sfa_update_user(request, user_hrn, user_pub_key)
                         sfa_update_user(request, user_hrn, user_pub_key)
-                        messages.success(request, 'Sucess: New Keypair Generated! Delegation of your credentials will be automatic.')
+                        result_sfa_user = sfa_get_user(request, user_hrn, public_key)
+                        result_sfa_user = result_sfa_user[0]
+                        if 'keys' in result_sfa_user and result_sfa_user['keys'][0] == public_key:
+                            # updating manifold
+                            updated_config = json.dumps(account_config) 
+                            user_params = { 'config': keypair, 'auth_type':'managed'}
+                            manifold_update_account(request, user_id, user_params)
+                            messages.success(request, 'Sucess: New Keypair Generated! Delegation of your credentials will be automatic.')
+                        else:
+                            messages.error(request, 'Error: An error occured during the update of your public key at the Registry, or your public key is not matching the one stored.')
                         return HttpResponseRedirect("/portal/account/")
         else:
             messages.error(request, 'Account error: You need an account in myslice platform to perform this action')
diff --git a/portal/actions.py b/portal/actions.py
index a88b3416..c22d8fba 100644
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -35,6 +35,13 @@ def authority_get_pi_emails(request, authority_hrn):
         print "mails",  [result['email'] for result in results]
         return [result['email'] for result in results]
 
+# SFA get record
+
+def sfa_get_user(request, user_hrn, pub):
+    query_sfa_user = Query.get('user').filter_by('user_hrn', '==', user_hrn)
+    result_sfa_user = execute_query(request, query_sfa_user)
+    return result_sfa_user                        
+
 # SFA add record (user, slice)
 
 def sfa_add_user(request, user_params):