cf-uaac 3.13.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ef367062c3e28c384a318cbf086099558e965a4
-  data.tar.gz: 2cc9ad180ad1a8ccdb88eab48191cc8931bd336c
+  metadata.gz: cb3a16efbbbd2a3b0bff7ebab805279ace288798
+  data.tar.gz: 7a64f69585ad57c783213e13be0689caa03352dd
 SHA512:
-  metadata.gz: c56c0743dbede318336371e6d731d0f6d895a949f41905bc60cd492348a8ae818b21cf4f0f7cbb85ebc5ae3a5b46195c44e674315a074fa97d3df55325adbfc6
-  data.tar.gz: ade14cd1d7aeec495397587b486327cf046794e68c8a5a902005b25f0124b8db7c9d50e966f828bcf3fe390ee0c15bc4e22c75a4e52de6481f1249598a50c17a
+  metadata.gz: 6d0e17c6c6e7e1e75c595c7c40bd486941b05ad977437c6468e06647b43170befcb0b9f02b8e44918d37875a39cb65b42fc4782b7905f920b3fdd3d2249c44fa
+  data.tar.gz: e20e97f7510f41dd00fe7a79e1e231e20a19d9cdb6b20dc56788cecd0d5e6c26cf752e70415e9179a2e888e089786af630877bb8376fdd3769b5cfc6c54f7337

data/lib/uaa/cli/group.rb

@@ -145,7 +145,9 @@ class GroupCli < CommonCli
     group = scim_get_object(scim, :group, gname(name))
 
     old_members = (group['members'] || [])
-    new_members = find_members(scim, members)
+    new_members = find_members(scim, members).map do |member|
+      member.merge('origin' => 'uaa')
+    end
 
     unless new_members.size == members.size
       raise 'not all users found, none added'
@@ -183,25 +185,6 @@ class GroupCli < CommonCli
     'success'
   end
 
-  def update_members(scim, name, attr, users, add = true)
-    group = scim_get_object(scim, :group, gname(name))
-    old_ids = id_set(group[attr] || [])
-    new_ids = id_set(scim.ids(:user, *users))
-    if add
-      raise 'not all users found, none added' unless new_ids.size == users.size
-      group[attr] = (old_ids + new_ids).to_a
-      raise 'no new users given' unless group[attr].size > old_ids.size
-    else
-      raise 'not all users found, none deleted' unless new_ids.size == users.size
-      group[attr] = (old_ids - new_ids).to_a
-      raise 'no existing users to delete' unless group[attr].size < old_ids.size
-      group.delete(attr) if group[attr].empty?
-    end
-
-    scim.put(:group, group)
-    'success'
-  end
-
   desc "member add [name] [users...]", "add members to a group" do |name, *users|
     pp scim_request { |scim| add_members(scim, name, users) }
   end
@@ -209,23 +192,6 @@ class GroupCli < CommonCli
   desc "member delete [name] [users...]", "remove members from a group" do |name, *users|
     pp scim_request { |scim| delete_members(scim, name, users) }
   end
-
-  desc "group reader add [name] [users...]", "add users who can read the members" do |name, *users|
-    pp scim_request { |scim| update_members(scim, name, "readers", users) }
-  end
-
-  desc "group reader delete [name] [users...]", "delete users who can read members" do |name, *users|
-    pp scim_request { |scim| update_members(scim, name, "readers", users, false) }
-  end
-
-  desc "group writer add [name] [users...]", "add users who can modify group" do |name, *users|
-    pp scim_request { |scim| update_members(scim, name, "writers", users) }
-  end
-
-  desc "group writer delete [name] [users...]", "remove user who can modify group" do |name, *users|
-    pp scim_request { |scim| update_members(scim, name, "writers", users, false) }
-  end
-
   private
 
   def is_natural_number?(input)

data/lib/uaa/cli/version.rb

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

data/spec/group_spec.rb

@@ -101,57 +101,6 @@ describe GroupCli do
     check_members
   end
 
-  it "adds one reader to the group" do
-    Cli.run("group reader add #{@test_group} #{@test_user}r").should be
-    Cli.output.string.should include "success"
-  end
-
-  it "adds one writer to the group" do
-    Cli.run("group writer add #{@test_group} #{@test_user}w").should be
-    Cli.output.string.should include "success"
-  end
-
-  it "gets readers and writers in the group" do
-    Cli.run("group get #{@test_group}").should be
-    Cli.output.string.should be
-  end
-
-  it "reads members as a reader" do
-    pending "Test not applicable in integration test runs" if ENV["UAA_CLIENT_TARGET"]
-
-    Cli.run("token owner get #{@test_client} -s #{@test_secret} #{@test_user}r -p #{@test_pwd}").should be
-    Cli.run("group get #{@test_group} -a memBers").should be
-    ids = Cli.output.string.scan(/.*value:\s+([^\s]+)/).flatten
-    @users.size.should == ids.size
-  end
-
-  it "can't write members as a reader" do
-    Cli.run("token owner get #{@test_client} -s #{@test_secret} #{@test_user}r -p #{@test_pwd}").should be
-    Cli.run("member add #{@test_group} #{@test_user}z").should_not be
-    Cli.output.string.should include "access_denied"
-  end
-
-  it "adds a member as a writer" do
-    pending "Test not applicable in integration test runs" if ENV["UAA_CLIENT_TARGET"]
-
-    Cli.run "context #{@test_client}"
-    Cli.run("user add #{@test_user}z -p #{@test_pwd} --email sam@example.com").should be
-    @users << "#{@test_user}z"
-    Cli.run("token owner get #{@test_client} -s #{@test_secret} #{@test_user}w -p #{@test_pwd}").should be
-    Cli.run("member add #{@test_group} #{@test_user}z").should be
-    Cli.run("group get #{@test_group} -a memBers").should be
-    ids = Cli.output.string.scan(/.*value:\s+([^\s]+)/).flatten
-    @users.size.should == ids.size
-    # check_members
-  end
-
-  it "can't read members as a non-reader" do
-    pending "real uaa still returns members even if user is not in readers list" unless @stub_uaa
-    Cli.run("token owner get #{@test_client} -s #{@test_secret} #{@test_user}m -p #{@test_pwd}").should be
-    Cli.run("group get #{@test_group}").should be_nil
-    Cli.output.string.should include "NotFound"
-  end
-
   it "deletes all members from a group" do
     Cli.run "context #{@test_client}"
     cmd = "member delete #{@test_group.downcase} "

metadata

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