Merge branch '15599-keepstore-iam-role'

[arvados.git] / services / api / app / models / user.rb

diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index 9526f6593308da0e3700d0be2c417e248dfa361f..4493f038cd1c03e5e265d973ed774e7223eb43e4 100644 (file)
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -10,6 +10,7 @@ class User < ArvadosModel
   include KindAndEtag
   include CommonApiTemplate
   include CanBeAnOwner
+  extend CurrentApiClient
 
   serialize :prefs, Hash
   has_many :api_client_authorizations
@@ -393,10 +394,10 @@ class User < ArvadosModel
                               :is_active => Rails.configuration.Users.NewUsersAreActive)
 
       primary_user.set_initial_username(requested: info['username']) if info['username']
+      primary_user.identity_url = info['identity_url'] if identity_url
     end
 
     primary_user.email = info['email'] if info['email']
-    primary_user.identity_url = info['identity_url'] if identity_url
     primary_user.first_name = info['first_name'] if info['first_name']
     primary_user.last_name = info['last_name'] if info['last_name']