github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 21:21:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Display json response when Discourse::InvalidAccess is raised for

Browse Source 
non json requests.
This commit is contained in:
Guo Xiang Tan
2017-09-28 15:29:57 +08:00
parent 373fd8990e
commit 5f1c29e424
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/application_controller.rb
View File

@ -157,7 +157,8 @@ class ApplicationController < ActionController::Base
opts ||= {} opts ||= {}
show_json_errors = (request.format && request.format.json?) || show_json_errors = (request.format && request.format.json?) ||
(request.xhr?) || (request.xhr?) ||
((params[:external_id] || '').ends_with? '.json') ((params[:external_id] || '').ends_with? '.json') ||
!(current_user rescue nil)
if show_json_errors if show_json_errors
# HACK: do not use render_json_error for topics#show # HACK: do not use render_json_error for topics#show

8
spec/controllers/topics_controller_spec.rb
View File

@ -1064,6 +1064,14 @@ describe TopicsController do
}, format: :json }, format: :json
expect(response.code.to_i).to be(403) expect(response.code.to_i).to be(403)
expect(response.body).to eq(I18n.t("invalid_access"))
get :show, params: {
topic_id: topic.id, slug: topic.slug, api_key: "bad"
}, format: :html
expect(response.code.to_i).to be(403)
expect(response.body).to eq(I18n.t("invalid_access"))
end end
end end
end end