oauth_im 0.12.2 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 364497681f86814ce9f653bb9bfbce1e205f290fefb89efd57909fd0abf8b9a4
-  data.tar.gz: 7186e2c813011b1687d2a03e54ea3a7a2582a5cd4291896772b36171cecae16d
+  metadata.gz: ecc07f31fb74db3651dadae56787ce3ad67e9b777639675b7af37edeeba6434e
+  data.tar.gz: b45f15f1eeadffb2dbec7e5111b078b88b791fbe3a7cb3e7bd2a40d0c1051d6f
 SHA512:
-  metadata.gz: abc834522d265fa3d6257125a5ee18b75a2101e49b2702b493b94bcf8b97ad0ba7d763d4adaa9f71379bbc310939c18fcaba7059994e6c3aac4aa3d052a2878b
-  data.tar.gz: 04ad73bded20cbc1efdeb1fdc1c1e6b1482b06ae7ee8482b89698b858933a2d3dfb25047065033a5029103c5728292cdd489f621641f4eab77decb640c475c3d
+  metadata.gz: e065f24ecf91c480189a9914670b7a39b4e070c808df35452dc866a3ca6d72bbe66c7aa01f1e849cd6376cbbee3431fdf58551ef584cc50b7d38ddb2072fb616
+  data.tar.gz: e9619bfcee928003c066590201174307df1b34a18de2f4ea2e373523e6f33eaa05d401fe82202fec07e7d8dfbcc1a52e80f2c8c1ecd4f0ec30958fedff51f48b

data/app/controllers/oauth_im/client_controller.rb

@@ -4,6 +4,7 @@ require 'oauth2'
 
 module OauthIm
   class ClientController < OauthIm::ApplicationController
+    delegate :configuration, to: OauthIm
     delegate :oauth_rescue_redirect_path, to: :configuration
 
     def callback

data/app/services/oauth_im/admin_client.rb

@@ -4,17 +4,11 @@ require 'fusionauth/fusionauth_client'
 
 module OauthIm
   class AdminClient < IdpClient
-    def search_for(term: '', email: '', limit: 25, offset: 0)
+    def search_for(term: '', email: '', query: nil, limit: 25, offset: 0)
       if email.present?
         proxy_users_for client.retrieve_user_by_email(email)
-      elsif term.present?
-        proxy_users_for client.search_users_by_query(
-          search: {
-            numberOfResults: limit,
-            queryString: term,
-            startRow: offset
-          }
-        )
+      elsif term.present? || query.present?
+        search term: term, query: query, limit: limit, offset: offset
       else
         []
       end
@@ -43,5 +37,22 @@ module OauthIm
     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
+        )
+      )
+    end
+
+    def search_params(term:, query:, limit:, offset:)
+      {
+        numberOfResults: limit,
+        startRow: offset,
+        queryString: term,
+        query: query&.to_json
+      }.reject { |_key, val| val.blank? }
+    end
   end
 end

data/lib/oauth_im/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oauth_im
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.1
 platform: ruby
 authors:
 - Eric Connally
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fusionauth_client