activestorage 7.0.8.6 → 7.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '081e67136972e6a3b205bac0beff965c632d3d2f956adaaa10c94ce473224bd2'
-  data.tar.gz: cc4ce99ff4f7437e98d9cbbed2a48d7007cd4553e8c7558cbbf3ce79aaf15481
+  metadata.gz: 5dfb6f1b9694161b8a664871f19104256c481525dbcd52a738137c2fdb0e7c55
+  data.tar.gz: f72483c9153ef5bae19222f6ccb659d7d6ee0444d8785a00f9fa54c12f0a861b
 SHA512:
-  metadata.gz: e733f1df52d9b02de9c50f26265b62578e4b55832244ccddfd738c6f79b2593dfa66358de87d588f9dd79e394b758945ffa2aa4bfb3f6643edf61d5de9d7f5bc
-  data.tar.gz: d0542ba9bf7bbc078686a60ada01b6818b70dd5b6e897f4c9aab3c35450c4a653aa299bf8795d18c578c7bece8b039fcf06e97fb423af33f644fa8f228e757cb
+  metadata.gz: c7fb7bd0ff896ca2f063a71cbc2187659b14b819d6899c23c48ad43ce54f4a48a4039c027e7802a551986b9f0cbde296e4acf9f633aacaf886a3608a3902a07d
+  data.tar.gz: 438c8ad07e00b2bdcee84b781bf764fb4c209999e3ccb757b41c5c7c4b9d32f26ea5c36b8f820bd7f1c3b1901ae088448e92b09ff340528636eef841a62df7f4

data/CHANGELOG.md

@@ -1,29 +1,4 @@
-## Rails 7.0.8.6 (October 23, 2024) ##
-
-*   No changes.
-
-
-## Rails 7.0.8.5 (October 15, 2024) ##
-
-*   No changes.
-
-
-## Rails 7.0.8.4 (June 04, 2024) ##
-
-*   No changes.
-
-
-## Rails 7.0.8.3 (May 17, 2024) ##
-
-*   No changes.
-
-
-## Rails 7.0.8.2 (May 16, 2024) ##
-
-*   No changes.
-
-
-## Rails 7.0.8.1 (February 21, 2024) ##
+## Rails 7.1.0.beta1 (September 13, 2023) ##
 
 *   Disables the session in `ActiveStorage::Blobs::ProxyController`
     and `ActiveStorage::Representations::ProxyController`
@@ -33,407 +8,214 @@
 
     *Bruno Prieto*
 
-## Rails 7.0.8 (September 09, 2023) ##
-
-*   No changes.
-
-
-## Rails 7.0.7.2 (August 22, 2023) ##
-
-*   No changes.
-
-
-## Rails 7.0.7.1 (August 22, 2023) ##
-
-*   No changes.
-
-
-## Rails 7.0.7 (August 09, 2023) ##
-
-*   No changes.
-
-
-## Rails 7.0.6 (June 29, 2023) ##
-
-*   Fix retrieving rotation value from FFmpeg on version 5.0+.
-
-    In FFmpeg version 5.0+ the rotation value has been removed from tags.
-    Instead the value can be found in side_data_list. Along with
-    this update it's possible to have values of -90, -270 to denote the video
-    has been rotated.
-
-    *Haroon Ahmed*
-
-
-## Rails 7.0.5.1 (June 26, 2023) ##
-
-*   No changes.
-
-
-## Rails 7.0.5 (May 24, 2023) ##
-
-*   No changes.
-
-
-## Rails 7.0.4.3 (March 13, 2023) ##
-
-*   No changes.
-
-
-## Rails 7.0.4.2 (January 24, 2023) ##
-
-*   No changes.
-
+*   Add `tags` to `ActiveStorage::Analyzer::AudioAnalyzer` output
 
-## Rails 7.0.4.1 (January 17, 2023) ##
+    *Keaton Roux*
 
-*   No changes.
+*   Add an option to preprocess variants
 
+    ActiveStorage variants are processed on the fly when they are needed but
+    sometimes we're sure that they are accessed and want to processed them
+    upfront.
 
-## Rails 7.0.4 (September 09, 2022) ##
-
-*   Fixes proxy downloads of files over 5MiB
-
-    Previously, trying to view and/or download files larger than 5mb stored in
-    services like S3 via proxy mode could return corrupted files at around
-    5.2mb or cause random halts in the download. Now,
-    `ActiveStorage::Blobs::ProxyController` correctly handles streaming these
-    larger files from the service to the client without any issues.
-
-    Fixes #44679
-
-    *Felipe Raul*
-
-## Rails 7.0.3.1 (July 12, 2022) ##
-
-*   No changes.
-
-
-## Rails 7.0.3 (May 09, 2022) ##
-
-*   Don't stream responses in redirect mode
-
-    Previously, both redirect mode and proxy mode streamed their
-    responses which caused a new thread to be created, and could end
-    up leaking connections in the connection pool. But since redirect
-    mode doesn't actually send any data, it doesn't need to be
-    streamed.
-
-    *Luke Lau*
-
-## Rails 7.0.2.4 (April 26, 2022) ##
-
-*   No changes.
-
-
-## Rails 7.0.2.3 (March 08, 2022) ##
-
-*   Added image transformation validation via configurable allow-list.
-
-    Variant now offers a configurable allow-list for
-    transformation methods in addition to a configurable deny-list for arguments.
-
-    [CVE-2022-21831]
-
-
-## Rails 7.0.2.2 (February 11, 2022) ##
-
-*   No changes.
-
-## Rails 7.0.2.1 (February 11, 2022) ##
-
-*   No changes.
-
-
-## Rails 7.0.2 (February 08, 2022) ##
-
-*   Revert the ability to pass `service_name` param to `DirectUploadsController` which was introduced
-    in 7.0.0.
-
-    That change caused a lot of problems to upgrade Rails applications so we decided to remove it
-    while in work in a more backwards compatible implementation.
-
-    *Gannon McGibbon*
-
-*   Allow applications to opt out of precompiling Active Storage JavaScript assets.
-
-    *jlestavel*
+    `preprocessed` option is added when declaring variants.
 
+    ```
+    class User < ApplicationRecord
+      has_one_attached :avatar do |attachable|
+        attachable.variant :thumb, resize_to_limit: [100, 100], preprocessed: true
+      end
+    end
+    ```
 
-## Rails 7.0.1 (January 06, 2022) ##
+    *Shouichi Kamiya*
 
-*   No changes.
+*   Fix variants not included when eager loading multiple records containing a single attachment
 
+    When using the `with_attached_#{name}` scope for a `has_one_attached` relation,
+    attachment variants were not eagerly loaded.
 
-## Rails 7.0.0 (December 15, 2021) ##
+    *Russell Porter*
 
-*   Support transforming empty-ish `has_many_attached` value into `[]` (e.g. `[""]`).
+*   Allow an ActiveStorage attachment to be removed via a form post
 
+    Attachments can already be removed by updating the attachment to be nil such as:
     ```ruby
-    @user.highlights = [""]
-    @user.highlights # => []
+    User.find(params[:id]).update!(avatar: nil)
     ```
 
-    *Sean Doyle*
-
-
-## Rails 7.0.0.rc3 (December 14, 2021) ##
-
-*   No changes.
-
-
-## Rails 7.0.0.rc2 (December 14, 2021) ##
-
-*   No changes.
-
-## Rails 7.0.0.rc1 (December 06, 2021) ##
-
-*   `Add ActiveStorage::Blob.compose` to concatenate multiple blobs.
-
-    *Gannon McGibbon*
-
-*   Setting custom metadata on blobs are now persisted to remote storage.
-
-    *joshuamsager*
-
-*   Support direct uploads to multiple services.
-
-    *Dmitry Tsepelev*
-
-*   Invalid default content types are deprecated
-
-    Blobs created with content_type `image/jpg`, `image/pjpeg`, `image/bmp`, `text/javascript` will now produce
-    a deprecation warning, since these are not valid content types.
-
-    These content types will be removed from the defaults in Rails 7.1.
-
-    You can set `config.active_storage.silence_invalid_content_types_warning = true` to dismiss the warning.
-
-    *Alex Ghiculescu*
-
-## Rails 7.0.0.alpha2 (September 15, 2021) ##
-
-*   No changes.
-
-
-## Rails 7.0.0.alpha1 (September 15, 2021) ##
+    However, a form cannot post a nil param, it can only post an empty string. But, posting an
+    empty string would result in an `ActiveSupport::MessageVerifier::InvalidSignature: mismatched digest`
+    error being raised, because it's being treated as a signed blob id.
 
-*   Emit Active Support instrumentation events from Active Storage analyzers.
-
-    Fixes #42930
-
-    *Shouichi Kamiya*
-
-*   Add support for byte range requests
-
-    *Tom Prats*
-
-*   Attachments can be deleted after their association is no longer defined.
-
-    Fixes #42514
-
-    *Don Sisco*
+    Now, nil and an empty string are treated as a delete, which allows attachments to be removed via:
+    ```ruby
+    User.find(params[:id]).update!(params.require(:user).permit(:avatar))
 
-*   Make `vips` the default variant processor for new apps.
+    ```
 
-    See the upgrade guide for instructions on converting from `mini_magick` to `vips`. `mini_magick` is
-    not deprecated, existing apps can keep using it.
+    *Nate Matykiewicz*
 
-    *Breno Gazzola*
+*   Remove mini_mime usage in favour of marcel.
 
-*   Deprecate `ActiveStorage::Current.host` in favor of `ActiveStorage::Current.url_options` which accepts
-    a host, protocol and port.
+    We have two libraries that are have similar usage. This change removes
+    dependency on mini_mime and makes use of similar methods from marcel.
 
-    *Santiago Bartesaghi*
+    *Vipul A M*
 
-*   Allow using [IAM](https://cloud.google.com/storage/docs/access-control/signed-urls) when signing URLs with GCS.
+*   Allow destroying active storage variants
 
-    ```yaml
-    gcs:
-      service: GCS
-      ...
-      iam: true
+    ```ruby
+    User.first.avatar.variant(resize_to_limit: [100, 100]).destroy
     ```
 
-    *RRethy*
+    *Shouichi Kamiya*, *Yuichiro NAKAGAWA*, *Ryohei UEDA*
 
-*   OpenSSL constants are now used for Digest computations.
+*   Add `sample_rate` to `ActiveStorage::Analyzer::AudioAnalyzer` output
 
-    *Dirkjan Bussink*
+    *Matija Čupić*
 
-*   Deprecate `config.active_storage.replace_on_assign_to_many`. Future versions of Rails
-    will behave the same way as when the config is set to `true`.
+*   Remove deprecated `purge` and `purge_later` methods from the attachments association.
 
-    *Santiago Bartesaghi*
+    *Rafael Mendonça França*
 
-*   Remove deprecated methods: `build_after_upload`, `create_after_upload!` in favor of `create_and_upload!`,
-    and `service_url` in favor of `url`.
+*   Remove deprecated behavior when assigning to a collection of attachments.
 
-    *Santiago Bartesaghi*
+    Instead of appending to the collection, the collection is now replaced.
 
-*   Add support of `strict_loading_by_default` to `ActiveStorage::Representations` controllers.
+    *Rafael Mendonça França*
 
-    *Anton Topchii*, *Andrew White*
+*   Remove deprecated `ActiveStorage::Current#host` and `ActiveStorage::Current#host=` methods.
 
-*   Allow to detach an attachment when record is not persisted.
+    *Rafael Mendonça França*
 
-    *Jacopo Beschi*
+*   Remove deprecated invalid default content types in Active Storage configurations.
 
-*   Use libvips instead of ImageMagick to analyze images when `active_storage.variant_processor = vips`.
+    *Rafael Mendonça França*
 
-    *Breno Gazzola*
+*   Add missing preview event to `ActiveStorage::LogSubscriber`
 
-*   Add metadata value for presence of video channel in video blobs.
+    A `preview` event is being instrumented in `ActiveStorage::Previewer`.
+    However it was not added inside ActiveStorage's LogSubscriber class.
 
-    The `metadata` attribute of video blobs has a new boolean key named `video` that is set to
-    `true` if the file has an video channel and `false` if it doesn't.
+    This will allow to have logs for when a preview happens
+    in the same fashion as all other ActiveStorage events such as
+    `upload` and `download` inside `Rails.logger`.
 
-    *Breno Gazzola*
+    *Chedli Bourguiba*
 
-*   Deprecate usage of `purge` and `purge_later` from the association extension.
+*   Fix retrieving rotation value from FFmpeg on version 5.0+.
 
-    *Jacopo Beschi*
+    In FFmpeg version 5.0+ the rotation value has been removed from tags.
+    Instead the value can be found in side_data_list. Along with
+    this update it's possible to have values of -90, -270 to denote the video
+    has been rotated.
 
-*   Passing extra parameters in `ActiveStorage::Blob#url` to S3 Client.
+    *Haroon Ahmed*
 
-    This allows calls of `ActiveStorage::Blob#url` to have more interaction with
-    the S3 Presigner, enabling, amongst other options, custom S3 domain URL
-    Generation.
+*   Touch all corresponding model records after ActiveStorage::Blob is analyzed
 
-    ```ruby
-    blob = ActiveStorage::Blob.last
+    This fixes a race condition where a record can be requested and have a cache entry built, before
+    the initial `analyze_later` completes, which will not be invalidated until something else
+    updates the record. This also invalidates cache entries when a blob is re-analyzed, which
+    is helpful if a bug is fixed in an analyzer or a new analyzer is added.
 
-    blob.url # => https://<bucket-name>.s3.<region>.amazonaws.com/<key>
-    blob.url(virtual_host: true) # => # => https://<bucket-name>/<key>
-    ```
+    *Nate Matykiewicz*
 
-    *josegomezr*
+*   Add ability to use pre-defined variants when calling `preview` or
+    `representation` on an attachment.
 
-*   Allow setting a `Cache-Control` on files uploaded to GCS.
+    ```ruby
+    class User < ActiveRecord::Base
+      has_one_attached :file do |attachable|
+        attachable.variant :thumb, resize_to_limit: [100, 100]
+      end
+    end
 
-    ```yaml
-    gcs:
-      service: GCS
-      ...
-      cache_control: "public, max-age=3600"
+    <%= image_tag user.file.representation(:thumb) %>
     ```
 
-    *maleblond*
-
-*   The parameters sent to `ffmpeg` for generating a video preview image are now
-    configurable under `config.active_storage.video_preview_arguments`.
+    *Richard Böhme*
 
-    *Brendon Muir*
+*   Method `attach` always returns the attachments except when the record
+    is persisted, unchanged, and saving it fails, in which case it returns `nil`.
 
-*   The ActiveStorage video previewer will now use scene change detection to generate
-    better preview images (rather than the previous default of using the first frame
-    of the video). This change requires FFmpeg v3.4+.
-
-    *Jonathan Hefner*
+    *Santiago Bartesaghi*
 
-*   Add support for ActiveStorage expiring URLs.
+*   Fixes multiple `attach` calls within transaction not uploading files correctly.
 
+    In the following example, the code failed to upload all but the last file to the configured service.
     ```ruby
-    rails_blob_path(user.avatar, disposition: "attachment", expires_in: 30.minutes)
+    ActiveRecord::Base.transaction do
+      user.attachments.attach({
+        content_type: "text/plain",
+        filename: "dummy.txt",
+        io: ::StringIO.new("dummy"),
+      })
+      user.attachments.attach({
+        content_type: "text/plain",
+        filename: "dummy2.txt",
+        io: ::StringIO.new("dummy2"),
+      })
+    end
 
-    <%= image_tag rails_blob_path(user.avatar.variant(resize: "100x100"), expires_in: 30.minutes) %>
+    assert_equal 2, user.attachments.count
+    assert user.attachments.first.service.exist?(user.attachments.first.key)  # Fails
     ```
 
-    If you want to set default expiration time for ActiveStorage URLs throughout your application, set `config.active_storage.urls_expire_in`.
-
-    *aki77*
-
-*   Allow to purge an attachment when record is not persisted for `has_many_attached`.
-
-    *Jacopo Beschi*
-
-*   Add `with_all_variant_records` method to eager load all variant records on an attachment at once.
-    `with_attached_image` scope now eager loads variant records if using variant tracking.
-
-    *Alex Ghiculescu*
-
-*   Add metadata value for presence of audio channel in video blobs.
+    This was addressed by keeping track of the subchanges pending upload, and uploading them
+    once the transaction is committed.
 
-    The `metadata` attribute of video blobs has a new boolean key named `audio` that is set to
-    `true` if the file has an audio channel and `false` if it doesn't.
+    Fixes #41661
 
-    *Breno Gazzola*
+    *Santiago Bartesaghi*, *Bruno Vezoli*, *Juan Roig*, *Abhay Nikam*
 
-*   Adds analyzer for audio files.
+*   Raise an exception if `config.active_storage.service` is not set.
 
-    *Breno Gazzola*
+    If Active Storage is configured and `config.active_storage.service` is not
+    set in the respective environment's configuration file, then an exception
+    is raised with a meaningful message when attempting to use Active Storage.
 
-*   Respect Active Record's primary_key_type in Active Storage migrations.
+    *Ghouse Mohamed*
 
-    *fatkodima*
+*   Fixes proxy downloads of files over 5mb
 
-*   Allow `expires_in` for ActiveStorage signed ids.
-
-    *aki77*
-
-*   Allow to purge an attachment when record is not persisted for `has_one_attached`.
-
-    *Jacopo Beschi*
-
-*   Add a load hook called `active_storage_variant_record` (providing `ActiveStorage::VariantRecord`)
-    to allow for overriding aspects of the `ActiveStorage::VariantRecord` class. This makes
-    `ActiveStorage::VariantRecord` consistent with `ActiveStorage::Blob` and `ActiveStorage::Attachment`
-    that already have load hooks.
-
-    *Brendon Muir*
-
-*   `ActiveStorage::PreviewError` is raised when a previewer is unable to generate a preview image.
-
-    *Alex Robbin*
-
-*   Add `ActiveStorage::Streaming` module that can be included in a controller to get access to `#send_blob_stream`,
-    which wraps the new `ActionController::Base#send_stream` method to stream a blob from cloud storage:
-
-    ```ruby
-    class MyPublicBlobsController < ApplicationController
-      include ActiveStorage::SetBlob, ActiveStorage::Streaming
-
-      def show
-        http_cache_forever(public: true) do
-          send_blob_stream @blob, disposition: params[:disposition]
-        end
-      end
-    end
-    ```
+    Previously, trying to view and/or download files larger than 5mb stored in
+    services like S3 via proxy mode could return corrupted files at around
+    5.2mb or cause random halts in the download. Now,
+    `ActiveStorage::Blobs::ProxyController` correctly handles streaming these
+    larger files from the service to the client without any issues.
 
-    *DHH*
+    Fixes #44679
 
-*   Add ability to use pre-defined variants.
+    *Felipe Raul*
 
-    ```ruby
-    class User < ActiveRecord::Base
-      has_one_attached :avatar do |attachable|
-        attachable.variant :thumb, resize: "100x100"
-        attachable.variant :medium, resize: "300x300", monochrome: true
-      end
-    end
+*   Saving attachment(s) to a record returns the blob/blobs object
 
-    class Gallery < ActiveRecord::Base
-      has_many_attached :photos do |attachable|
-        attachable.variant :thumb, resize: "100x100"
-        attachable.variant :medium, resize: "300x300", monochrome: true
-      end
-    end
+    Previously, saving attachments did not return the blob/blobs that
+    were attached. Now, saving attachments to a record with `#attach`
+    method returns the blob or array of blobs that were attached to
+    the record. If it fails to save the attachment(s), then it returns
+    `false`.
 
-    <%= image_tag user.avatar.variant(:thumb) %>
-    ```
+    *Ghouse Mohamed*
 
-    *fatkodima*
+*   Don't stream responses in redirect mode
 
-*   After setting `config.active_storage.resolve_model_to_route = :rails_storage_proxy`
-    `rails_blob_path` and `rails_representation_path` will generate proxy URLs by default.
+    Previously, both redirect mode and proxy mode streamed their
+    responses which caused a new thread to be created, and could end
+    up leaking connections in the connection pool. But since redirect
+    mode doesn't actually send any data, it doesn't need to be
+    streamed.
 
-    *Ali Ismayilov*
+    *Luke Lau*
 
-*   Declare `ActiveStorage::FixtureSet` and `ActiveStorage::FixtureSet.blob` to
-    improve fixture integration.
+*   Safe for direct upload on Libraries or Frameworks
 
-    *Sean Doyle*
+    Enable the use of custom headers during direct uploads, which allows for
+    the inclusion of Authorization bearer tokens or other forms of authorization
+    tokens through headers.
 
+    *Radamés Roriz*
 
-Please check [6-1-stable](https://github.com/rails/rails/blob/6-1-stable/activestorage/CHANGELOG.md) for previous changes.
+Please check [7-0-stable](https://github.com/rails/rails/blob/7-0-stable/activestorage/CHANGELOG.md) for previous changes.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2017-2022 David Heinemeier Hansson, Basecamp
+Copyright (c) David Heinemeier Hansson, 37signals LLC
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -6,11 +6,11 @@ Files can be uploaded from the server to the cloud or directly from the client t
 
 Image files can furthermore be transformed using on-demand variants for quality, aspect ratio, size, or any other [MiniMagick](https://github.com/minimagick/minimagick) or [Vips](https://www.rubydoc.info/gems/ruby-vips/Vips/Image) supported transformation.
 
-You can read more about Active Storage in the [Active Storage Overview](https://edgeguides.rubyonrails.org/active_storage_overview.html) guide.
+You can read more about Active Storage in the [Active Storage Overview](https://guides.rubyonrails.org/active_storage_overview.html) guide.
 
 ## Compared to other storage solutions
 
-A key difference to how Active Storage works compared to other attachment solutions in Rails is through the use of built-in [Blob](https://github.com/rails/rails/blob/main/activestorage/app/models/active_storage/blob.rb) and [Attachment](https://github.com/rails/rails/blob/main/activestorage/app/models/active_storage/attachment.rb) models (backed by Active Record). This means existing application models do not need to be modified with additional columns to associate with files. Active Storage uses polymorphic associations via the `Attachment` join model, which then connects to the actual `Blob`.
+A key difference to how Active Storage works compared to other attachment solutions in \Rails is through the use of built-in [Blob](https://github.com/rails/rails/blob/main/activestorage/app/models/active_storage/blob.rb) and [Attachment](https://github.com/rails/rails/blob/main/activestorage/app/models/active_storage/attachment.rb) models (backed by Active Record). This means existing application models do not need to be modified with additional columns to associate with files. Active Storage uses polymorphic associations via the `Attachment` join model, which then connects to the actual `Blob`.
 
 `Blob` models store attachment metadata (filename, content-type, etc.), and their identifier key in the storage service. Blob models do not store the actual binary data. They are intended to be immutable in spirit. One file, one blob. You can associate the same blob with multiple application models as well. And if you want to do transformations of a given `Blob`, the idea is that you'll simply create a new one, rather than attempt to mutate the existing one (though of course you can delete the previous version later if you don't need it).
 
@@ -144,11 +144,11 @@ Active Storage, with its included JavaScript library, supports uploading directl
 
 1. Include the Active Storage JavaScript in your application's JavaScript bundle or reference it directly.
 
-    Requiring directly without bundling through the asset pipeline in the application html with autostart:
+    Requiring directly without bundling through the asset pipeline in the application HTML with autostart:
     ```html
     <%= javascript_include_tag "activestorage" %>
     ```
-    Requiring via importmap-rails without bundling through the asset pipeline in the application html without autostart as ESM:
+    Requiring via importmap-rails without bundling through the asset pipeline in the application HTML without autostart as ESM:
     ```ruby
     # config/importmap.rb
     pin "@rails/activestorage", to: "activestorage.esm.js"

data/app/assets/javascripts/activestorage.esm.js

@@ -508,7 +508,7 @@ function toArray(value) {
 }
 
 class BlobRecord {
-  constructor(file, checksum, url) {
+  constructor(file, checksum, url, customHeaders = {}) {
     this.file = file;
     this.attributes = {
       filename: file.name,
@@ -522,6 +522,9 @@ class BlobRecord {
     this.xhr.setRequestHeader("Content-Type", "application/json");
     this.xhr.setRequestHeader("Accept", "application/json");
     this.xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+    Object.keys(customHeaders).forEach((headerKey => {
+      this.xhr.setRequestHeader(headerKey, customHeaders[headerKey]);
+    }));
     const csrfToken = getMetaValue("csrf-token");
     if (csrfToken != undefined) {
       this.xhr.setRequestHeader("X-CSRF-Token", csrfToken);
@@ -604,11 +607,12 @@ class BlobUpload {
 let id = 0;
 
 class DirectUpload {
-  constructor(file, url, delegate) {
+  constructor(file, url, delegate, customHeaders = {}) {
     this.id = ++id;
     this.file = file;
     this.url = url;
     this.delegate = delegate;
+    this.customHeaders = customHeaders;
   }
   create(callback) {
     FileChecksum.create(this.file, ((error, checksum) => {
@@ -616,7 +620,7 @@ class DirectUpload {
         callback(error);
         return;
       }
-      const blob = new BlobRecord(this.file, checksum, this.url);
+      const blob = new BlobRecord(this.file, checksum, this.url, this.customHeaders);
       notify(this.delegate, "directUploadWillCreateBlobWithXHR", blob.xhr);
       blob.create((error => {
         if (error) {
@@ -841,4 +845,4 @@ function autostart() {
 
 setTimeout(autostart, 1);
 
-export { DirectUpload, start };
+export { DirectUpload, DirectUploadController, DirectUploadsController, start };