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.

fixes

Damian Legawieca701ec7225f5
diff --git a/api/app/controllers/concerns/spree/api/v3/order_concern.rb b/api/app/controllers/concerns/spree/api/v3/order_concern.rb
index 1ded95360b..9c008a5a43 100644
--- a/api/app/controllers/concerns/spree/api/v3/order_concern.rb
+++ b/api/app/controllers/concerns/spree/api/v3/order_concern.rb
@@ -6,41 +6,24 @@ module Spree
# Allow access to order via order token for guests or authenticated users
def authorize_order_access!
- # Allow if user is authenticated and owns the order
- return if current_user && @order.user == current_user
-
- # Allow guest access via order token
- order_token = extract_order_token
-
- unless order_token.present? && @order.token == order_token
- render_error(
- code: ERROR_CODES[:access_denied],
- message: 'Access denied',
- status: :forbidden
- )
- return false
- end
+ authorize!(:update, @order, order_token)
end
protected
# Finds order by number from params
# Uses params[:order_id] for nested resources (line items, payments, etc.)
- # Uses params[:id] for order resource endpoints
def set_order
- order_param = params[:order_id].presence || params[:id]
- @order = current_store.orders.incomplete.friendly.find(order_param)
+ @order = current_store.orders.friendly.find(params[:order_id])
end
- private
-
- def extract_order_token
+ def order_token
# Check X-Spree-Order-Token header first
header = request.headers['X-Spree-Order-Token']
return header if header.present?
# Fallback to query param
- params[:order_token]
+ params[:token]
end
end
end
diff --git a/api/app/controllers/spree/api/v3/resource_controller.rb b/api/app/controllers/spree/api/v3/resource_controller.rb
index f8d2599134..2d6229775f 100644
--- a/api/app/controllers/spree/api/v3/resource_controller.rb
+++ b/api/app/controllers/spree/api/v3/resource_controller.rb
@@ -59,7 +59,12 @@ module Spree
# Sets the resource for show, update, destroy actions
def set_resource
- @resource = scope.find(params[:id])
+ @resource = if model_class.respond_to?(:friendly)
+ model_class.friendly.find(params[:id])
+ else
+ scope.find(params[:id])
+ end
+
authorize_resource!(@resource)
end
diff --git a/api/app/controllers/spree/api/v3/storefront/credit_cards_controller.rb b/api/app/controllers/spree/api/v3/storefront/credit_cards_controller.rb
new file mode 100644
index 0000000000..7e6ae3c80b
--- /dev/null
+++ b/api/app/controllers/spree/api/v3/storefront/credit_cards_controller.rb
@@ -0,0 +1,25 @@
+module Spree
+ module Api
+ module V3
+ module Storefront
+ class CreditCardsController < ResourceController
+ before_action :require_authentication!
+
+ protected
+
+ def scope
+ current_user.credit_cards
+ end
+
+ def model_class
+ Spree::CreditCard
+ end
+
+ def serializer_class
+ Spree.api.v3_storefront_credit_card_serializer
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/api/app/controllers/spree/api/v3/storefront/order_addresses_controller.rb b/api/app/controllers/spree/api/v3/storefront/order_addresses_controller.rb
deleted file mode 100644
index 1e75e005c2..0000000000
--- a/api/app/controllers/spree/api/v3/storefront/order_addresses_controller.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-module Spree
- module Api
- module V3
- module Storefront
- class OrderAddressesController < BaseController
- include Spree::Api::V3::OrderConcern
-
- before_action :set_order
- before_action :authorize_order_access!
-
- # GET /api/v3/storefront/orders/:order_id/billing_address
- # GET /api/v3/storefront/orders/:order_id/shipping_address
- def show
- address = address_type == 'billing' ? @order.bill_address : @order.ship_address
-
- if address
- render json: serialize_address(address)
- else
- render json: { error: 'Address not found' }, status: :not_found
- end
- end
-
- # PATCH /api/v3/storefront/orders/:order_id/billing_address
- # PATCH /api/v3/storefront/orders/:order_id/shipping_address
- def update
- address = address_type == 'billing' ? @order.bill_address : @order.ship_address
-
- if address.nil?
- # Create new address
- address = Spree::Address.new(address_params)
- if address_type == 'billing'
- @order.bill_address = address
- else
- @order.ship_address = address
- end
- else
- # Update existing address
- address.assign_attributes(address_params)
- end
-
- if @order.save
- render json: serialize_address(address)
- else
- render_errors(address.errors.any? ? address.errors : @order.errors)
- end
- end
-
- protected
-
- def address_type
- params[:address_type]
- end
-
- def serialize_address(address)
- serializer_class.new(address, params: serializer_params).to_h
- end
-
- def serializer_class
- Spree.api.v3_storefront_address_serializer
- end
-
- def serializer_params
- {
- store: current_store,
- locale: current_locale,
- includes: include_tree
- }
- end
-
- def address_params
- params.require(:address).permit(Spree::PermittedAttributes.address_attributes)
- end
- end
- end
- end
- end
-end
diff --git a/api/app/controllers/spree/api/v3/storefront/orders_controller.rb b/api/app/controllers/spree/api/v3/storefront/orders_controller.rb
index a48f796700..ccf6bec364 100644
--- a/api/app/controllers/spree/api/v3/storefront/orders_controller.rb
+++ b/api/app/controllers/spree/api/v3/storefront/orders_controller.rb
@@ -8,8 +8,6 @@ module Spree
# Override authorization for orders
skip_before_action :set_resource, only: [:index, :create]
before_action :require_authentication!, only: [:index]
- before_action :set_order, only: [:show, :update, :destroy, :next, :advance, :complete, :cancel]
- before_action :authorize_order_access!, only: [:show, :update, :destroy, :next, :advance, :complete, :cancel]
# POST /api/v3/storefront/orders (public - guest checkout)
def create
@@ -24,11 +22,6 @@ module Spree
), status: :created
end
- # GET /api/v3/storefront/orders/:id
- def show
- render json: serialize_resource(@order)
- end
-
# PATCH /api/v3/storefront/orders/:id
def update
result = update_service.call(
@@ -86,19 +79,9 @@ module Spree
protected
- def load_order
- # for show action we need to find any order by id, not only incomplete orders
- if action_name == 'show'
- @order = current_store.orders.friendly.find(params[:id])
- else
- super
- end
- end
-
- def scope
- return Spree::Order.none unless current_user
-
- current_user.orders.for_store(current_store)
+ # override authorize_resource! to pass the order token
+ def authorize_resource!(resource = @resource, action = action_name.to_sym)
+ authorize!(action, resource, order_token)
end
def model_class
diff --git a/api/app/controllers/spree/api/v3/storefront/payment_sources_controller.rb b/api/app/controllers/spree/api/v3/storefront/payment_sources_controller.rb
index b071ee09b6..bf5cf806bd 100644
--- a/api/app/controllers/spree/api/v3/storefront/payment_sources_controller.rb
+++ b/api/app/controllers/spree/api/v3/storefront/payment_sources_controller.rb
@@ -2,49 +2,21 @@ module Spree
module Api
module V3
module Storefront
- class PaymentSourcesController < BaseController
+ class PaymentSourcesController < ResourceController
before_action :require_authentication!
- before_action :set_payment_source, only: [:show, :destroy]
-
- # GET /api/v3/storefront/customers/me/payment_sources
- def index
- @payment_sources = current_user.credit_cards
-
- render json: {
- data: serialize_collection(@payment_sources)
- }
- end
-
- # GET /api/v3/storefront/customers/me/payment_sources/:id
- def show
- render json: serialize_resource(@payment_source)
- end
-
- # DELETE /api/v3/storefront/customers/me/payment_sources/:id
- def destroy
- @payment_source.destroy
- head :no_content
- end
protected
- def set_payment_source
- @payment_source = current_user.credit_cards.find(params[:id])
+ def scope
+ current_user.payment_sources
end
- def serialize_collection(collection)
- collection.map { |item| serialize_resource(item) }
+ def model_class
+ Spree::PaymentSource
end
- def serialize_resource(resource)
- {
- id: resource.id,
- cc_type: resource.cc_type,
- last_digits: resource.last_digits,
- month: resource.month,
- year: resource.year,
- name: resource.name
- }
+ def serializer_class
+ Spree.api.v3_storefront_payment_source_serializer
end
end
end
diff --git a/api/app/controllers/spree/api/v3/storefront/states_controller.rb b/api/app/controllers/spree/api/v3/storefront/states_controller.rb
deleted file mode 100644
index 7897852702..0000000000
--- a/api/app/controllers/spree/api/v3/storefront/states_controller.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-module Spree
- module Api
- module V3
- module Storefront
- class StatesController < ResourceController
- # Public endpoint - no authentication required
-
- before_action :set_country, if: -> { params[:country_id].present? }
-
- protected
-
- def set_country
- @country = Spree::Country.find(params[:country_id])
- end
-
- def scope
- base_scope = @country ? @country.states : Spree::State
- base_scope.accessible_by(current_ability, :show)
- end
-
- def model_class
- Spree::State
- end
-
- def serializer_class
- Spree.api.v3_storefront_state_serializer
- end
-
- # Not needed for index/show
- def permitted_params
- {}
- end
- end
- end
- end
- end
-end
diff --git a/api/app/controllers/spree/api/v3/storefront/variants_controller.rb b/api/app/controllers/spree/api/v3/storefront/variants_controller.rb
deleted file mode 100644
index 30ae52f6b0..0000000000
--- a/api/app/controllers/spree/api/v3/storefront/variants_controller.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-module Spree
- module Api
- module V3
- module Storefront
- class VariantsController < ResourceController
- before_action :set_product
-
- # GET /api/v3/storefront/products/:product_id/variants/:id
- def show
- @resource = @product.variants.find(params[:id])
- render json: serialize_resource(@resource)
- end
-
- protected
-
- def set_product
- @product = Spree::Product.available.for_store(current_store).find(params[:product_id])
- end
-
- def scope
- @product.variants.accessible_by(current_ability, :show).includes(scope_includes)
- end
-
- def scope_includes
- [:prices, { stock_items: :stock_location }]
- end
-
- def model_class
- Spree::Variant
- end
-
- def serializer_class
- Spree.api.v3_storefront_variant_serializer
- end
-
- # Not needed for index/show
- def permitted_params
- {}
- end
- end
- end
- end
- end
-end
diff --git a/api/app/controllers/spree/api/v3/storefront/wishlist_items_controller.rb b/api/app/controllers/spree/api/v3/storefront/wishlist_items_controller.rb
index dc2273ad40..7bb5dcaf11 100644
--- a/api/app/controllers/spree/api/v3/storefront/wishlist_items_controller.rb
+++ b/api/app/controllers/spree/api/v3/storefront/wishlist_items_controller.rb
@@ -6,16 +6,9 @@ module Spree
before_action :require_authentication!
before_action :set_wishlist
- # GET /api/v3/storefront/wishlists/:wishlist_id/items
- def index
- render json: {
- data: serialize_collection(@wishlist.wished_items)
- }
- end
-
# POST /api/v3/storefront/wishlists/:wishlist_id/items
def create
- @item = @wishlist.wished_items.build(item_params)
+ @item = @wishlist.wished_items.build(permitted_params)
if @item.save
render json: serialize_resource(@item), status: :created
@@ -34,7 +27,7 @@ module Spree
def update
@item = @wishlist.wished_items.find(params[:id])
- if @item.update(item_params)
+ if @item.update(permitted_params)
render json: serialize_resource(@item)
else
render_errors(@item.errors)
@@ -63,10 +56,6 @@ module Spree
end
def permitted_params
- item_params
- end
-
- def item_params
params.require(:item).permit(Spree::PermittedAttributes.wished_item_attributes)
end
end
diff --git a/api/app/controllers/spree/api/v3/storefront/wishlists_controller.rb b/api/app/controllers/spree/api/v3/storefront/wishlists_controller.rb
index a2adb96538..a2f0de340b 100644
--- a/api/app/controllers/spree/api/v3/storefront/wishlists_controller.rb
+++ b/api/app/controllers/spree/api/v3/storefront/wishlists_controller.rb
@@ -5,17 +5,6 @@ module Spree
class WishlistsController < ResourceController
before_action :require_authentication!
- # GET /api/v3/storefront/wishlists/default
- def default
- @wishlist = current_user.wishlists.default.first_or_create!(
- name: 'Default',
- is_default: true,
- store: current_store
- )
-
- render json: serialize_resource(@wishlist)
- end
-
protected
def scope
diff --git a/api/app/serializers/spree/api/v3/image_serializer.rb b/api/app/serializers/spree/api/v3/image_serializer.rb
index f81fc5539a..326a1af631 100644
--- a/api/app/serializers/spree/api/v3/image_serializer.rb
+++ b/api/app/serializers/spree/api/v3/image_serializer.rb
@@ -2,7 +2,7 @@ module Spree
module Api
module V3
class ImageSerializer < BaseSerializer
- attributes :id, :position, :alt
+ attributes :id, :position, :alt, :viewable_type, :viewable_id
attribute :original_url do |image|
image_url(image)
diff --git a/api/app/serializers/spree/api/v3/line_item_serializer.rb b/api/app/serializers/spree/api/v3/line_item_serializer.rb
index 3bdcba039e..01d5ccfabb 100644
--- a/api/app/serializers/spree/api/v3/line_item_serializer.rb
+++ b/api/app/serializers/spree/api/v3/line_item_serializer.rb
@@ -2,7 +2,7 @@ module Spree
module Api
module V3
class LineItemSerializer < BaseSerializer
- attributes :id, :quantity, :name, :slug, :options_text, :currency
+ attributes :id, :variant_id, :quantity, :currency
attribute :price do |line_item|
line_item.price.to_f
@@ -80,6 +80,10 @@ module Spree
one :variant,
resource: Spree.api.v3_storefront_variant_serializer,
if: proc { params[:includes]&.include?('variant') }
+
+ one :product,
+ resource: Spree.api.v3_storefront_product_serializer,
+ if: proc { params[:includes]&.include?('product') }
end
end
end
diff --git a/api/app/serializers/spree/api/v3/order_serializer.rb b/api/app/serializers/spree/api/v3/order_serializer.rb
index cac1ed89fa..7e3ac9cf8d 100644
--- a/api/app/serializers/spree/api/v3/order_serializer.rb
+++ b/api/app/serializers/spree/api/v3/order_serializer.rb
@@ -89,14 +89,12 @@ module Spree
end
one :billing_address,
- key: :billing_address,
resource: Spree.api.v3_storefront_address_serializer,
if: proc { params[:includes]&.include?('billing_address') } do |order|
order.bill_address
end
one :shipping_address,
- key: :shipping_address,
resource: Spree.api.v3_storefront_address_serializer,
if: proc { params[:includes]&.include?('shipping_address') } do |order|
order.ship_address
diff --git a/api/app/serializers/spree/api/v3/product_serializer.rb b/api/app/serializers/spree/api/v3/product_serializer.rb
index 13f6000a2d..832ec75328 100644
--- a/api/app/serializers/spree/api/v3/product_serializer.rb
+++ b/api/app/serializers/spree/api/v3/product_serializer.rb
@@ -51,10 +51,10 @@ module Spree
end
# Conditional associations
- many :images,
+ many :variant_images,
+ key: :images,
resource: Spree.api.v3_storefront_image_serializer,
- if: proc { params[:includes]&.include?('images') },
- source: :variant_images
+ if: proc { params[:includes]&.include?('images') }
many :variants,
resource: Spree.api.v3_storefront_variant_serializer,
@@ -64,11 +64,10 @@ module Spree
resource: Spree.api.v3_storefront_variant_serializer,
if: proc { params[:includes]&.include?('default_variant') }
- one :master_variant,
+ one :master,
key: :master_variant,
resource: Spree.api.v3_storefront_variant_serializer,
- if: proc { params[:includes]&.include?('master_variant') },
- source: :master
+ if: proc { params[:includes]&.include?('master_variant') }
many :option_types,
resource: Spree.api.v3_storefront_option_type_serializer,
diff --git a/api/app/serializers/spree/api/v3/taxon_serializer.rb b/api/app/serializers/spree/api/v3/taxon_serializer.rb
index e6a6d3a7aa..a292ce5ac4 100644
--- a/api/app/serializers/spree/api/v3/taxon_serializer.rb
+++ b/api/app/serializers/spree/api/v3/taxon_serializer.rb
@@ -4,7 +4,7 @@ module Spree
class TaxonSerializer < BaseSerializer
attributes :id, :name, :permalink, :position, :lft, :rgt, :depth,
:meta_title, :meta_description, :meta_keywords,
- :parent_id, :taxonomy_id,
+ :parent_id, :taxonomy_id, :children_count,
created_at: :iso8601, updated_at: :iso8601
attribute :description do |taxon|
diff --git a/api/app/serializers/spree/api/v3/variant_serializer.rb b/api/app/serializers/spree/api/v3/variant_serializer.rb
index e4c1e01baf..895e29d466 100644
--- a/api/app/serializers/spree/api/v3/variant_serializer.rb
+++ b/api/app/serializers/spree/api/v3/variant_serializer.rb
@@ -2,7 +2,7 @@ module Spree
module Api
module V3
class VariantSerializer < BaseSerializer
- attributes :id, :name, :sku, :barcode, :is_master, :options_text
+ attributes :id, :product_id, :sku, :barcode, :is_master, :options_text, :track_inventory, :image_count
attribute :purchasable do |variant|
variant.purchasable?
@@ -36,6 +36,10 @@ module Spree
price_object(variant)&.amount&.to_f
end
+ attribute :price_in_cents do |variant|
+ price_object(variant)&.display_amount&.amount_in_cents
+ end
+
attribute :display_price do |variant|
price_object(variant)&.display_price&.to_s
end
diff --git a/api/app/serializers/spree/api/v3/wished_item_serializer.rb b/api/app/serializers/spree/api/v3/wished_item_serializer.rb
index 4004f9dcdd..d784682c1f 100644
--- a/api/app/serializers/spree/api/v3/wished_item_serializer.rb
+++ b/api/app/serializers/spree/api/v3/wished_item_serializer.rb
@@ -2,7 +2,7 @@ module Spree
module Api
module V3
class WishedItemSerializer < BaseSerializer
- attributes :id, :quantity, created_at: :iso8601, updated_at: :iso8601
+ attributes :id, :variant_id, :wishlist_id, :quantity, created_at: :iso8601, updated_at: :iso8601
one :variant,
resource: Spree.api.v3_storefront_variant_serializer,
diff --git a/api/config/routes.rb b/api/config/routes.rb
index dfa36db275..cb6c946a33 100644
--- a/api/config/routes.rb
+++ b/api/config/routes.rb
@@ -229,19 +229,14 @@ Spree::Core::Engine.add_routes do
# ===== STORE & CONFIGURATION (Public) =====
get 'store', to: 'stores#current'
- resources :stores, only: [:show], param: :code
# Geography
- resources :countries, only: [:index, :show] do
- resources :states, only: [:index, :show]
- end
+ resources :countries, only: [:index, :show]
# ===== CATALOG (Public) =====
# Products with Ransack filtering
# GET /products?q[name_cont]=shirt&q[s]=price+asc
- resources :products, only: [:index, :show] do
- resources :variants, only: [:index, :show]
- end
+ resources :products, only: [:index, :show]
# Taxons (categories)
resources :taxons, only: [:index, :show]
@@ -267,10 +262,6 @@ Spree::Core::Engine.add_routes do
# Available methods for order
resources :shipping_methods, only: [:index]
resources :payment_methods, only: [:index]
-
- # Addresses as nested resources
- resource :billing_address, only: [:show, :update], controller: 'order_addresses', defaults: { address_type: 'billing' }
- resource :shipping_address, only: [:show, :update], controller: 'order_addresses', defaults: { address_type: 'shipping' }
end
# ===== CUSTOMER (JWT Required) =====
@@ -278,14 +269,13 @@ Spree::Core::Engine.add_routes do
patch 'customers/me', to: 'customers#update'
resources :addresses, only: [:index, :show, :create, :update, :destroy], path: 'customers/me/addresses'
+ resources :credit_cards, only: [:index, :show, :destroy], path: 'customers/me/credit_cards'
resources :payment_sources, only: [:index, :show, :destroy], path: 'customers/me/payment_sources'
# ===== WISHLISTS (JWT Required) =====
resources :wishlists do
- get :default, on: :collection # Get or create default wishlist
-
# Wishlist items as nested resource
- resources :items, only: [:index, :create, :update, :destroy], controller: 'wishlist_items'
+ resources :items, only: [:create, :update, :destroy], controller: 'wishlist_items'
end
# ===== CMS & CONTENT (Public) =====
diff --git a/api/lib/spree/api/dependencies.rb b/api/lib/spree/api/dependencies.rb
index 3fadac57a9..b66c3c9b5f 100644
--- a/api/lib/spree/api/dependencies.rb
+++ b/api/lib/spree/api/dependencies.rb
@@ -91,6 +91,7 @@ module Spree
storefront_metafield_serializer: 'Spree::V2::Storefront::MetafieldSerializer',
# v3 storefront serializers
+ v3_storefront_credit_card_serializer: 'Spree::Api::V3::CreditCardSerializer',
v3_storefront_product_serializer: 'Spree::Api::V3::ProductSerializer',
v3_storefront_variant_serializer: 'Spree::Api::V3::VariantSerializer',
v3_storefront_image_serializer: 'Spree::Api::V3::ImageSerializer',
@@ -100,6 +101,7 @@ module Spree
v3_storefront_order_serializer: 'Spree::Api::V3::OrderSerializer',
v3_storefront_line_item_serializer: 'Spree::Api::V3::LineItemSerializer',
v3_storefront_payment_serializer: 'Spree::Api::V3::PaymentSerializer',
+ v3_storefront_payment_source_serializer: 'Spree::Api::V3::PaymentSourceSerializer',
v3_storefront_shipment_serializer: 'Spree::Api::V3::ShipmentSerializer',
v3_storefront_address_serializer: 'Spree::Api::V3::AddressSerializer',
v3_storefront_user_serializer: 'Spree::Api::V3::UserSerializer',
@@ -112,6 +114,7 @@ module Spree
v3_storefront_shipping_method_serializer: 'Spree::Api::V3::ShippingMethodSerializer',
v3_storefront_shipping_rate_serializer: 'Spree::Api::V3::ShippingRateSerializer',
v3_storefront_taxonomy_serializer: 'Spree::Api::V3::TaxonomySerializer',
+
# platform serializers
platform_metafield_serializer: 'Spree::Api::V2::Platform::MetafieldSerializer',