cf-uaac 3.13.0 → 3.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe342c673876fa863a16c2da17b1bd624f5a0924
-  data.tar.gz: e7fdd1f8fbd5719171140051355443eed0a73648
+  metadata.gz: 8ef367062c3e28c384a318cbf086099558e965a4
+  data.tar.gz: 2cc9ad180ad1a8ccdb88eab48191cc8931bd336c
 SHA512:
-  metadata.gz: f00cbc1ee59f2b3fecc665721f118c45ae0a536de5b70129f26f4c84f4b0025ccc1be71f1565ab7c21797a5ec9be7fae5c8d6ad70dbab0e725bea7c9ea2b3df1
-  data.tar.gz: 901faa8b5087b9264e044edd210cc5725669fe0112737e1b6e358cbec354f6a617e45a6f84e2a9ae7a92ea4a1baa5604c4e438e7abe7cbb1535027eb253b9e2b
+  metadata.gz: c56c0743dbede318336371e6d731d0f6d895a949f41905bc60cd492348a8ae818b21cf4f0f7cbb85ebc5ae3a5b46195c44e674315a074fa97d3df55325adbfc6
+  data.tar.gz: ade14cd1d7aeec495397587b486327cf046794e68c8a5a902005b25f0124b8db7c9d50e966f828bcf3fe390ee0c15bc4e22c75a4e52de6481f1249598a50c17a

data/cf-uaac.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   # dependencies
-  s.add_runtime_dependency 'cf-uaa-lib', '~> 3.10.0'
+  s.add_runtime_dependency 'cf-uaa-lib', '~> 3.11'
   s.add_development_dependency 'bundler', '~> 1.14'
   s.add_development_dependency 'rake', '~> 10.3', '>= 10.3.1'
   s.add_development_dependency 'rspec', '~> 2.14', '>= 2.14.1'

data/lib/uaa/cli/group.rb

@@ -106,30 +106,108 @@ class GroupCli < CommonCli
     }
   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?
+  def find_members(scim, members)
+    found_members = []
+
+    scim.ids(:user, *members).each do |member|
+      found_members << {
+          'type' => 'USER',
+          'value' => member['id'],
+          'origin' => member['origin']
+      }
+    end
+
+    found_members
+  end
+
+  def union(old_members, new_members)
+    old_ids = id_set(old_members)
+    all_members = old_members.clone
+
+    new_members.each do |member|
+      unless old_ids.include?(member['value'])
+        all_members << member
       end
-      scim.put(:group, group)
-      "success"
+    end
+
+    all_members
+  end
+
+  def difference(old_members, new_members)
+    new_ids = id_set(new_members)
+
+    old_members.reject do |member|
+      new_ids.include?(member['value'])
+    end
+  end
+
+  def add_members(scim, name, members)
+    group = scim_get_object(scim, :group, gname(name))
+
+    old_members = (group['members'] || [])
+    new_members = find_members(scim, members)
+
+    unless new_members.size == members.size
+      raise 'not all users found, none added'
+    end
+
+    group['members'] = union(old_members, new_members)
+
+    unless group['members'].size > old_members.size
+      raise 'no new users given'
+    end
+
+    scim.put(:group, group)
+    'success'
+  end
+
+  def delete_members(scim, name, members)
+    group = scim_get_object(scim, :group, gname(name))
+
+    old_members = (group['members'] || [])
+    new_members = find_members(scim, members)
+
+    unless new_members.size == members.size
+      raise 'not all users found, none deleted'
+    end
+
+    group['members'] = difference(old_members, new_members)
+
+    unless group['members'].size < old_members.size
+      raise 'no existing users to delete'
+    end
+
+    group.delete('members') if group['members'].empty?
+
+    scim.put(:group, group)
+    '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| update_members(scim, name, "members", users) }
+    pp scim_request { |scim| add_members(scim, name, users) }
   end
 
   desc "member delete [name] [users...]", "remove members from a group" do |name, *users|
-    pp scim_request { |scim| update_members(scim, name, "members", users, false) }
+    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|

data/lib/uaa/cli/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 3.13.0
+  version: 3.13.1
 platform: ruby
 authors:
 - Dave Syer
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cf-uaa-lib
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: '3.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement