Merge pull request #388 from basecamp/relative-upload-links

Use relative links for uploaded files

Author: kevinmcconnell

app/views/action_text/markdown/uploads/create.json.jbuilder

@@ -1,4 +1,4 @@
 json.message "File uploaded successfully"
 json.fileName @upload.filename.to_s
 json.mimetype @upload.content_type
-json.fileUrl @upload.slug_url host: request.host
+json.fileUrl @upload.slug_path

lib/rails_ext/active_storage_sluggable.rb

@@ -5,8 +5,8 @@ module ActiveStorage::Sluggable
     before_create :set_slug
   end
 
-  def slug_url(host: ActiveStorage::Current.host)
-    Rails.application.routes.url_helpers.action_text_markdown_upload_url(slug, host: host)
+  def slug_path
+    Rails.application.routes.url_helpers.action_text_markdown_upload_path(slug)
   end
 
   private

test/controllers/action_text/markdown/uploads_controller_test.rb

@@ -15,6 +15,9 @@ class ActionText::Markdown::UploadsControllerTest < ActionDispatch::IntegrationT
     end
 
     assert_response :success
+
+    # Uploads should use relative URLs, to allow for future hostname changes
+    assert JSON.parse(response.body)["fileUrl"].start_with?("/")
   end
 
   test "view attached file" do