DRY

4 files changed, 14 insertions, 10 deletions

diff --git a/activestorage/lib/active_storage/service/azure_storage_service.rb b/activestorage/lib/active_storage/service/azure_storage_service.rb
index d0ee2273c5..895cc9c2f1 100644
--- a/activestorage/lib/active_storage/service/azure_storage_service.rb
+++ b/activestorage/lib/active_storage/service/azure_storage_service.rb
@@ -59,12 +59,16 @@ module ActiveStorage
       end
     end
 
-    def url(key, expires_in:, disposition:, filename:, content_type:)
+    def url(key, expires_in:, filename:, disposition:, content_type:)
       instrument :url, key do |payload|
         base_url = url_for(key)
-        generated_url = signer.signed_uri(URI(base_url), false, permissions: "r",
-          expiry: format_expiry(expires_in), content_type: content_type,
-          content_disposition: "#{disposition}; filename=\"#{filename}\"").to_s
+        generated_url = signer.signed_uri(
+          URI(base_url), false,
+          permissions: "r",
+          expiry: format_expiry(expires_in),
+          content_disposition: disposition,
+          content_type: content_type
+        ).to_s
 
         payload[:url] = generated_url
 
diff --git a/activestorage/lib/active_storage/service/disk_service.rb b/activestorage/lib/active_storage/service/disk_service.rb
index 1d121dcb6c..5aa8d74a5a 100644
--- a/activestorage/lib/active_storage/service/disk_service.rb
+++ b/activestorage/lib/active_storage/service/disk_service.rb
@@ -56,7 +56,7 @@ module ActiveStorage
       end
     end
 
-    def url(key, expires_in:, disposition:, filename:, content_type:)
+    def url(key, expires_in:, filename:, disposition:, content_type:)
       instrument :url, key do |payload|
         verified_key_with_expiration = ActiveStorage.verifier.generate(key, expires_in: expires_in, purpose: :blob_key)
 
@@ -64,7 +64,7 @@ module ActiveStorage
           if defined?(Rails.application)
             Rails.application.routes.url_helpers.rails_disk_service_path \
               verified_key_with_expiration,
-              disposition: disposition, filename: filename, content_type: content_type
+              filename: filename, disposition: disposition, content_type: content_type
           else
             "/rails/active_storage/disk/#{verified_key_with_expiration}/#{filename}?disposition=#{disposition}&content_type=#{content_type}"
           end
diff --git a/activestorage/lib/active_storage/service/gcs_service.rb b/activestorage/lib/active_storage/service/gcs_service.rb
index e656f2c69f..ebf24a36d7 100644
--- a/activestorage/lib/active_storage/service/gcs_service.rb
+++ b/activestorage/lib/active_storage/service/gcs_service.rb
@@ -47,10 +47,10 @@ module ActiveStorage
       end
     end
 
-    def url(key, expires_in:, disposition:, filename:, content_type:)
+    def url(key, expires_in:, filename:, content_type:, disposition:)
       instrument :url, key do |payload|
         generated_url = file_for(key).signed_url expires: expires_in, query: {
-          "response-content-disposition" => "#{disposition}; filename=\"#{filename}\"",
+          "response-content-disposition" => disposition,
           "response-content-type" => content_type
         }
 
diff --git a/activestorage/lib/active_storage/service/s3_service.rb b/activestorage/lib/active_storage/service/s3_service.rb
index bef2ecbea9..2b52c3786d 100644
--- a/activestorage/lib/active_storage/service/s3_service.rb
+++ b/activestorage/lib/active_storage/service/s3_service.rb
@@ -52,10 +52,10 @@ module ActiveStorage
       end
     end
 
-    def url(key, expires_in:, disposition:, filename:, content_type:)
+    def url(key, expires_in:, disposition:, filename:, disposition:, content_type:)
       instrument :url, key do |payload|
         generated_url = object_for(key).presigned_url :get, expires_in: expires_in,
-          response_content_disposition: "#{disposition}; filename=\"#{filename}\"",
+          response_content_disposition: disposition,
           response_content_type: content_type
 
         payload[:url] = generated_url