spree_api 4.8.3 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 870a75c20df08101daae7df947e3dfd285a831eefe5e30105389771bcf5e578e
-  data.tar.gz: edc2ee5df0c726087fa837456d38d271c27a35fa95762b1c2c422763fb132fd3
+  metadata.gz: 4c9439192de12b6b1178bee80776eb695521403795e642f0a2705371046127cb
+  data.tar.gz: 22d7e3c800a68a29e4c8a6c5d9a5ec56050b32aa96c64d0a988259293b5e3c59
 SHA512:
-  metadata.gz: 414c7d4eeb5b12c336b63f8ce4f8a237a7bb38f372bef045926d201df72078bb0e17613496a6ef5e47c89554e95283f4d4f510f85e020f555a9b05763b3826e0
-  data.tar.gz: 241adceec83317dda28aca5a2183c44d3906af1b197a3b0d41b0fd86fdd6ef88f7780135633b1e8da49824374752c28dcc9f354f5f05433c1ac7c2d01a3d3a67
+  metadata.gz: f263e4c2eceb996112faef3810743bbde167c048a21899ae32d4fd965f03c6f6666bf6587b12ad4f6fdcb2c45d0b97261dd76102f259d2a792268c12ac919fb3
+  data.tar.gz: 4b77cbc8ad82234718f992ea8482fb8c10931efb2b74e3a3aae1fe1662df862ec56f114f23a3426dda5993c102e5a0843abddb5c6fa294c5724fcac8b9e6c699

data/LICENSE.md

@@ -0,0 +1,57 @@
+# License
+
+Copyright © 2024-present, Vendo Connect Inc.
+
+Copyright © 2015-2024, Spark Solutions Sp. z o.o.
+
+Copyright © 2007-2015, Spree Commerce Inc.
+
+Spree Commerce is a free, open-source eCommerce framework giving you full control and customizability.
+
+For **Spree Commerce versions 4.10** and later in the [spree/spree](https://github.com/spree/spree) repository two licenses apply simultaneously and users are required to comply with the terms of these two licenses at the same time:
+
+* [AGPL-3.0](https://opensource.org/license/agpl-v3) - for all contributions from version 4.10 onwards
+
+* [BSD-3-Clause](https://opensource.org/license/bsd-3-clause) - for all other contributions predating version 4.10
+Effectively, for versions 4.10 and upwards **AGPL-3.0** license applies.
+
+**Spree Commerce versions 4.9** and earlier in the [spree/spree](https://github.com/spree/spree) repository are available under the **BSD-3-Clause** license and users are required to comply with its terms.
+
+If you’d like to use Spree Commerce without the AGPL-3.0 restrictions e.g. for a **SaaS** business, please talk to us about obtaining a [Commercial License](#commercial-license).
+
+All third party components incorporated into this software are licensed under the original license provided by the owner of the applicable component.
+
+Please refer to our [Licensing FAQ](https://spreecommerce.org/why-spree-is-changing-its-open-source-license-to-agpl-3-0-and-introducing-a-commercial-license/) in case of questions.
+
+## AGPL-3.0 License - Spree 4.10 upwards
+
+If you decide to accept the AGPL-3.0 license by using Spree Commerce version 4.10 or later, you must comply with the following terms:
+
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see [https://www.gnu.org/licenses/](https://www.gnu.org/licenses/).
+
+## BSD 3-Clause License
+
+If you decide to accept the BSD-3-Clause license by using Spree Commerce, you must comply with the following terms:
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the name of Spree Commerce Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,     THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR                CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,              PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF         LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## Commercial License
+
+Should you decide to use Spree Commerce version 4.10 or later for commercial redistribution (eg. SaaS) - also known as Commercial Distribution - you must do so in accordance with the terms and conditions contained in a separate written agreement between you and [Vendo Connect Inc.](https://www.getvendo.com/).
+
+For more information about the Commercial License (CL) please contact [sales@getvendo.com](mailto:sales@getvendo.com).
+
+Please refer to our [Licensing FAQ](https://spreecommerce.org/why-spree-is-changing-its-open-source-license-to-agpl-3-0-and-introducing-a-commercial-license/) in case of questions.

data/app/controllers/concerns/spree/api/v2/caching.rb

@@ -5,22 +5,19 @@ module Spree
         extend ActiveSupport::Concern
 
         def collection_cache_key(collection)
-          ids_and_timestamps = collection.unscope(:includes).unscope(:order).pluck(:id, :updated_at)
-
-          ids = ids_and_timestamps.map(&:first)
-          max_updated_at = ids_and_timestamps.map(&:last).max
+          params.delete(:page) if params[:page] == 1
 
           cache_key_parts = [
-            self.class.to_s,
-            max_updated_at,
-            ids,
+            collection.cache_key_with_version,
             resource_includes,
             sparse_fields,
-            serializer_params,
+            serializer_params_cache_key,
             params[:sort]&.strip,
             params[:page]&.to_s&.strip,
             params[:per_page]&.to_s&.strip,
-          ].flatten.join('-')
+          ]
+          cache_key_parts += additional_cache_key_parts if defined?(additional_cache_key_parts)
+          cache_key_parts = cache_key_parts.flatten.join('-')
 
           Digest::MD5.hexdigest(cache_key_parts)
         end
@@ -31,6 +28,12 @@ module Spree
             expires_in: Spree::Api::Config[:api_v2_collection_cache_ttl],
           }
         end
+
+        def serializer_params_cache_key
+          serializer_params.values.map do |param|
+            param.try(:cache_key) || param.try(:flatten).try(:join, '-') || param.try(:to_s)
+          end.compact.join('-')
+        end
       end
     end
   end

data/app/controllers/concerns/spree/api/v2/storefront/order_concern.rb

@@ -9,7 +9,7 @@ module Spree
             if result.success?
               render_serialized_payload { serialized_current_order }
             else
-              render_error_payload(result.error)
+              render_error_payload(result.error&.value || result.value)
             end
           end
 
@@ -18,7 +18,7 @@ module Spree
           end
 
           def order_token
-            request.headers['X-Spree-Order-Token'] || params[:order_token]
+            request.headers['X-Vendo-Order-Token'] || request.headers['X-Spree-Order-Token'] || params[:order_token]
           end
 
           def spree_current_order

data/app/controllers/spree/api/v2/base_controller.rb

@@ -142,11 +142,15 @@ module Spree
           }
         end
 
-        def record_not_found
+        def record_not_found(exception)
+          result = error_handler.call(exception: exception, opts: { user: spree_current_user })
+
           render_error_payload(I18n.t(:resource_not_found, scope: 'spree.api'), 404)
         end
 
         def access_denied(exception)
+          result = error_handler.call(exception: exception, opts: { user: spree_current_user })
+
           render_error_payload(exception.message, 403)
         end
 
@@ -155,6 +159,8 @@ module Spree
         end
 
         def gateway_error(exception)
+          result = error_handler.call(exception: exception, opts: { user: spree_current_user })
+
           render_error_payload(exception.message)
         end
 

data/app/controllers/spree/api/v2/platform/resource_controller.rb

@@ -88,7 +88,7 @@ module Spree
           end
 
           # if using a user oAuth token we need to check CanCanCan abilities
-          # defined in https://github.com/spree/spree/blob/master/core/app/models/spree/ability.rb
+          # defined in https://github.com/spree/spree/blob/main/core/app/models/spree/ability.rb
           def authorize_spree_user
             return if spree_current_user.nil?
 

data/app/controllers/spree/api/v2/storefront/checkout_controller.rb

@@ -36,7 +36,7 @@ module Spree
             result = update_service.call(
               order: spree_current_order,
               params: params,
-              # defined in https://github.com/spree/spree/blob/master/core/lib/spree/core/controller_helpers/strong_parameters.rb#L19
+              # defined in https://github.com/spree/spree/blob/main/core/lib/spree/core/controller_helpers/strong_parameters.rb#L19
               permitted_attributes: permitted_checkout_attributes,
               request_env: request.headers.env
             )

data/app/controllers/spree/api/v2/storefront/products_controller.rb

@@ -16,7 +16,14 @@ module Spree
           end
 
           def resource
-            @resource ||= find_with_fallback_default_locale { scope.find_by(slug: params[:id]) } || scope.find(params[:id])
+            # fixed N+1 queries issue
+            variant_includes = [
+              :prices,
+              { option_values: [:option_type] }
+            ]
+
+            # using FriendlyId so old slugs still work
+            @resource ||= find_with_fallback_default_locale { scope.includes(variants: variant_includes, master: variant_includes).friendly.find(params[:id]) } || scope.includes(variants: variant_includes, master: variant_includes).friendly.find(params[:id])
           end
 
           def collection_sorter

data/app/controllers/spree/api/v2/storefront/variants_controller.rb

@@ -0,0 +1,41 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class VariantsController < ::Spree::Api::V2::ResourceController
+          private
+
+          def model_class
+            Spree::Variant
+          end
+
+          def scope
+            product_scope = Spree::Product.for_store(current_store)
+            product_scope = product_scope.accessible_by(current_ability, :show)
+            product_scope = product_scope.i18n if model_class.include?(TranslatableResource)
+
+            product = product_scope.friendly.find(params[:id])
+            product.variants_including_master
+          end
+
+          def collection_finder
+            Spree::Api::Dependencies.storefront_variant_finder.constantize
+          end
+
+          def collection_serializer
+            Spree::Api::Dependencies.storefront_variant_serializer.constantize
+          end
+
+          def scope_includes
+            variant_includes = {
+              prices: [],
+              option_values: :option_type,
+            }
+            variant_includes[:images] = [] if params[:include]&.match(/images/)
+            variant_includes
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/storefront/wishlists_controller.rb

@@ -100,6 +100,41 @@ module Spree
             end
           end
 
+          def add_items
+            spree_authorize! :create, Spree::WishedItem
+
+            @wished_items = resource.wished_items
+            ApplicationRecord.transaction do
+              wished_items_attributes.each do |wished_item_attributes|
+                wished_item = @wished_items.find_by(variant_id: wished_item_attributes[:variant_id])
+
+                if wished_item
+                  wished_item.update!(quantity: wished_item_attributes[:quantity] || 1)
+                else
+                  Spree::WishedItem.create!(wished_item_attributes.merge(wishlist: resource))
+                end
+              end
+            end
+
+            resource.reload
+            render_serialized_payload { serialize_resource(resource) }
+          rescue ActiveRecord::RecordInvalid => e
+            render json: { error: e.record.errors.full_messages.to_sentence }, status: 422
+          end
+
+          def remove_items
+            spree_authorize! :destroy, Spree::WishedItem
+
+            ApplicationRecord.transaction do
+              resource.wished_items.where(id: wished_items_ids).each(&:destroy!)
+            end
+
+            resource.reload
+            render_serialized_payload { serialize_resource(resource) }
+          rescue ActiveRecord::RecordNotDestroyed => e
+            render json: { error: e.record.errors.full_messages.to_sentence }, status: 422
+          end
+
           private
 
           def scope(skip_cancancan: true)
@@ -164,6 +199,14 @@ module Spree
                                   1
                                 end
           end
+
+          def wished_items_attributes
+            params.permit(wished_items: permitted_wished_item_attributes).require(:wished_items)
+          end
+
+          def wished_items_ids
+            params.require(:wished_items_ids)
+          end
         end
       end
     end

data/app/models/concerns/spree/webhooks/has_webhooks.rb

@@ -10,13 +10,15 @@ module Spree
 
         def queue_webhooks_requests!(event_name)
           return if disable_spree_webhooks?
-          return if Spree::Webhooks::Subscriber.none?
-          return if Spree::Webhooks::Subscriber.active.with_urls_for(event_name).none?
+          return if no_webhooks_subscribers?(event_name)
           return if update_event?(event_name) && updating_only_ignored_attributes?
           return if webhook_payload_body.blank?
 
           Spree::Webhooks::Subscribers::QueueRequests.call(
-            event_name: event_name, webhook_payload_body: webhook_payload_body, **webhooks_request_options
+            record: self,
+            event_name: event_name,
+            webhook_payload_body: webhook_payload_body,
+            **webhooks_request_options
           )
         end
 
@@ -43,7 +45,9 @@ module Spree
       end
 
       def included_relationships
-        if resource_serializer.relationships_to_serialize
+        if self.class.respond_to?(:webhook_included_relationships)
+          self.class.webhook_included_relationships
+        elsif resource_serializer.relationships_to_serialize
           resource_serializer.relationships_to_serialize.keys
         else
           []
@@ -74,7 +78,11 @@ module Spree
       end
 
       def disable_spree_webhooks?
-        ENV['DISABLE_SPREE_WEBHOOKS'] == 'true'
+        Spree::Webhooks.disabled?
+      end
+
+      def no_webhooks_subscribers?(event_name)
+        !Spree::Webhooks::Subscriber.active.with_urls_for(event_name).exists?
       end
 
       def webhooks_request_options

data/app/models/spree/oauth_application.rb

@@ -6,6 +6,13 @@ module Spree
 
     before_validation :set_blank_for_redirect_uri
 
+    # returns the last someone used this application
+    #
+    # @return [DateTime]
+    def last_used_at
+      access_tokens.order(:created_at).last&.created_at
+    end
+
     private
 
     def set_blank_for_redirect_uri

data/app/models/spree/order/webhooks.rb

@@ -0,0 +1,39 @@
+module Spree
+  class Order < Spree::Base
+    module Webhooks
+      extend ActiveSupport::Concern
+      include Spree::Webhooks::HasWebhooks
+
+      included do
+        after_update_commit :queue_webhooks_requests_for_order_resumed!
+      end
+
+      class_methods do
+        def custom_webhook_events
+          %w[order.canceled order.placed order.resumed order.shipped]
+        end
+      end
+
+      def send_order_canceled_webhook
+        queue_webhooks_requests!('order.canceled')
+      end
+
+      def send_order_placed_webhook
+        queue_webhooks_requests!('order.placed')
+      end
+
+      def send_order_resumed_webhook
+        queue_webhooks_requests!('order.resumed')
+        self.state_machine_resumed = false # to not fire the same webhook twice
+      end
+
+      def queue_webhooks_requests_for_order_resumed!
+        return if state_machine_resumed?
+        return unless state_previously_changed?
+        return unless state_previous_change&.last == 'resumed'
+
+        send_order_resumed_webhook
+      end
+    end
+  end
+end

data/app/models/spree/payment/webhooks.rb

@@ -0,0 +1,23 @@
+module Spree
+  class Payment < Spree::Base
+    module Webhooks
+      extend ActiveSupport::Concern
+      include Spree::Webhooks::HasWebhooks
+
+      class_methods do
+        def custom_webhook_events
+          %w[payment.paid payment.voided]
+        end
+      end
+
+      def send_payment_voided_webhook
+        queue_webhooks_requests!('payment.voided')
+      end
+
+      def send_payment_completed_webhook
+        queue_webhooks_requests!('payment.paid')
+        order.queue_webhooks_requests!('order.paid') if order.paid?
+      end
+    end
+  end
+end

data/app/models/spree/product/webhooks.rb

@@ -0,0 +1,42 @@
+module Spree
+  class Product < Spree::Base
+    module Webhooks
+      extend ActiveSupport::Concern
+      include Spree::Webhooks::HasWebhooks
+
+      included do
+        after_update_commit :queue_webhooks_requests_for_product_discontinued!
+      end
+
+      class_methods do
+        def custom_webhook_events
+          %w[product.back_in_stock product.backorderable product.discontinued
+             product.out_of_stock product.activated product.archived product.drafted]
+        end
+
+        def ignored_attributes_for_update_webhook_event
+          %w[status]
+        end
+      end
+
+      def send_product_activated_webhook
+        queue_webhooks_requests!('product.activated')
+      end
+
+      def send_product_archived_webhook
+        queue_webhooks_requests!('product.archived')
+      end
+
+      def send_product_drafted_webhook
+        queue_webhooks_requests!('product.drafted')
+      end
+
+      def queue_webhooks_requests_for_product_discontinued!
+        return unless discontinue_on_previously_changed?
+        return if (change = discontinue_on_previous_change).blank? || change.last.blank?
+
+        queue_webhooks_requests!('product.discontinued')
+      end
+    end
+  end
+end

data/app/models/spree/shipment/webhooks.rb

@@ -0,0 +1,19 @@
+module Spree
+  class Shipment < Spree::Base
+    module Webhooks
+      extend ActiveSupport::Concern
+      include Spree::Webhooks::HasWebhooks
+
+      class_methods do
+        def custom_webhook_events
+          %w[shipment.shipped]
+        end
+      end
+
+      def send_shipment_shipped_webhook
+        queue_webhooks_requests!('shipment.shipped')
+        order.queue_webhooks_requests!('order.shipped') if order.fully_shipped?
+      end
+    end
+  end
+end

data/app/models/spree/stock_item/webhooks.rb

@@ -0,0 +1,40 @@
+module Spree
+  class StockItem < Spree::Base
+    module Webhooks
+      extend ActiveSupport::Concern
+      include Spree::Webhooks::HasWebhooks
+
+      included do
+        around_save :queue_webhooks_requests_for_variant_backorderable!
+        around_save :queue_webhooks_requests_for_product_backorderable!
+      end
+
+      def queue_webhooks_requests_for_variant_backorderable!
+        was_out_of_stock = !variant.in_stock_or_backorderable?
+        was_not_backorderable = !variant_backorderable?
+        yield
+        if was_out_of_stock && was_not_backorderable && variant_backorderable?
+          reload
+          variant.queue_webhooks_requests!('variant.backorderable')
+        end
+      end
+
+      def queue_webhooks_requests_for_product_backorderable!
+        product_was_out_of_stock = !product.any_variant_in_stock_or_backorderable?
+        product_was_not_backorderable = !product_backorderable?
+        yield
+        if product_was_out_of_stock && product_was_not_backorderable && product_backorderable?
+          variant.product.queue_webhooks_requests!('product.backorderable')
+        end
+      end
+
+      def product_backorderable?
+        Spree::StockItem.exists?(backorderable: true, variant_id: variant.product.variants.ids)
+      end
+
+      def variant_backorderable?
+        variant.stock_items.exists?(backorderable: true)
+      end
+    end
+  end
+end

data/app/models/spree/stock_movement/webhooks.rb

@@ -0,0 +1,49 @@
+module Spree
+  class StockMovement < Spree::Base
+    module Webhooks
+      extend ActiveSupport::Concern
+      include Spree::Webhooks::HasWebhooks
+
+      included do
+        around_save :queue_webhooks_requests_for_variant_out_of_stock!
+        around_save :queue_webhooks_requests_for_variant_back_in_stock!
+        around_save :queue_webhooks_requests_for_product_out_of_stock!
+        around_save :queue_webhooks_requests_for_product_back_in_stock!
+      end
+
+      def queue_webhooks_requests_for_variant_out_of_stock!
+        variant_in_stock_before_update = variant.in_stock_or_backorderable?
+        yield
+        if variant_in_stock_before_update && !variant.in_stock_or_backorderable?
+          reload
+          stock_item.variant.queue_webhooks_requests!('variant.out_of_stock')
+        end
+      end
+
+      def queue_webhooks_requests_for_variant_back_in_stock!
+        variant_was_out_of_stock = !variant.in_stock_or_backorderable?
+        yield
+        if variant_was_out_of_stock && variant.in_stock_or_backorderable?
+          reload
+          variant.queue_webhooks_requests!('variant.back_in_stock')
+        end
+      end
+
+      def queue_webhooks_requests_for_product_back_in_stock!
+        product_was_out_of_stock = !product.any_variant_in_stock_or_backorderable?
+        yield
+        if product_was_out_of_stock && product.any_variant_in_stock_or_backorderable?
+          product.queue_webhooks_requests!('product.back_in_stock')
+        end
+      end
+
+      def queue_webhooks_requests_for_product_out_of_stock!
+        product_was_in_stock = product.any_variant_in_stock_or_backorderable?
+        yield
+        if product_was_in_stock && !product.any_variant_in_stock_or_backorderable?
+          product.queue_webhooks_requests!('product.out_of_stock')
+        end
+      end
+    end
+  end
+end

data/app/models/spree/variant/webhooks.rb

@@ -0,0 +1,25 @@
+module Spree
+  class Variant < Spree::Base
+    module Webhooks
+      extend ActiveSupport::Concern
+      include Spree::Webhooks::HasWebhooks
+
+      included do
+        after_update_commit :queue_webhooks_requests_for_variant_discontinued!
+      end
+
+      class_methods do
+        def custom_webhook_events
+          %w[variant.back_in_stock variant.backorderable variant.discontinued variant.out_of_stock]
+        end
+      end
+
+      def queue_webhooks_requests_for_variant_discontinued!
+        return unless discontinue_on_previously_changed?
+        return if (change = discontinue_on_previous_change).blank? || change.last.blank?
+
+        queue_webhooks_requests!('variant.discontinued')
+      end
+    end
+  end
+end

data/app/models/spree/webhooks/subscriber.rb

@@ -25,6 +25,10 @@ module Spree
 
       before_save :parse_subscriptions
 
+      def latest_event_at
+        events.order(:created_at).last&.created_at
+      end
+      
       def self.with_urls_for(event)
         where(
           case ActiveRecord::Base.connection.adapter_name

data/app/serializers/spree/api/v2/platform/admin_user_serializer.rb

@@ -0,0 +1,11 @@
+module Spree
+  module Api
+    module V2
+      module Platform
+        class AdminUserSerializer < UserSerializer
+          set_type :admin_user
+        end
+      end
+    end
+  end
+end

data/app/serializers/spree/api/v2/platform/refund_serializer.rb

@@ -5,6 +5,7 @@ module Spree
         class RefundSerializer < BaseSerializer
           include ResourceSerializerConcern
 
+          belongs_to :refunder, serializer: Dependencies.platform_admin_user_serializer.constantize
           belongs_to :payment
           belongs_to :reimbursement
           belongs_to :refund_reason, object_method_name: :reason

data/app/serializers/spree/api/v2/platform/store_credit_serializer.rb

@@ -6,7 +6,7 @@ module Spree
           include ResourceSerializerConcern
 
           belongs_to :user
-          belongs_to :created_by, serializer: :user, type: :user
+          belongs_to :created_by, serializer: Dependencies.platform_admin_user_serializer.constantize
           belongs_to :store_credit_category, object_method_name: :category, id_method_name: :category_id
           belongs_to :store_credit_type, object_method_name: :credit_type, id_method_name: :type_id
 

data/app/serializers/spree/v2/storefront/credit_card_serializer.rb

@@ -4,7 +4,7 @@ module Spree
       class CreditCardSerializer < BaseSerializer
         set_type :credit_card
 
-        attributes :cc_type, :last_digits, :month, :year, :name, :default, :public_metadata
+        attributes :cc_type, :last_digits, :month, :year, :name, :default, :gateway_payment_profile_id, :public_metadata
 
         belongs_to :payment_method
       end

data/app/serializers/spree/v2/storefront/shipping_category_serializer.rb

@@ -0,0 +1,10 @@
+module Spree
+  module V2
+    module Storefront
+      class ShippingCategorySerializer < BaseSerializer
+        set_type  :shipping_category
+        attribute :name
+      end
+    end
+  end
+end