spree_api 4.3.0.rc1 → 4.4.0.rc1

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

@@ -3,8 +3,29 @@ module Spree
     module V2
       module Platform
         class TaxonsController < ResourceController
+          include ::Spree::Api::V2::Platform::NestedSetRepositionConcern
+
           private
 
+          def successful_reposition_actions
+            reload_taxon_and_set_new_permalink(resource)
+            update_permalinks_on_child_taxons
+
+            render_serialized_payload { serialize_resource(resource) }
+          end
+
+          def reload_taxon_and_set_new_permalink(taxon)
+            taxon.reload
+            taxon.set_permalink
+            taxon.save!
+          end
+
+          def update_permalinks_on_child_taxons
+            resource.descendants.each do |taxon|
+              reload_taxon_and_set_new_permalink(taxon)
+            end
+          end
+
           def model_class
             Spree::Taxon
           end
@@ -23,6 +44,10 @@ module Spree
           def serializer_params
             super.merge(include_products: action_name == 'show')
           end
+
+          def spree_permitted_attributes
+            super + [:new_parent_id, :new_position_idx]
+          end
         end
       end
     end

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

@@ -21,6 +21,10 @@ module Spree
           def model_param_name
             'user'
           end
+
+          def spree_permitted_attributes
+            super + [:password, :password_confirmation]
+          end
         end
       end
     end

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

@@ -0,0 +1,19 @@
+module Spree
+  module Api
+    module V2
+      module Platform
+        class VariantsController < ResourceController
+          private
+
+          def model_class
+            Spree::Variant
+          end
+
+          def spree_permitted_attributes
+            super + [:option_value_ids, :price, :currency]
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/platform/webhooks/events_controller.rb

@@ -0,0 +1,21 @@
+module Spree
+  module Api
+    module V2
+      module Platform
+        module Webhooks
+          class EventsController < ResourceController
+            private
+
+            def model_class
+              Spree::Webhooks::Event
+            end
+
+            def scope_includes
+              %i[subscriber]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/platform/webhooks/subscribers_controller.rb

@@ -0,0 +1,21 @@
+module Spree
+  module Api
+    module V2
+      module Platform
+        module Webhooks
+          class SubscribersController < ResourceController
+            private
+
+            def model_class
+              Spree::Webhooks::Subscriber
+            end
+
+            def spree_permitted_attributes
+              super + [{ subscriptions: [] }]
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Spree
+  module Api
+    module V2
+      module Platform
+        class WishedItemsController < ResourceController
+          private
+
+          def scope_includes
+            [:variant]
+          end
+
+          def model_class
+            Spree::WishedItem
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Spree
+  module Api
+    module V2
+      module Platform
+        class WishlistsController < ResourceController
+          private
+
+          def model_class
+            Spree::Wishlist
+          end
+
+          def scope_includes
+            [:wished_items]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+module Spree
+  module Api
+    module V2
+      module Platform
+        class ZonesController < ResourceController
+          private
+
+          def model_class
+            Spree::Zone
+          end
+
+          def scope_includes
+            [:zone_members]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,9 +3,14 @@ module Spree
     module V2
       class ResourceController < ::Spree::Api::V2::BaseController
         include Spree::Api::V2::CollectionOptionsHelpers
+        include Spree::Api::V2::Caching
 
         def index
-          render_serialized_payload { serialize_collection(paginated_collection) }
+          render_serialized_payload do
+            Rails.cache.fetch(collection_cache_key(paginated_collection), collection_cache_opts) do
+              serialize_collection(paginated_collection)
+            end
+          end
         end
 
         def show
@@ -19,11 +24,11 @@ module Spree
         end
 
         def allowed_sort_attributes
-          default_sort_atributes
+          default_sort_attributes
         end
 
-        def default_sort_atributes
-          [:id, :name, :number, :position, :updated_at, :created_at]
+        def default_sort_attributes
+          [:id, :name, :slug, :number, :position, :updated_at, :created_at, :deleted_at]
         end
 
         def scope(skip_cancancan: false)

data/app/controllers/spree/api/v2/storefront/account/addresses_controller.rb

@@ -4,6 +4,8 @@ module Spree
       module Storefront
         module Account
           class AddressesController < ::Spree::Api::V2::ResourceController
+            include Spree::BaseHelper
+
             before_action :require_spree_current_user
 
             def create
@@ -37,7 +39,7 @@ module Spree
             end
 
             def scope
-              super.where(user: spree_current_user).not_deleted
+              super.where(user: spree_current_user, country: available_countries).not_deleted
             end
 
             def model_class
@@ -57,11 +59,11 @@ module Spree
             end
 
             def create_service
-              Spree::Api::Dependencies.storefront_account_create_address_service.constantize
+              Spree::Api::Dependencies.storefront_address_create_service.constantize
             end
 
             def update_service
-              Spree::Api::Dependencies.storefront_account_update_address_service.constantize
+              Spree::Api::Dependencies.storefront_address_update_service.constantize
             end
 
             def address_params

data/app/controllers/spree/api/v2/storefront/account/credit_cards_controller.rb

@@ -23,7 +23,10 @@ module Spree
             end
 
             def scope
-              super.where(user: spree_current_user, payment_method: current_store.payment_methods.available_on_front_end)
+              super.not_expired.not_removed.where(
+                user: spree_current_user,
+                payment_method: current_store.payment_methods.available_on_front_end
+              )
             end
 
             def collection_serializer

data/app/controllers/spree/api/v2/storefront/account/orders_controller.rb

@@ -38,6 +38,10 @@ module Spree
             def resource_finder
               Spree::Api::Dependencies.storefront_completed_order_finder.constantize
             end
+
+            def model_class
+              Spree::Order
+            end
           end
         end
       end

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

@@ -3,21 +3,29 @@ module Spree
     module V2
       module Storefront
         class CartController < ::Spree::Api::V2::BaseController
-          include Spree::Api::V2::Storefront::OrderConcern
-          before_action :ensure_order, except: :create
+          include OrderConcern
+          include CouponCodesHelper
+          include Spree::Api::V2::Storefront::MetadataControllerConcern
+
+          before_action :ensure_valid_metadata, only: %i[create add_item]
+          before_action :ensure_order, except: %i[create associate]
           before_action :load_variant, only: :add_item
+          before_action :require_spree_current_user, only: :associate
+
 
           def create
             spree_authorize! :create, Spree::Order
 
-            order_params = {
+            create_cart_params = {
               user: spree_current_user,
               store: current_store,
-              currency: current_currency
+              currency: current_currency,
+              public_metadata: add_item_params[:public_metadata],
+              private_metadata: add_item_params[:private_metadata],
             }
 
             order   = spree_current_order if spree_current_order.present?
-            order ||= create_service.call(order_params).value
+            order ||= create_service.call(create_cart_params).value
 
             render_serialized_payload(201) { serialize_resource(order) }
           end
@@ -29,8 +37,10 @@ module Spree
             result = add_item_service.call(
               order: spree_current_order,
               variant: @variant,
-              quantity: params[:quantity],
-              options: params[:options]
+              quantity: add_item_params[:quantity],
+              public_metadata: add_item_params[:public_metadata],
+              private_metadata: add_item_params[:private_metadata],
+              options: add_item_params[:options]
             )
 
             render_order(result)
@@ -105,7 +115,7 @@ module Spree
 
             coupon_codes = select_coupon_codes
 
-            return render_error_payload(Spree.t('v2.cart.no_coupon_code', scope: 'api')) if coupon_codes.empty?
+            return render_error_payload(I18n.t('spree.api.v2.cart.no_coupon_code')) if coupon_codes.empty?
 
             result_errors = coupon_codes.count > 1 ? select_errors(coupon_codes) : select_error(coupon_codes)
 
@@ -128,6 +138,34 @@ module Spree
             end
           end
 
+          def associate
+            guest_order_token = params[:guest_order_token]
+            guest_order = ::Spree::Api::Dependencies.storefront_current_order_finder.constantize.new.execute(
+              store: current_store,
+              user: nil,
+              token: guest_order_token,
+              currency: current_currency
+            )
+
+            spree_authorize! :update, guest_order, guest_order_token
+
+            result = associate_service.call(guest_order: guest_order, user: spree_current_user)
+
+            if result.success?
+              render_serialized_payload { serialize_resource(guest_order) }
+            else
+              render_error_payload(result.error)
+            end
+          end
+
+          def change_currency
+            spree_authorize! :update, spree_current_order, order_token
+
+            result = change_currency_service.call(order: spree_current_order, new_currency: params[:new_currency])
+
+            render_order(result)
+          end
+
           private
 
           def resource_serializer
@@ -166,12 +204,20 @@ module Spree
             Spree::Api::Dependencies.storefront_cart_estimate_shipping_rates_service.constantize
           end
 
+          def associate_service
+            Spree::Api::Dependencies.storefront_cart_associate_service.constantize
+          end
+
+          def change_currency_service
+            Spree::Api::Dependencies.storefront_cart_change_currency_service.constantize
+          end
+
           def line_item
             @line_item ||= spree_current_order.line_items.find(params[:line_item_id])
           end
 
           def load_variant
-            @variant = current_store.variants.find(params[:variant_id])
+            @variant = current_store.variants.find(add_item_params[:variant_id])
           end
 
           def render_error_item_quantity
@@ -189,26 +235,8 @@ module Spree
             ).serializable_hash
           end
 
-          def select_coupon_codes
-            params[:coupon_code].present? ? [params[:coupon_code]] : check_coupon_codes
-          end
-
-          def check_coupon_codes
-            spree_current_order.promotions.coupons.map(&:code)
-          end
-
-          def select_error(coupon_codes)
-            result = coupon_handler.new(spree_current_order).remove(coupon_codes.first)
-            result.error
-          end
-
-          def select_errors(coupon_codes)
-            results = []
-            coupon_codes.each do |coupon_code|
-              results << coupon_handler.new(spree_current_order).remove(coupon_code)
-            end
-
-            results.select(&:error)
+          def add_item_params
+            params.permit(:quantity, :variant_id, public_metadata: {}, private_metadata: {}, options: {})
           end
         end
       end

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

@@ -44,6 +44,22 @@ module Spree
             render_order(result)
           end
 
+          def create_payment
+            result = create_payment_service.call(order: spree_current_order, params: params)
+
+            if result.success?
+              render_serialized_payload(201) { serialize_resource(spree_current_order.reload) }
+            else
+              render_error_payload(result.error)
+            end
+          end
+
+          def select_shipping_method
+            result = select_shipping_method_service.call(order: spree_current_order, params: params)
+
+            render_order(result)
+          end
+
           def add_store_credit
             spree_authorize! :update, spree_current_order, order_token
 
@@ -118,6 +134,14 @@ module Spree
             Spree::Api::Dependencies.storefront_shipment_serializer.constantize
           end
 
+          def create_payment_service
+            Spree::Api::Dependencies.storefront_payment_create_service.constantize
+          end
+
+          def select_shipping_method_service
+            Spree::Api::Dependencies.storefront_checkout_select_shipping_method_service.constantize
+          end
+
           def serialize_payment_methods(payment_methods)
             payment_methods_serializer.new(payment_methods, params: serializer_params).serializable_hash
           end

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

@@ -3,6 +3,8 @@ module Spree
     module V2
       module Storefront
         class CountriesController < ::Spree::Api::V2::ResourceController
+          before_action :set_default_per_page
+
           private
 
           def serialize_collection(collection)
@@ -43,6 +45,11 @@ module Spree
           def model_class
             Spree::Country
           end
+
+          # by default we want to return all countries on a single page
+          def set_default_per_page
+            params[:per_page] ||= Spree::Country.count
+          end
         end
       end
     end

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

@@ -0,0 +1,54 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class DigitalsController < ::Spree::Api::V2::ResourceController
+          def download
+            if attachment.present?
+              if digital_link.authorize!
+                if defined?(ActiveStorage::Service::DiskService) && ActiveStorage::Blob.service.instance_of?(ActiveStorage::Service::DiskService)
+                  # The asset is hosted on disk, use send_file.
+
+                  send_file(
+                    ActiveStorage::Blob.service.path_for(attachment.key),
+                    filename: attachment.filename.to_s,
+                    type: attachment.content_type.to_s,
+                    status: :ok
+                  ) and return
+
+                else
+                  # The asset is hosted on a 3rd party service, use an expiring url with disposition: 'attachment'.
+
+                  redirect_to attachment.url(
+                    expires_in: current_store.digital_asset_link_expire_time.seconds,
+                    disposition: 'attachment',
+                    host: current_store.formatted_url
+                  ) and return
+
+                end
+              end
+            else
+              Rails.logger.error I18n.t('spree.api.v2.digitals.missing_file')
+            end
+
+            render json: { error: I18n.t('spree.api.v2.digitals.unauthorized') }, status: 403
+          end
+
+          private
+
+          def model_class
+            Spree::Digital
+          end
+
+          def digital_link
+            @digital_link ||= DigitalLink.find_by!(token: params[:token])
+          end
+
+          def attachment
+            @attachment ||= digital_link.digital.try(:attachment) if digital_link.present?
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -42,6 +42,18 @@ module Spree
           def scope_includes
             product_list_includes
           end
+
+          def allowed_sort_attributes
+            super << :available_on
+          end
+
+          def collection_meta(collection)
+            super(collection).merge(filters: filters_meta)
+          end
+
+          def filters_meta
+            Spree::Api::Products::FiltersPresenter.new(current_store, current_currency, params).to_h
+          end
         end
       end
     end