FIX: http://trac.myslice.info/ticket/10

[myslice.git] / portal / accountview.py

diff --git a/portal/accountview.py b/portal/accountview.py
index d4b68f4..f0e7a4a 100644 (file)
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -60,12 +60,15 @@ class AccountView(LoginRequiredAutoLogoutView):
                     account_type_list.append(account_type)
                     usr_hrn_list.append(account_usr_hrn)
                     pub_key_list.append(account_pub_key)
+            
+                # to hide private key row if it doesn't exist    
+                if 'myslice' in platform_detail['platform']:
+                    account_config = json.loads(account_detail['config'])
+                    account_priv_key = account_config.get('user_private_key','N/A')
         
         # combining 4 lists into 1 [to render in the template] 
         lst = [{'platform_name': t[0], 'account_type': t[1], 'usr_hrn':t[2], 'usr_pubkey':t[3]} 
                for t in zip(platform_name_list, account_type_list, usr_hrn_list, pub_key_list)]
-        #print "test"
-        #print lst
 
         context = super(AccountView, self).get_context_data(**kwargs)
         context['data'] = lst
@@ -74,7 +77,7 @@ class AccountView(LoginRequiredAutoLogoutView):
         context ['lastname'] = config.get('lastname',"?")
         context ['fullname'] = context['firstname'] +' '+ context['lastname']
         context ['authority'] = config.get('authority',"Unknown Authority")
-        #context['users'] = userlist.render(self.request)
+        context['user_private_key'] = account_priv_key
         
         # XXX This is repeated in all pages
         # more general variables expected in the template
@@ -161,12 +164,20 @@ def account_process(request):
 #                        private_key = k.as_pem()
 #                        private_key = ''.join(private_key.split())
 #                        public_key = "ssh-rsa " + public_key
-                        keypair = '{"user_public_key":'+ public_key + ', "user_private_key":'+ private_key + '}'
+                        # now we overwrite the config field with keypair
+                        # once there will be user_hrn, we need to keep user_hrn and change only the keypair
+                        # see submit_name section for implementing this    
 #                       keypair = re.sub("\r", "", keypair)
 #                       keypair = re.sub("\n", "\\n", keypair)
 #                       #keypair = keypair.rstrip('\r\n')
 #                       keypair = ''.join(keypair.split())
                         # updating maniolf local:account table
+                        account_config = json.loads(account_detail['config'])
+                        # 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) 
+
                         user_params = { 'config': keypair, 'auth_type':'managed'}
                         manifold_update_account(request,user_params)
                         messages.success(request, 'Sucess: New Keypair Generated!')
@@ -186,7 +197,10 @@ def account_process(request):
                         file_extension = os.path.splitext(file_name)[1] 
                         allowed_extension =  ['.pub','.txt']
                         if file_extension in allowed_extension and re.search(r'ssh-rsa',file_content):
-                            file_content = '{"user_public_key":"'+ file_content +'"}'
+                            account_config = json.loads(account_detail['config'])
+                            # preserving user_hrn
+                            user_hrn = account_config.get('user_hrn','N/A')
+                            file_content = '{"user_public_key":"'+ file_content + '", "user_hrn":"'+ user_hrn +'"}'
                             #file_content = re.sub("\r", "", file_content)
                             #file_content = re.sub("\n", "\\n",file_content)
                             file_content = ''.join(file_content.split())