oauth_im 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d76c8274bed6bd0f1186d0f91c3f19d1f4c9c3f33fb76f42aabef39aa8e69abc
-  data.tar.gz: 7aa343de7cd28ba873083f234c8af2129673bf1f362fcbedc48749ed637f8e26
+  metadata.gz: 21c49f432ffef807fecc90eb4e676bdb8ca1aba6523eaf82421d817f519f4eac
+  data.tar.gz: 5bc900d0b0227686df48bf2ae06fd1517c5376d5e5f6bf265d8894b87fad0d37
 SHA512:
-  metadata.gz: 16ef3dc4382aef3277073f88ad5acacbff0cb036c7dcf971d207b03bc29ef2e3e455a73c90e954426c1b81e5117c6cbeb30af28f7ca12db84045e3271282ae23
-  data.tar.gz: 5e270df61e8e55069d2c788347e26492c359ed0fcbc3dcc38707e5bd60098e6e2ce8ef95e184e5d5167828a601f46bbaa03917b461068c7130c6f261bfa97f43
+  metadata.gz: 577dda1cad914c4f3013834f6e674ef6476624347af8a3aab91dae76ecf3e4dd6403e4edd78cecfd06161d0f96d29fb80da26921f233947264238bef49f54711
+  data.tar.gz: 4d778e7f5800e8b33f9d55fb90b890c34002d9b5619c53a337612e7bd10a1796644b962e446ce9426248d47e629ae8de2591022232930e0223dade039fb26273

data/app/controllers/oauth_im/client_controller.rb

@@ -4,9 +4,14 @@ require 'oauth2'
 
 module OauthIm
   class ClientController < OauthIm::ApplicationController
+    delegate :oauth_rescue_redirect_path, to: :configuration
+
     def callback
       session[:user_jwt] = user_jwt
       redirect_to main_app.root_path
+    rescue StandardError => e
+      Rollbar.warning "rescue OauthIm::ClientController#callback: #{request.original_url} #{e.message}"
+      redirect_to oauth_rescue_redirect_path
     end
 
     def login

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/configuration.rb

@@ -17,6 +17,7 @@ module OauthIm
       client_secret
       hmac
       rsa_public
+      oauth_rescue_redirect_path
     ].freeze
 
   class Configuration

data/lib/oauth_im/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oauth_im
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Eric Connally