solidus_api 4.5.1 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b3fd9044a23f9e90d975679f852a3d2d78de8ce247c0e2c0aa79aca920d2465
-  data.tar.gz: dcc797abebfe49d10d802dad0c7b7b7cae1d21b3aaf1a05455fa4a6a9dd48c17
+  metadata.gz: 5549be04b7ef5d8383c6d7496a7b7e4064a5358a821c30144ab815a69904cbae
+  data.tar.gz: 73a9a781462acef1a5acab160abf72e7efdfec3d98fa6a933d8d7c5c03cb9d00
 SHA512:
-  metadata.gz: cb9130b933a3b5854cafb66610969e46e751fe612eb25d5fd10a9eaf3b98d1a2a0269ae018a625c69f48b48d1f90b36bd32f4264d323b1daccab3fa4003cddf2
-  data.tar.gz: 74185c1bd1d9cc5d032b0c18d4918b4da9dd0de47df0d69dd0b8a5d1f05c8d2b2159621acd184b85b7752ab9aefb27571636531add366d6ea9430737511d4ff4
+  metadata.gz: d4210a7c4b2a60d3c352019287ba0dacce4084079d98d65b57c9967964917fdbb4839d78f1c4fa9ca0cddd917d1dfed57b033565ca69be84a8a6b69fbdffd723
+  data.tar.gz: 73e352d81bdada984ff2ba8fcbd1656bcf335c868a08c7f304e657dccefaf5a176454e461134e8dde443a828d270ee9a76ee643cbb094072236218d284ba4391

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

@@ -21,12 +21,11 @@ module Spree
       class_attribute :admin_metadata_attributes
       self.admin_metadata_attributes = [{ admin_metadata: {} }]
 
-      attr_accessor :current_api_user
-
-      before_action :load_user
+      before_action :deprecated_load_user
       before_action :authorize_for_order, if: proc { order_token.present? }
       before_action :authenticate_user
-      before_action :load_user_roles
+      # This is deprecated and will be removed in Spree 5.0
+      before_action :load_deprecated_user_roles
 
       rescue_from ActionController::ParameterMissing, with: :parameter_missing_error
       rescue_from ActiveRecord::RecordNotFound, with: :not_found
@@ -35,6 +34,7 @@ module Spree
       rescue_from StateMachines::InvalidTransition, with: :invalid_transition
 
       helper Spree::Api::ApiHelpers
+      helper_method :current_user_roles, :current_api_user
 
       private
 
@@ -61,12 +61,12 @@ module Spree
         can?(:admin, Spree.user_class) ? super + admin_metadata_attributes : super
       end
 
-      def load_user
-        @current_api_user ||= Spree.user_class.find_by(spree_api_key: api_key.to_s)
+      def current_api_user
+        @_current_api_user ||= Spree.user_class.find_by(spree_api_key: api_key.to_s)
       end
 
       def authenticate_user
-        unless @current_api_user
+        unless current_api_user
           if requires_authentication? && api_key.blank? && order_token.blank?
             render "spree/api/errors/must_specify_api_key", status: :unauthorized
           elsif order_token.blank? && (requires_authentication? || api_key.present?)
@@ -75,9 +75,25 @@ module Spree
         end
       end
 
-      def load_user_roles
-        @current_user_roles = if @current_api_user
-          @current_api_user.spree_roles.pluck(:name)
+      def load_deprecated_user_roles
+        @current_user_roles = if Rails.version < Gem::Version.new("7.2.0")
+          ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new(self, :current_user_roles, :@current_user_roles, Spree.deprecator)
+        else
+          ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new(self, :current_user_roles, :@current_user_roles, deprecator: Spree.deprecator)
+        end
+      end
+
+      def deprecated_load_user
+        @current_api_user = if Rails.version < Gem::Version.new("7.2.0")
+          ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new(self, :current_api_user, :@current_api_user, Spree.deprecator)
+        else
+          ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new(self, :current_api_user, :@current_api_user, deprecator: Spree.deprecator)
+        end
+      end
+
+      def current_user_roles
+        @_current_user_roles ||= if current_api_user
+          current_api_user.spree_roles.pluck(:name)
         else
           []
         end

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

@@ -66,7 +66,7 @@ module Spree
       def extract_metadata
         metadata = { customer_metadata: line_item_params[:customer_metadata] }
 
-        if @current_user_roles&.include?("admin")
+        if current_user_roles&.include?("admin")
           metadata[:admin_metadata] = line_item_params[:admin_metadata]
         end
 

data/app/helpers/spree/api/api_helpers.rb

@@ -67,7 +67,7 @@ module Spree
 
       def variant_attributes
         preference_attributes = Spree::Api::Config.variant_attributes
-        if @current_user_roles&.include?("admin")
+        if current_user_roles&.include?("admin")
           preference_attributes + [:cost_price]
         else
           preference_attributes

data/app/views/spree/api/line_items/new.json.jbuilder

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
-json.attributes(([*line_item_attributes] - [:id]))
+json.attributes([*line_item_attributes] - [:id])
 json.required_attributes([:variant_id, :quantity])

data/app/views/spree/api/payments/source_views/_gateway.json.jbuilder

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 attrs = [:id, :month, :year, :cc_type, :last_digits, :name]
-if @current_user_roles.include?("admin")
+if current_user_roles.include?("admin")
   attrs += [:gateway_customer_profile_id, :gateway_payment_profile_id]
 end
 

data/app/views/spree/api/products/_product.json.jbuilder

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 @product_attributes ||= product_attributes
-json.cache! [I18n.locale, @current_user_roles.include?('admin'), current_pricing_options, @product_attributes, @exclude_data, product] do
+json.cache! [I18n.locale, current_user_roles.include?('admin'), current_pricing_options, @product_attributes, @exclude_data, product] do
   json.(product, *(@product_attributes - [:total_on_hand]))
   json.total_on_hand(total_on_hand_for(product))
   json.price(product.price_for_options(current_pricing_options)&.amount)

data/lib/spree/api/testing_support/helpers.rb

@@ -30,7 +30,7 @@ module Spree
         # This method can be overridden (with a let block) inside a context
         # For instance, if you wanted to have an admin user instead.
         def current_api_user
-          @current_api_user ||= stub_model(Spree::LegacyUser, email: "solidus@example.com", spree_roles: [])
+          @_current_api_user ||= stub_model(Spree::LegacyUser, email: "solidus@example.com", spree_roles: [])
         end
 
         def image(filename)

data/lib/spree/api_configuration.rb

@@ -85,7 +85,7 @@ module Spree
     preference :address_attributes, :array, default: [
       :id, :name, :address1, :address2, :city, :zipcode, :phone, :company,
       :alternative_phone, :country_id, :country_iso, :state_id, :state_name,
-      :state_text
+      :state_text, :email, :vat_id, :reverse_charge_status
     ]
 
     preference :country_attributes, :array, default: [:id, :iso_name, :iso, :iso3, :name, :numcode]
@@ -149,7 +149,7 @@ module Spree
     preference :store_attributes, :array, default: [
       :id, :name, :url, :meta_description, :meta_keywords, :seo_title,
       :mail_from_address, :default_currency, :code, :default, :available_locales,
-      :bcc_email
+      :bcc_email, :reverse_charge_status
     ]
 
     preference :store_credit_history_attributes, :array, default: [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solidus_api
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.6.0
 platform: ruby
 authors:
 - Solidus Team
 bindir: bin
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.5.1
+        version: 4.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.5.1
+        version: 4.6.0
 description: REST API for the Solidus e-commerce framework.
 email: contact@solidus.io
 executables: []
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.9
 specification_version: 4
 summary: REST API for the Solidus e-commerce framework.
 test_files: []