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, sfa_update_user
+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, sfa_get_user
#
from unfold.page import Page
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
for account_detail in account_details:
if platform_detail['platform_id'] == account_detail['platform_id']:
platform_name = platform_detail['platform']
- account_config = json.loads(account_detail['config'])
- account_usr_hrn = account_config.get('user_hrn','N/A')
- account_pub_key = account_config.get('user_public_key','N/A')
- account_reference = account_config.get ('reference_platform','N/A')
+ if 'config' in account_detail and account_detail['config'] is not '':
+ account_config = json.loads(account_detail['config'])
+ account_usr_hrn = account_config.get('user_hrn','N/A')
+ account_pub_key = account_config.get('user_public_key','N/A')
+ account_reference = account_config.get ('reference_platform','N/A')
# credentials of myslice platform
if 'myslice' in platform_detail['platform']:
acc_user_cred = account_config.get('delegated_user_credential','N/A')
# 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)
# 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)
+ 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:
messages.error(request, 'Account error: You need an account in myslice platform to perform this action')