oauth_im 0.15.2 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4749aa8af3a4a6985c6d1d75993628037546650a37763713dc832a2c8e42336e
-  data.tar.gz: 9bb51b3e52a787b8983a2de1eb979e2e60175bef2627cfbfb9b395101de17133
+  metadata.gz: 340c3017228bd8deac795d9b39c291a9f0d20662c213c0e04c503fd22bcb5bc4
+  data.tar.gz: 867e207345538f7861d140874f5d95481867b15292b8cbeb6854d74aa36d0bb8
 SHA512:
-  metadata.gz: 053b4ff02c5542685dfabd6d58dfd2a0effc15f40a407b91674028b785f5238a88ff8530d2b8182d34bcce5847fa37a8a421643494a7de27873b8594dd4d3216
-  data.tar.gz: 6453b5f666529f3b8d4323e2899bf9bf03d7bb527accde2195479d84504b6c6adf08398920dad800ebbbce984be87060fb52e35724633a9aa4d0f21872d6a7bf
+  metadata.gz: e19cb411c221a5c6300ab9e0fdbc1d2c45fc2d052d94d700d666e82de8bc5d3d034062e17c9115a2a391c97dfed9a929a74e5faf60dd75cded1ac5b199236eaa
+  data.tar.gz: 29119e6529f226beb84eecfda8bfc0f30c001c67e9f33067a9a1d209d27d4b4dda34b125f2b7a252f8a10d08eac9e835a9b65205995b3910ec204a3402025bcf

data/app/services/oauth_im/admin_client.rb

@@ -28,31 +28,37 @@ module OauthIm
     private
 
     def user_attrs_for(response)
-      response.success_response.then do |results|
-        results&.users.presence ||
-          [results&.user.presence].compact
+      users_for(response).map do |attrs|
+        attrs
+          .to_h
+          .with_indifferent_access
+          .merge api_key: api_key,
+                 idp_url: idp_url
       end
     end
 
+    def users_for(response)
+      results = response.success_response
+      [results&.users, results&.user].flatten.compact
+    end
+
     def proxy_users_for(response)
       user_attrs_for(response).map { |attrs| ProxyUser.new(attrs) }
     end
 
     def search(term:, query:, limit:, offset:)
-      proxy_users_for client.search_users_by_query(
-        search: search_params(
-          term: term, query: query, limit: limit, offset: offset
-        )
-      )
+      search_query = search_params_for term: term,
+                                       query: query,
+                                       limit: limit,
+                                       offset: offset
+      proxy_users_for client.search_users_by_query search: search_query
     end
 
-    def search_params(term:, query:, limit:, offset:)
-      {
-        numberOfResults: limit,
+    def search_params_for(term:, query:, limit:, offset:)
+      { numberOfResults: limit,
         startRow: offset,
         queryString: term,
-        query: query&.to_json
-      }.reject { |_key, val| val.blank? }
+        query: query&.to_json }.reject { |_key, val| val.blank? }
     end
   end
 end

data/app/services/oauth_im/has_registration_data.rb

@@ -11,7 +11,6 @@ require 'fusionauth/fusionauth_client'
 
 module OauthIm
   module HasRegistrationData
-    delegate :email, to: :attrs
     delegate :role, :grade_level, :school, :district, :state,
              to: :registration_data
     delegate :name, :id,
@@ -25,6 +24,10 @@ module OauthIm
     delegate :name, :id,
              to: :state, prefix: true
 
+    def email
+      attrs[:email]
+    end
+
     def registrations
       attrs[:registrations] || []
     end

data/lib/oauth_im/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OauthIm
-  VERSION = '0.15.2'
+  VERSION = '0.15.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oauth_im
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.4
 platform: ruby
 authors:
 - Eric Connally
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2024-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusionauth_client