Merge pull request rails#43650 from gmcgibbon/fixes_for_38957

Fixes for multi-service direct uploads

Author: gmcgibbon

actiontext/app/javascript/actiontext/attachment_upload.js

@@ -4,7 +4,7 @@ export class AttachmentUpload {
   constructor(attachment, element) {
     this.attachment = attachment
     this.element = element
-    this.directUpload = new DirectUpload(attachment.file, this.directUploadUrl, this)
+    this.directUpload = new DirectUpload(attachment.file, this.directUploadUrl, this.directUploadToken, this.attachmentName, this)
   }
 
   start() {
@@ -42,4 +42,11 @@ export class AttachmentUpload {
   get blobUrlTemplate() {
     return this.element.dataset.blobUrlTemplate
   }
+
+  get directUploadToken() {
+    return this.element.getAttribute("data-direct-upload-token");
+  }
+  get attachmentName() {
+    return this.element.getAttribute("data-direct-upload-attachment-name");
+  }
 }

activestorage/test/controllers/direct_uploads_controller_test.rb

@@ -25,7 +25,7 @@ class ActiveStorage::S3DirectUploadsControllerTest < ActionDispatch::Integration
         "library_ID": "12345"
       }
 
-      ActiveStorage::DirectUploadToken.stub(:verify_direct_upload_token, "local") do
+      ActiveStorage::DirectUploadToken.stub(:verify_direct_upload_token, "s3") do
         post rails_direct_uploads_url, params: { blob: {
           filename: "hello.txt", byte_size: 6, checksum: checksum, content_type: "text/plain", metadata: metadata } }
       end
@@ -70,7 +70,7 @@ class ActiveStorage::GCSDirectUploadsControllerTest < ActionDispatch::Integratio
         "library_ID": "12345"
       }
 
-      ActiveStorage::DirectUploadToken.stub(:verify_direct_upload_token, "local") do
+      ActiveStorage::DirectUploadToken.stub(:verify_direct_upload_token, "gcs") do
         post rails_direct_uploads_url, params: { blob: {
           filename: "hello.txt", byte_size: 6, checksum: checksum, content_type: "text/plain", metadata: metadata } }
       end
@@ -114,7 +114,7 @@ class ActiveStorage::AzureStorageDirectUploadsControllerTest < ActionDispatch::I
         "library_ID": "12345"
       }
 
-      ActiveStorage::DirectUploadToken.stub(:verify_direct_upload_token, "local") do
+      ActiveStorage::DirectUploadToken.stub(:verify_direct_upload_token, "azure") do
         post rails_direct_uploads_url, params: { blob: {
           filename: "hello.txt", byte_size: 6, checksum: checksum, content_type: "text/plain", metadata: metadata } }
       end