X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c0818b26246432407b8cd76a887dd61a7e824cd0..06d6b29b121b80cb975e5d9d29a9a6f9b3763c47:/apps/workbench/app/controllers/users_controller.rb

diff --git a/apps/workbench/app/controllers/users_controller.rb b/apps/workbench/app/controllers/users_controller.rb
index d657f92603..4cf1fffc09 100644
--- a/apps/workbench/app/controllers/users_controller.rb
+++ b/apps/workbench/app/controllers/users_controller.rb
@@ -9,7 +9,11 @@ class UsersController < ApplicationController
     if params[:uuid] == current_user.uuid
       respond_to do |f|
         f.html do
-          redirect_to(params[:return_to] || project_path(params[:uuid]))
+          if request.url.include?("/users/#{current_user.uuid}")
+            super
+          else
+            redirect_to(params[:return_to] || project_path(params[:uuid]))
+          end
         end
       end
     else
@@ -204,26 +208,28 @@ class UsersController < ApplicationController
         if params['openid_prefix'] && params['openid_prefix'].size>0
           setup_params[:openid_prefix] = params['openid_prefix']
         end
-        if params['repo_name'] && params['repo_name'].size>0
-          setup_params[:repo_name] = params['repo_name']
-        end
         if params['vm_uuid'] && params['vm_uuid'].size>0
           setup_params[:vm_uuid] = params['vm_uuid']
         end
 
-        if User.setup setup_params
+        setup_resp = User.setup setup_params
+        if setup_resp
+          vm_link = nil
+          setup_resp[:items].each do |item|
+            if item[:head_kind] == "arvados#virtualMachine"
+              vm_link = item
+              break
+            end
+          end
           if params[:groups]
-            new_groups = params[:groups].split(',').map(&:strip).compact.select{|i| !i.to_s.empty?}
-            can_login_perms = Link.where(tail_uuid: params[:user_email],
-                                         head_kind: 'arvados#user',
-                                         link_class: 'permission',
-                                         name: 'can_login')
-            if can_login_perms.any?
-              perm = can_login_perms.first
-              props = perm.properties
-              if new_groups != props[:groups]
+            new_groups = params[:groups].split(',').map(&:strip).select{|i| !i.empty?}
+            if vm_link and new_groups != vm_link[:properties][:groups]
+              vm_login_link = Link.where(uuid: vm_link[:uuid])
+              if vm_login_link.items_available > 0
+                link = vm_login_link.results.first
+                props = link.properties
                 props[:groups] = new_groups
-                perm.save!
+                link.save!
               end
             end
           end
@@ -345,15 +351,14 @@ class UsersController < ApplicationController
     end
 
     # oid login perm
-    can_login_perms = Link.where(tail_uuid: user.email,
+    oid_login_perms = Link.where(tail_uuid: user.email,
                                    head_kind: 'arvados#user',
                                    link_class: 'permission',
                                    name: 'can_login')
 
-    if can_login_perms.any?
-      perm_properties = can_login_perms.first.properties
-      current_selections[:identity_url_prefix] = perm_properties[:identity_url_prefix]
-      current_selections[:groups] = perm_properties[:groups].andand.join(', ')
+    if oid_login_perms.any?
+      prefix_properties = oid_login_perms.first.properties
+      current_selections[:identity_url_prefix] = prefix_properties[:identity_url_prefix]
     end
 
     # repo perm
@@ -376,8 +381,10 @@ class UsersController < ApplicationController
                               link_class: 'permission',
                               name: 'can_login')
     if vm_login_perms.any?
-      vm_uuid = vm_login_perms.first.head_uuid
+      vm_perm = vm_login_perms.first
+      vm_uuid = vm_perm.head_uuid
       current_selections[:vm_uuid] = vm_uuid
+      current_selections[:groups] = vm_perm.properties[:groups].andand.join(', ')
     end
 
     return current_selections