From 4500504ec2be89bdedaef27bbf1cf82f77483ccd Mon Sep 17 00:00:00 2001 From: Claire Date: Sun, 2 Oct 2022 18:10:49 +0200 Subject: [PATCH] Revert "Change search API to be accessible without being logged in (#18963)" This reverts commit c57907737a35d05d4bb936acd662df6ce725456f. --- app/controllers/api/v2/search_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/v2/search_controller.rb b/app/controllers/api/v2/search_controller.rb index d14cd5627..77eeab5b0 100644 --- a/app/controllers/api/v2/search_controller.rb +++ b/app/controllers/api/v2/search_controller.rb @@ -5,7 +5,8 @@ class Api::V2::SearchController < Api::BaseController RESULTS_LIMIT = (ENV['MAX_SEARCH_RESULTS'] || 20).to_i - before_action -> { authorize_if_got_token! :read, :'read:search' } + before_action -> { doorkeeper_authorize! :read, :'read:search' } + before_action :require_user! def index @search = Search.new(search_results) @@ -23,7 +24,7 @@ class Api::V2::SearchController < Api::BaseController params[:q], current_account, limit_param(RESULTS_LIMIT), - search_params.merge(resolve: user_signed_in? ? truthy_param?(:resolve) : false, exclude_unreviewed: truthy_param?(:exclude_unreviewed)) + search_params.merge(resolve: truthy_param?(:resolve), exclude_unreviewed: truthy_param?(:exclude_unreviewed)) ) end