[ARVADOS] updated: 1.1.4-194-g931f77f

[Git user]

Summary of changes:
 services/api/app/controllers/user_sessions_controller.rb | 14 +++++++-------
 services/api/app/models/user.rb                          |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

       via  931f77f9bff46dbba8adb0517720eb3c60b83bb3 (commit)
       via  3294cfcee6d9316df0d0fae9848118501f57d908 (commit)
      from  4cbac38547d8047e5e23cb4945b25aaa31e3eb06 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 931f77f9bff46dbba8adb0517720eb3c60b83bb3
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon May 7 15:11:58 2018 -0400

    12626: Copy omniauth info into auth account, not target account.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/app/controllers/user_sessions_controller.rb b/services/api/app/controllers/user_sessions_controller.rb
index 87967a4..2063315 100644
--- a/services/api/app/controllers/user_sessions_controller.rb
+++ b/services/api/app/controllers/user_sessions_controller.rb
@@ -46,13 +46,6 @@ class UserSessionsController < ApplicationController
       end
     end
 
-    while (uuid = user.andand.redirect_to_user_uuid)
-      user = User.where(uuid: uuid).first
-      if !user
-        raise Exception.new("identity_url #{omniauth['info']['identity_url']} redirects to nonexistent uuid #{uuid}")
-      end
-    end
-
     if not user
       # New user registration
       user = User.new(:email => omniauth['info']['email'],
@@ -75,6 +68,13 @@ class UserSessionsController < ApplicationController
         # First login to a pre-activated account
         user.identity_url = omniauth['info']['identity_url']
       end
+
+      while (uuid = user.redirect_to_user_uuid)
+        user = User.where(uuid: uuid).first
+        if !user
+          raise Exception.new("identity_url #{omniauth['info']['identity_url']} redirects to nonexistent uuid #{uuid}")
+        end
+      end
     end
 
     # For the benefit of functional and integration tests:

commit 3294cfcee6d9316df0d0fae9848118501f57d908
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon May 7 15:10:24 2018 -0400

    12626: Update permission graph after user merge.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index a9a6a23..831036f 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -327,6 +327,7 @@ class User < ArvadosModel
       end
 
       update_attributes!(redirect_to_user_uuid: new_user.uuid)
+      invalidate_permissions_cache
     end
   end
 

-----------------------------------------------------------------------


hooks/post-receive
--