spree_api 3.7.6 → 3.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9d53c2c93cd6e8f8ead5e168cf247b090d2af9acae7a567c3bfb04cef55aafc
-  data.tar.gz: cf223d9e31436052eedd774636c7654cc5ab81c7411678e77698695dae68c00e
+  metadata.gz: 96fc20e54aac0b2643858fef36f6d0922f95826c5457fb164f49fcb61343a7a1
+  data.tar.gz: 9f2a7b0f5eeefda89ecba23e00d0aed608b98b993c579db75c7440a301144865
 SHA512:
-  metadata.gz: 6f91a75fb76b3802494f9220b3008b7ce3957a2683c3cd40791d8b3960254a2f6df63dfecdcc2bde5c1de73dbc7ccc2d51fda282ed7f1ae6d8bfd671e40ea769
-  data.tar.gz: ab691051e21cc65cd3cfa4be64ac8ff8c03b0975d99067dcba24f808febe6559086194efdf1b1d252518da93d5bf72004f75f8758429879735ddf8f1e9b0bf6e
+  metadata.gz: 513ce938dfd546144e0bcdf774730bf7be5075a4818fdcea8b2ec75723af09963ca68f8ffc850ea79f76f283f10ff76a0aed486d40602709b03ce1d674c18613
+  data.tar.gz: b62499c581685e13be2be4c782b958694924b31de9f06423dece56c43b22eec09fe2739c65cddd68d39273b9b9e12f83e1f61510ae25998901b6a0608638379e

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

@@ -36,7 +36,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/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
@@ -33,6 +35,10 @@ module Spree
           def resource_serializer
             Spree::Api::Dependencies.storefront_cart_serializer.constantize
           end
+
+          def ensure_order_token
+            raise ActiveRecord::RecordNotFound unless order_token
+          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.6
+  version: 3.7.11
 platform: ruby
 authors:
 - Ryan Bigg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2020-10-15 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.6
+        version: 3.7.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.7.6
+        version: 3.7.11
 - !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: []