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.

Simplify / fix bugs

Damian Legawiec75d6d52e71ad
diff --git a/api/app/controllers/concerns/spree/api/v3/error_handler.rb b/api/app/controllers/concerns/spree/api/v3/error_handler.rb
index 7e7d63cf27..2509bafbbf 100644
--- a/api/app/controllers/concerns/spree/api/v3/error_handler.rb
+++ b/api/app/controllers/concerns/spree/api/v3/error_handler.rb
@@ -6,9 +6,12 @@ module Spree
# Stripe-style error codes for consistent API error responses
ERROR_CODES = {
- # Authentication errors
+ # Authentication & authorization errors
authentication_required: 'authentication_required',
authentication_failed: 'authentication_failed',
+ access_denied: 'access_denied',
+ invalid_token: 'invalid_token',
+ invalid_provider: 'invalid_provider',
# Resource errors
record_not_found: 'record_not_found',
@@ -32,13 +35,6 @@ module Spree
parameter_missing: 'parameter_missing',
parameter_invalid: 'parameter_invalid',
- # Authentication & authorization errors
- authentication_required: 'authentication_required',
- authentication_failed: 'authentication_failed',
- access_denied: 'access_denied',
- invalid_token: 'invalid_token',
- invalid_provider: 'invalid_provider',
-
# Payment errors
payment_failed: 'payment_failed',
payment_processing_error: 'payment_processing_error',
diff --git a/api/app/controllers/spree/api/v3/store/customers_controller.rb b/api/app/controllers/spree/api/v3/store/customers_controller.rb
index 9864b6d6bd..49d1c3d946 100644
--- a/api/app/controllers/spree/api/v3/store/customers_controller.rb
+++ b/api/app/controllers/spree/api/v3/store/customers_controller.rb
@@ -21,10 +21,6 @@ module Spree
protected
- def serialize_resource(resource)
- serializer_class.new(resource, params: serializer_params).to_h
- end
-
def serializer_class
Spree.api.v3_store_user_serializer
end
diff --git a/api/app/controllers/spree/api/v3/store/digitals_controller.rb b/api/app/controllers/spree/api/v3/store/digitals_controller.rb
index 2e836d8237..2ceed46e51 100644
--- a/api/app/controllers/spree/api/v3/store/digitals_controller.rb
+++ b/api/app/controllers/spree/api/v3/store/digitals_controller.rb
@@ -2,22 +2,38 @@ module Spree
module Api
module V3
module Store
- class DigitalsController < BaseController
- # Public endpoint - access via token
-
- # GET /api/v3/store/digitals/:token
- def download
- digital_link = Spree::DigitalLink.find_by!(token: params[:token])
-
- if digital_link.authorize!
- send_file digital_link.digital.attachment.path,
- filename: digital_link.digital.attachment.filename.to_s,
- type: digital_link.digital.attachment.content_type
+ class DigitalsController < ResourceController
+ # GET /api/v3/store/digitals/:id?token=...
+ def show
+ if @resource.authorize!
+ send_file @resource.digital.attachment.path,
+ filename: @resource.digital.attachment.filename.to_s,
+ type: @resource.digital.attachment.content_type
else
- render json: { error: 'Download link expired or invalid' }, status: :forbidden
+ render_error(
+ code: ERROR_CODES[:digital_link_expired],
+ message: 'Download link expired or invalid',
+ status: :forbidden
+ )
end
- rescue ActiveRecord::RecordNotFound
- render json: { error: 'Digital download not found' }, status: :not_found
+ end
+
+ protected
+
+ def model_class
+ Spree::DigitalLink
+ end
+
+ def serializer_class
+ Spree.api.v3_store_digital_link_serializer
+ end
+
+ def authorize_resource!(resource = @resource, action = action_name.to_sym)
+ authorize!(action, resource, digital_token)
+ end
+
+ def digital_token
+ request.headers['X-Spree-Digital-Token'].presence || params[:token]
end
end
end
diff --git a/api/app/controllers/spree/api/v3/store/line_items_controller.rb b/api/app/controllers/spree/api/v3/store/line_items_controller.rb
index 294cb93c53..9504afb7d2 100644
--- a/api/app/controllers/spree/api/v3/store/line_items_controller.rb
+++ b/api/app/controllers/spree/api/v3/store/line_items_controller.rb
@@ -61,7 +61,7 @@ module Spree
protected
def variant
- current_store.variants.accessible_by(current_ability).find(line_item_params[:variant_id])
+ current_store.variants.accessible_by(current_ability).find(permitted_params[:variant_id])
end
def scope
diff --git a/api/app/controllers/spree/api/v3/store/order_promotions_controller.rb b/api/app/controllers/spree/api/v3/store/order_promotions_controller.rb
index e0bfcbd4ec..bb9688e29f 100644
--- a/api/app/controllers/spree/api/v3/store/order_promotions_controller.rb
+++ b/api/app/controllers/spree/api/v3/store/order_promotions_controller.rb
@@ -23,7 +23,7 @@ module Spree
# DELETE /api/v3/store/orders/:order_id/order_promotions/:id
def destroy
- coupon_code = @order_promotion.code.presence || @order_promotion.name
+ coupon_code = @resource.code.presence || @resource.name
promotion_handler.remove(coupon_code)
@@ -34,6 +34,8 @@ module Spree
end
end
+ protected
+
def promotion_handler
@promotion_handler ||= Spree::PromotionHandler::Coupon.new(@order)
end
diff --git a/api/app/controllers/spree/api/v3/store/payment_sources_controller.rb b/api/app/controllers/spree/api/v3/store/payment_sources_controller.rb
index 3a3db8fe1d..f5a41ed414 100644
--- a/api/app/controllers/spree/api/v3/store/payment_sources_controller.rb
+++ b/api/app/controllers/spree/api/v3/store/payment_sources_controller.rb
@@ -1,7 +1,7 @@
module Spree
module Api
module V3
- module Storefront
+ module Store
class PaymentSourcesController < ResourceController
before_action :require_authentication!
diff --git a/api/app/controllers/spree/api/v3/store/shipments_controller.rb b/api/app/controllers/spree/api/v3/store/shipments_controller.rb
index c124724039..4018b12789 100644
--- a/api/app/controllers/spree/api/v3/store/shipments_controller.rb
+++ b/api/app/controllers/spree/api/v3/store/shipments_controller.rb
@@ -7,34 +7,11 @@ module Spree
before_action :set_order
before_action :authorize_order_access!
- before_action :set_shipment, only: [:show, :update]
-
- # GET /api/v3/store/orders/:order_id/shipments
- def index
- render json: {
- data: serialize_collection(@order.shipments)
- }
- end
-
- # GET /api/v3/store/orders/:order_id/shipments/:id
- def show
- render json: serialize_resource(@shipment)
- end
-
- # PATCH /api/v3/store/orders/:order_id/shipments/:id
- def update
- if permitted_params[:selected_shipping_rate_id].present?
- @shipment.selected_shipping_rate_id = permitted_params[:selected_shipping_rate_id]
- @shipment.save
- end
-
- render json: serialize_resource(@shipment)
- end
protected
- def set_shipment
- @shipment = @order.shipments.find(params[:id])
+ def scope
+ @order.shipments
end
def model_class
@@ -46,7 +23,7 @@ module Spree
end
def permitted_params
- params.require(:shipment).permit(Spree::PermittedAttributes.shipment_attributes)
+ params.require(:shipment).permit(:selected_shipping_rate_id)
end
end
end
diff --git a/api/app/controllers/spree/api/v3/store/stores_controller.rb b/api/app/controllers/spree/api/v3/store/stores_controller.rb
index 71efe8954b..f6ddc815ed 100644
--- a/api/app/controllers/spree/api/v3/store/stores_controller.rb
+++ b/api/app/controllers/spree/api/v3/store/stores_controller.rb
@@ -26,11 +26,6 @@ module Spree
def serializer_class
Spree.api.v3_store_store_serializer
end
-
- # Not needed for show
- def permitted_params
- {}
- end
end
end
end
diff --git a/api/app/controllers/spree/api/v3/store/taxonomies_controller.rb b/api/app/controllers/spree/api/v3/store/taxonomies_controller.rb
index b6147c742f..a56ba82931 100644
--- a/api/app/controllers/spree/api/v3/store/taxonomies_controller.rb
+++ b/api/app/controllers/spree/api/v3/store/taxonomies_controller.rb
@@ -1,7 +1,7 @@
module Spree
module Api
module V3
- module Storefront
+ module Store
class TaxonomiesController < ResourceController
protected
diff --git a/api/app/controllers/spree/api/v3/store/taxons_controller.rb b/api/app/controllers/spree/api/v3/store/taxons_controller.rb
index 65e534c5d1..93378e4e0c 100644
--- a/api/app/controllers/spree/api/v3/store/taxons_controller.rb
+++ b/api/app/controllers/spree/api/v3/store/taxons_controller.rb
@@ -16,11 +16,6 @@ module Spree
def scope
Spree::Taxon.for_store(current_store)
end
-
- # Not needed for index/show
- def permitted_params
- {}
- end
end
end
end
diff --git a/api/app/controllers/spree/api/v3/store/wishlist_items_controller.rb b/api/app/controllers/spree/api/v3/store/wishlist_items_controller.rb
index 63201892e8..a7905b2696 100644
--- a/api/app/controllers/spree/api/v3/store/wishlist_items_controller.rb
+++ b/api/app/controllers/spree/api/v3/store/wishlist_items_controller.rb
@@ -2,7 +2,7 @@ module Spree
module Api
module V3
module Store
- class WishedItemsController < ResourceController
+ class WishlistItemsController < ResourceController
before_action :require_authentication!
before_action :set_wishlist
diff --git a/api/app/serializers/spree/api/v3/store/digital_link_serializer.rb b/api/app/serializers/spree/api/v3/store/digital_link_serializer.rb
new file mode 100644
index 0000000000..2b6029db7e
--- /dev/null
+++ b/api/app/serializers/spree/api/v3/store/digital_link_serializer.rb
@@ -0,0 +1,24 @@
+module Spree
+ module Api
+ module V3
+ module Store
+ class DigitalLinkSerializer < BaseSerializer
+ attributes :id, :access_counter, :authorizable, :expired, :access_limit_exceeded,
+ :filename, :content_type
+
+ attribute :authorizable do |digital_link|
+ digital_link.authorizable?
+ end
+
+ attribute :expired do |digital_link|
+ digital_link.expired?
+ end
+
+ attribute :access_limit_exceeded do |digital_link|
+ digital_link.access_limit_exceeded?
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/api/lib/spree/api/dependencies.rb b/api/lib/spree/api/dependencies.rb
index d54db8357c..4367b4e285 100644
--- a/api/lib/spree/api/dependencies.rb
+++ b/api/lib/spree/api/dependencies.rb
@@ -116,6 +116,7 @@ module Spree
v3_store_taxonomy_serializer: 'Spree::Api::V3::Store::TaxonomySerializer',
v3_store_taxon_serializer: 'Spree::Api::V3::Store::TaxonSerializer',
v3_store_order_promotion_serializer: 'Spree::Api::V3::Store::OrderPromotionSerializer',
+ v3_store_digital_link_serializer: 'Spree::Api::V3::Store::DigitalLinkSerializer',
# platform serializers
platform_metafield_serializer: 'Spree::Api::V2::Platform::MetafieldSerializer',
diff --git a/core/app/models/spree/ability.rb b/core/app/models/spree/ability.rb
index 5aa1dd5000..2934bd8ff4 100644
--- a/core/app/models/spree/ability.rb
+++ b/core/app/models/spree/ability.rb
@@ -165,6 +165,9 @@ module Spree
wished_item.wishlist.user == user
end
can :accept, Spree::Invitation, invitee_id: [user.id, nil], invitee_type: user.class.name, status: 'pending'
+ can :show, ::Spree::DigitalLink do |digital_link, token|
+ digital_link.token == token
+ end
can :read, ::Spree::Policy
can :read, ::Spree::Page if defined?(Spree::Page)
can :read, ::Spree::Post if defined?(Spree::Post)
diff --git a/core/app/models/spree/permission_sets/default_customer.rb b/core/app/models/spree/permission_sets/default_customer.rb
index 083b8fbee7..802b1289c2 100644
--- a/core/app/models/spree/permission_sets/default_customer.rb
+++ b/core/app/models/spree/permission_sets/default_customer.rb
@@ -60,6 +60,11 @@ module Spree
# Invitation acceptance
can :accept, Spree::Invitation, invitee_id: [user.id, nil], invitee_type: user.class.name, status: 'pending'
+
+ # Digital downloads - token-based access
+ can :show, Spree::DigitalLink do |digital_link, token|
+ digital_link.token == token
+ end
end
end
end