Make sure oid_login_perm exists when setup is executed for an existing user

[arvados.git] / services / api / script / setup-new-user.rb

diff --git a/services/api/script/setup-new-user.rb b/services/api/script/setup-new-user.rb
index 561f8175126520e09f54b8d44c6f549050aa07ad..10df4725fd2a0bdad9e90030b09d522d510e7e7c 100755 (executable)
--- a/services/api/script/setup-new-user.rb
+++ b/services/api/script/setup-new-user.rb
@@ -53,21 +53,15 @@ rescue Arvados::TransactionFailedError
   end
 end
 
-# Invoke user setup method 
+# Invoke user setup method
 if (found_user)
-  user = {uuid: found_user[:uuid]}
+  user = arv.user.setup uuid: found_user[:uuid], repo_name: user_repo_name,
+        vm_uuid: vm_uuid, openid_prefix: opts.openid_prefix
 else
-  user = {email: user_arg}
+  user = arv.user.setup user: {email: user_arg}, repo_name: user_repo_name,
+        vm_uuid: vm_uuid, openid_prefix: opts.openid_prefix
 end
 
-if opts.openid_prefix
-  puts "used the -o option"
-end
-
-user = arv.user.setup(user: user, repo_name: user_repo_name, vm_uuid: vm_uuid,
-    openid_prefix: opts.openid_prefix)
-
-log.info { "user uuid: " + user[:uuid] }
+log.info {"user uuid: " + user[:uuid]}
 
 puts user.inspect
-