spree_api 5.0.5 → 5.1.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f67c86eda1e98e651cd731dcdbac2c7ed93a9c1e98b8a495c1aee40bc4653ea
-  data.tar.gz: 13ff000f44bbbd6942a85706ae69cbc650f43029d44d1bfe9b59637ec83157d1
+  metadata.gz: 135a1dc5140d807b83dd4a366141eede834c6d7e3c03979c881c3a5551f750b8
+  data.tar.gz: fe206c574f166d016107b1d9c1c32000d5b6ff825ee35fd65233adfe9284a87d
 SHA512:
-  metadata.gz: 933a1611da8b4aae233624f8b531d38ef891038cda2e1423443e8574076bd6bc42e3c0cc94b7828759b2f19001e9a299e34e442f36d7074fdbd33352f0cb7bb6
-  data.tar.gz: d6afc9425274558d048f2c8bf2412fb859bc2b14f6a66ff0ad6931e96f272ab869fb8280a6192bc777f7ecf98c309c31b5f80e19ca25c6522ff8619f606332d6
+  metadata.gz: 5d77511e3dae8752352fd0124339a8f7737ecb834266bbc136c499c8e55004c93161a0f452a81641db5fb93e684eb3c0820d31a8ede262c2c26a79e4af6fcb1e
+  data.tar.gz: 24c4f966a8c57d89fc29e5c757a5f831bfc89b8f8d32f054f301027fb3f0fec3bd875d6a3f00681f08d0fdddf313370c0a9a7000e64b5e7b83e688e2233fa31e

data/app/controllers/concerns/spree/api/v2/product_list_includes.rb

@@ -3,22 +3,28 @@ module Spree
     module V2
       module ProductListIncludes
         def product_list_includes
-          {
-            product_properties: [],
-            option_types: [],
-            variant_images: [],
-            master: product_variant_includes,
-            variants: product_variant_includes,
-            translations: []
+          @product_list_includes ||= {
+            taggings: [:tag],
+            variants: [],
+            master: [:prices]
           }
+
+          @product_list_includes[:variant_images] = [] if params[:include]&.match('images')
+          @product_list_includes[:option_types] = [] if params[:include]&.match('option_types')
+          @product_list_includes[:product_properties] = [:property] if params[:include]&.match('product_properties')
+          @product_list_includes[:master] = variant_includes if params[:include]&.match(/master|default_variant/)
+          @product_list_includes[:variants] = variant_includes if params[:include]&.match(/variants|default_variant/)
+          @product_list_includes[:taxons] = [:taxonomy, :icon, :store, :rich_text_translations, image_attachment: :blob] if params[:include]&.match('taxons')
+          @product_list_includes
         end
 
-        def product_variant_includes
-          {
+        def variant_includes
+          variant_includes = {
             prices: [],
             option_values: :option_type,
-            images: []
           }
+          variant_includes[:images] = [] if params[:include]&.match(/images/)
+          variant_includes
         end
       end
     end

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

@@ -96,7 +96,12 @@ module Spree
 
         # Needs to be overridden so that we use Spree's Ability rather than anyone else's.
         def current_ability
-          @current_ability ||= Spree::Dependencies.ability_class.constantize.new(spree_current_user)
+          @current_ability ||= Spree::Dependencies.ability_class.constantize.new(spree_current_user, ability_options)
+        end
+
+        # this method can be extended in extensions or developer applications
+        def ability_options
+          { store: current_store }
         end
 
         def request_includes

data/app/controllers/spree/api/v2/platform/users_controller.rb

@@ -25,11 +25,6 @@ module Spree
           def spree_permitted_attributes
             super + [:password, :password_confirmation]
           end
-
-          # we need to override this method to avoid trying to create user role when creating a user
-          def ensure_current_store(_resource)
-            # do nothing
-          end
         end
       end
     end

data/config/initializers/doorkeeper.rb

@@ -25,7 +25,7 @@ Doorkeeper.configure do
   end
 
   admin_authenticator do |routes|
-    current_spree_user&.spree_admin? || redirect_to(routes.root_url)
+    current_spree_user&.spree_admin?(Spree::Store.current) || redirect_to(routes.root_url)
   end
 
   grant_flows %w[password client_credentials]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 5.1.0.beta
 platform: ruby
 authors:
 - Ryan Bigg
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-30 00:00:00.000000000 Z
+date: 2025-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-rspec
@@ -102,14 +102,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 5.1.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        version: 5.1.0.beta
 description: Spree's API
 email:
 - hello@spreecommerce.org
@@ -364,9 +364,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.5
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0.beta
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.0.5
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta
 post_install_message:
 rdoc_options: []
 require_paths: