From: radhika chippada <radhika@radhika.curoverse>
Date: Fri, 21 Mar 2014 20:05:37 +0000 (-0400)
Subject: Pass openid_prefix to setup method only when -o option is used
X-Git-Tag: 1.1.0~2709^2~68
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/d51fa3200eef8da2798ab7d29e0e6180d3da71f7

Pass openid_prefix to setup method only when -o option is used
---

diff --git a/services/api/script/setup-new-user.rb b/services/api/script/setup-new-user.rb
index 561f817512..7bfc5715e5 100755
--- a/services/api/script/setup-new-user.rb
+++ b/services/api/script/setup-new-user.rb
@@ -23,6 +23,8 @@ 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
@@ -64,10 +66,14 @@ 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)
+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
+end
 
-log.info { "user uuid: " + user[:uuid] }
+log.info {"user uuid: " + user[:uuid]}
 
 puts user.inspect