spree_api 3.7.13 → 4.0.0.beta

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

@@ -29,7 +29,7 @@ module Spree
 
         def update
           authorize! :update, taxonomy
-          if taxonomy.update_attributes(taxonomy_params)
+          if taxonomy.update(taxonomy_params)
             respond_with(taxonomy, status: 200, default_template: :show)
           else
             invalid_resource!(taxonomy)
@@ -45,13 +45,13 @@ module Spree
         private
 
         def taxonomies
-          @taxonomies = Taxonomy.accessible_by(current_ability, :read).order('name').includes(root: :children).
+          @taxonomies = Taxonomy.accessible_by(current_ability).order('name').includes(root: :children).
                         ransack(params[:q]).result.
                         page(params[:page]).per(params[:per_page])
         end
 
         def taxonomy
-          @taxonomy ||= Taxonomy.accessible_by(current_ability, :read).find(params[:id])
+          @taxonomy ||= Taxonomy.accessible_by(current_ability, :show).find(params[:id])
         end
 
         def taxonomy_params

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

@@ -6,9 +6,9 @@ module Spree
           @taxons = if taxonomy
                       taxonomy.root.children
                     elsif params[:ids]
-                      Spree::Taxon.includes(:children).accessible_by(current_ability, :read).where(id: params[:ids].split(','))
+                      Spree::Taxon.includes(:children).accessible_by(current_ability).where(id: params[:ids].split(','))
                     else
-                      Spree::Taxon.includes(:children).accessible_by(current_ability, :read).order(:taxonomy_id, :lft)
+                      Spree::Taxon.includes(:children).accessible_by(current_ability).order(:taxonomy_id, :lft)
                     end
           @taxons = @taxons.ransack(params[:q]).result
           @taxons = @taxons.page(params[:page]).per(params[:per_page])
@@ -48,7 +48,7 @@ module Spree
 
         def update
           authorize! :update, taxon
-          if taxon.update_attributes(taxon_params)
+          if taxon.update(taxon_params)
             respond_with(taxon, status: 200, default_template: :show)
           else
             invalid_resource!(taxon)
@@ -74,12 +74,12 @@ module Spree
 
         def taxonomy
           if params[:taxonomy_id].present?
-            @taxonomy ||= Spree::Taxonomy.accessible_by(current_ability, :read).find(params[:taxonomy_id])
+            @taxonomy ||= Spree::Taxonomy.accessible_by(current_ability, :show).find(params[:taxonomy_id])
           end
         end
 
         def taxon
-          @taxon ||= taxonomy.taxons.accessible_by(current_ability, :read).find(params[:id])
+          @taxon ||= taxonomy.taxons.accessible_by(current_ability, :show).find(params[:id])
         end
 
         def taxon_params

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

@@ -5,7 +5,7 @@ module Spree
         rescue_from Spree::Core::DestroyWithOrdersError, with: :error_during_processing
 
         def index
-          @users = Spree.user_class.accessible_by(current_ability, :read)
+          @users = Spree.user_class.accessible_by(current_ability, :show)
 
           @users = if params[:ids]
                      @users.ransack(id_in: params[:ids].split(','))
@@ -37,7 +37,7 @@ module Spree
 
         def update
           authorize! :update, user
-          if user.update_attributes(user_params)
+          if user.update(user_params)
             respond_with(user, status: 200, default_template: :show)
           else
             invalid_resource!(user)
@@ -53,7 +53,7 @@ module Spree
         private
 
         def user
-          @user ||= Spree.user_class.accessible_by(current_ability, :read).find(params[:id])
+          @user ||= Spree.user_class.accessible_by(current_ability, :show).find(params[:id])
         end
 
         def user_params

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

@@ -38,7 +38,7 @@ module Spree
 
         def update
           @variant = scope.accessible_by(current_ability, :update).find(params[:id])
-          if @variant.update_attributes(variant_params)
+          if @variant.update(variant_params)
             respond_with(@variant, status: 200, default_template: :show)
           else
             invalid_resource!(@product)
@@ -49,7 +49,7 @@ module Spree
 
         def product
           if params[:product_id]
-            @product ||= Spree::Product.accessible_by(current_ability, :read).
+            @product ||= Spree::Product.accessible_by(current_ability, :show).
                          friendly.find(params[:product_id])
           end
         end
@@ -65,7 +65,7 @@ module Spree
             variants = variants.with_deleted
           end
 
-          variants.eligible.accessible_by(current_ability, :read)
+          variants.eligible.accessible_by(current_ability)
         end
 
         def variant_params

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

@@ -19,7 +19,7 @@ module Spree
         end
 
         def index
-          @zones = Zone.accessible_by(current_ability, :read).order('name ASC').ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+          @zones = Zone.accessible_by(current_ability).order('name ASC').ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
           respond_with(@zones)
         end
 
@@ -29,7 +29,7 @@ module Spree
 
         def update
           authorize! :update, zone
-          if zone.update_attributes(zone_params)
+          if zone.update(zone_params)
             respond_with(zone, status: 200, default_template: :show)
           else
             invalid_resource!(zone)
@@ -47,7 +47,7 @@ module Spree
         end
 
         def zone
-          @zone ||= Spree::Zone.accessible_by(current_ability, :read).find(params[:id])
+          @zone ||= Spree::Zone.accessible_by(current_ability, :show).find(params[:id])
         end
       end
     end

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

@@ -55,12 +55,7 @@ module Spree
         end
 
         def spree_current_user
-          return nil unless doorkeeper_token
-          return @spree_current_user if @spree_current_user
-
-          doorkeeper_authorize!
-
-          @spree_current_user ||= Spree.user_class.find_by(id: doorkeeper_token.resource_owner_id)
+          @spree_current_user ||= Spree.user_class.find_by(id: doorkeeper_token.resource_owner_id) if doorkeeper_token
         end
 
         def spree_authorize!(action, subject, *args)

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

@@ -41,7 +41,7 @@ module Spree
             end
 
             def scope
-              spree_current_user.credit_cards.accessible_by(current_ability, :read)
+              spree_current_user.credit_cards.accessible_by(current_ability, :show)
             end
           end
         end

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

@@ -36,6 +36,7 @@ module Spree
             return scope.default if params[:iso] == 'default'
 
             scope.find_by(iso: params[:iso]&.upcase) ||
+              scope.find_by(id: params[:iso]&.upcase) ||
               scope.find_by(iso3: params[:iso]&.upcase)
           end
 
@@ -52,7 +53,7 @@ module Spree
           end
 
           def scope
-            Spree::Country.accessible_by(current_ability, :read)
+            Spree::Country.accessible_by(current_ability, :show)
           end
         end
       end

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

@@ -5,8 +5,6 @@ module Spree
         class OrderStatusController < ::Spree::Api::V2::BaseController
           include Spree::Api::V2::Storefront::OrderConcern
 
-          before_action :ensure_order_token
-
           def show
             render_serialized_payload { serialize_resource(resource) }
           end
@@ -27,10 +25,6 @@ module Spree
           def resource_serializer
             Spree::Api::Dependencies.storefront_cart_serializer.constantize
           end
-
-          def ensure_order_token
-            raise ActiveRecord::RecordNotFound unless order_token.present?
-          end
         end
       end
     end

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

@@ -44,7 +44,7 @@ module Spree
           end
 
           def scope
-            Spree::Product.accessible_by(current_ability, :read).includes(scope_includes)
+            Spree::Product.accessible_by(current_ability, :show).includes(scope_includes)
           end
 
           def scope_includes

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

@@ -40,7 +40,7 @@ module Spree
           end
 
           def scope
-            Spree::Taxon.accessible_by(current_ability, :read).includes(scope_includes)
+            Spree::Taxon.accessible_by(current_ability, :show).includes(scope_includes)
           end
 
           def scope_includes