A platform for community discussion. Free, open, simple.
FIX: Keep the subfolder in JSON:API resource links (#45106)
Jarek Radosz445fbb6584a2
diff --git a/app/controllers/json_api_kit/endpoint_controller/client_context.rb b/app/controllers/json_api_kit/endpoint_controller/client_context.rbindex 7b1dfa4e524..16c810057f6 100644--- a/app/controllers/json_api_kit/endpoint_controller/client_context.rb+++ b/app/controllers/json_api_kit/endpoint_controller/client_context.rb@@ -11,7 +11,7 @@ module JsonApiKitdef urlsUrls.new(- base: "#{request.base_url}#{ROOT}",+ base: "#{request.base_url}#{Discourse.base_path}#{ROOT}",current: "#{request.base_url}#{request.path}",parameters: request.query_parameters,)diff --git a/spec/integration/json_api_kit/endpoint_spec.rb b/spec/integration/json_api_kit/endpoint_spec.rbindex b8dfa898677..117d31bdc1b 100644--- a/spec/integration/json_api_kit/endpoint_spec.rb+++ b/spec/integration/json_api_kit/endpoint_spec.rb@@ -34,10 +34,12 @@ RSpec.describe "a JSON:API endpoint", type: :request dolet(:path) { "/api/topics" }let(:version) { JsonApiKit::Timeline.current.to_s }let(:headers) { {} }+ let(:subfolder) { nil }let(:parsed_body) { JSON.parse(response.body) }let(:error) { parsed_body["errors"].sole }before do+ set_subfolder(subfolder) if subfolderallow(Discourse).to receive(:warn_exception)Rails.application.routes.disable_clear_and_finalize = trueRails.application.routes.draw do@@ -188,6 +190,20 @@ RSpec.describe "a JSON:API endpoint", type: :request do)end+ context "when Discourse runs in a subfolder" do+ let(:subfolder) { "/forum" }+ let(:query) { { "fields" => { "topics" => "title,posts" }, "include" => "posts" } }+ let(:topic_url) { "http://test.localhost/forum/api/topics/#{middle.id}" }++ it "keeps the subfolder in resource and relationship links", :aggregate_failures do+ expect(parsed_body.dig("data", "links", "self")).to eq(topic_url)+ expect(parsed_body.dig("data", "relationships", "posts", "links")).to include(+ "self" => "#{topic_url}/relationships/posts",+ "related" => "#{topic_url}/posts",+ )+ end+ end+context "when no record has that id" dolet(:path) { "/api/topics/0" }