spree_api 5.4.0.beta8 → 5.4.0.beta10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d59f56e428252697b4360183c26b92d20fe7607630b84589a5203ad766d6a467
-  data.tar.gz: 2807c39fa35138ae1db42e5fb184998dfc8e9c25d7309f11b43edc0af1751877
+  metadata.gz: e3501d1a88ac6902a6a1ec3bb13d6fbf32740c8fb99dbc7c307b9459889d04cf
+  data.tar.gz: 7db1fed6aaaec434b3a0e22ab93024dfdddf02fa18e8b4d74758112c549253c4
 SHA512:
-  metadata.gz: ed23df8b1714945bb9b4718f0c81443fb140fb3ddbaf48e72fbc4de1f9b6b0f9b41373587cf57f69fcc4e928aa75fc1636c7dc57b700e24c9958a3bd70c42bc0
-  data.tar.gz: bc499f9d970dc0fc0d24de5c711070b267e103d60c82704e5de1f48c7bcd635183cf024e1cfef4b0f9d0841f5e2ea150e74618f7ec3283dd59ee73f20059682f
+  metadata.gz: 013bbf4bb70026183fbdd6be58976e87402757580c18d4c71537ea6c205677cf5270179f7c9830447156020af5618b4c2635dea742e9feb3a13c0c4de1ede34e
+  data.tar.gz: c934ecf6b24a136073093632d63af7a9a85c5834b95c97a427e8411ae13d58f144499bec306dee7638030331d4f381a5b83e21c495cf1ae9d5ddecc073aa1a90

data/Rakefile

@@ -46,6 +46,23 @@ namespace :typelizer do
 
     # Writer config is in config/initializers/typelizer.rb
     Typelizer::Generator.call(force: true)
+
+    # Post-process: convert `type Foo = {` to `interface Foo {` for declaration merging support.
+    # This lets SDK consumers extend generated types via `declare module '@spree/sdk' { interface Product { ... } }`.
+    api_root = Spree::Api::Engine.root
+    [
+      api_root.join('../../packages/sdk/src/types/generated'),
+      api_root.join('../../packages/admin-sdk/src/types/generated')
+    ].each do |dir|
+      Dir[File.join(dir, '*.ts')].each do |file|
+        next if File.basename(file) == 'index.ts'
+
+        content = File.read(file)
+        updated = content.gsub(/^type (\w+) = \{/, 'interface \1 {')
+        File.write(file, updated) if updated != content
+      end
+    end
+
     puts "Generated types → packages/sdk/src/types/generated/ & packages/admin-sdk/src/types/generated/"
   end
 

data/app/controllers/concerns/spree/api/v3/error_handler.rb

@@ -12,6 +12,7 @@ module Spree
           access_denied: 'access_denied',
           invalid_token: 'invalid_token',
           invalid_provider: 'invalid_provider',
+          invalid_refresh_token: 'invalid_refresh_token',
           current_password_invalid: 'current_password_invalid',
           password_reset_token_invalid: 'password_reset_token_invalid',
           redirect_url_not_allowed: 'redirect_url_not_allowed',

data/app/controllers/concerns/spree/api/v3/http_caching.rb

@@ -72,7 +72,7 @@ module Spree
         # Includes: latest updated_at, total count, query params, pagination, expand, currency, locale
         def collection_cache_key(collection)
           # For ActiveRecord collections use updated_at, for plain arrays use store's updated_at as proxy
-          latest_updated_at = if collection.first.respond_to?(:updated_at)
+          latest_updated_at = if collection.first&.respond_to?(:updated_at)
                                 collection.map(&:updated_at).max&.to_i
                               else
                                 current_store&.updated_at&.to_i

data/app/controllers/concerns/spree/api/v3/store/search_provider_support.rb

@@ -0,0 +1,27 @@
+module Spree
+  module Api
+    module V3
+      module Store
+        module SearchProviderSupport
+          extend ActiveSupport::Concern
+
+          private
+
+          def search_query
+            params.dig(:q, :search)
+          end
+
+          def search_filters
+            q = params[:q]&.to_unsafe_h || params[:q] || {}
+            q = q.to_h if q.respond_to?(:to_h) && !q.is_a?(Hash)
+            q.except('search').presence
+          end
+
+          def search_provider
+            @search_provider ||= Spree.search_provider.constantize.new(current_store)
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v3/store/auth_controller.rb

@@ -7,9 +7,9 @@ module Spree
           rate_limit to: Spree::Api::Config[:rate_limit_login], within: Spree::Api::Config[:rate_limit_window].seconds, store: Rails.cache, only: :create, with: RATE_LIMIT_RESPONSE
           rate_limit to: Spree::Api::Config[:rate_limit_refresh], within: Spree::Api::Config[:rate_limit_window].seconds, store: Rails.cache, only: :refresh, with: RATE_LIMIT_RESPONSE
           rate_limit to: Spree::Api::Config[:rate_limit_oauth], within: Spree::Api::Config[:rate_limit_window].seconds, store: Rails.cache, only: :oauth_callback, with: RATE_LIMIT_RESPONSE
+          rate_limit to: Spree::Api::Config[:rate_limit_refresh], within: Spree::Api::Config[:rate_limit_window].seconds, store: Rails.cache, only: :logout, with: RATE_LIMIT_RESPONSE
 
-          skip_before_action :authenticate_user, only: [:create, :oauth_callback]
-          prepend_before_action :require_authentication!, only: [:refresh]
+          skip_before_action :authenticate_user, only: [:create, :refresh, :oauth_callback]
 
           # POST  /api/v3/store/auth/login
           # Supports multiple authentication providers via :provider param
@@ -23,11 +23,7 @@ module Spree
 
             if result.success?
               user = result.value
-              token = generate_jwt(user)
-              render json: {
-                token: token,
-                user: user_serializer.new(user, params: serializer_params).to_h
-              }
+              render json: auth_response(user)
             else
               render_error(
                 code: ERROR_CODES[:authentication_failed],
@@ -38,21 +34,55 @@ module Spree
           end
 
           # POST  /api/v3/store/auth/refresh
+          # Accepts: { "refresh_token": "rt_xxx" }
+          # Returns new access JWT + rotated refresh token
           def refresh
-            token = generate_jwt(current_user)
+            refresh_token_value = params[:refresh_token]
+
+            if refresh_token_value.blank?
+              return render_error(
+                code: ERROR_CODES[:invalid_refresh_token],
+                message: 'refresh_token is required',
+                status: :unauthorized
+              )
+            end
+
+            refresh_token = Spree::RefreshToken.active.find_by(token: refresh_token_value)
+
+            if refresh_token.nil?
+              return render_error(
+                code: ERROR_CODES[:invalid_refresh_token],
+                message: 'Invalid or expired refresh token',
+                status: :unauthorized
+              )
+            end
+
+            user = refresh_token.user
+            new_refresh_token = refresh_token.rotate!(request_env: request_env_for_token)
+
             render json: {
-              token: token,
-              user: user_serializer.new(current_user, params: serializer_params).to_h
+              token: generate_jwt(user),
+              refresh_token: new_refresh_token.token,
+              user: user_serializer.new(user, params: serializer_params).to_h
             }
           end
 
+          # POST  /api/v3/store/auth/logout
+          # Accepts: { "refresh_token": "rt_xxx" }
+          # Revokes the refresh token
+          def logout
+            refresh_token_value = params[:refresh_token]
+
+            if refresh_token_value.present?
+              Spree::RefreshToken.find_by(token: refresh_token_value)&.destroy
+            end
+
+            head :no_content
+          end
+
           # POST  /api/v3/store/auth/oauth/callback
           # OAuth callback endpoint for server-side OAuth flows
           def oauth_callback
-            # This endpoint is designed for OAuth flows where the server
-            # exchanges the authorization code for an access token
-            # For client-side flows, use the regular /login endpoint with id_token
-
             strategy = authentication_strategy
             return unless strategy # Error already rendered by determine_strategy
 
@@ -60,11 +90,7 @@ module Spree
 
             if result.success?
               user = result.value
-              token = generate_jwt(user)
-              render json: {
-                token: token,
-                user: user_serializer.new(user, params: serializer_params).to_h
-              }
+              render json: auth_response(user)
             else
               render_error(
                 code: ERROR_CODES[:authentication_failed],
@@ -88,6 +114,23 @@ module Spree
 
           private
 
+          def auth_response(user)
+            refresh_token = Spree::RefreshToken.create_for(user, request_env: request_env_for_token)
+
+            {
+              token: generate_jwt(user),
+              refresh_token: refresh_token.token,
+              user: user_serializer.new(user, params: serializer_params).to_h
+            }
+          end
+
+          def request_env_for_token
+            {
+              ip_address: request.remote_ip,
+              user_agent: request.user_agent&.truncate(255)
+            }
+          end
+
           def authentication_strategy
             strategy_class = determine_strategy
             strategy_class.new(

data/app/controllers/spree/api/v3/store/carts/{shipments_controller.rb → fulfillments_controller.rb}

@@ -3,31 +3,31 @@ module Spree
     module V3
       module Store
         module Carts
-          class ShipmentsController < Store::BaseController
+          class FulfillmentsController < Store::BaseController
             include Spree::Api::V3::CartResolvable
             include Spree::Api::V3::OrderLock
 
             before_action :find_cart!
 
-            # GET /api/v3/store/carts/:cart_id/shipments
+            # GET /api/v3/store/carts/:cart_id/fulfillments
             def index
-              shipments = @cart.shipments.includes(shipping_rates: :shipping_method)
+              fulfillments = @cart.shipments.includes(shipping_rates: :shipping_method)
               render json: {
-                data: shipments.map { |s| Spree.api.shipment_serializer.new(s, params: serializer_params).to_h },
-                meta: { count: shipments.size }
+                data: fulfillments.map { |s| Spree.api.fulfillment_serializer.new(s, params: serializer_params).to_h },
+                meta: { count: fulfillments.size }
               }
             end
 
-            # PATCH /api/v3/store/carts/:cart_id/shipments/:id
-            # Select a shipping rate for a specific shipment
+            # PATCH /api/v3/store/carts/:cart_id/fulfillments/:id
+            # Select a delivery rate for a specific fulfillment
             def update
               with_order_lock do
-                shipment = @cart.shipments.find_by_prefix_id!(params[:id])
+                fulfillment = @cart.shipments.find_by_prefix_id!(params[:id])
 
-                if permitted_params[:selected_shipping_rate_id].present?
-                  shipping_rate = shipment.shipping_rates.find_by_prefix_id!(permitted_params[:selected_shipping_rate_id])
-                  shipment.selected_shipping_rate_id = shipping_rate.id
-                  shipment.save!
+                if permitted_params[:selected_delivery_rate_id].present?
+                  delivery_rate = fulfillment.shipping_rates.find_by_prefix_id!(permitted_params[:selected_delivery_rate_id])
+                  fulfillment.selected_shipping_rate_id = delivery_rate.id
+                  fulfillment.save!
                 end
 
                 # Auto-advance (e.g. delivery → payment) after rate selection.
@@ -41,7 +41,7 @@ module Spree
             private
 
             def permitted_params
-              params.permit(:selected_shipping_rate_id)
+              params.permit(:selected_delivery_rate_id)
             end
 
             # Temporary — Spree 6 removes the checkout state machine.

data/app/controllers/spree/api/v3/store/carts_controller.rb

@@ -140,13 +140,14 @@ module Spree
           def permitted_params
             params.permit(
               :email,
-              :special_instructions,
+              :customer_note,
               :currency,
               :locale,
-              :ship_address_id,
-              :bill_address_id,
-              ship_address: address_params,
-              bill_address: address_params,
+              :shipping_address_id,
+              :billing_address_id,
+              :use_shipping,
+              shipping_address: address_params,
+              billing_address: address_params,
               metadata: {},
               items: item_params
             )
@@ -154,8 +155,9 @@ module Spree
 
           def address_params
             [
-              :id, :firstname, :lastname, :address1, :address2,
-              :city, :zipcode, :phone, :company,
+              :id, :first_name, :last_name,
+              :address1, :address2,
+              :city, :postal_code, :phone, :company,
               :country_iso, :state_abbr, :state_name, :quick_checkout
             ]
           end

data/app/controllers/spree/api/v3/store/customer/addresses_controller.rb

@@ -73,8 +73,8 @@ module Spree
 
             def permitted_params
               params.permit(
-                :firstname, :lastname, :address1, :address2, :city,
-                :zipcode, :phone, :company, :country_iso, :state_abbr, :state_name
+                :first_name, :last_name, :address1, :address2, :city,
+                :postal_code, :phone, :company, :country_iso, :state_abbr, :state_name
               )
             end
           end

data/app/controllers/spree/api/v3/store/customer/password_resets_controller.rb

@@ -55,10 +55,12 @@ module Spree
 
               if user.update(password: params[:password], password_confirmation: params[:password_confirmation])
                 jwt = generate_jwt(user)
+                refresh_token = Spree::RefreshToken.create_for(user, request_env: { ip_address: request.remote_ip, user_agent: request.user_agent&.truncate(255) })
                 user.publish_event('customer.password_reset')
 
                 render json: {
                   token: jwt,
+                  refresh_token: refresh_token.token,
                   user: serializer_class.new(user, params: serializer_params).to_h
                 }
               else

data/app/controllers/spree/api/v3/store/customers_controller.rb

@@ -13,9 +13,13 @@ module Spree
             user = Spree.user_class.new(create_params)
 
             if user.save
-              token = generate_jwt(user)
+              refresh_token = Spree::RefreshToken.create_for(user, request_env: {
+                ip_address: request.remote_ip,
+                user_agent: request.user_agent&.truncate(255)
+              })
               render json: {
-                token: token,
+                token: generate_jwt(user),
+                refresh_token: refresh_token.token,
                 user: user_serializer.new(user, params: serializer_params).to_h
               }, status: :created
             else

data/app/controllers/spree/api/v3/store/products/filters_controller.rb

@@ -4,29 +4,33 @@ module Spree
       module Store
         module Products
           class FiltersController < Store::BaseController
+            include Spree::Api::V3::Store::SearchProviderSupport
+
             def index
-              aggregator = Spree::Api::V3::FiltersAggregator.new(
+              result = search_provider.search_and_filter(
                 scope: filters_scope,
-                currency: current_currency,
-                category: category
+                query: search_query,
+                filters: (search_filters || {}).merge('_category' => category),
+                page: 1,
+                limit: 0
               )
-              render json: aggregator.call
+
+              render json: {
+                filters: result.filters,
+                sort_options: result.sort_options,
+                default_sort: result.default_sort,
+                total_count: result.total_count
+              }
             end
 
             private
 
-            # Build scope from category and/or ransack params
-            # @return [ActiveRecord::Relation]
             def filters_scope
               scope = current_store.products.active(current_currency)
               scope = scope.in_category(category) if category.present?
-              scope = scope.ransack(params[:q]).result if params[:q].present?
               scope.accessible_by(current_ability, :show)
             end
 
-            # Fetches category from params
-            # @param [String] category_id
-            # @return [Spree::Category]
             def category
               category_id = params[:category_id]
               @category ||= category_id.present? ? current_store.categories.find_by_param(category_id) : nil

data/app/controllers/spree/api/v3/store/products_controller.rb

@@ -4,13 +4,7 @@ module Spree
       module Store
         class ProductsController < ResourceController
           include Spree::Api::V3::HttpCaching
-
-          # Sort values that require special scopes (not plain Ransack column sorts).
-          CUSTOM_SORT_SCOPES = {
-            'price' => :ascend_by_price,
-            '-price' => :descend_by_price,
-            'best_selling' => :by_best_selling
-          }.freeze
+          include Spree::Api::V3::Store::SearchProviderSupport
 
           protected
 
@@ -47,37 +41,23 @@ module Spree
             ]
           end
 
-          # Applies sorting from the unified `sort` param.
-          # Custom values ('price', '-price', 'best_selling') use product-specific scopes.
-          # Standard Ransack values ('name', '-created_at') are handled by base ResourceController.
-          def apply_collection_sort(collection)
-            sort_value = sort_param
-            return collection unless sort_value.present?
-
-            scope_method = CUSTOM_SORT_SCOPES[sort_value]
-            return collection unless scope_method
-
-            sorted = collection.reorder(nil)
-            sorted.send(scope_method)
-          end
-
-          # Skip base Ransack sort injection for custom sort scopes
-          def ransack_params
-            rp = super
-
-            # Remove Ransack sort when a custom scope handles it
-            if sort_param.present? && CUSTOM_SORT_SCOPES.key?(sort_param)
-              rp = rp.is_a?(Hash) ? rp.dup : rp.to_unsafe_h
-              rp.delete('s')
-            end
-
-            rp
-          end
+          # Override collection to use search provider.
+          # The provider handles search, filtering, sorting, pagination, and returns a Pagy object.
+          def collection
+            return @collection if @collection.present?
 
-          private
+            result = search_provider.search_and_filter(
+              scope: scope.includes(collection_includes).preload_associations_lazily.accessible_by(current_ability, :show),
+              query: search_query,
+              filters: search_filters,
+              sort: sort_param,
+              page: page,
+              limit: limit
+            )
 
-          def custom_sort_requested?
-            CUSTOM_SORT_SCOPES.key?(sort_param)
+            @search_result = result
+            @pagy = result.pagy
+            @collection = result.products
           end
         end
       end

data/app/serializers/spree/api/v3/address_serializer.rb

@@ -2,15 +2,15 @@ module Spree
   module Api
     module V3
       class AddressSerializer < BaseSerializer
-        typelize firstname: [:string, nullable: true], lastname: [:string, nullable: true], full_name: :string,
+        typelize first_name: [:string, nullable: true], last_name: [:string, nullable: true], full_name: :string,
                  address1: [:string, nullable: true], address2: [:string, nullable: true],
-                 city: [:string, nullable: true], zipcode: [:string, nullable: true], phone: [:string, nullable: true],
+                 city: [:string, nullable: true], postal_code: [:string, nullable: true], phone: [:string, nullable: true],
                  company: [:string, nullable: true], state_abbr: [:string, nullable: true], state_name: [:string, nullable: true],
                  state_text: [:string, nullable: true], country_iso: :string, country_name: :string,
                  quick_checkout: :boolean
 
-        attributes :firstname, :lastname, :full_name, :address1, :address2,
-                   :city, :zipcode, :phone, :company, :country_name, :country_iso, :state_text,
+        attributes :first_name, :last_name, :full_name, :address1, :address2, :postal_code,
+                   :city, :phone, :company, :country_name, :country_iso, :state_text,
                    :state_abbr, :quick_checkout
 
         # State name - used for countries without predefined states

data/app/serializers/spree/api/v3/admin/address_serializer.rb

@@ -4,13 +4,13 @@ module Spree
       module Admin
         class AddressSerializer < V3::AddressSerializer
           typelize label: [:string, nullable: true],
-                   user_id: [:string, nullable: true],
+                   customer_id: [:string, nullable: true],
                    metadata: 'Record<string, unknown> | null'
 
           attributes :label,
                      created_at: :iso8601, updated_at: :iso8601
 
-          attribute :user_id do |address|
+          attribute :customer_id do |address|
             address.user&.prefixed_id
           end
 

data/app/serializers/spree/api/v3/admin/credit_card_serializer.rb

@@ -3,10 +3,10 @@ module Spree
     module V3
       module Admin
         class CreditCardSerializer < V3::CreditCardSerializer
-          typelize user_id: [:string, nullable: true],
+          typelize customer_id: [:string, nullable: true],
                    payment_method_id: [:string, nullable: true]
 
-          attribute :user_id do |credit_card|
+          attribute :customer_id do |credit_card|
             credit_card.user&.prefixed_id
           end
 

data/app/serializers/spree/api/v3/admin/{shipping_method_serializer.rb → delivery_method_serializer.rb}

@@ -2,7 +2,7 @@ module Spree
   module Api
     module V3
       module Admin
-        class ShippingMethodSerializer < V3::ShippingMethodSerializer
+        class DeliveryMethodSerializer < V3::DeliveryMethodSerializer
           attributes created_at: :iso8601, updated_at: :iso8601
         end
       end

data/app/serializers/spree/api/v3/admin/delivery_rate_serializer.rb

@@ -0,0 +1,11 @@
+module Spree
+  module Api
+    module V3
+      module Admin
+        class DeliveryRateSerializer < V3::DeliveryRateSerializer
+          one :shipping_method, key: :delivery_method, resource: Spree.api.admin_delivery_method_serializer, if: proc { expand?('delivery_method') }
+        end
+      end
+    end
+  end
+end

data/app/serializers/spree/api/v3/admin/{order_promotion_serializer.rb → discount_serializer.rb}

@@ -2,7 +2,7 @@ module Spree
   module Api
     module V3
       module Admin
-        class OrderPromotionSerializer < V3::OrderPromotionSerializer
+        class DiscountSerializer < V3::DiscountSerializer
         end
       end
     end

data/app/serializers/spree/api/v3/admin/{shipment_serializer.rb → fulfillment_serializer.rb}

@@ -2,7 +2,7 @@ module Spree
   module Api
     module V3
       module Admin
-        class ShipmentSerializer < V3::ShipmentSerializer
+        class FulfillmentSerializer < V3::FulfillmentSerializer
           typelize metadata: 'Record<string, unknown> | null',
                    order_id: [:string, nullable: true],
                    stock_location_id: [:string, nullable: true],
@@ -26,9 +26,9 @@ module Spree
           end
 
           # Override inherited associations to use admin serializers
-          one :shipping_method, resource: Spree.api.admin_shipping_method_serializer, if: proc { expand?('shipping_method') }
+          one :shipping_method, key: :delivery_method, resource: Spree.api.admin_delivery_method_serializer, if: proc { expand?('delivery_method') }
           one :stock_location, resource: Spree.api.admin_stock_location_serializer, if: proc { expand?('stock_location') }
-          many :shipping_rates, resource: Spree.api.admin_shipping_rate_serializer, if: proc { expand?('shipping_rates') }
+          many :shipping_rates, key: :delivery_rates, resource: Spree.api.admin_delivery_rate_serializer, if: proc { expand?('delivery_rates') }
 
           one :order,
               resource: Spree.api.admin_order_serializer,

data/app/serializers/spree/api/v3/admin/order_serializer.rb

@@ -11,7 +11,7 @@ module Spree
                    store_owner_notification_delivered: :boolean,
                    internal_note: [:string, nullable: true], approver_id: [:string, nullable: true],
                    canceler_id: [:string, nullable: true], created_by_id: [:string, nullable: true],
-                   user_id: [:string, nullable: true],
+                   customer_id: [:string, nullable: true],
                    canceled_at: [:string, nullable: true], approved_at: [:string, nullable: true],
                    payment_total: :string, display_payment_total: :string,
                    metadata: 'Record<string, unknown> | null'
@@ -38,24 +38,25 @@ module Spree
             order.created_by&.prefixed_id
           end
 
-          attribute :user_id do |order|
+          attribute :customer_id do |order|
             order.user&.prefixed_id
           end
 
           # Override inherited associations to use admin serializers
-          many :order_promotions, key: :promotions, resource: Spree.api.admin_order_promotion_serializer, if: proc { expand?('promotions') }
+          many :discounts, resource: Spree.api.admin_discount_serializer, if: proc { expand?('discounts') }
           many :line_items, key: :items, resource: Spree.api.admin_line_item_serializer, if: proc { expand?('items') }
-          many :shipments, resource: Spree.api.admin_shipment_serializer, if: proc { expand?('shipments') }
+          many :fulfillments, resource: Spree.api.admin_fulfillment_serializer, if: proc { expand?('fulfillments') }
           many :payments, resource: Spree.api.admin_payment_serializer, if: proc { expand?('payments') }
 
-          one :bill_address, resource: Spree.api.admin_address_serializer, if: proc { expand?('bill_address') }
-          one :ship_address, resource: Spree.api.admin_address_serializer, if: proc { expand?('ship_address') }
+          one :billing_address, resource: Spree.api.admin_address_serializer, if: proc { expand?('billing_address') }
+          one :shipping_address, resource: Spree.api.admin_address_serializer, if: proc { expand?('shipping_address') }
 
           many :payment_methods, resource: Spree.api.admin_payment_method_serializer, if: proc { expand?('payment_methods') }
 
           one :user,
+              key: :customer,
               resource: Spree.api.admin_customer_serializer,
-              if: proc { expand?('user') }
+              if: proc { expand?('customer') }
 
           one :approver,
               resource: Spree.api.admin_customer_serializer,

data/app/serializers/spree/api/v3/admin/product_serializer.rb

@@ -32,11 +32,6 @@ module Spree
               resource: Spree.api.admin_variant_serializer,
               if: proc { expand?('default_variant') }
 
-          one :master,
-              key: :master_variant,
-              resource: Spree.api.admin_variant_serializer,
-              if: proc { expand?('master_variant') }
-
           one :primary_media,
               resource: Spree.api.admin_media_serializer,
               if: proc { expand?('primary_media') }

data/app/serializers/spree/api/v3/admin/store_credit_serializer.rb

@@ -3,11 +3,11 @@ module Spree
     module V3
       module Admin
         class StoreCreditSerializer < V3::StoreCreditSerializer
-          typelize user_id: [:string, nullable: true],
+          typelize customer_id: [:string, nullable: true],
                    created_by_id: [:string, nullable: true],
                    metadata: 'Record<string, unknown> | null'
 
-          attribute :user_id do |store_credit|
+          attribute :customer_id do |store_credit|
             store_credit.user&.prefixed_id
           end