sp-seutils 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbad290d1c8944202370f5dc03228c9952a3c664bd61b8f061e6e0121cc75ea6
-  data.tar.gz: a81cb77c92d5bb2009e5c5d40053a61b5aed034b72eaa2d4ae8e58def4f64be6
+  metadata.gz: b00d6d780a49c095b8dd0be022c840570fdd84f3884a5fa30f07ffd98574f0e3
+  data.tar.gz: bbffb16003d9f93c8dde7ded798dab195757e46b5574e682fd16e6e5c1655590
 SHA512:
-  metadata.gz: f79bcd35c7dc7ffe8bbc3e5a95094d6407aa8530c273a4dca360ed9bddbe714510495168dd569019dc5ab29860e5c3f69623249e35c3bb317de4c9197c455e71
-  data.tar.gz: 4b53eca404537d0ffb8c34bd294b6b1fada511f5f45869703b4026bc0da03e24afb0021e824531f1f63cdc81a0e6795c337c6d5102e68da3b2782fbcdf911451
+  metadata.gz: 8a59afbfd523b0f95482eed68d944615497d5e3b0b1cb6cab0e3f3cd7f28d4a4290f12be1a3052a2a697a8a9b27ad275313b394bbb922bd0ad8ea380a76bebeb
+  data.tar.gz: 5d318e31a53927d7fae7bf64270db79b1771e4ccb2612ef31ac75e5b0c4a69ed33ffa4472202085c2a1bcab6d95cf85fe907953913c7f4fbe7f5e27cf2e15b23

data/lib/sp-seutils.rb

@@ -188,7 +188,6 @@ class SeUtils
     i = 0
     loop do
       url = URI.join(org, api).to_s+arg.to_s+"?limit=250&offset="+i.to_s
-      # puts "executing API GET #{url}"
       token = token || idn_oauth(org,user,password,client_id,client_secret)
       page = nil
       RestClient.get(url, {'Authorization' => "Bearer #{token}", 'X-CSRF-Token' => 'nocheck' }  ) do |response, request, result, &block|
@@ -536,7 +535,6 @@ class SeUtils
       i += page.length
       page.each do |u|
         users[u["name"].split(" ").join(".")] = u["externalId"] unless u.nil?
-        @idn_users << u unless u.nil?
         nil_users+=1 if u.nil?
       end
       break if page.length != 250
@@ -571,7 +569,6 @@ class SeUtils
             timeout: nil,
             headers: {'Authorization' => "Bearer #{token}", 
                           "Accept"=>"*/*" ,
-                          'Cache-Control' => 'no-cache',
                           'Content-Type' => 'application/json',
                           'cache-control' => 'no-cache'
                           }
@@ -660,7 +657,6 @@ class SeUtils
       timeout: nil,
       headers: {'Authorization' => "Bearer #{token}", 
                     "Accept"=>"*/*" ,
-                    'Cache-Control' => 'no-cache',
                     'Content-Type' => 'application/json',
                     'cache-control' => 'no-cache'
                     }
@@ -1449,7 +1445,6 @@ class SeUtils
       timeout: nil,
       headers: {'Authorization' => "Bearer #{token}", 
                     "Accept"=>"*/*" ,
-                    'Cache-Control' => 'no-cache',
                     'Content-Type' => 'application/json',
                     'cache-control' => 'no-cache'
                     }
@@ -1598,8 +1593,8 @@ class SeUtils
     return result
   end
 
-  def self.source_name_id_extid(org, user, pass, api_user, api_key)
-    sources_list = JSON.parse(api_get(org, "source/list", user, pass, api_user, api_key, @token))
+  def self.source_name_id_extid(org,user,pass,client_id,client_secret,token)
+    sources_list = JSON.parse(api_get(org,"source/list",user,pass,client_id,client_secret,token))
     name_id_extid = {}
     sources_list.each do |i|
       next if i["name"] == "IdN Admins" # skip this source, which is flat file and unique to each IdN org
@@ -1611,7 +1606,7 @@ class SeUtils
     return name_id_extid
   end
 
-  def self.entitlement_id_transform(org, user, pass, api_user, api_key)
+  def self.entitlement_id_transform(org,user,pass,client_id,client_secret,token)
     entitlement_maps = {}
     source_dir_contents = Dir.entries(@sources_dir)[2..-1]
     sources = {}
@@ -1638,7 +1633,7 @@ class SeUtils
         all_entitlement_map[ent["id"]][:name] = ent["displayableName"] if ent["displayName"].nil? # could be a bug?
       end
     end
-    sources_list = JSON.parse(api_get(org, "source/list", user, pass, api_user, api_key, @token))
+    sources_list = JSON.parse(api_get(org,"source/list",user,pass,client_id,client_secret,token))
     ext_ids = {}
     sources_list.each do |i|
       next if i["name"] == "IdN Admins" # skip this source, which is flat file and unique to each IdN org
@@ -1651,7 +1646,7 @@ class SeUtils
     ext_ids.each do |id, ext_id|
       threads << Thread.new do
         app_entitlements = []
-        result = api_get(org, "entitlement/list/?CISApplicationId=#{ext_id}", user, pass, api_user, api_key, @token)
+        result = api_get(org, "entitlement/list/?CISApplicationId=#{ext_id}",user,pass,client_id,client_secret,token)
         entitlement_bundle = JSON.parse(result)["items"]
         entitlement_bundle.each do |ent|
           entitlement = {}
@@ -2322,7 +2317,7 @@ class SeUtils
   def self.rest_value_array(a)
     return a if (a == []) || (a.nil?)
     s = ["["]
-    a.each{ |i| s << i+','}
+    a.each{ |i| s << i.to_s+','}
     s.last.chop!
     s << "]"
     a = s.join

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sp-seutils
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Josh Karnes