solidus_api 2.11.5 → 3.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b700b541040c01e87ec18bc5d65f51be73904fc72eed6cb11702f3d59e29857f
-  data.tar.gz: 1e218892060c961813eff6df57d8183f51704fdfd98670c6adef7805e546a42d
+  metadata.gz: 03f38abf5a8115d6e8ecc4dd6fee2e3e3b1787aaadd8544ebe5ffc46212b6a73
+  data.tar.gz: 692143e952bec18b74fe8531085ce71fb75174c3fa1b943b109002d59464fed0
 SHA512:
-  metadata.gz: 34dfc56c007035a10026061a90ddc88eb561829291bc4f1c195a40a65e494d70723b3c98d674ccdbca71faceaf9d88f376a45413814f7d8351b929834e4da883
-  data.tar.gz: 316013b0da91d2393f9528bbcb77125eda9de788238f7efc6f94f072adcf7aa721711d983fb86f7b2d35931cb510d895e790a523e67fe7ea659a03cb20f78c04
+  metadata.gz: 10b782a658fb0f721a6115b086a802bea34061c7d8abd7547bb52224f3dee90d37dbfda07e29a7c194a59ec2f4e2b33e6aef1a3c7ff7465339e0c39a8261a96a
+  data.tar.gz: a236c9b2003e2e79d79390634ba69c579a8757b20cdf9ca0f06ecb19e93be43f71f8a61888e71d6cf72f5c855197b1edb1a9332a891f3c3fb8dc6ee696fce738

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

@@ -104,7 +104,7 @@ module Spree
       end
 
       def api_key
-        bearer_token || spree_token || params[:token]
+        bearer_token || params[:token]
       end
       helper_method :api_key
 
@@ -114,17 +114,6 @@ module Spree
         header.gsub(pattern, '') if header.present? && header.match(pattern)
       end
 
-      def spree_token
-        token = request.headers["X-Spree-Token"]
-        return if token.blank?
-
-        Spree::Deprecation.warn(
-          'The custom X-Spree-Token request header is deprecated and will be removed in the next release.' \
-          ' Please use bearer token authorization header instead.'
-        )
-        token
-      end
-
       def order_token
         request.headers["X-Spree-Order-Token"] || params[:order_token]
       end

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

@@ -9,11 +9,10 @@ module Spree
 
       rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
 
-      include Spree::Core::ControllerHelpers::Order
-
-      # TODO: Remove this after deprecated usage in #update is removed
       include Spree::Core::ControllerHelpers::PaymentParameters
 
+      include Spree::Core::ControllerHelpers::Order
+
       def next
         authorize! :update, @order, order_token
         if !expected_total_ok?(params[:expected_total])
@@ -95,7 +94,7 @@ module Spree
         massaged_params
       end
 
-      # Should be overriden if you have areas of your checkout that don't match
+      # Should be overridden if you have areas of your checkout that don't match
       # up to a step within checkout_steps, such as a registration step
       def skip_state_validation?
         false
@@ -116,17 +115,6 @@ module Spree
       end
 
       def after_update_attributes
-        if params[:order] && params[:order][:coupon_code].present?
-          Spree::Deprecation.warn('This method is deprecated. Please use `Spree::Api::CouponCodesController#create` endpoint instead.')
-          handler = PromotionHandler::Coupon.new(@order)
-          handler.apply
-
-          if handler.error.present?
-            @coupon_message = handler.error
-            respond_with(@order, default_template: 'spree/api/orders/could_not_apply_coupon', status: 422)
-            return true
-          end
-        end
         false
       end
 

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

@@ -12,8 +12,6 @@ module Spree
       class_attribute :admin_payment_attributes
       self.admin_payment_attributes = [:payment_method, :amount, :state, source: {}]
 
-      skip_before_action :authenticate_user, only: :apply_coupon_code
-
       before_action :find_order, except: [:create, :mine, :current, :index]
       around_action :lock_order, except: [:create, :mine, :current, :index, :show]
 
@@ -104,20 +102,6 @@ module Spree
         end
       end
 
-      def apply_coupon_code
-        Spree::Deprecation.warn('This method is deprecated. Please use `Spree::Api::CouponCodesController#create` endpoint instead.')
-
-        authorize! :update, @order, order_token
-        @order.coupon_code = params[:coupon_code]
-        @handler = PromotionHandler::Coupon.new(@order).apply
-        if @handler.successful?
-          render "spree/api/promotions/handler", status: 200
-        else
-          logger.error("apply_coupon_code_error=#{@handler.error.inspect}")
-          render "spree/api/promotions/handler", status: 422
-        end
-      end
-
       private
 
       def order_params

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

@@ -15,12 +15,6 @@ module Spree
         respond_with(taxonomy)
       end
 
-      # Because JSTree wants parameters in a *slightly* different format
-      def jstree
-        Spree::Deprecation.warn("Please don't use `/api/taxonomies/:taxonomy_id/jstree` endpoint. It is deprecated and will be removed in the next future.", caller)
-        show
-      end
-
       def create
         authorize! :create, Taxonomy
         @taxonomy = Spree::Taxonomy.new(taxonomy_params)

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

@@ -29,11 +29,6 @@ module Spree
         respond_with(@taxon)
       end
 
-      def jstree
-        Spree::Deprecation.warn("Please don't use `/api/taxonomies/:taxonomy_id/taxons/:taxon_id/jstree` endpoint. It is deprecated and will be removed in the next future.", caller)
-        show
-      end
-
       def create
         authorize! :create, Taxon
         @taxon = Spree::Taxon.new(taxon_params)

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

@@ -126,19 +126,12 @@ module Spree
         :id, :number, :state, :order_id, :memo, :created_at, :updated_at
       ]
 
-      @@address_base_attributes = [
+      @@address_attributes = [
         :id, :name, :address1, :address2, :city, :zipcode, :phone, :company,
         :alternative_phone, :country_id, :country_iso, :state_id, :state_name,
         :state_text
       ]
 
-      @@address_attributes = if Spree::Config.use_combined_first_and_last_name_in_address
-                               @@address_base_attributes
-                             else
-                               @@address_base_attributes +
-                                 Spree::Address::LEGACY_NAME_ATTRS.map(&:to_sym)
-                             end
-
       @@country_attributes = [:id, :iso_name, :iso, :iso3, :name, :numcode]
 
       @@state_attributes = [:id, :name, :abbr, :country_id]

data/app/views/spree/api/config/show.json.jbuilder

@@ -1,4 +1,3 @@
 # frozen_string_literal: true
 
-json.default_country_id(Spree::Country.default.id)
 json.default_country_iso(Spree::Config[:default_country_iso])

data/config/routes.rb

@@ -4,11 +4,6 @@ Spree::Core::Engine.routes.draw do
   namespace :admin do
     resources :users do
       resource :api_key, controller: 'users/api_key', only: [:create, :destroy]
-
-      member do
-        put :generate_api_key # Deprecated
-        put :clear_api_key # Deprecated
-      end
     end
   end
 
@@ -68,7 +63,6 @@ Spree::Core::Engine.routes.draw do
       member do
         put :cancel
         put :empty
-        put :apply_coupon_code
       end
 
       resources :coupon_codes, only: [:create, :destroy]
@@ -99,14 +93,7 @@ Spree::Core::Engine.routes.draw do
     resources :states, only: [:index, :show]
 
     resources :taxonomies do
-      member do
-        get :jstree
-      end
-      resources :taxons do
-        member do
-          get :jstree
-        end
-      end
+      resources :taxons
     end
 
     resources :taxons, only: [:index]

data/lib/spree/api/engine.rb

@@ -8,7 +8,7 @@ module Spree
       isolate_namespace Spree
       engine_name 'spree_api'
 
-      # Leave initializer empty for backwards-compatability. Other apps
+      # Leave initializer empty for backwards-compatibility. Other apps
       # might still rely on this event.
       initializer "spree.api.environment", before: :load_config_initializers do; end
     end

data/lib/spree/api/responders/jbuilder_template.rb

@@ -16,8 +16,6 @@ module Spree
           options[:default_template]
         end
       end
-
-      RablTemplate = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('RablTemplate', 'JbuilderTemplate')
     end
   end
 end

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

@@ -27,7 +27,7 @@ module Spree
           allow(Spree.user_class).to receive(:find_by).with(hash_including(:spree_api_key)) { current_api_user }
         end
 
-        # This method can be overriden (with a let block) inside a context
+        # 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: [])

data/openapi/solidus-api.oas.yml

@@ -1,7 +1,7 @@
 openapi: 3.0.3
 info:
   title: Solidus API
-  version: "1.0"
+  version: '1.0'
   description: The standard Solidus API.
   contact:
     name: Solidus
@@ -1067,12 +1067,10 @@ paths:
         '422':
           $ref: '#/components/responses/delete-restriction'
       summary: Remove address from user address book
-      description: >-
+      description: |-
         Removes an address from a user's address book.
 
-
-        **Note:** Rather than delete a `Spree::UserAddress` record this action
-        set its `archived` attribute to `true`.
+        **Note:** Rather than delete a `Spree::UserAddress` record this action set its `archived` attribute to `true`.
       operationId: remove-address-from-user-address-book
       tags:
         - Address books
@@ -1101,16 +1099,10 @@ paths:
       operationId: update-user-address-book
       tags:
         - Address books
-      description: >-
+      description: |-
         Updates a user's address book.
 
-
-        **Note:** if the passed `id` matches an existing `address` a new
-        `Spree::Address` record will be created and the matched `address`
-        `archived` on `Spree::UserAddress`. For a similar logic, if the passed
-        `id` matches an existing `address` which is in `archived` state, the
-        `Spree::UserAddress#archived` record will be restored to `false`.
-
+        **Note:** if the passed `id` matches an existing `address` a new `Spree::Address` record will be created and the matched `address` `archived` on `Spree::UserAddress`. For a similar logic, if the passed `id` matches an existing `address` which is in `archived` state, the `Spree::UserAddress#archived` record will be restored to `false`.
         See `user_address_book.rb` for further information.
       security:
         - api-key: []
@@ -1521,7 +1513,7 @@ paths:
         '422':
           $ref: '#/components/responses/unprocessable-entity'
       summary: Update order customer return
-      description: "Updates an orders customer return."
+      description: Updates an orders customer return.
       operationId: update-order-customer-return
       tags:
         - Customer returns
@@ -1897,8 +1889,6 @@ paths:
               schema:
                 type: object
                 properties:
-                  default_country_id:
-                    type: integer
                   default_country_iso:
                     type: string
         '401':
@@ -3502,65 +3492,6 @@ paths:
         - api-key: []
       requestBody:
         $ref: '#/components/requestBodies/zone-input'
-  '/taxonomies/{taxonomy_id}/jstree':
-    get:
-      responses:
-        '200':
-          description: ''
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/jstree'
-        '401':
-          $ref: '#/components/responses/invalid-api-key'
-        '404':
-          $ref: '#/components/responses/not-found'
-      summary: Get taxonomy jsTree
-      description: Builds a taxonomy's jsTree.
-      operationId: get-taxonomy-jstree
-      tags:
-        - Taxonomies
-      security:
-        - api-key: []
-    parameters:
-      - name: taxonomy_id
-        in: path
-        required: true
-        schema:
-          type: string
-  '/taxonomies/{taxonomy_id}/taxons/{taxon_id}/jstree':
-    get:
-      responses:
-        '200':
-          description: ''
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/jstree'
-        '401':
-          $ref: '#/components/responses/invalid-api-key'
-        '404':
-          $ref: '#/components/responses/not-found'
-      summary: Get taxon jsTree
-      description: Builds a taxon's jsTree.
-      operationId: get-taxon-jstree
-      tags:
-        - Taxons
-      security:
-        - api-key: []
-    parameters:
-      - name: taxonomy_id
-        in: path
-        required: true
-        schema:
-          type: string
-      - name: taxon_id
-        in: path
-        required: true
-        schema:
-          type: string
   '/promotions/{id}':
     get:
       responses:
@@ -3844,13 +3775,10 @@ paths:
         '422':
           $ref: '#/components/responses/unprocessable-entity'
       summary: Update checkout
-      description: >-
+      description: |-
         Updates a checkout.
 
-
-        **Note:** In addition to the order update, this action always attempts
-        to perform an order state machine transition which results in a `422`
-        response if it cannot be transitioned.
+        **Note:** In addition to the order update, this action always attempts to perform an order state machine transition which results in a `422` response if it cannot be transitioned.
       operationId: update-checkout
       tags:
         - Checkouts
@@ -4268,42 +4196,6 @@ paths:
                   type: integer
                 position:
                   type: integer
-  '/orders/{order_number}/apply_coupon_code':
-    put:
-      responses:
-        '200':
-          description: ''
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/coupon-code-handler'
-        '401':
-          $ref: '#/components/responses/invalid-api-key'
-        '404':
-          $ref: '#/components/responses/not-found'
-        '422':
-          $ref: '#/components/responses/unprocessable-entity'
-      summary: Apply order coupon code
-      deprecated: true
-      description: >-
-        **Deprecated:** This method is deprecated. Please use
-        `Spree::Api::CouponCodesController#create` endpoint instead.
-
-        Applies a coupon code on the order.
-      operationId: apply-order-coupon-code
-      tags:
-        - Coupon codes
-      security:
-        - api-key: []
-        - order-token: []
-      requestBody:
-        $ref: '#/components/requestBodies/coupon-code-input'
-    parameters:
-      - name: order_number
-        in: path
-        required: true
-        schema:
-          type: string
   '/orders/{order_number}/cancel':
     put:
       responses:
@@ -4983,7 +4875,7 @@ paths:
         '404':
           $ref: '#/components/responses/not-found'
       summary: List order customer returns
-      description: "Lists an order's customer returns."
+      description: Lists an order's customer returns.
       operationId: list-order-customer-returns
       tags:
         - Customer returns
@@ -5675,20 +5567,8 @@ components:
           type: integer
         country_iso:
           type: string
-        firstname:
-          type: string
-          deprecated: true
-          description: '*Deprecated: will be removed in Solidus 3.0, please use `name` property*'
-        full_name:
-          type: string
-          deprecated: true
-          description: '*Deprecated: will be removed in Solidus 3.0, please use `name` property*'
         id:
           type: integer
-        lastname:
-          type: string
-          deprecated: true
-          description: '*Deprecated: will be removed in Solidus 3.0, please use `name` property*'
         name:
           type: string
         phone:
@@ -6117,23 +5997,6 @@ components:
         root:
           $ref: '#/components/schemas/taxon'
       title: Taxonomy
-    jstree:
-      type: array
-      items:
-        type: object
-        properties:
-          attr:
-            type: object
-            properties:
-              id:
-                type: integer
-              name:
-                type: string
-          data:
-            type: string
-          state:
-            type: string
-      title: jsTree
     promotion:
       type: object
       properties:
@@ -6225,14 +6088,6 @@ components:
           type: integer
         name:
           type: string
-        firstname:
-          type: string
-          deprecated: true
-          description: '*Deprecated: will be removed in Solidus 3.0, please use `name` property*'
-        lastname:
-          type: string
-          deprecated: true
-          description: '*Deprecated: will be removed in Solidus 3.0, please use `name` property*'
         address1:
           type: string
         address2:
@@ -6282,10 +6137,7 @@ components:
           description: 'Passing `0`, the line item will be removed.'
         options:
           type: object
-          description: >-
-            This field can be used to pass custom line item attributes. When
-            used, it will force a new price calculation, unless `price` is one
-            of the options.
+          description: 'This field can be used to pass custom line item attributes. When used, it will force a new price calculation, unless `price` is one of the options.'
         id:
           type: integer
           description: Required for existing line items only.
@@ -6399,8 +6251,6 @@ components:
               type: string
             encrypted_data:
               type: string
-            existing_card_id:
-              type: integer
             wallet_payment_source_id:
               type: integer
             address_attributes:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_api
 version: !ruby/object:Gem::Version
-  version: 2.11.5
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - Solidus Team
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.5
+        version: 3.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.11.5
+        version: 3.0.0.rc2
 description: REST API for the Solidus e-commerce framework.
 email: contact@solidus.io
 executables: []
@@ -151,7 +151,6 @@ files:
 - app/views/spree/api/orders/_big.json.jbuilder
 - app/views/spree/api/orders/_order.json.jbuilder
 - app/views/spree/api/orders/could_not_apply_coupon.json.jbuilder
-- app/views/spree/api/orders/could_not_transition.json.jbuilder
 - app/views/spree/api/orders/expected_total_mismatch.json.jbuilder
 - app/views/spree/api/orders/index.json.jbuilder
 - app/views/spree/api/orders/invalid_shipping_method.json.jbuilder

data/app/views/spree/api/orders/could_not_transition.json.jbuilder

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-Spree::Deprecation.warn(
-  'spree/api/orders/could_not_transition is deprecated.' \
-  ' Please use spree/api/errors/could_not_transition'
-)
-
-json.error(I18n.t(:could_not_transition, scope: "spree.api.order"))
-json.errors(@order.errors.to_hash)