X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Fmanageuserview.py;h=6e55b8426d702d34f8384c2090386d16bb81bcbd;hp=e2a3231f1893b32503d04373099cd0930de01a5b;hb=9e8fe5f8fa341f4bb636f3b257fe6f83fb0b8938;hpb=254eb62e6dd744a3cf08fe530c404a88d00c5bef diff --git a/portal/manageuserview.py b/portal/manageuserview.py index e2a3231f..6e55b842 100644 --- a/portal/manageuserview.py +++ b/portal/manageuserview.py @@ -1,7 +1,7 @@ from unfold.loginrequired import LoginRequiredAutoLogoutView # from manifold.core.query import Query -from manifold.manifoldapi import execute_query +from manifold.manifoldapi import execute_query, execute_admin_query from portal.actions import manifold_update_user, manifold_update_account, manifold_add_account, manifold_delete_account, sfa_update_user # from unfold.page import Page @@ -29,16 +29,18 @@ class UserView(LoginRequiredAutoLogoutView): page.add_css_files ( [ "css/onelab.css", "css/account_view.css","css/plugin.css" ] ) for key, value in kwargs.iteritems(): - print "%s = %s" % (key, value) - #if key == "platformname": - # platformname=value + #print "%s = %s" % (key, value) + if key == "email": + selected_email=value - user_query = Query().get('local:user').select('config','email','status') - user_details = execute_query(self.request, user_query) + user_query = Query().get('local:user').filter_by('email', '==', selected_email).select('user_id','config','email','status') + user_details = execute_admin_query(self.request, user_query) # not always found in user_details... config={} for user_detail in user_details: + user_id = user_detail['user_id'] + user_email = user_detail['email'] # different significations of user_status if user_detail['status'] == 0: user_status = 'Disabled' @@ -53,9 +55,9 @@ class UserView(LoginRequiredAutoLogoutView): config = json.loads(user_detail['config']) platform_query = Query().get('local:platform').select('platform_id','platform','gateway_type','disabled') - account_query = Query().get('local:account').select('user_id','platform_id','auth_type','config') + account_query = Query().get('local:account').filter_by('user_id', '==', user_id).select('user_id','platform_id','auth_type','config') platform_details = execute_query(self.request, platform_query) - account_details = execute_query(self.request, account_query) + account_details = execute_admin_query(self.request, account_query) # initial assignment needed for users having account.config = {} platform_name = '' @@ -190,7 +192,7 @@ class UserView(LoginRequiredAutoLogoutView): context['my_slices'] = my_slices context['my_auths'] = my_auths context['user_status'] = user_status - context['person'] = self.request.user + context['user_email'] = user_email context['firstname'] = config.get('firstname',"?") context['lastname'] = config.get('lastname',"?") context['fullname'] = context['firstname'] +' '+ context['lastname'] @@ -212,19 +214,28 @@ class UserView(LoginRequiredAutoLogoutView): @login_required #my_acc form value processing -def user_process(request): - user_query = Query().get('local:user').select('user_id','email','password','config') - user_details = execute_query(request, user_query) - - account_query = Query().get('local:account').select('user_id','platform_id','auth_type','config') - account_details = execute_query(request, account_query) +def user_process(request, **kwargs): + + for key, value in kwargs.iteritems(): + if key == "email": + selected_email=value - platform_query = Query().get('local:platform').select('platform_id','platform') - platform_details = execute_query(request, platform_query) + redirect_url = "/portal/user/"+selected_email + user_query = Query().get('local:user').filter_by('email', '==', selected_email).select('user_id','email','password','config') + user_details = execute_admin_query(request, user_query) + # getting the user_id from the session for user_detail in user_details: - user_id = user_detail['user_id'] + user_id = user_detail['user_id'] + user_email = user_detail['email'] + + account_query = Query().get('local:account').filter_by('user_id', '==', user_id).select('user_id','platform_id','auth_type','config') + account_details = execute_admin_query(request, account_query) + + platform_query = Query().get('local:platform').select('platform_id','platform') + platform_details = execute_admin_query(request, platform_query) + for account_detail in account_details: for platform_detail in platform_details: @@ -234,15 +245,15 @@ def user_process(request): user_params = {'platform_id': platform_id, 'user_id': user_id, 'auth_type': "reference", 'config': '{"reference_platform": "myslice"}'} manifold_add_account(request,user_params) messages.info(request, 'Reference Account is added to the selected platform successfully!') - return HttpResponseRedirect("/portal/account/") + return HttpResponseRedirect(redirect_url) # Delete reference account from the platforms if 'delete_'+platform_detail['platform'] in request.POST: platform_id = platform_detail['platform_id'] user_params = {'user_id':user_id} manifold_delete_account(request,platform_id,user_params) - messages.info(request, 'Reference Account is removed from the selected platform') - return HttpResponseRedirect("/portal/account/") + messages.info(request, 'Refeence Account is removed from the selected platform') + return HttpResponseRedirect(redirect_url) if platform_detail['platform_id'] == account_detail['platform_id']: if 'myslice' in platform_detail['platform']: @@ -302,23 +313,33 @@ def user_process(request): user_config['config']= '{"firstname":"' + edited_first_name + '", "lastname":"'+ edited_last_name + '", "authority": "Unknown Authority"}' user_params = {'config': user_config['config']} # updating config local:user in manifold - manifold_update_user(request, request.user.email,user_params) + manifold_update_user(request, user_email, user_params) # this will be depricated, we will show the success msg in same page # Redirect to same page with success message messages.success(request, 'Sucess: First Name and Last Name Updated.') - return HttpResponseRedirect("/portal/account/") + return HttpResponseRedirect(redirect_url) - elif 'submit_pass' in request.POST: - edited_password = request.POST['password'] + elif 'submit_auth' in request.POST: + edited_auth = request.POST['authority'] - for user_pass in user_details: - user_pass['password'] = edited_password - #updating password in local:user - user_params = { 'password': user_pass['password']} - manifold_update_user(request,request.user.email,user_params) -# return HttpResponse('Success: Password Changed!!') - messages.success(request, 'Sucess: Password Updated.') - return HttpResponseRedirect("/portal/account/") + config={} + for user_config in user_details: + if user_config['config']: + config = json.loads(user_config['config']) + config['firstname'] = config.get('firstname', 'N/A') + config['lastname'] = config.get('lastname','N/A') + config['authority'] = edited_auth + updated_config = json.dumps(config) + user_params = {'config': updated_config} + else: # it's needed if the config is empty + user_config['config']= '{"firstname": "N/A", "lastname":"N/A", "authority":"' + edited_auth + '"}' + user_params = {'config': user_config['config']} + # updating config local:user in manifold + manifold_update_user(request, user_email, user_params) + # this will be depricated, we will show the success msg in same page + # Redirect to same page with success message + messages.success(request, 'Sucess: Authority Updated.') + return HttpResponseRedirect(redirect_url) # XXX TODO: Factorize with portal/registrationview.py @@ -342,14 +363,14 @@ def user_process(request): user_params = { 'config': keypair, 'auth_type':'managed'} manifold_update_account(request,user_params) # updating sfa - public_key = public_key.replace('"', ''); - user_pub_key = {'keys': public_key} - sfa_update_user(request, user_hrn, user_pub_key) + #public_key = public_key.replace('"', ''); + #user_pub_key = {'keys': public_key} + #sfa_update_user(request, user_hrn, user_pub_key) messages.success(request, 'Sucess: New Keypair Generated! Delegation of your credentials will be automatic.') - return HttpResponseRedirect("/portal/account/") + return HttpResponseRedirect(redirect_url) else: messages.error(request, 'Account error: You need an account in myslice platform to perform this action') - return HttpResponseRedirect("/portal/account/") + return HttpResponseRedirect(redirect_url) elif 'upload_key' in request.POST: for account_detail in account_details: @@ -373,13 +394,13 @@ def user_process(request): user_params = { 'config': file_content, 'auth_type':'user'} manifold_update_account(request,user_params) # updating sfa - user_pub_key = {'keys': file_content} - sfa_update_user(request, user_hrn, user_pub_key) + #user_pub_key = {'keys': file_content} + #sfa_update_user(request, user_hrn, user_pub_key) messages.success(request, 'Publickey uploaded! Please delegate your credentials using SFA: http://trac.myslice.info/wiki/DelegatingCredentials') - return HttpResponseRedirect("/portal/account/") + return HttpResponseRedirect(redirect_url) else: messages.error(request, 'RSA key error: Please upload a valid RSA public key [.txt or .pub].') - return HttpResponseRedirect("/portal/account/") + return HttpResponseRedirect(redirect_url) else: messages.error(request, 'Account error: You need an account in myslice platform to perform this action') return HttpResponseRedirect("/portal/account/") @@ -397,7 +418,7 @@ def user_process(request): break else: messages.error(request, 'Account error: You need an account in myslice platform to perform this action') - return HttpResponseRedirect("/portal/account/") + return HttpResponseRedirect(redirect_url) elif 'dl_pkey' in request.POST: for account_detail in account_details: @@ -412,7 +433,7 @@ def user_process(request): return response else: messages.error(request, 'Download error: Private key is not stored in the server') - return HttpResponseRedirect("/portal/account/") + return HttpResponseRedirect(redirect_url) else: messages.error(request, 'Account error: You need an account in myslice platform to perform this action') @@ -437,11 +458,11 @@ def user_process(request): return HttpResponseRedirect("/portal/account/") else: messages.error(request, 'Delete error: Private key is not stored in the server') - return HttpResponseRedirect("/portal/account/") + return HttpResponseRedirect(redirect_url) else: messages.error(request, 'Account error: You need an account in myslice platform to perform this action') - return HttpResponseRedirect("/portal/account/") + return HttpResponseRedirect(redirect_url) #clear all creds elif 'clear_cred' in request.POST: @@ -462,10 +483,10 @@ def user_process(request): return HttpResponseRedirect("/portal/account/") else: messages.error(request, 'Delete error: Credentials are not stored in the server') - return HttpResponseRedirect("/portal/account/") + return HttpResponseRedirect(redirect_url) else: messages.error(request, 'Account error: You need an account in myslice platform to perform this action') - return HttpResponseRedirect("/portal/account/") + return HttpResponseRedirect(redirect_url) # Download delegated_user_cred @@ -477,10 +498,10 @@ def user_process(request): return response else: messages.error(request, 'Download error: User credential is not stored in the server') - return HttpResponseRedirect("/portal/account/") + return HttpResponseRedirect(redirect_url) else: messages.info(request, 'Under Construction. Please try again later!') - return HttpResponseRedirect("/portal/account/") + return HttpResponseRedirect(redirect_url)