spree_api 3.7.9 → 3.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f284475e9b95a045ca244239eed7abba9248ffd3fe8f717e1630ea720056b5f3
-  data.tar.gz: 20041f45aedfad6120afdc4fab02e1d7e97460c2051e02dc8a22b0cfd4750988
+  metadata.gz: 6031bec6c997b390ca7096fb411a07198011536677687a7c5b61b60fe5538d19
+  data.tar.gz: c37818ea854581de7302f65192cfac609a8ff0ddbb019c663502cf40a1366e1d
 SHA512:
-  metadata.gz: dab9077a7e7b3071905f40f3fcd497d844a3dcfe335c317bd4a31a649024e2083892efc8811a48c963ddb9b70425564322e56d8344cc90402ad5f564ba003cf8
-  data.tar.gz: 37081d4e0d9d35350395cb5cc8d7cd6b08bbb37e377581e3dc2e55a42758bea6af7d6f3056c0d6abfbbf69fd62bf69d54fa6ce5df051f24df274d2feeeb83eaf
+  metadata.gz: 7b78338d29d9f2632491b0a06d8ea1d11c5a42b23faa256ec84c4f13634bb2190ef6eb6757ce706055a8071893c2002710b87a9a17ec6829a7700cd908660286
+  data.tar.gz: dad3b9c8d033a1c42b57b01e84f7c91ff196be47aff4aa50608c7d0ad1fa5c0a5854bc8ef55803dc367bb0ec9e861a57f9e84bb9fc91b76b6536daaa2634032f

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

@@ -13,6 +13,25 @@ module Spree
 
         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
@@ -36,7 +55,12 @@ module Spree
         end
 
         def spree_current_user
-          @spree_current_user ||= Spree.user_class.find_by(id: doorkeeper_token.resource_owner_id) if doorkeeper_token
+          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)
         end
 
         def spree_authorize!(action, subject, *args)

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

@@ -40,14 +40,6 @@ module Spree
               ).serializable_hash
             end
 
-            def serialize_resource(resource)
-              resource_serializer.new(
-                resource,
-                include: resource_includes,
-                fields: sparse_fields
-              ).serializable_hash
-            end
-
             def scope
               spree_current_user.credit_cards.accessible_by(current_ability, :read)
             end

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

@@ -19,10 +19,6 @@ module Spree
 
             private
 
-            def paginated_collection
-              collection_paginator.new(sorted_collection, params).call
-            end
-
             def sorted_collection
               collection_sorter.new(collection, params).call
             end
@@ -38,21 +34,6 @@ module Spree
               resource
             end
 
-            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,
-                sparse_fields: sparse_fields
-              ).serializable_hash
-            end
-
             def collection_serializer
               Spree::Api::Dependencies.storefront_cart_serializer.constantize
             end
@@ -76,15 +57,6 @@ module Spree
             def collection_paginator
               Spree::Api::Dependencies.storefront_collection_paginator.constantize
             end
-
-            def collection_options(collection)
-              {
-                links: collection_links(collection),
-                meta: collection_meta(collection),
-                include: resource_includes,
-                sparse_fields: sparse_fields
-              }
-            end
           end
         end
       end

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

@@ -15,14 +15,6 @@ module Spree
             spree_current_user
           end
 
-          def serialize_resource(resource)
-            resource_serializer.new(
-              resource,
-              include: resource_includes,
-              fields: sparse_fields
-            ).serializable_hash
-          end
-
           def resource_serializer
             Spree::Api::Dependencies.storefront_user_serializer.constantize
           end

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

@@ -5,6 +5,8 @@ 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
@@ -18,14 +20,6 @@ module Spree
             resource
           end
 
-          def serialize_resource(resource)
-            resource_serializer.new(
-              resource,
-              include: resource_includes,
-              sparse_fields: sparse_fields
-            ).serializable_hash
-          end
-
           def resource_finder
             Spree::Api::Dependencies.storefront_completed_order_finder.constantize
           end
@@ -33,6 +27,10 @@ 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

@@ -15,25 +15,6 @@ module Spree
 
           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 sorted_collection
             collection_sorter.new(collection, params, current_currency).call
           end
@@ -62,15 +43,6 @@ module Spree
             Spree::Api::Dependencies.storefront_product_serializer.constantize
           end
 
-          def collection_options(collection)
-            {
-              links: collection_links(collection),
-              meta: collection_meta(collection),
-              include: resource_includes,
-              fields: sparse_fields
-            }
-          end
-
           def scope
             Spree::Product.accessible_by(current_ability, :read).includes(scope_includes)
           end

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

@@ -15,21 +15,6 @@ module Spree
 
           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 collection_serializer
             Spree::Api::Dependencies.storefront_taxon_serializer.constantize
           end
@@ -42,15 +27,6 @@ module Spree
             Spree::Api::Dependencies.storefront_taxon_finder.constantize
           end
 
-          def collection_options(collection)
-            {
-              links: collection_links(collection),
-              meta: collection_meta(collection),
-              include: resource_includes,
-              fields: sparse_fields
-            }
-          end
-
           def paginated_collection
             collection_paginator.new(collection, params).call
           end

data/app/helpers/spree/api/v2/collection_options_helpers.rb

@@ -31,6 +31,15 @@ module Spree
         def pagination_url(page)
           url_for(collection_permitted_params.merge(page: page))
         end
+
+        def collection_options(collection)
+          {
+            links: collection_links(collection),
+            meta: collection_meta(collection),
+            include: resource_includes,
+            fields: sparse_fields
+          }
+        end
       end
     end
   end

data/docs/v2/storefront/index.yaml

@@ -154,6 +154,8 @@ paths:
         - $ref: '#/components/parameters/OrderParam'
         - $ref: '#/components/parameters/CartIncludeParam'
         - $ref: '#/components/parameters/SparseFieldsParam'
+      security:
+        - orderToken: []
   '/cart':
     post:
       description: >-

data/lib/spree/api/testing_support/v2/base.rb

@@ -4,7 +4,7 @@ shared_context 'API v2 tokens' do
   let(:headers_order_token) { { 'X-Spree-Order-Token' => order.token } }
 end
 
-[200, 201, 400, 404, 403, 422].each do |status_code|
+[200, 201, 400, 401, 404, 403, 422].each do |status_code|
   shared_examples "returns #{status_code} HTTP status" do
     it "returns #{status_code}" do
       expect(response.status).to eq(status_code)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 3.7.9
+  version: 3.7.14
 platform: ruby
 authors:
 - Ryan Bigg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-02 00:00:00.000000000 Z
+date: 2021-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-rspec
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.9
+        version: 3.7.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.9
+        version: 3.7.14
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -314,7 +314,7 @@ homepage: http://spreecommerce.org
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -329,8 +329,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Spree's API
 test_files: []