cf-uaa-lib 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 724dc6bfaa51c2bfcf8488c914581b4596a52fca
-  data.tar.gz: a9c9f6d61094c2c5b0008f9b232540c17aad81ca
+  metadata.gz: f245d2cfe14edb44c63bc69fa6fe487f4ef64589
+  data.tar.gz: c0f530c759641e62bf5f0b38be7233233e058ed0
 SHA512:
-  metadata.gz: a7ea32c489b18713ac195b8ef3819718d8f4c2767d823670a8efef03563176c4c8d9e1cf368134551323d7a6e2575cc3fec1c3efb3a1730e6d1013904b0c6cab
-  data.tar.gz: 60714df4d646b641c90cefbb18957fb4da0074f11c9bd6fa54e346d55785c453f9c9545c9323143d1b957cb8be6a17f03fa5bb2f68a09586d3b41fb85731e30d
+  metadata.gz: 70bb9323f4c2955b266a8ad69f3b274ff3e1dda1c8aee11d15920b00fcbe5104281077cf3249cfdcbda0f260789ef9ff3ef9cd62b45376eecd86b38863975434
+  data.tar.gz: 4f0a349fdcc4635de8c7692783353d7c5fda26e974fa4423f73c3f8b968666a977071a56cb738a10ff6fa453913dd49e744739ecfd5d1232b6d58df0e09535df

data/lib/uaa/scim.rb

@@ -315,17 +315,17 @@ class Scim
         "#{type_info(:client, :path)}/#{URI.encode(client_id)}/secret", req, headers))
   end
 
-  def map_group(group, is_id, external_group)
+  def map_group(group, is_id, external_group, origin = "ldap")
     key_name = is_id ? :groupId : :displayName
-    request = {key_name => group, :externalGroup => external_group, :schemas => ["urn:scim:schemas:core:1.0"] }
+    request = {key_name => group, :externalGroup => external_group, :schemas => ["urn:scim:schemas:core:1.0"], :origin => origin }
     result = json_parse_reply(@key_style, *json_post(@target,
                                                      "#{type_info(:group_mapping, :path)}", request,
                                                      headers))
     result
   end
 
-  def unmap_group(group_id, external_group)
-    http_delete(@target, "#{type_info(:group_mapping, :path)}/id/#{group_id}/#{URI.encode(external_group)}",
+  def unmap_group(group_id, external_group, origin = "ldap")
+    http_delete(@target, "#{type_info(:group_mapping, :path)}/groupId/#{group_id}/externalGroup/#{URI.encode(external_group)}/origin/#{origin}",
                           @auth_header, @zone)
   end
 

data/lib/uaa/version.rb

@@ -14,6 +14,6 @@
 # Cloud Foundry namespace
 module CF
   module UAA
-    VERSION = "3.3.0"
+    VERSION = "3.4.0"
   end
 end

data/spec/scim_spec.rb

@@ -157,7 +157,20 @@ describe Scim do
       url.should == "#{@target}/Groups/External"
       method.should == :post
       check_headers(headers, :json, :json, nil)
-      body.should include('"displayName":"uaa-scope-name"', '"externalGroup":"external-group-name"', '"schemas":["urn:scim:schemas:core:1.0"]')
+      body.should include('"displayName":"uaa-scope-name"', '"externalGroup":"external-group-name"', '"schemas":["urn:scim:schemas:core:1.0"]', '"origin":"test-origin"')
+      [201, '{"displayName":"uaa-scope-name", "externalGroup": "external-group-name"}', {"content-type" => "application/json"}]
+    end
+    result = subject.map_group("uaa-scope-name", false, "external-group-name", "test-origin")
+    result['displayname'].should == "uaa-scope-name"
+    result['externalgroup'].should == "external-group-name"
+  end
+
+  it "defaults to ldap origin when mapping a uaa group from an external group" do
+    subject.set_request_handler do |url, method, body, headers|
+      url.should == "#{@target}/Groups/External"
+      method.should == :post
+      check_headers(headers, :json, :json, nil)
+      body.should include('"displayName":"uaa-scope-name"', '"externalGroup":"external-group-name"', '"schemas":["urn:scim:schemas:core:1.0"]', '"origin":"ldap"')
       [201, '{"displayName":"uaa-scope-name", "externalGroup": "external-group-name"}', {"content-type" => "application/json"}]
     end
     result = subject.map_group("uaa-scope-name", false, "external-group-name")
@@ -167,7 +180,18 @@ describe Scim do
 
   it "unmaps a uaa group from an external group" do
     subject.set_request_handler do |url, method, body, headers|
-      url.should == "#{@target}/Groups/External/id/uaa-group-id/external%20group%20name"
+      url.should == "#{@target}/Groups/External/groupId/uaa-group-id/externalGroup/external%20group%20name/origin/test-origin"
+      method.should == :delete
+      check_headers(headers, nil, nil, nil)
+
+      [200, '{"displayName":"uaa-scope-name", "groupId": "uaa-group-id", "externalGroup": "external-group-name"}', {"content-type" => "application/json"}]
+    end
+    subject.unmap_group("uaa-group-id", "external group name", "test-origin")
+  end
+
+  it "defaults to ldap origin when unmapping a uaa group from an external group" do
+    subject.set_request_handler do |url, method, body, headers|
+      url.should == "#{@target}/Groups/External/groupId/uaa-group-id/externalGroup/external%20group%20name/origin/ldap"
       method.should == :delete
       check_headers(headers, nil, nil, nil)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaa-lib
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Dave Syer
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-25 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: cf-uaa-lib
-rubygems_version: 2.2.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Client library for CloudFoundry UAA