spree_api 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02e3a969bdbac77ab7eba1edb5986472deb10d660fbad8b2c51df6e586f97709
-  data.tar.gz: c3f880037bc5751de97fbccdbcacae67d643c8ddf8aefa66a3ac804d488645a7
+  metadata.gz: 88513caab1df4ae8256a450d38b98601d724763697f75cd6bbe92f20986fac7c
+  data.tar.gz: 87742481e6e84a33e11080d3c830ca960eb692a243fb6d1b6c926a43f7d951e0
 SHA512:
-  metadata.gz: cb6694163e15d45f56831fc65547a3a5728f022dd2d1e0610ea758b844ef05b1a5fd80340fad8cb4b75ef2f525582cd423212a052da3406e2e241822137c64ed
-  data.tar.gz: 423fe47f6ce5d99bd55eea7613e2594bc3d4c382eee23dd47ff28e1b2b1f43f678c8034c96e12ef6dafd30fa537d946a3f13d0e9c899bdf0f005c93c62c89df5
+  metadata.gz: 10e0aa59755c08b5d83f12080be796d2a4a8cd3cbb70e77a47d369853385dc78f3583296534b0482dc76816396a285f6b476c12cc0c1863eac45defedc646f71
+  data.tar.gz: fd76b27f733d1acf21c0deb06341cf2cde81de862dc1d1eaaefcb91f2ffb216bafd3c2f24d4f7a09f1a6dbe39d31f66b9e37584561c26e64563099c67a3592bb

data/app/controllers/spree/api/v3/admin/invitation_acceptances_controller.rb

@@ -12,7 +12,7 @@ module Spree
 
           request_params 'InvitationAcceptParams', action: :accept do |body|
             body.attribute :password, :string,
-              description: 'Required when the invitee has no account yet: it creates one. An existing account signs in without it.'
+              description: 'Creates the account when the invitee has none yet. An existing account confirms it is theirs with it, unless the request is already signed in as that account.'
             body.attribute :password_confirmation, :string
             body.attribute :first_name, :string
             body.attribute :last_name, :string
@@ -74,10 +74,14 @@ module Spree
           # implicit: we look the user up by `invitation.email`, never by a
           # client-supplied email. The token is the credential.
           def resolve_or_create_invitee(invitation)
-            existing = Spree.admin_user_class.find_by(email: invitation.email)
-            return authenticate_existing(existing) if existing
+            existing = invitation.invitee_account
+            return create_new_invitee(invitation) unless existing
 
-            create_new_invitee(invitation)
+            # Someone already signed in as the invitee has proven who they are.
+            authenticate_user
+            return existing if current_user == existing
+
+            authenticate_existing(existing)
           end
 
           def authenticate_existing(user)

data/app/controllers/spree/api/v3/admin/sellers_controller.rb

@@ -195,7 +195,7 @@ module Spree
           # every seller on the page, so it loads once. Applied to the scope
           # rather than the collection so a single-seller read gets it too.
           def scope_includes
-            [:billing_address, :requirement_submissions, { stock_locations: [] },
+            [:billing_address, :requirement_submissions, :external_references, { stock_locations: [] },
              { store: :seller_requirements, logo_attachment: :blob, cover_photo_attachment: :blob }]
           end
 

data/app/controllers/spree/api/v3/admin/store_controller.rb

@@ -7,8 +7,15 @@ module Spree
 
           request_params :store do |body|
             body.attribute :name, :string, example: 'My Store'
-            body.attribute :admin_locale, :string, example: 'en'
-            body.attribute :timezone, :string, example: 'Europe/Berlin'
+            body.attribute :seo_title, :string,
+              nullable: true,
+              description: "The storefront's default page title, in the store's default language. Translate it through the translations endpoints."
+            body.attribute :meta_description, :string,
+              nullable: true,
+              description: "The storefront's default meta description, in the store's default language."
+            body.attribute :admin_locale, :locale, nullable: true, example: 'en',
+              description: 'The language the dashboard opens in for every staff member; null lets each use their own.'
+            body.attribute :timezone, :time_zone, example: 'Europe/Berlin'
             body.attribute :weight_unit, :weight_unit
             body.attribute :unit_system, :string, choices: Spree::Store::UNIT_SYSTEMS
             body.attribute :storefront_access, :string,
@@ -143,17 +150,19 @@ module Spree
           # GET /api/v3/admin/store
           def show
             authorize! :show, current_store
-            render json: serialize_store
+            render json: in_default_locale { serialize_store }
           end
 
           # PATCH /api/v3/admin/store
           def update
             authorize! :update, current_store
 
-            if current_store.update(permitted_params)
-              render json: serialize_store
-            else
-              render_validation_error(current_store.errors)
+            in_default_locale do
+              if current_store.update(permitted_params)
+                render json: serialize_store
+              else
+                render_validation_error(current_store.errors)
+              end
             end
           end
 
@@ -177,6 +186,13 @@ module Spree
 
           private
 
+          # Settings hold the store's default-language values, whatever locale
+          # the request resolved to. Other languages are written through the
+          # translations endpoints.
+          def in_default_locale(&)
+            Mobility.with_locale(current_store.default_locale, &)
+          end
+
           def describe(provider_classes)
             provider_classes.map do |provider_class|
               {

data/app/controllers/spree/api/v3/seller/invitation_acceptances_controller.rb

@@ -24,7 +24,7 @@ module Spree
 
           request_params 'InvitationAcceptParams', action: :accept do |body|
             body.attribute :password, :string,
-              description: 'Sets the password of a new account, or confirms the password of an existing one.'
+              description: 'Sets the password of a new account, or confirms the password of an existing one, unless the request is already signed in as that account.'
             body.attribute :password_confirmation, :string
             body.attribute :first_name, :string, description: 'Used only when the invitation creates a new account.'
             body.attribute :last_name, :string, description: 'Used only when the invitation creates a new account.'
@@ -35,7 +35,7 @@ module Spree
             return unless load_invitation
 
             render json: Spree.api.seller_invitation_serializer.new(
-              @invitation, params: { store: @invitation.store }
+              @invitation, params: { store: @invitation.store, acceptance: true }
             ).serializable_hash
           end
 
@@ -97,10 +97,14 @@ module Spree
           # implicit: we look the user up by `invitation.email`, never by a
           # client-supplied email. The token is the credential.
           def resolve_or_create_invitee(invitation)
-            existing = Spree.admin_user_class.find_by(email: invitation.email)
-            return authenticate_existing(existing) if existing
+            existing = invitation.invitee_account
+            return create_new_invitee(invitation) unless existing
 
-            create_new_invitee(invitation)
+            # Someone already signed in as the invitee has proven who they are.
+            authenticate_user
+            return existing if current_user == existing
+
+            authenticate_existing(existing)
           end
 
           def authenticate_existing(user)
@@ -151,6 +155,12 @@ module Spree
             user.sellers.map { |seller| { id: seller.prefixed_id, name: seller.name, status: seller.status } }
           end
 
+          # The plain v3 base expects a storefront token; the session this
+          # page may carry is a seller panel one.
+          def expected_audience
+            Spree::Api::V3::JwtAuthentication::JWT_AUDIENCE_SELLER
+          end
+
           def request_env_for_token
             { ip_address: request.remote_ip, user_agent: request.user_agent&.truncate(255) }
           end

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

@@ -111,6 +111,7 @@ module Spree
               currency: current_currency,
               user: current_user,
               includes: [],
+              expand: expand_list,
               hide_prices: hide_prices?
             }
           end

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

@@ -0,0 +1,25 @@
+module Spree
+  module Api
+    module V3
+      module Store
+        # Exposes the store the request resolved to, so a storefront can render
+        # its name and default SEO metadata in the requested locale.
+        class StoreController < Store::BaseController
+          # A gated storefront still needs a page title on its sign-in wall.
+          allow_guest_storefront_access!
+
+          # GET /api/v3/store/store
+          def show
+            render json: serialize_resource(current_store)
+          end
+
+          protected
+
+          def serializer_class
+            Spree.api.store_serializer
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -35,6 +35,8 @@ module Spree
         # The address book the entry belongs to. Null for an address in no
         # book: one a guest typed in, or the copy a placed order keeps.
         one :owner, resource: proc { Spree.api.address_owner_serializer }
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -28,6 +28,8 @@ module Spree
           prefixed_id_attributes customer_id: :customer_owner
 
           one :owner, resource: proc { Spree.api.admin_address_owner_serializer }
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -28,9 +28,7 @@ module Spree
                resource: proc { Spree.api.admin_category_serializer },
                if: proc { expand?('ancestors') }
 
-          many :custom_fields,
-               resource: proc { Spree.api.admin_custom_field_serializer },
-               if: proc { expand?('custom_fields') }
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -26,6 +26,8 @@ module Spree
           one :reason, resource: proc { Spree.api.admin_claim_reason_serializer }, if: proc { expand?('reason') }
           one :order, resource: proc { Spree.api.admin_order_serializer }, if: proc { expand?('order') }
           many :refunds, resource: proc { Spree.api.admin_refund_serializer }, if: proc { expand?('refunds') }
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -18,10 +18,7 @@ module Spree
                resource: proc { Spree.api.admin_collection_rule_serializer },
                if: proc { expand?('rules') }
 
-          # Override inherited custom_fields to use the admin serializer.
-          many :custom_fields,
-               resource: proc { Spree.api.admin_custom_field_serializer },
-               if: proc { expand?('custom_fields') }
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -30,6 +30,8 @@ module Spree
           many :memberships,
                resource: proc { Spree.api.admin_company_membership_serializer },
                if: proc { expand?('memberships') }
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -11,6 +11,8 @@ module Spree
 
           attributes :metadata,
                      created_at: :iso8601, updated_at: :iso8601
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -99,6 +99,8 @@ module Spree
           many :companies,
                resource: proc { Spree.api.admin_company_serializer },
                if: proc { expand?('companies') }
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -59,6 +59,8 @@ module Spree
             calculator = record.calculator
             { type: calculator.class.api_type, preferences: calculator.serialized_preferences } if calculator
           end
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -61,6 +61,7 @@ module Spree
               resource: proc { Spree.api.admin_order_serializer },
               if: proc { expand?('order') }
 
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -51,6 +51,8 @@ module Spree
           many :orders,
                resource: proc { Spree.api.admin_order_serializer },
                if: proc { expand?('orders') }
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -37,7 +37,7 @@ module Spree
           # Looked up by email so an admin who's already on another store sees
           # the password prompt, not a fresh account form.
           attribute :invitee_exists do |invitation|
-            Spree.admin_user_class.exists?(email: invitation.email)
+            invitation.invitee_account.present?
           end
 
           # Minimal store identity for the unauthenticated acceptance page's

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

@@ -85,6 +85,7 @@ module Spree
               resource: proc { Spree.api.admin_tax_category_serializer },
               if: proc { expand?('tax_category') }
 
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -86,6 +86,8 @@ module Spree
           attribute :viewable_type do |asset|
             Spree::Base.polymorphic_api_type(asset.viewable_type)
           end
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -9,6 +9,8 @@ module Spree
         # customer-facing serializer so public fields stay in sync.
         class NewsletterSubscriberSerializer < V3::NewsletterSubscriberSerializer
           prefixed_id_attributes :customer
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -13,6 +13,8 @@ module Spree
           many :option_values,
                resource: proc { Spree.api.admin_option_value_serializer },
                if: proc { expand?('option_values') }
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -11,6 +11,8 @@ module Spree
           one :option_type,
               resource: proc { Spree.api.admin_option_type_serializer },
               if: proc { expand?('option_type') }
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -198,6 +198,8 @@ module Spree
           typelize freight_summary: [:FreightSummary, nullable: true]
 
           one :freight_summary, resource: proc { Spree.api.admin_freight_summary_serializer }
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -25,6 +25,8 @@ module Spree
           attribute(:logo_url) { |payment_method| payment_method.class.logo_url }
           attribute(:docs_url) { |payment_method| payment_method.class.docs_url }
           attribute(:third_party) { |payment_method| payment_method.class.third_party? }
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -45,7 +45,7 @@ module Spree
                            Spree.api.admin_payment_source_serializer
                          end
 
-            serializer.new(payment.source).to_h
+            serializer.new(payment.source, params: nested_params('source')).to_h
           end
 
           many :capture_events,
@@ -65,6 +65,8 @@ module Spree
           many :payment_splits,
                resource: proc { Spree.api.admin_payment_split_serializer },
                if: proc { expand?('payment_splits') }
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -7,6 +7,8 @@ module Spree
 
           attributes :metadata,
                      created_at: :iso8601, updated_at: :iso8601
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -108,9 +108,7 @@ module Spree
                resource: proc { Spree.api.admin_collection_serializer },
                if: proc { expand?('collections') }
 
-          many :custom_fields,
-               resource: proc { Spree.api.admin_custom_field_serializer },
-               if: proc { expand?('custom_fields') }
+          expandable_custom_fields admin: true
 
           many :product_publications,
                resource: proc { Spree.api.admin_product_publication_serializer },

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

@@ -49,6 +49,8 @@ module Spree
 
           # Where the inbound parcel is, as the carrier last reported it.
           many :deliveries, resource: proc { Spree.api.admin_delivery_serializer }
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -17,7 +17,8 @@ module Spree
                    reference: 'string | null',
                    period_start: 'string | null',
                    period_end: 'string | null',
-                   transfers_count: :number
+                   transfers_count: :number,
+                   metadata: 'Record<string, unknown>'
 
           attributes :status, :currency, :reference, :metadata,
                      period_start: :iso8601, period_end: :iso8601,

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

@@ -6,6 +6,8 @@ module Spree
         # shopper also gets, plus the operational state and the settlement and
         # tax configuration only the operator sets.
         class SellerSerializer < V3::SellerSerializer
+          include Concerns::ExternalReferencesAttribute
+
           typelize status: [:string, enum: Spree::Seller.statuses, enum_type_name: 'SellerStatus'],
                    legal_name: [:string, nullable: true],
                    registration_number: [:string, nullable: true],
@@ -75,6 +77,8 @@ module Spree
           one :returns_address,
               resource: proc { Spree.api.admin_address_serializer },
               if: proc { |seller| seller.returns_address.present? }
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -52,6 +52,8 @@ module Spree
           one :customer,
               resource: proc { Spree.api.admin_customer_serializer },
               if: proc { expand?('customer') }
+
+          expandable_custom_fields admin: true
         end
       end
     end

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

@@ -2,10 +2,10 @@ module Spree
   module Api
     module V3
       module Admin
-        class StoreSerializer < V3::BaseSerializer
-          typelize name: :string, url: :string, code: :string, api_url: :string,
+        class StoreSerializer < V3::StoreSerializer
+          typelize url: :string, code: :string, api_url: :string,
                    default_currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'], default_locale: [:string, enum: Spree::Locales::ALL, enum_type_name: 'LocaleCode'],
-                   default_country_code: [:string, nullable: true],
+                   default_country_code: [:string, nullable: true, enum: Spree::IsoData.country_codes, enum_type_name: 'CountryCode'],
                    supported_currencies: [:string, multi: true, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    supported_locales: [:string, multi: true, enum: Spree::Locales::ALL, enum_type_name: 'LocaleCode'],
                    available_locales: [:string, multi: true, enum: Spree::Locales::ALL, enum_type_name: 'LocaleCode'],
@@ -20,7 +20,6 @@ module Spree
                    metadata: 'Record<string, unknown>'
 
           attributes :metadata,
-                     :name,
                      :code,
                      :default_currency,
                      :default_locale,

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

@@ -112,9 +112,7 @@ module Spree
                resource: proc { Spree.api.admin_price_serializer },
                if: proc { expand?('prices') }
 
-          many :custom_fields,
-               resource: proc { Spree.api.admin_custom_field_serializer },
-               if: proc { expand?('custom_fields') }
+          expandable_custom_fields admin: true
 
           many :stock_levels,
                resource: proc { Spree.api.admin_stock_level_serializer },

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

@@ -152,6 +152,12 @@ module Spree
         }.freeze
         private_constant :PREFERENCE_LIST_NAMES
 
+        # Settings declared with a code format share the code list request
+        # bodies take, so a value read back is the type a write takes.
+        FORMAT_CODE_LISTS = { 'iso-country' => :country, 'currency' => :currency, 'locale' => :locale,
+                              'timezone' => :time_zone }.freeze
+        private_constant :FORMAT_CODE_LISTS
+
         def self.preference_type_hint(schema, name)
           types = Array(schema['type'])
           options = {}
@@ -165,6 +171,9 @@ module Spree
           if schema['enum']
             options[:enum] = schema['enum'].compact
             options[:enum_type_name] = PREFERENCE_LIST_NAMES[name.to_sym] if PREFERENCE_LIST_NAMES.key?(name.to_sym)
+          elsif (code_list = FORMAT_CODE_LISTS[(schema['items'] || schema)['format']])
+            options[:enum_type_name], values = Spree::Api::V3::RequestSchema::CODE_LISTS.fetch(code_list)
+            options[:enum] = values.call
           end
           options.empty? ? hint : [hint, options]
         end
@@ -192,6 +201,25 @@ module Spree
           end
         end
 
+        # Declares the opt-in `custom_fields` expand. The Store API sends only
+        # values whose definition is storefront visible; Admin API serializers
+        # pass `admin: true` to send every value.
+        #
+        # @param admin [Boolean] whether to send every value rather than only storefront visible ones
+        # @return [void]
+        def self.expandable_custom_fields(admin: false)
+          if admin
+            many :custom_fields,
+                 resource: proc { Spree.api.admin_custom_field_serializer },
+                 if: proc { expand?('custom_fields') }
+          else
+            many :storefront_custom_fields,
+                 key: :custom_fields,
+                 resource: proc { Spree.api.custom_field_serializer },
+                 if: proc { expand?('custom_fields') }
+          end
+        end
+
         # Plain decimal notation. BigDecimal renders 0.06 as "0.6e-1", which
         # is what a client would otherwise print beside a unit.
         #

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

@@ -50,10 +50,7 @@ module Spree
              resource: proc { Spree.api.category_serializer },
              if: proc { expand?('ancestors') }
 
-        many :storefront_custom_fields,
-             key: :custom_fields,
-             resource: proc { Spree.api.custom_field_serializer },
-             if: proc { expand?('custom_fields') }
+        expandable_custom_fields
       end
     end
   end

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

@@ -42,6 +42,8 @@ module Spree
         many :claim_line_items,
              resource: proc { Spree.api.claim_line_item_serializer },
              if: proc { expand?('claim_line_items') }
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -29,10 +29,7 @@ module Spree
           image_url_for(collection.square_image)
         end
 
-        many :storefront_custom_fields,
-             key: :custom_fields,
-             resource: proc { Spree.api.custom_field_serializer },
-             if: proc { expand?('custom_fields') }
+        expandable_custom_fields
       end
     end
   end

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

@@ -25,6 +25,8 @@ module Spree
             { 'id' => node.prefixed_id, 'name' => node.name, 'kind' => node.kind }
           end
         end
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -7,6 +7,8 @@ module Spree
                  gateway_payment_profile_id: [:string, nullable: true]
 
         attributes :brand, :last4, :month, :year, :name, :default, :gateway_payment_profile_id
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -54,6 +54,8 @@ module Spree
         many :customer_groups,
              proc { |groups, params| groups.for_store(params&.dig(:store) || Spree::Current.store) },
              resource: proc { Spree.api.customer_group_serializer }
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -15,6 +15,8 @@ module Spree
         attribute :digital, &:digital?
         attribute :pickup, &:pickup?
         attribute :pickup_point, &:pickup_point?
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -59,6 +59,8 @@ module Spree
         one :stock_location, resource: proc { Spree.api.stock_location_serializer }
         many :delivery_rates, resource: proc { Spree.api.delivery_rate_serializer }
         many :tax_lines, resource: proc { Spree.api.tax_line_serializer }, if: proc { expand?('tax_lines') }
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -51,6 +51,7 @@ module Spree
 
         attribute :active, &:active?
 
+        expandable_custom_fields
       end
     end
   end

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

@@ -73,6 +73,8 @@ module Spree
         # exactly-one-adjustable rule makes the nested view complete, and the
         # owner already carries the tax totals.
         many :tax_lines, resource: proc { Spree.api.tax_line_serializer }, if: proc { expand?('tax_lines') }
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -99,6 +99,8 @@ module Spree
         def url_helpers
           Rails.application.routes.url_helpers
         end
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -21,6 +21,8 @@ module Spree
         attribute :customer_id do |subscriber|
           subscriber.customer&.prefixed_id if current_user && subscriber.customer_id == current_user.id
         end
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -5,6 +5,8 @@ module Spree
         typelize name: :string, label: :string, position: :number, kind: [:string, enum: Spree::OptionType::KINDS, enum_type_name: 'OptionTypeKind']
 
         attributes :name, :label, :position, :kind
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -21,6 +21,8 @@ module Spree
         attribute :image_url do |option_value|
           image_url_for(option_value.image)
         end
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -79,6 +79,8 @@ module Spree
         one :shipping_address, resource: proc { Spree.api.address_serializer }
         one :gift_card, resource: proc { Spree.api.gift_card_serializer }
         one :market, resource: proc { Spree.api.market_serializer }
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -14,6 +14,8 @@ module Spree
         attribute :session_required, &:session_required?
 
         attribute :source_required, &:source_required?
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -42,10 +42,12 @@ module Spree
                          Spree.api.payment_source_serializer
                        end
 
-          serializer.new(payment.source).to_h
+          serializer.new(payment.source, params: nested_params('source')).to_h
         end
 
         one :payment_method, resource: proc { Spree.api.payment_method_serializer }
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -5,6 +5,8 @@ module Spree
         typelize gateway_payment_profile_id: [:string, nullable: true]
 
         attributes :gateway_payment_profile_id
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -137,10 +137,7 @@ module Spree
              resource: proc { Spree.api.category_serializer },
              if: proc { expand?('categories') }
 
-        many :storefront_custom_fields,
-             key: :custom_fields,
-             resource: proc { Spree.api.custom_field_serializer },
-             if: proc { expand?('custom_fields') }
+        expandable_custom_fields
 
         typelize prior_price: ['PriceHistory', nullable: true],
                  seller_id: [:string, nullable: true]

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

@@ -44,6 +44,8 @@ module Spree
         many :return_line_items,
              resource: proc { Spree.api.return_line_item_serializer },
              if: proc { expand?('return_line_items') }
+
+        expandable_custom_fields
       end
     end
   end

data/app/serializers/spree/api/v3/seller/invitation_serializer.rb

@@ -5,12 +5,33 @@ module Spree
         class InvitationSerializer < V3::BaseSerializer
           typelize email: :string, status: [:string, enum: Spree::Invitation.statuses, enum_type_name: 'InvitationStatus'],
                    expires_at: [:string, nullable: true],
-                   accepted_at: [:string, nullable: true]
+                   accepted_at: [:string, nullable: true],
+                   inviter_email: :string,
+                   invitee_exists: [:boolean, optional: true],
+                   seller: '{ id: string; name: string }'
 
           attributes :email,
                      created_at: :iso8601, expires_at: :iso8601, accepted_at: :iso8601
 
           attributes status: :string
+
+          attribute :inviter_email do |invitation|
+            invitation.inviter.email
+          end
+
+          # Drives the acceptance page's sign-in vs sign-up branch, so only the
+          # public lookup carries it: whoever holds the emailed link already
+          # knows the address. A seller's team screen does not get to learn
+          # which addresses hold accounts elsewhere on the marketplace.
+          attribute :invitee_exists, if: proc { params[:acceptance] } do |invitation|
+            invitation.invitee_account.present?
+          end
+
+          # The smallest shape the acceptance page's title ("Join <seller>")
+          # needs; the page is public, so nothing more of the seller goes out.
+          attribute :seller do |invitation|
+            { id: invitation.resource.prefixed_id, name: invitation.resource.name }
+          end
         end
       end
     end

data/app/serializers/spree/api/v3/seller/profile_serializer.rb

@@ -17,7 +17,7 @@ module Spree
                    products_count: :number,
                    default_currency: [:string, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
                    supported_currencies: [:string, multi: true, enum: Spree::Money::Rounding::CURRENCY_CODES, enum_type_name: 'CurrencyCode'],
-                   timezone: [:string, nullable: true]
+                   timezone: [:string, nullable: true, enum: Spree::TimeZones::SUGGESTED, enum_type_name: 'TimeZone']
 
           attributes :timezone,
                      :status, :legal_name, :registration_number,

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

@@ -42,6 +42,8 @@ module Spree
         many :policies,
              resource: proc { Spree.api.policy_serializer },
              if: proc { expand?('policies') }
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -7,6 +7,8 @@ module Spree
         money_attributes :amount, :amount_used, :amount_remaining, :display_amount,
                          :display_amount_used, :display_amount_remaining
         attributes :currency
+
+        expandable_custom_fields
       end
     end
   end

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

@@ -0,0 +1,16 @@
+module Spree
+  module Api
+    module V3
+      # The current store's public identity and default SEO metadata, in the
+      # request's locale. Missing translations fall back to the store's default
+      # locale.
+      class StoreSerializer < BaseSerializer
+        typelize name: :string,
+                 seo_title: [:string, nullable: true],
+                 meta_description: [:string, nullable: true]
+
+        attributes :name, :seo_title, :meta_description
+      end
+    end
+  end
+end

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

@@ -127,10 +127,7 @@ module Spree
 
         many :option_values, resource: proc { Spree.api.option_value_serializer }
 
-        many :storefront_custom_fields,
-             key: :custom_fields,
-             resource: proc { Spree.api.custom_field_serializer },
-             if: proc { expand?('custom_fields') }
+        expandable_custom_fields
 
         typelize prior_price: ['PriceHistory', nullable: true]
 

data/app/services/spree/api/v3/request_schema.rb

@@ -40,22 +40,25 @@ module Spree
           datetime: { type: :string, format: :'date-time' },
           id: { type: :string },
           any: {},
-          # Codes from the closed lists below.
+          # Codes from the lists below.
           country: { type: :string },
           currency: { type: :string },
           locale: { type: :string },
+          time_zone: { type: :string },
           weight_unit: { type: :string },
           dimension_unit: { type: :string }
         }.freeze
 
-        # The closed lists a code field takes, published once per API as a
-        # named component — the same `CountryCode`, `CurrencyCode` and
-        # `WeightUnit` types the serializers declare, so a value read from a
-        # response is the type a request takes.
+        # The lists a code field takes, published once per API as a named
+        # component — the same `CountryCode`, `CurrencyCode` and `WeightUnit`
+        # types the serializers declare, so a value read from a response is the
+        # type a request takes. A list `Typelizer::OpenEnums` does not close
+        # only suggests its values.
         CODE_LISTS = {
           country: ['CountryCode', -> { Spree::IsoData.country_codes }],
           currency: ['CurrencyCode', -> { Spree::Money::Rounding::CURRENCY_CODES }],
           locale: ['LocaleCode', -> { Spree::Locales::ALL }],
+          time_zone: ['TimeZone', -> { Spree::TimeZones::SUGGESTED }],
           weight_unit: ['WeightUnit', -> { Spree::Variant::WEIGHT_UNITS }],
           dimension_unit: ['DimensionUnit', -> { Spree::Variant::DIMENSION_UNITS }]
         }.freeze
@@ -348,7 +351,12 @@ module Spree
             next unless CODE_LISTS.key?(field.kind)
 
             name, values = CODE_LISTS[field.kind]
-            lists[name] = { type: :string, enum: values.call }
+            lists[name] = if Typelizer::OpenEnums.closed?(name)
+                            { type: :string, enum: values.call }
+                          else
+                            Typelizer::OpenEnums.open_schema({ type: :string }, values.call)
+                              .merge(description: Typelizer::OpenEnums.description(name)).compact
+                          end
           end
         end
 
@@ -469,7 +477,7 @@ module Spree
 
           # The same open list the serializers publish (`enum_type_name`):
           # clients autocomplete the built-in values and still accept any other.
-          { anyOf: [schema.merge(enum: field.enum), schema] }
+          Typelizer::OpenEnums.open_schema(schema, field.enum)
         end
       end
     end

data/config/routes.rb

@@ -22,6 +22,9 @@ Spree::Core::Engine.add_routes do
         # Current channel context (never a list — see Store::ChannelController)
         resource :channel, only: [:show], controller: 'channel'
 
+        # Current store context (name and default SEO metadata, localized)
+        resource :store, only: [:show], controller: 'store'
+
         # Catalog
         resources :products, only: [:index, :show] do
           collection do
@@ -287,9 +290,9 @@ Spree::Core::Engine.add_routes do
         resource :store, only: [:show, :update], controller: 'store' do
           get :data_sources
         end
-        # The store's own custom fields, addressed by its id like every other
+        # The store's own custom fields and translations, addressed by its id like every other
         # parent. The controller only ever resolves the current store.
-        resources :stores, only: [], concerns: :custom_fieldable
+        resources :stores, only: [], concerns: [:custom_fieldable, :translatable]
 
         # Staff & access (invitations, admin users, roles, API keys)
         resources :admin_users, only: [:index, :show, :update, :destroy]

data/lib/spree/api/dependencies.rb

@@ -18,7 +18,7 @@ module Spree
            product_filter_sort_option media_event return return_line_item exchange exchange_line_item claim
            claim_line_item return_reason claim_reason digital_asset export gift_card_batch import import_row
            invitation newsletter_subscriber promotion refund stock_level stock_movement stock_reservation
-           stock_transfer company company_membership company_invitation seller file_upload file_upload_target].freeze
+           stock_transfer company company_membership company_invitation seller file_upload file_upload_target store].freeze
 
       ADMIN_SERIALIZERS =
         %i[country state locale applied_promotion discount tax_line cart delivery_zone delivery_profile

data/lib/spree/api/enum_types.rb

@@ -110,7 +110,8 @@ module Spree
           type = "export type #{name} = (typeof #{constant})[number] | (string & {})"
           type = "export type #{name} =\n  | (typeof #{constant})[number]\n  | (string & {})" if type.length > LINE_WIDTH
 
-          "\n/** The built-in values of `#{name}`. Extensions may add more. */\n#{line}\n#{type}\n"
+          summary = Typelizer::OpenEnums.description(name) || "The built-in values of `#{name}`. Extensions may add more."
+          "\n/** #{summary} */\n#{line}\n#{type}\n"
         end
       end
     end

data/lib/typelizer/open_enums.rb

@@ -34,6 +34,25 @@ module Typelizer
       TaxRemittance UnitSystem
     ].freeze
 
+    # Open lists whose values are suggestions rather than built-ins an
+    # extension adds to, described as such wherever the list is published.
+    DESCRIPTIONS = {
+      'TimeZone' => 'Common IANA time zones; any other IANA time zone identifier is accepted too.'
+    }.freeze
+
+    # @param name [String, nil] a list's `enum_type_name`
+    # @return [String, nil] what the list's values are, when they are not built-ins
+    def self.description(name)
+      DESCRIPTIONS[name]
+    end
+
+    # @param schema [Hash] the schema of any value in the list
+    # @param values [Array<String>] the values to suggest
+    # @return [Hash] a schema suggesting the values while accepting any other
+    def self.open_schema(schema, values)
+      { anyOf: [schema.merge(enum: values), schema] }
+    end
+
     # @param name [String, nil] a list's `enum_type_name`
     # @return [Boolean] whether the list is closed: no value outside it is valid
     def self.closed?(name)
@@ -63,7 +82,7 @@ module Typelizer
         return super unless property.enum_type_name && property.enum.is_a?(Array) && !property.multi
         return super if OpenEnums.closed?(property.enum_type_name)
 
-        open = { anyOf: [{ type: :string, enum: property.enum.compact }, { type: :string }] }
+        open = OpenEnums.open_schema({ type: :string }, property.enum.compact)
         # OpenAPI 3.0 ignores `nullable` beside `anyOf`, which is where
         # Typelizer puts it, so the free-string branch carries it instead.
         if property.nullable && !v31?(openapi_version)
@@ -72,7 +91,7 @@ module Typelizer
           apply_nullable(open, property, openapi_version: openapi_version)
         end
         apply_metadata(open, property)
-        open[:description] ||= OPEN_ENUM_DESCRIPTION
+        open[:description] ||= OpenEnums.description(property.enum_type_name) || OPEN_ENUM_DESCRIPTION
         open
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-10-27 00:00:00.000000000 Z
+date: 2026-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rswag-specs
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.1
 description: Spree Commerce Store / Admin API and HTTP webhooks
 email:
 - hello@spreecommerce.org
@@ -390,6 +390,7 @@ files:
 - app/controllers/spree/api/v3/store/products_controller.rb
 - app/controllers/spree/api/v3/store/resource_controller.rb
 - app/controllers/spree/api/v3/store/sellers_controller.rb
+- app/controllers/spree/api/v3/store/store_controller.rb
 - app/controllers/spree/api/v3/store/wishlist_items_controller.rb
 - app/controllers/spree/api/v3/store/wishlists_controller.rb
 - app/controllers/spree/api/v3/webhooks/fulfillments_controller.rb
@@ -740,6 +741,7 @@ files:
 - app/serializers/spree/api/v3/stock_transfer_serializer.rb
 - app/serializers/spree/api/v3/store_credit_event_serializer.rb
 - app/serializers/spree/api/v3/store_credit_serializer.rb
+- app/serializers/spree/api/v3/store_serializer.rb
 - app/serializers/spree/api/v3/supplier_event_serializer.rb
 - app/serializers/spree/api/v3/tax_category_serializer.rb
 - app/serializers/spree/api/v3/tax_identifier_serializer.rb
@@ -836,9 +838,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v6.0.0
+  changelog_uri: https://github.com/spree/spree/releases/tag/v6.0.1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v6.0.0
+  source_code_uri: https://github.com/spree/spree/tree/v6.0.1
 post_install_message:
 rdoc_options: []
 require_paths: