cf-uaac 3.11.0 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d82226a5579050e9e9fff98de302c291a96a7b05
-  data.tar.gz: f868e74326c0140a5586257d184a95c27362974f
+  metadata.gz: abfe6eadf0fa01ba99d89a0eea473cbd0104338f
+  data.tar.gz: f2b20a9a55eff6d475e47521bfba5a0fa95ce85e
 SHA512:
-  metadata.gz: a57c42af2d72f2b817c9ebeee3c2f5697c419e777596508dced216b6f4d9d90b1c3e91992e49ed789f4f612c14d45f2f565e8f43b1474269b219fb2bcfa7cc68
-  data.tar.gz: 9cb180a3232a919f83d3e6bec490023b91062b9ec560cb789bfc6cce1cf982048952327390c7961dae14af4865f60514a349fb5ad26db4dc85a2d5f6122e64ff
+  metadata.gz: bd5e414a3b9d0339b945ee71133146329d398c3b3a66b0793bd32a47df4b02a51d44544705dd1109b20d0c622d8bd52068266a7c865614367aee84bb9c8eb783
+  data.tar.gz: 52d00507c138a3e95de5b1234d12d9e2ab1968a8a4d67c49d3e9d03a088725cd896ceda7c8faecba9957a1296fa99c5ad3fa5a2499f1f245a5ee691ea8041214

data/lib/uaa/cli/common.rb

@@ -111,7 +111,6 @@ class CommonCli < Topic
     raise NotFound if info.length == 0
     if info.length >= 2
       info.each_with_index do |i, idx|
-         puts "#{idx+1}: #{i['username']} from #{i['origin']}"
       end
 
       choice = @highline.ask("Select user:  ").to_i

data/lib/uaa/cli/user.rb

@@ -49,7 +49,7 @@ class UserCli < CommonCli
   end
 
   desc 'user add [name]', 'Add a user account', *USER_INFO_OPTS, :password do |name|
-    info = {userName: username(name), password: verified_pwd('Password', opts[:password])}
+    info = {userName: username(name), password: ((opts[:origin] == nil || opts[:origin] =='uaa') ? verified_pwd('Password', opts[:password]): nil)}
     pp scim_request { |ua|
       ua.add(:user, user_opts(info))
       'user account successfully added'

data/lib/uaa/cli/version.rb

@@ -14,6 +14,6 @@
 # Cloud Foundry namespace
 module CF
   module UAA
-    CLI_VERSION = '3.11.0'
+    CLI_VERSION = '3.12.0'
   end
 end

data/spec/user_spec.rb

@@ -52,6 +52,40 @@ describe UserCli do
     Cli.run("user delete #{user_with_origin}")
   end
 
+  it 'creates user without asking for password when origin is not uaa' do
+    user_with_origin = "#{@test_user}_with_origin_ldap"
+    Cli.run("user add #{user_with_origin} " +
+                '--emails sam@example.com --given_name SamueL ' +
+                "--phones 801-555-1212 --family_name jonES --origin ldap").should be
+
+    expect(Cli.output.string).to match 'user account successfully added'
+
+    Cli.run("user delete #{user_with_origin} --origin ldap")
+    expect(Cli.output.string).to match 'user account successfully deleted'
+  end
+
+  it 'create user prompts for password when origin is set to uaa explicitly' do
+    user_with_origin = "#{@test_user}_with_origin_ldap"
+    Cli.input = StringIO.new("password") # selecting first origin through stdin
+    Cli.run("user add #{user_with_origin} " +
+                '--emails sam@example.com --given_name SamueL ' +
+                "--phones 801-555-1212 --family_name jonES --origin uaa").should be
+
+    expect(Cli.output.string).to match 'Password:'
+    Cli.run("user delete #{user_with_origin}")
+  end
+
+  it 'create user prompts for password when origin is uaa implicitly' do
+    user_with_origin = "#{@test_user}_with_origin_ldap"
+    Cli.input = StringIO.new("password") # selecting first origin through stdin
+    Cli.run("user add #{user_with_origin} " +
+                '--emails sam@example.com --given_name SamueL ' +
+                "--phones 801-555-1212 --family_name jonES").should be
+
+    expect(Cli.output.string).to match 'Password:'
+    Cli.run("user delete #{user_with_origin}")
+  end
+
   it 'updates origin when specified' do
     user_with_origin = "#{@test_user}_with_origin"
     create_user_by_origin( user_with_origin, 'ldap')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.12.0
 platform: ruby
 authors:
 - Dave Syer
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib