Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fix for Digital Downloads (#11401)

Matthew Kennedyd90bce344f69
diff --git a/api/app/controllers/spree/api/v2/platform/digital_links_controller.rb b/api/app/controllers/spree/api/v2/platform/digital_links_controller.rb
index f17b293fd6..a094886f9a 100644
--- a/api/app/controllers/spree/api/v2/platform/digital_links_controller.rb
+++ b/api/app/controllers/spree/api/v2/platform/digital_links_controller.rb
@@ -4,13 +4,12 @@ module Spree
module Platform
class DigitalLinksController < ResourceController
def reset
- spree_authorize! :update, @digital_link if spree_current_user.present?
+ spree_authorize! :update, resource if spree_current_user.present?
- @digital_link = scope.find(params[:id])
- @digital_link.reset!
-
- if @digital_link.save
- render_serialized_payload { serialize_resource(@digital_link) }
+ if resource.reset!
+ render_serialized_payload { serialize_resource(resource) }
+ else
+ render_error_payload(resource.errors)
end
end
diff --git a/api/app/controllers/spree/api/v2/storefront/digitals_controller.rb b/api/app/controllers/spree/api/v2/storefront/digitals_controller.rb
index 40d0e5ff91..bbd7a7bdc4 100644
--- a/api/app/controllers/spree/api/v2/storefront/digitals_controller.rb
+++ b/api/app/controllers/spree/api/v2/storefront/digitals_controller.rb
@@ -6,12 +6,26 @@ module Spree
def download
if attachment.present?
if digital_link.authorize!
- send_file(
- ActiveStorage::Blob.service.path_for(attachment.key),
- filename: attachment.filename.to_s,
- type: attachment.content_type.to_s,
- status: :ok
- ) and return
+ if defined?(ActiveStorage::Service::DiskService) && ActiveStorage::Blob.service.instance_of?(ActiveStorage::Service::DiskService)
+ # The asset is hosted on disk, use send_file.
+
+ send_file(
+ ActiveStorage::Blob.service.path_for(attachment.key),
+ filename: attachment.filename.to_s,
+ type: attachment.content_type.to_s,
+ status: :ok
+ ) and return
+
+ else
+ # The asset is hosted on a 3rd party service, use an expiring url with disposition: 'attachment'.
+
+ redirect_to attachment.url(
+ expires_in: current_store.digital_asset_link_expire_time.seconds,
+ disposition: 'attachment',
+ host: current_store.formatted_url
+ ) and return
+
+ end
end
else
Rails.logger.error I18n.t('spree.api.v2.digitals.missing_file')
diff --git a/api/spec/integration/api/v2/platform/line_items_spec.rb b/api/spec/integration/api/v2/platform/line_items_spec.rb
index de11dd4164..22c6afba5b 100644
--- a/api/spec/integration/api/v2/platform/line_items_spec.rb
+++ b/api/spec/integration/api/v2/platform/line_items_spec.rb
@@ -5,7 +5,7 @@ describe 'Line Items API', swagger: true do
resource_name = 'Line Item'
options = {
- include_example: 'order,tax_category,variant.product',
+ include_example: 'order,tax_category,variant.product,digital_links',
filter_examples: [{ name: 'filter[order_id_eq]', example: '123' }]
}
diff --git a/core/app/models/spree/digital.rb b/core/app/models/spree/digital.rb
index da1675f238..3ad0f344c3 100644
--- a/core/app/models/spree/digital.rb
+++ b/core/app/models/spree/digital.rb
@@ -3,7 +3,11 @@ module Spree
belongs_to :variant
has_many :digital_links, dependent: :destroy
- has_one_attached :attachment
+ if Spree.private_storage_service_name
+ has_one_attached :attachment, service: Spree.private_storage_service_name
+ else
+ has_one_attached :attachment
+ end
validates :attachment, attached: true
validates :variant, presence: true
diff --git a/core/app/models/spree/digital_link.rb b/core/app/models/spree/digital_link.rb
index b16c08ccf2..493277b47c 100644
--- a/core/app/models/spree/digital_link.rb
+++ b/core/app/models/spree/digital_link.rb
@@ -36,8 +36,9 @@ module Spree
end
def reset!
- update_column :access_counter, 0
- update_column :created_at, Time.current
+ self.access_counter = 0
+ self.created_at = Time.current
+ save!
end
private
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index 674f80a210..782bf48d4e 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -6,6 +6,7 @@ module Spree
s.boolean :limit_digital_download_days, default: true, null: false
s.integer :digital_asset_authorized_clicks, default: 5, null: false # number of times a customer can download a digital file.
s.integer :digital_asset_authorized_days, default: 7, null: false # number of days after initial purchase the customer can download a file.
+ s.integer :digital_asset_link_expire_time, default: 300, null: false # 5 minutes in seconds
end
MAILER_LOGO_CONTENT_TYPES = ['image/png', 'image/jpg', 'image/jpeg'].freeze
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index 7fb1df8a24..68d13e9297 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -25,7 +25,7 @@ require 'activerecord-typedstore'
StateMachines::Machine.ignore_method_conflicts = true
module Spree
- mattr_accessor :user_class, :admin_user_class
+ mattr_accessor :user_class, :admin_user_class, :private_storage_service_name
def self.user_class(constantize: true)
if @@user_class.is_a?(Class)
@@ -45,6 +45,16 @@ module Spree
end
end
+ def self.private_storage_service_name
+ if @@private_storage_service_name
+ if @@private_storage_service_name.is_a?(String) || @@private_storage_service_name.is_a?(Symbol)
+ @@private_storage_service_name.to_sym
+ else
+ raise 'Spree.private_storage_service_name MUST be a String or Symbol object.'
+ end
+ end
+ end
+
# Used to configure Spree.
#
# Example:
diff --git a/core/spec/lib/spree/core_spec.rb b/core/spec/lib/spree/core_spec.rb
index 375ef60cb3..a186961d43 100644
--- a/core/spec/lib/spree/core_spec.rb
+++ b/core/spec/lib/spree/core_spec.rb
@@ -84,4 +84,42 @@ describe Spree do
end
end
end
+
+ describe '.private_storage_service_name' do
+ after do
+ described_class.private_storage_service_name = nil
+ end
+
+ context 'when private_storage_service_name is a Symbol instance' do
+ it 'returns the private_storage_service_name as a symbol' do
+ described_class.private_storage_service_name = :my_secret_asset_store
+
+ expect(described_class.private_storage_service_name).to eq(:my_secret_asset_store)
+ end
+ end
+
+ context 'when private_storage_service_name is a String instance' do
+ it 'returns the private_storage_service_name as a symbol' do
+ described_class.private_storage_service_name = 'my_hidden_asset_store'
+
+ expect(described_class.private_storage_service_name).to eq(:my_hidden_asset_store)
+ end
+ end
+
+ context 'when private_storage_service_name is a Integer instance' do
+ it 'raises an error' do
+ described_class.private_storage_service_name = 33
+
+ expect { described_class.private_storage_service_name }.to raise_error(RuntimeError)
+ end
+ end
+
+ context 'when private_storage_service_name is set to nil' do
+ it 'returns the private_storage_service_name as nil value' do
+ described_class.private_storage_service_name = nil
+
+ expect(described_class.private_storage_service_name).to be nil
+ end
+ end
+ end
end