Paginate users before making the request to avoid 414

powerhome · Feb 4, 2025 · 73be562 · 73be562
1 parent 1af41ec
commit 73be562
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/audiences/app/models/audiences/external_user.rb b/audiences/app/models/audiences/external_user.rb
@@ -10,11 +10,13 @@ class ExternalUser < ApplicationRecord
                             inverse_of: false
     end
 
-    def self.fetch(external_ids)
+    def self.fetch(external_ids, count: 100)
       return [] unless external_ids.any?
 
-      filter = Array(external_ids).map { "externalId eq #{_1}" }.join(" OR ")
-      Audiences::Scim.resource(:Users).all(filter: filter)
+      Array(external_ids).in_groups_of(count, false).flat_map do |ids|
+        filter = Array(ids).map { "externalId eq #{_1}" }.join(" OR ")
+        Audiences::Scim.resource(:Users).all(count: count, filter: filter).to_a
+      end
     end
 
     def self.wrap(resources)

diff --git a/audiences/spec/controllers/contexts_controller_spec.rb b/audiences/spec/controllers/contexts_controller_spec.rb
@@ -51,6 +51,7 @@
       stub_request(:get, "http://example.com/scim/v2/Users")
         .with(query: {
                 attributes: "id,externalId,displayName,active,photos.type,photos.value",
+                count: 100,
                 filter: "(active eq true) and (externalId eq 123)",
               })
         .to_return(status: 200, body: { "Resources" => [{ "displayName" => "John Doe", "confidential" => "data",

diff --git a/audiences/spec/lib/audiences_spec.rb b/audiences/spec/lib/audiences_spec.rb
@@ -21,6 +21,7 @@
       stub_request(:get, "http://example.com/scim/v2/Users")
         .with(query: {
                 attributes: "id,externalId,displayName,active,photos.type,photos.value",
+                count: 100,
                 filter: "(active eq true) and (externalId eq 678 OR externalId eq 321)",
               })
         .to_return(status: 200, body: { "Resources" => [{ "displayName" => "John", "externalId" => 678 },