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 835fb544c0bfb671692d6d31bcf6b6102b0ffac1..10df4725fd2a0bdad9e90030b09d522d510e7e7c 100755 (executable)
--- a/services/api/script/setup-new-user.rb
+++ b/services/api/script/setup-new-user.rb
@@ -23,8 +23,6 @@ claim the account.
   eos
 end
 
-default_openid_prefix = 'https://www.google.com/accounts/o8/id'
-
 log.level = (ENV['DEBUG'] || opts.debug) ? Logger::DEBUG : Logger::WARN
     
 if ARGV.count != 3
@@ -55,22 +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}
-end
-
-if opts.openid_prefix
-  puts "used the -o option"
-end
-
-if opts.openid_prefix == default_openid_prefix
-  user = arv.user.setup user: user, repo_name: user_repo_name, vm_uuid: vm_uuid
-else
-  user = arv.user.setup user: user, repo_name: user_repo_name, vm_uuid: vm_uuid,
-      openid_prefix: opts.openid_prefix
+  user = arv.user.setup user: {email: user_arg}, repo_name: user_repo_name,
+        vm_uuid: vm_uuid, openid_prefix: opts.openid_prefix
 end
 
 log.info {"user uuid: " + user[:uuid]}
+
+puts user.inspect