cf-uaa-lib 3.10.0 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 339b000b5ecc7622591dc843922a7d2b3aa03f86
-  data.tar.gz: dd889d4ae8c9068e519957e6fef24cd3bd627e08
+  metadata.gz: a39c7cac1bfb08a869bf7550ad7cf6bbe12773fe
+  data.tar.gz: 1d0ddccaa0bc2e16233f5b97c869b49039be14df
 SHA512:
-  metadata.gz: b214f9d0e6fee14b91350d280eda4e54af0075a67fe8f8bfb344b97540efd4b580c68c4fe36e3813a737d09a02247fee2e2a95f32c96f67772f182d20bc5832a
-  data.tar.gz: '06719f1ede8310dc79b0fa3f33f89e21383af9c1c016a373ea37b8e61b122966d2a5f74bafca04dc4b942cc8c55b2c0ca4583fe2bd3abbdca1778ebfeb7bfb97'
+  metadata.gz: ed1db7f178ef9bdf94698575429be99920f52e298c10bd9617a0fa045457647244a58e41ca288aa8c9e7eac9703433bbfe5239dfcbbe8a8c83ba1fb317233e2b
+  data.tar.gz: 7bb052fa64c0473588d24aeda1c855e556215fc82f891fc56b2f7f15f7ae7fa3967cb0ac300ff95b285c30a3ed80cd1d0cc748280c78e48bd95181b46595ff17

data/.travis.yml

@@ -5,5 +5,6 @@ before_install:
   - gem install bundler
 
 rvm:
-  - 1.9.3
+  - 2.2.7
+  - 2.3.4
   - 2.4.1

data/lib/uaa/scim.rb

@@ -42,16 +42,27 @@ class Scim
 
   def force_attr(k)
     kd = k.to_s.downcase
-    kc = {"username" => "userName", "familyname" => "familyName",
-      "givenname" => "givenName", "middlename" => "middleName",
-      "honorificprefix" => "honorificPrefix",
-      "honorificsuffix" => "honorificSuffix", "displayname" => "displayName",
-      "nickname" => "nickName", "profileurl" => "profileUrl",
-      "streetaddress" => "streetAddress", "postalcode" => "postalCode",
-      "usertype" => "userType", "preferredlanguage" => "preferredLanguage",
-      "x509certificates" => "x509Certificates", "lastmodified" => "lastModified",
-      "externalid" => "externalId", "phonenumbers" => "phoneNumbers",
-      "startindex" => "startIndex"}[kd]
+    kc = {
+        'username' => 'userName',
+        'familyname' => 'familyName',
+        'givenname' => 'givenName',
+        'middlename' => 'middleName',
+        'honorificprefix' => 'honorificPrefix',
+        'honorificsuffix' => 'honorificSuffix',
+        'displayname' => 'displayName',
+        'nickname' => 'nickName',
+        'profileurl' => 'profileUrl',
+        'streetaddress' => 'streetAddress',
+        'postalcode' => 'postalCode',
+        'usertype' => 'userType',
+        'preferredlanguage' => 'preferredLanguage',
+        'x509certificates' => 'x509Certificates',
+        'lastmodified' => 'lastModified',
+        'externalid' => 'externalId',
+        'phonenumbers' => 'phoneNumbers',
+        'startindex' => 'startIndex',
+        'zoneid' => 'zoneId'
+    }[kd]
     kc || kd
   end
 
@@ -76,15 +87,46 @@ class Scim
 
   # an attempt to hide some scim and uaa oddities
   def type_info(type, elem)
-    scimfo = {:user => ["/Users", "userName"], :group => ["/Groups", "displayName"],
-      :client => ["/oauth/clients", 'client_id'], :user_id => ["/ids/Users", 'userName'], :group_mapping => ["/Groups/External", "externalGroup"]}
-    unless elem == :path || elem == :name_attr
-      raise ArgumentError, "scim schema element must be :path or :name_attr"
-    end
-    unless ary = scimfo[type]
+    scimfo = {
+        user: {
+            path: '/Users',
+            name_attr: 'userName',
+            origin_attr: 'origin'
+        },
+        group: {
+            path: '/Groups',
+            name_attr: 'displayName',
+            origin_attr: 'zoneid'
+        },
+        client: {
+            path: '/oauth/clients',
+            name_attr: 'client_id'
+        },
+        user_id: {
+            path: '/ids/Users',
+            name_attr: 'userName',
+            origin_attr: 'origin',
+        },
+        group_mapping: {
+            path: '/Groups/External',
+            name_attr: 'externalGroup',
+            origin_attr: 'origin'
+        }
+    }
+
+    type_info = scimfo[type]
+
+    unless type_info
       raise ArgumentError, "scim resource type must be one of #{scimfo.keys.inspect}"
     end
-    ary[elem == :path ? 0 : 1]
+
+    value = type_info[elem]
+
+    unless value
+      raise ArgumentError, "scim schema element must be one of #{type_info.keys.inspect}"
+    end
+
+    value
   end
 
   def jkey(k) @key_style == :down ? k.to_s : k end
@@ -262,9 +304,16 @@ class Scim
   # @param type (see #add)
   # @return [Array] array of name/id hashes for each object found
   def ids(type, *names)
-    na = type_info(type, :name_attr)
-    filter = names.map { |n| "#{na} eq \"#{n}\""}
-    all_pages(type, :attributes => "id,#{na}", :filter => filter.join(" or "))
+    name_attr = type_info(type, :name_attr)
+    origin_attr = type_info(type, :origin_attr)
+
+    filter = names.map do |n|
+      "#{name_attr} eq \"#{n}\""
+    end
+
+    attributes = ['id', name_attr, origin_attr]
+
+    all_pages(type, attributes: attributes.join(','), filter: filter.join(' or '))
   end
 
   # Convenience method to query for single object by name.

data/lib/uaa/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaa-lib
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.11.0
 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: multi_json