spree_api 4.0.0.rc3 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6064574ff2f1083d6d90789c4d2c9560fd52aac40545b5117bfadb7f5bb2f14b
-  data.tar.gz: b0f41b268234fe9fc1951f26751ec79536275bb6afc8aa562d7ef8851c1d7aa8
+  metadata.gz: fc158319298bbbcc29f0137370d6785232e6e9a03f1335a6759a1604daffd9d0
+  data.tar.gz: e4295163450d6523e8480f960fc239b72051b0ec8f5ad958ec95f6ea898334a4
 SHA512:
-  metadata.gz: 3f213b7b87c542d60c7c65726bd40564e2d93ae2235f65838e2f4bbd08f5e171f8efc4d56a96f22f3a3563f73dbf305bc2ef35a5f93bb97f362971837fa1ac51
-  data.tar.gz: 1dd02adbf07965baddab2baccb5aabe4a100025d13cf3b8b6225b0bd5f96b371eee75ba01eb28ec885b6276ce6ae1900bd630b16c1c464e0e7f539d8ed8fe1a2
+  metadata.gz: 32baa584cd58b7e51784162c1b6f630013cb4af832465fb4cfb313e9c914684d0898cbacab9e7237b57b78fea2ed5244e7b2c6c8499287260f542361bab3d9b8
+  data.tar.gz: 6194748bc05257b57003d98f751c5729815171fce592027b3858f40e600ac252284d34fd26b2676075bfe64d6019a55cda9265806aa94cb18741d2cce5d684f0

data/app/controllers/spree/api/v1/users_controller.rb

@@ -7,13 +7,17 @@ module Spree
         def index
           @users = Spree.user_class.accessible_by(current_ability, :show)
 
-          @users = if params[:ids]
-                     @users.ransack(id_in: params[:ids].split(','))
-                   else
-                     @users.ransack(params[:q])
-                   end
+          if params[:ids]
+            @users = @users.where(id: params[:ids])
+          elsif params[:q]
+            users_with_ship_address = @users.with_address(params[:q][:ship_address_firstname_start])
+            users_with_bill_address = @users.with_address(params[:q][:ship_address_firstname_start], :bill_address)
 
-          @users = @users.result.page(params[:page]).per(params[:per_page])
+            users_with_addresses_ids = (users_with_ship_address.ids + users_with_bill_address.ids).compact.uniq
+            @users = @users.with_email_or_addresses_ids(params[:q][:email_start], users_with_addresses_ids)
+          end
+
+          @users = @users.page(params[:page]).per(params[:per_page])
           expires_in 15.minutes, public: true
           headers['Surrogate-Control'] = "max-age=#{15.minutes}"
           respond_with(@users)

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

@@ -55,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/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
@@ -25,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
+          end
         end
       end
     end

data/app/serializers/spree/v2/storefront/cart_serializer.rb

@@ -12,15 +12,7 @@ module Spree
 
         has_many   :line_items
         has_many   :variants
-        has_many   :promotions, id_method_name: :promotion_id do |cart|
-          # we only want to display applied and valid promotions
-          # sometimes Order can have multiple promotions but the promo engine
-          # will only apply those that are more beneficial for the customer
-          # TODO: we should probably move this code out of the serializer
-          promotion_ids = cart.all_adjustments.eligible.nonzero.promotion.map { |a| a.source.promotion_id }.uniq
-
-          cart.order_promotions.where(promotion_id: promotion_ids).uniq(&:promotion_id)
-        end
+        has_many   :promotions, object_method_name: :valid_promotions, id_method_name: :valid_promotion_ids
         has_many   :payments do |cart|
           cart.payments.valid
         end

data/docs/v2/storefront/index.yaml

@@ -162,6 +162,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: 4.0.0.rc3
+  version: 4.0.4
 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: 4.0.0.rc3
+        version: 4.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc3
+        version: 4.0.4
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -301,7 +301,7 @@ homepage: http://spreecommerce.org
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -312,12 +312,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      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: []