spree_api 4.2.0 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa0ba5ffcc873cf68159260e0b7f52879f39f54f7140887a438c73f1257293d2
-  data.tar.gz: 1f05304db222d36a1f31d563ea5a071a01cfe7eb80fa4c13a002b6a4dd6775f8
+  metadata.gz: 398e606a4fa385f695dcae2d670fd962b8f89bf70ea3dee71d8f3c51ba570509
+  data.tar.gz: 63e8b6115082c93cf97a01517d4ccb87de04cb08a15139c64e10dab186505449
 SHA512:
-  metadata.gz: 0d83abd3762d05c58b37e8290d0fddc8ead28edc15ad3dd1267915ed2abb234399a36071a8250d4d7a3e08a0871e5e438acff6a28a67d2512460ec718c1785dd
-  data.tar.gz: 41eee02e45c3491b25333eecda173b23a520e0595ba39ef4c38ad1eb7d356d4c206ee7f16d19fd927f5e291475e3a40f6a785a634f0c1055f29cf60ad1e82ea8
+  metadata.gz: 6cb3deff3d9592281640ed605a85bf33e47ecf992db9d78d54a242d4ab8fc081d7fcc7b98f2705317f8b22b9b36182609e8f046db46e7787b01c3bf8eeb3e07b
+  data.tar.gz: f6a6b2e292107eb33c8d0eabcd6cea61eb3f1b9f92785e5540f31e92d06bcc17d66520213f17465303cc6071d73facd7af28e29a1a7c13e0c705e945ba27c633

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

@@ -11,6 +11,9 @@ module Spree
         rescue_from CanCan::AccessDenied, with: :access_denied
         rescue_from Spree::Core::GatewayError, with: :gateway_error
         rescue_from ActionController::ParameterMissing, with: :error_during_processing
+        if defined?(JSONAPI::Serializer::UnsupportedIncludeError)
+          rescue_from JSONAPI::Serializer::UnsupportedIncludeError, with: :error_during_processing
+        end
         rescue_from ArgumentError, with: :error_during_processing
 
         def content_type

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

@@ -7,21 +7,39 @@ module Spree
             before_action :require_spree_current_user
 
             def create
+              spree_authorize! :create, model_class
+
               result = create_service.call(user: spree_current_user, address_params: address_params)
               render_result(result)
             end
 
             def update
+              spree_authorize! :update, resource
+
               result = update_service.call(address: resource, address_params: address_params)
               render_result(result)
             end
 
+            def destroy
+              spree_authorize! :destroy, resource
+
+              if resource.destroy
+                head 204
+              else
+                render_error_payload(resource.errors)
+              end
+            end
+
             private
 
             def collection
               collection_finder.new(scope: scope, params: params).execute
             end
 
+            def scope
+              super.not_deleted
+            end
+
             def model_class
               Spree::Address
             end

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

@@ -12,6 +12,10 @@ module Spree
               Spree::CreditCard
             end
 
+            def scope
+              super.where(user: spree_current_user)
+            end
+
             def collection_serializer
               Spree::Api::Dependencies.storefront_credit_card_serializer.constantize
             end

data/config/initializers/doorkeeper.rb

@@ -10,7 +10,7 @@ Doorkeeper.configure do
   resource_owner_from_credentials do
     user = Spree.user_class.find_for_database_authentication(email: params[:username])
 
-    return nil if user.nil?
+    next if user.nil?
 
     if defined?(Spree::Auth::Config) && Spree::Auth::Config[:confirmable] == true
       user if user.active_for_authentication? && user.valid_for_authentication? { user.valid_password?(params[:password]) }

data/config/routes.rb

@@ -152,7 +152,7 @@ Spree::Core::Engine.add_routes do
         resource :account, controller: :account, only: %i[show]
 
         namespace :account do
-          resources :addresses, controller: :addresses, only: %i[index create update]
+          resources :addresses, controller: :addresses
           resources :credit_cards, controller: :credit_cards, only: %i[index show]
           resources :orders, controller: :orders, only: %i[index show]
         end

data/docs/v2/storefront/index.yaml

@@ -239,6 +239,21 @@ paths:
       security:
         - bearerAuth: []
   '/api/v2/storefront/account/addresses/{id}':
+    delete:
+      description: 'Removes selected Address for the signed in User. It uses soft-delete for addresses with shipments and orders.'
+      tags:
+        - Account
+      operationId: Remove Address
+      parameters:
+        - $ref: '#/components/parameters/AddressId'
+      responses:
+        '204':
+          description: Requested Address has been removed from the User Account
+        '404':
+          $ref: '#/components/responses/404NotFound'
+      security:
+        - bearerAuth: []
+      summary: Remove Address
     patch:
       description: >-
         Update selected Address for the signed in User
@@ -247,13 +262,7 @@ paths:
         - Account
       operationId: 'Update Address'
       parameters:
-        - name: id
-          in: path
-          required: true
-          description: Selected Address for update
-          schema:
-            type: string
-          example: '1'
+        - $ref: '#/components/parameters/AddressId'
       requestBody:
         required: true
         content:
@@ -5246,6 +5255,14 @@ components:
         - state_name
         - country_iso
   parameters:
+    AddressId:
+      name: address_id
+      in: path
+      required: true
+      description: Address ID
+      schema:
+        type: string
+      example: '1'
     CreditCardIncludeParam:
       name: include
       in: query

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.4
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-rspec
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.4
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -310,9 +310,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.4
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.4
 post_install_message:
 rdoc_options: []
 require_paths: