From c57907737a35d05d4bb936acd662df6ce725456f Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 28 Aug 2022 03:45:19 +0200
Subject: [PATCH] Change search API to be accessible without being logged in
(#18963)
But with the resolve option turned off
---
app/controllers/api/v2/search_controller.rb | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/app/controllers/api/v2/search_controller.rb b/app/controllers/api/v2/search_controller.rb
index a305601333..e384ecbaf1 100644
--- a/app/controllers/api/v2/search_controller.rb
+++ b/app/controllers/api/v2/search_controller.rb
@@ -5,8 +5,7 @@ class Api::V2::SearchController < Api::BaseController
RESULTS_LIMIT = 20
- before_action -> { doorkeeper_authorize! :read, :'read:search' }
- before_action :require_user!
+ before_action -> { authorize_if_got_token! :read, :'read:search' }
def index
@search = Search.new(search_results)
@@ -24,7 +23,7 @@ class Api::V2::SearchController < Api::BaseController
params[:q],
current_account,
limit_param(RESULTS_LIMIT),
- search_params.merge(resolve: truthy_param?(:resolve), exclude_unreviewed: truthy_param?(:exclude_unreviewed))
+ search_params.merge(resolve: user_signed_in? ? truthy_param?(:resolve) : false, exclude_unreviewed: truthy_param?(:exclude_unreviewed))
)
end