Fix: minor

[myslice.git] / portal / manageuserview.py

diff --git a/portal/manageuserview.py b/portal/manageuserview.py
index 11166bb..6e55b84 100644 (file)
--- a/portal/manageuserview.py
+++ b/portal/manageuserview.py
@@ -41,8 +41,6 @@ class UserView(LoginRequiredAutoLogoutView):
         for user_detail in user_details:
             user_id = user_detail['user_id']
             user_email = user_detail['email'] 
-            print "hello_world"
-            print user_id          
             # different significations of user_status
             if user_detail['status'] == 0: 
                 user_status = 'Disabled'
@@ -231,7 +229,7 @@ def user_process(request, **kwargs):
     for user_detail in user_details:
         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)
 
@@ -321,17 +319,27 @@ def user_process(request, **kwargs):
         messages.success(request, 'Sucess: First Name and Last Name Updated.')
         return HttpResponseRedirect(redirect_url)       
     
-    #elif 'submit_pass' in request.POST:
-    #    edited_password = request.POST['password']
-    #    
-    #    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/")
+    elif 'submit_auth' in request.POST:
+        edited_auth = request.POST['authority']
+        
+        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
 
@@ -355,9 +363,9 @@ def user_process(request, **kwargs):
                         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(redirect_url)
         else:
@@ -386,10 +394,10 @@ def user_process(request, **kwargs):
                             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(redirect_url)