spree_api 4.1.13 → 4.2.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e97b8e826fb8c422cac7fd8f2c48ed976bd801d2cd6b6a83d2bc63e7502680f
-  data.tar.gz: 590a06b109db49907897f093deefddeba7a1c9179a899507a4afb6634ce1351d
+  metadata.gz: 7c7b8ebf1a65cf7fb7063b4811c8d6226298c6435b5fdb9a60fd0c9a0579567d
+  data.tar.gz: 33ab903daaec69fdcb23340146c6e78be7dc64dbe760d2885353518d977887d3
 SHA512:
-  metadata.gz: e38f559497fd36c7bd4660352ad2761002a07d441eaacce603eb4c9ae11a27ae5241715ff071dee71acd487f8c8368ca61ce301660b0b052bdd0d1379400d56e
-  data.tar.gz: c441f94c2e98c93b06dd0afefbf1fb9cd0aa5b27fa1057182bd135f8bd3c6dfe5325c54e0504aa44c75ee39015fb67261f43b74b4acdeea5bf765adcacf1dd68
+  metadata.gz: 4f108ec0840bcfdf1aa5f15a8cf7f1de53fc7420bc0d0fc93072786ce139f60afcf5506470dca75c32cfac4b70221b4a9858e8b0a528b643e3f411c892cd46c9
+  data.tar.gz: 75d052059dda3df22fd17236878a14b9ca9a07da5bb287b0df03c11ea347a02abadabf75e2f7f7da950cd9e8bfdb56e96294d0a14ec46049797a63a69da58711

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

@@ -34,6 +34,10 @@ module Spree
             )
           end
 
+          def supported_currencies
+            current_store.supported_currencies_list
+          end
+
           def serialize_order(order)
             resource_serializer.new(order.reload, include: resource_includes, fields: sparse_fields).serializable_hash
           end

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

@@ -2,9 +2,7 @@ require_dependency 'spree/api/controller_setup'
 
 module Spree
   module Api
-    class BaseController < ActionController::Base
-      protect_from_forgery unless: -> { request.format.json? || request.format.xml? }
-
+    class BaseController < ActionController::API
       include Spree::Api::ControllerSetup
       include Spree::Core::ControllerHelpers::Store
       include Spree::Core::ControllerHelpers::StrongParameters
@@ -83,10 +81,16 @@ module Spree
       end
 
       def error_during_processing(exception)
-        Rails.logger.error exception.message
+        message = if exception.respond_to?(:original_message)
+                    exception.original_message
+                  else
+                    exception.message
+                  end
+
+        Rails.logger.error message
         Rails.logger.error exception.backtrace.join("\n")
 
-        unprocessable_entity(exception.message)
+        unprocessable_entity(message)
       end
 
       def unprocessable_entity(message)

data/app/controllers/spree/api/errors_controller.rb

@@ -1,6 +1,6 @@
 module Spree
   module Api
-    class ErrorsController < ActionController::Base
+    class ErrorsController < ActionController::API
       def render_404
         render 'spree/api/errors/not_found', status: 404
       end

data/app/controllers/spree/api/v1/shipments_controller.rb

@@ -92,12 +92,17 @@ module Spree
           @stock_location = Spree::StockLocation.find(params[:stock_location_id])
 
           unless @quantity > 0
-            unprocessable_entity("#{Spree.t(:shipment_transfer_errors_occured, scope: 'api')} \n #{Spree.t(:negative_quantity, scope: 'api')}")
+            unprocessable_entity("#{Spree.t(:shipment_transfer_errors_occurred, scope: 'api')} \n #{Spree.t(:negative_quantity, scope: 'api')}")
             return
           end
 
-          @original_shipment.transfer_to_location(@variant, @quantity, @stock_location)
-          render json: { success: true, message: Spree.t(:shipment_transfer_success) }, status: 201
+          transfer = @original_shipment.transfer_to_location(@variant, @quantity, @stock_location)
+          if transfer.valid?
+            transfer.run!
+            render json: { message: Spree.t(:shipment_transfer_success) }, status: 201
+          else
+            render json: { message: transfer.errors.full_messages.to_sentence }, status: 422
+          end
         end
 
         def transfer_to_shipment
@@ -113,10 +118,15 @@ module Spree
             end
 
           if error
-            unprocessable_entity("#{Spree.t(:shipment_transfer_errors_occured, scope: 'api')} \n#{error}")
+            unprocessable_entity("#{Spree.t(:shipment_transfer_errors_occurred, scope: 'api')} \n#{error}")
           else
-            @original_shipment.transfer_to_shipment(@variant, @quantity, @target_shipment)
-            render json: { success: true, message: Spree.t(:shipment_transfer_success) }, status: 201
+            transfer = @original_shipment.transfer_to_shipment(@variant, @quantity, @target_shipment)
+            if transfer.valid?
+              transfer.run!
+              render json: { message: Spree.t(:shipment_transfer_success) }, status: 201
+            else
+              render json: { message: transfer.errors.full_messages }, status: 422
+            end
           end
         end
 

data/app/controllers/spree/api/v1/taxons_controller.rb

@@ -74,7 +74,12 @@ module Spree
 
         def taxonomy
           if params[:taxonomy_id].present?
-            @taxonomy ||= Spree::Taxonomy.accessible_by(current_ability, :show).find(params[:taxonomy_id])
+            @taxonomy ||=
+              if defined?(SpreeGlobalize)
+                Spree::Taxonomy.includes(:translations, taxons: [:translations]).accessible_by(current_ability, :show).find(params[:taxonomy_id])
+              else
+                Spree::Taxonomy.accessible_by(current_ability, :show).find(params[:taxonomy_id])
+              end
           end
         end
 

data/app/controllers/spree/api/v1/users_controller.rb

@@ -5,22 +5,48 @@ module Spree
         rescue_from Spree::Core::DestroyWithOrdersError, with: :error_during_processing
 
         def index
-          @users = Spree.user_class.accessible_by(current_ability, :show)
+          users
 
           if params[:ids]
-            @users = @users.where(id: params[:ids])
-          elsif params[:q]
-            users_with_ship_address = @users.with_address(params[:q][:ship_address_firstname_start])
-            users_with_bill_address = @users.with_address(params[:q][:ship_address_firstname_start], :bill_address)
-
-            users_with_addresses_ids = (users_with_ship_address.ids + users_with_bill_address.ids).compact.uniq
-            @users = @users.with_email_or_addresses_ids(params[:q][:email_start], users_with_addresses_ids)
+            load_users_by_ids
+          elsif params.dig(:q, :ship_address_firstname_start)
+            load_users_by_address
+          elsif params.dig(:q, :email_start)
+            load_users_by_email
           end
 
+          prepare_index_response
+          respond_with(@users)
+        end
+
+        def users
+          @users ||= Spree.user_class.accessible_by(current_ability, :show)
+        end
+
+        def load_users_by_ids
+          @users = @users.where(id: params[:ids])
+        end
+
+        def load_users_by_address
+          address_params = params[:q][:ship_address_firstname_start] ||
+            params[:q][:ship_address_lastname_start] ||
+            params[:q][:bill_address_firstname_start] ||
+            params[:q][:bill_address_lastname_start]
+          @users = @users.with_email_or_address(params[:q][:email_start], address_params)
+        end
+
+        def load_users_by_email
+          @users = @users.with_email(params[:q][:email_start])
+        end
+
+        def paginate_users
           @users = @users.page(params[:page]).per(params[:per_page])
+        end
+
+        def prepare_index_response
+          paginate_users
           expires_in 15.minutes, public: true
           headers['Surrogate-Control'] = "max-age=#{15.minutes}"
-          respond_with(@users)
         end
 
         def show

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

@@ -9,35 +9,12 @@ module Spree
         rescue_from CanCan::AccessDenied, with: :access_denied
         rescue_from Spree::Core::GatewayError, with: :gateway_error
 
+        before_action :set_user_language
+
         def content_type
           Spree::Api::Config[:api_v2_content_type]
         end
 
-        private
-
-        def serialize_collection(collection)
-          collection_serializer.new(
-            collection,
-            collection_options(collection)
-          ).serializable_hash
-        end
-
-        def serialize_resource(resource)
-          resource_serializer.new(
-            resource,
-            include: resource_includes,
-            fields: sparse_fields
-          ).serializable_hash
-        end
-
-        def paginated_collection
-          collection_paginator.new(sorted_collection, params).call
-        end
-
-        def collection_paginator
-          Spree::Api::Dependencies.storefront_collection_paginator.constantize
-        end
-
         def render_serialized_payload(status = 200)
           render json: yield, status: status, content_type: content_type
         rescue ArgumentError => exception
@@ -118,6 +95,10 @@ module Spree
         def gateway_error(exception)
           render_error_payload(exception.message)
         end
+
+        def set_user_language
+          I18n.locale = current_store.default_locale
+        end
       end
     end
   end

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

@@ -0,0 +1,82 @@
+module Spree
+  module Api
+    module V2
+      class ResourceController < ::Spree::Api::V2::BaseController
+        include Spree::Api::V2::CollectionOptionsHelpers
+
+        def index
+          render_serialized_payload { serialize_collection(paginated_collection) }
+        end
+
+        def show
+          render_serialized_payload { serialize_resource(resource) }
+        end
+
+        protected
+
+        def serialize_collection(collection)
+          collection_serializer.new(
+            collection,
+            collection_options(collection)
+          ).serializable_hash
+        end
+
+        def serialize_resource(resource)
+          resource_serializer.new(
+            resource,
+            include: resource_includes,
+            fields: sparse_fields
+          ).serializable_hash
+        end
+
+        def paginated_collection
+          collection_paginator.new(sorted_collection, params).call
+        end
+
+        def collection_paginator
+          Spree::Api::Dependencies.storefront_collection_paginator.constantize
+        end
+
+        def sorted_collection
+          collection_sorter.new(collection, params, allowed_sort_attributes).call
+        end
+
+        def allowed_sort_attributes
+          default_sort_atributes
+        end
+
+        def default_sort_atributes
+          [:id, :updated_at, :created_at]
+        end
+
+        def scope
+          model_class.accessible_by(current_ability, :show).includes(scope_includes)
+        end
+
+        def scope_includes
+          []
+        end
+
+        def resource
+          @resource ||= if defined?(resource_finder)
+                          resource_finder.new(scope: scope, params: params).execute
+                        else
+                          scope.find(params[:id])
+                        end
+        end
+
+        def collection
+          @collection ||= if defined?(collection_finder)
+                            collection_finder.new(scope: scope, params: params).execute
+                          else
+                            scope
+                          end
+        end
+
+        def collection_sorter
+          Spree::Api::Dependencies.storefront_collection_sorter.constantize
+        end
+      end
+    end
+  end
+end

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

@@ -3,13 +3,9 @@ module Spree
     module V2
       module Storefront
         module Account
-          class AddressesController < ::Spree::Api::V2::BaseController
+          class AddressesController < ::Spree::Api::V2::ResourceController
             before_action :require_spree_current_user
 
-            def index
-              render_serialized_payload { serialize_collection(collection) }
-            end
-
             def create
               result = create_service.call(user: spree_current_user, address_params: address_params)
               render_result(result)
@@ -26,12 +22,8 @@ module Spree
               collection_finder.new(scope: scope, params: params).execute
             end
 
-            def resource
-              @resource ||= scope.find(params[:id])
-            end
-
-            def scope
-              spree_current_user.addresses
+            def model_class
+              Spree::Address
             end
 
             def collection_finder

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

@@ -3,27 +3,23 @@ module Spree
     module V2
       module Storefront
         module Account
-          class CreditCardsController < ::Spree::Api::V2::BaseController
+          class CreditCardsController < ::Spree::Api::V2::ResourceController
             before_action :require_spree_current_user
 
-            def index
-              render_serialized_payload { serialize_collection(resource) }
-            end
-
-            def show
-              render_serialized_payload { serialize_resource(resource) }
-            end
-
             private
 
-            def resource
-              resource_finder.new.execute(scope: scope, params: params)
+            def model_class
+              Spree::CreditCard
             end
 
             def collection_serializer
               Spree::Api::Dependencies.storefront_credit_card_serializer.constantize
             end
 
+            def collection_finder
+              Spree::Api::Dependencies.storefront_credit_card_finder.constantize
+            end
+
             def resource_serializer
               Spree::Api::Dependencies.storefront_credit_card_serializer.constantize
             end
@@ -39,10 +35,6 @@ module Spree
                 fields: sparse_fields
               ).serializable_hash
             end
-
-            def scope
-              spree_current_user.credit_cards.accessible_by(current_ability, :show)
-            end
           end
         end
       end

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

@@ -3,26 +3,11 @@ module Spree
     module V2
       module Storefront
         module Account
-          class OrdersController < ::Spree::Api::V2::BaseController
-            include Spree::Api::V2::CollectionOptionsHelpers
+          class OrdersController < ::Spree::Api::V2::ResourceController
             before_action :require_spree_current_user
 
-            def index
-              render_serialized_payload { serialize_collection(paginated_collection) }
-            end
-
-            def show
-              spree_authorize! :show, resource
-
-              render_serialized_payload { serialize_resource(resource) }
-            end
-
             private
 
-            def sorted_collection
-              collection_sorter.new(collection, params).call
-            end
-
             def collection
               collection_finder.new(user: spree_current_user).execute
             end
@@ -34,6 +19,10 @@ module Spree
               resource
             end
 
+            def allowed_sort_attributes
+              super << :completed_at
+            end
+
             def collection_serializer
               Spree::Api::Dependencies.storefront_order_serializer.constantize
             end
@@ -49,14 +38,6 @@ module Spree
             def resource_finder
               Spree::Api::Dependencies.storefront_completed_order_finder.constantize
             end
-
-            def collection_sorter
-              Spree::Api::Dependencies.storefront_order_sorter.constantize
-            end
-
-            def collection_paginator
-              Spree::Api::Dependencies.storefront_collection_paginator.constantize
-            end
           end
         end
       end

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

@@ -2,13 +2,9 @@ module Spree
   module Api
     module V2
       module Storefront
-        class AccountController < ::Spree::Api::V2::BaseController
+        class AccountController < ::Spree::Api::V2::ResourceController
           before_action :require_spree_current_user
 
-          def show
-            render_serialized_payload { serialize_resource(resource) }
-          end
-
           private
 
           def resource