Merge branch '13561-collection-versions-doc'

[arvados.git] / apps / workbench / app / models / user.rb

diff --git a/apps/workbench/app/models/user.rb b/apps/workbench/app/models/user.rb
index 449abe71452fc8391f70d78298e2f352ab5c617e..865ff6e9519cacf613b248df446fd4a1e0b24636 100644 (file)
--- a/apps/workbench/app/models/user.rb
+++ b/apps/workbench/app/models/user.rb
@@ -14,16 +14,44 @@ class User < ArvadosBase
     arvados_api_client.unpack_api_response(res)
   end
 
-  def self.merge new_user_token
+  def self.merge new_user_token, direction
+    # Merge user accounts.
+    #
+    # If the direction is "in", the current user is merged into the
+    # user represented by new_user_token
+    #
+    # If the direction is "out", the user represented by new_user_token
+    # is merged into the current user.
+
+    if direction == "in"
+      user_a = new_user_token
+      user_b = Thread.current[:arvados_api_token]
+      new_group_name = "Migrated from #{Thread.current[:user].email} (#{Thread.current[:user].uuid})"
+    elsif direction == "out"
+      user_a = Thread.current[:arvados_api_token]
+      user_b = new_user_token
+      res = arvados_api_client.api self, '/current', nil, {:arvados_api_token => user_b}, false
+      user_b_info = arvados_api_client.unpack_api_response(res)
+      new_group_name = "Migrated from #{user_b_info.email} (#{user_b_info.uuid})"
+    else
+      raise "Invalid merge direction, expected 'in' or 'out'"
+    end
+
+    # Create a project owned by user_a to accept everything owned by user_b
     res = arvados_api_client.api Group, nil, {:group => {
-                                                     :name => "Migrated from #{Thread.current[:user].email} (#{Thread.current[:user].uuid})",
-                                                     :group_class => "project"}},
-                                 {:arvados_api_token => new_user_token}, false
+                                                :name => new_group_name,
+                                                :group_class => "project"},
+                                              :ensure_unique_name => true},
+                                 {:arvados_api_token => user_a}, false
     target = arvados_api_client.unpack_api_response(res)
 
-    res = arvados_api_client.api self, '/merge', {:new_user_token => new_user_token,
+    # The merge API merges the "current" user (user_b) into the user
+    # represented by "new_user_token" (user_a).
+    # After merging, the user_b redirects to user_a.
+    res = arvados_api_client.api self, '/merge', {:new_user_token => user_a,
                                                   :new_owner_uuid => target[:uuid],
-                                                  :redirect_to_new_user => true}, {}, false
+                                                  :redirect_to_new_user => true},
+                                 {:arvados_api_token => user_b}, false
     arvados_api_client.unpack_api_response(res)
   end