X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Faccountview.py;h=20c2b05c26e4062df81c34d60482b094e05f8156;hb=3b78ac598a00cdd5c3e079381fa3e1d6466e54e8;hp=5d3c9f83d9d4748331414d18c085e497e8b79793;hpb=faff7d4312753dcd49eab496884bcbf0483f17c7;p=unfold.git

diff --git a/portal/accountview.py b/portal/accountview.py
index 5d3c9f83..20c2b05c 100644
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -10,9 +10,8 @@ from ui.topmenu                         import topmenu_items_live, the_user
 from django.http                        import HttpResponse, HttpResponseRedirect
 from django.contrib                     import messages
 from django.contrib.auth.decorators     import login_required
-from django.core.mail                   import send_mail
 
-from theme import ThemeView
+from myslice.theme import ThemeView
 
 #
 import json, os, re, itertools
@@ -204,6 +203,7 @@ class AccountView(LoginRequiredAutoLogoutView, ThemeView):
         # so we can sho who is logged
         context['username'] = the_user(self.request)
         context['theme'] = self.theme
+        context['section'] = "User account"
 #        context ['firstname'] = config['firstname']
         prelude_env = page.prelude_env()
         context.update(prelude_env)
@@ -347,14 +347,17 @@ def account_process(request):
                         #sfa_update_user(request, user_hrn, user_pub_key)
                         sfa_update_user(request, user_hrn, user_pub_key)
                         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:
+                        try:
+                            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:
+                                raise Exception,"Keys are not matching"
+                        except Exception,e:
                             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:
@@ -452,6 +455,29 @@ def account_process(request):
         else:
             messages.error(request, 'Account error: You need an account in myslice platform to perform this action')    
             return HttpResponseRedirect("/portal/account/")
+    
+    # download identity for jfed
+    elif 'dl_identity' in request.POST:
+        for account_detail in account_details:
+            for platform_detail in platform_details:
+                if platform_detail['platform_id'] == account_detail['platform_id']:
+                    if 'myslice' in platform_detail['platform']:
+                        account_config = json.loads(account_detail['config'])
+                        if 'user_private_key' in account_config:
+                            private_key = account_config['user_private_key']
+                            user_hrn = account_config.get('user_hrn','N/A')
+                            registry = 'http://sfa-fed4fire.pl.sophia.inria.fr:12345/'
+                            jfed_identity = user_hrn + '\n' + registry + '\n' + private_key 
+                            response = HttpResponse(jfed_identity, content_type='text/plain')
+                            response['Content-Disposition'] = 'attachment; filename="jfed_identity.txt"'
+                            return response
+                        else:
+                            messages.error(request, 'Download error: Private key is not stored in the server')
+                            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/")
 
     #clear all creds
     elif 'clear_cred' in request.POST: