diff options
Diffstat (limited to 'app/finders/users_finder.rb')
| -rw-r--r-- | app/finders/users_finder.rb | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/app/finders/users_finder.rb b/app/finders/users_finder.rb index 57dbeca5c51..88ba635e20b 100644 --- a/app/finders/users_finder.rb +++ b/app/finders/users_finder.rb @@ -80,15 +80,11 @@ class UsersFinder def by_search(users) return users unless params[:search].present? - if Feature.enabled?(:autocomplete_users_use_search_service) - users.search( - params[:search], - with_private_emails: current_user&.can_admin_all_resources?, - use_minimum_char_limit: params[:use_minimum_char_limit] - ) - else - users.search(params[:search], with_private_emails: current_user&.can_admin_all_resources?) - end + users.search( + params[:search], + with_private_emails: current_user&.can_admin_all_resources?, + use_minimum_char_limit: params[:use_minimum_char_limit] + ) end def by_blocked(users) @@ -103,13 +99,11 @@ class UsersFinder users.active end - # rubocop: disable CodeReuse/ActiveRecord def by_external_identity(users) - return users unless current_user&.can_admin_all_resources? && params[:extern_uid] && params[:provider] + return users unless params[:extern_uid] && params[:provider] - users.joins(:identities).merge(Identity.with_extern_uid(params[:provider], params[:extern_uid])) + users.by_provider_and_extern_uid(params[:provider], params[:extern_uid]) end - # rubocop: enable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord def by_external(users) |