spree_api 4.1.15 → 4.2.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2be761f149e4164aa05c5c66f12ea9e05a78ea53e2e9feded59c59227a636e28
-  data.tar.gz: fbccd84139146dc84a64290d1eee263ccfd38fe3625485caedaef03c63aa705c
+  metadata.gz: 3d7a31de48e37ea579244e2c62fb47e2891f5663b095aa8f49de99ecc24abc1e
+  data.tar.gz: 6d5470cb5181210801f5210f46b1e0fc7a3d704b8cd930f372a0544b5861713b
 SHA512:
-  metadata.gz: a31ea55d0cd832d8fbe09282014b425c4962860779ddd75b779abd45cfc3ff9b99cf6794fdc9d38707b882f7af80f31d27fb601168f3ffa7ab7fade84294df53
-  data.tar.gz: 3bb161972fdc08e3f1ffa8a142d3d28f1e8d880453867ddb0f80d80c6d0de095bb20eba303c86b496588061855b8c43ad74f04d99c899616682795bb7c5e22d1
+  metadata.gz: 0b79cb583334e0813cde900718b6062a3601761aba2093159846a383c684219735ebf6861056a24376701d072e766eb74b2a280ef9dacf0f4993f67237dc6c01
+  data.tar.gz: 2429b6091f2e256743136cef85b42a65cfd53f9daadc6b1a5f3945c0fba1b9a1f882491edc85f0cf8a22cd7a7ee8dbed30c174f53e3d139b7d62eda8fe91c4a4

data/app/controllers/concerns/spree/api/v2/storefront/order_concern.rb

@@ -34,6 +34,10 @@ module Spree
             )
           end
 
+          def supported_currencies
+            current_store.supported_currencies_list
+          end
+
           def serialize_order(order)
             resource_serializer.new(order.reload, include: resource_includes, fields: sparse_fields).serializable_hash
           end

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

@@ -2,9 +2,7 @@ require_dependency 'spree/api/controller_setup'
 
 module Spree
   module Api
-    class BaseController < ActionController::Base
-      protect_from_forgery unless: -> { request.format.json? || request.format.xml? }
-
+    class BaseController < ActionController::API
       include Spree::Api::ControllerSetup
       include Spree::Core::ControllerHelpers::Store
       include Spree::Core::ControllerHelpers::StrongParameters

data/app/controllers/spree/api/errors_controller.rb

@@ -1,6 +1,6 @@
 module Spree
   module Api
-    class ErrorsController < ActionController::Base
+    class ErrorsController < ActionController::API
       def render_404
         render 'spree/api/errors/not_found', status: 404
       end

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

@@ -74,7 +74,12 @@ module Spree
 
         def taxonomy
           if params[:taxonomy_id].present?
-            @taxonomy ||= Spree::Taxonomy.accessible_by(current_ability, :show).find(params[:taxonomy_id])
+            @taxonomy ||=
+              if defined?(SpreeGlobalize)
+                Spree::Taxonomy.includes(:translations, taxons: [:translations]).accessible_by(current_ability, :show).find(params[:taxonomy_id])
+              else
+                Spree::Taxonomy.accessible_by(current_ability, :show).find(params[:taxonomy_id])
+              end
           end
         end
 

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

@@ -5,22 +5,48 @@ module Spree
         rescue_from Spree::Core::DestroyWithOrdersError, with: :error_during_processing
 
         def index
-          @users = Spree.user_class.accessible_by(current_ability, :show)
+          users
 
           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_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)
+            load_users_by_ids
+          elsif params.dig(:q, :ship_address_firstname_start)
+            load_users_by_address
+          elsif params.dig(:q, :email_start)
+            load_users_by_email
           end
 
+          prepare_index_response
+          respond_with(@users)
+        end
+
+        def users
+          @users ||= Spree.user_class.accessible_by(current_ability, :show)
+        end
+
+        def load_users_by_ids
+          @users = @users.where(id: params[:ids])
+        end
+
+        def load_users_by_address
+          address_params = params[:q][:ship_address_firstname_start] ||
+            params[:q][:ship_address_lastname_start] ||
+            params[:q][:bill_address_firstname_start] ||
+            params[:q][:bill_address_lastname_start]
+          @users = @users.with_email_or_address(params[:q][:email_start], address_params)
+        end
+
+        def load_users_by_email
+          @users = @users.with_email(params[:q][:email_start])
+        end
+
+        def paginate_users
           @users = @users.page(params[:page]).per(params[:per_page])
+        end
+
+        def prepare_index_response
+          paginate_users
           expires_in 15.minutes, public: true
           headers['Surrogate-Control'] = "max-age=#{15.minutes}"
-          respond_with(@users)
         end
 
         def show

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

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

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

@@ -35,11 +35,11 @@ module Spree
             end
 
             def collection_serializer
-              Spree::Api::Dependencies.storefront_order_serializer.constantize
+              Spree::Api::Dependencies.storefront_cart_serializer.constantize
             end
 
             def resource_serializer
-              Spree::Api::Dependencies.storefront_order_serializer.constantize
+              Spree::Api::Dependencies.storefront_cart_serializer.constantize
             end
 
             def collection_finder

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

@@ -125,7 +125,8 @@ module Spree
           def serialize_shipping_rates(shipments)
             shipping_rates_serializer.new(
               shipments,
-              include: [:shipping_rates, :stock_location]
+              include: [:shipping_rates],
+              params: { show_rates: true }
             ).serializable_hash
           end
         end

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

@@ -29,7 +29,7 @@ module Spree
           end
 
           def ensure_order_token
-            raise ActiveRecord::RecordNotFound unless order_token.present?
+            raise ActiveRecord::RecordNotFound unless order_token
           end
         end
       end

data/app/helpers/spree/api/api_helpers.rb

@@ -161,8 +161,9 @@ module Spree
 
       @@store_attributes = [
         :id, :name, :url, :meta_description, :meta_keywords, :seo_title,
-        :mail_from_address, :default_currency, :code, :default,
-        :facebook, :twitter, :instagram
+        :mail_from_address, :customer_support_email, :default_currency,
+        :code, :default, :facebook, :twitter, :instagram,
+        :supported_currencies
       ]
 
       @@tag_attributes = [:id, :name]

data/app/models/spree/api_dependencies.rb

@@ -13,9 +13,7 @@ module Spree
       :storefront_country_serializer, :storefront_current_order_finder, :storefront_completed_order_finder, :storefront_order_sorter,
       :storefront_collection_paginator, :storefront_user_serializer, :storefront_products_sorter, :storefront_products_finder,
       :storefront_product_serializer, :storefront_taxon_serializer, :storefront_taxon_finder, :storefront_find_by_variant_finder,
-      :storefront_cart_update_service, :storefront_cart_estimate_shipping_rates_service, :storefront_estimated_shipment_serializer,
-      :storefront_store_serializer, :storefront_address_serializer, :storefront_order_serializer,
-      :storefront_account_create_address_service, :storefront_account_update_address_service, :storefront_address_finder
+      :storefront_cart_update_service, :storefront_cart_estimate_shipping_rates_service, :storefront_estimated_shipment_serializer
     ].freeze
 
     attr_accessor *INJECTION_POINTS
@@ -50,12 +48,7 @@ module Spree
       @storefront_checkout_remove_store_credit_service = Spree::Dependencies.checkout_remove_store_credit_service
       @storefront_checkout_get_shipping_rates_service = Spree::Dependencies.checkout_get_shipping_rates_service
 
-      # account services
-      @storefront_account_create_address_service = Spree::Dependencies.account_create_address_service
-      @storefront_account_update_address_service = Spree::Dependencies.account_update_address_service
-
       # serializers
-      @storefront_address_serializer = 'Spree::V2::Storefront::AddressSerializer'
       @storefront_cart_serializer = 'Spree::V2::Storefront::CartSerializer'
       @storefront_credit_card_serializer = 'Spree::V2::Storefront::CreditCardSerializer'
       @storefront_country_serializer = 'Spree::V2::Storefront::CountrySerializer'
@@ -65,8 +58,6 @@ module Spree
       @storefront_payment_method_serializer = 'Spree::V2::Storefront::PaymentMethodSerializer'
       @storefront_product_serializer = 'Spree::V2::Storefront::ProductSerializer'
       @storefront_estimated_shipment_serializer = 'Spree::V2::Storefront::EstimatedShippingRateSerializer'
-      @storefront_store_serializer = 'Spree::V2::Storefront::StoreSerializer'
-      @storefront_order_serializer = 'Spree::V2::Storefront::CartSerializer'
 
       # sorters
       @storefront_order_sorter = Spree::Dependencies.order_sorter
@@ -76,7 +67,6 @@ module Spree
       @storefront_collection_paginator = Spree::Dependencies.collection_paginator
 
       # finders
-      @storefront_address_finder = Spree::Dependencies.address_finder
       @storefront_country_finder = Spree::Dependencies.country_finder
       @storefront_current_order_finder = Spree::Dependencies.current_order_finder
       @storefront_completed_order_finder = Spree::Dependencies.completed_order_finder

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

@@ -8,9 +8,7 @@ module Spree
                    :updated_at, :completed_at, :included_tax_total, :additional_tax_total, :display_additional_tax_total,
                    :display_included_tax_total, :tax_total, :currency, :state, :token, :email,
                    :display_item_total, :display_ship_total, :display_adjustment_total, :display_tax_total,
-                   :promo_total, :display_promo_total, :item_count, :special_instructions, :display_total,
-                   :pre_tax_item_amount, :display_pre_tax_item_amount, :pre_tax_total, :display_pre_tax_total,
-                   :shipment_state, :payment_state
+                   :promo_total, :display_promo_total, :item_count, :special_instructions, :display_total
 
         has_many   :line_items
         has_many   :variants

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

@@ -9,8 +9,7 @@ module Spree
                    :display_adjustment_total, :additional_tax_total,
                    :discounted_amount, :display_discounted_amount,
                    :display_additional_tax_total, :promo_total, :display_promo_total,
-                   :included_tax_total, :display_included_tax_total,
-                   :pre_tax_amount, :display_pre_tax_amount
+                   :included_tax_total, :display_included_tax_total
 
         belongs_to :variant
       end

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

@@ -8,7 +8,7 @@ module Spree
         has_one :payment_method
 
         attributes :amount, :response_code, :number, :cvv_response_code, :cvv_response_message,
-                   :payment_method_id, :payment_method_name, :state
+                   :payment_method_id, :payment_method_name
       end
     end
   end

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

@@ -5,8 +5,8 @@ module Spree
         set_type :product
 
         attributes :name, :description, :price, :currency, :display_price,
-                   :available_on, :slug, :meta_description, :meta_keywords,
-                   :updated_at
+                   :compare_at_price, :display_compare_at_price, :available_on,
+                   :slug, :meta_description, :meta_keywords, :updated_at
 
         attribute :purchasable,   &:purchasable?
         attribute :in_stock,      &:in_stock?

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

@@ -9,9 +9,7 @@ module Spree
 
         attribute :free, &:free?
 
-        has_many :shipping_rates
-
-        belongs_to :stock_location
+        has_many :shipping_rates, if: proc { |_record, params| params&.dig(:show_rates) }
       end
     end
   end

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

@@ -4,7 +4,7 @@ module Spree
       class StoreCreditSerializer < BaseSerializer
         set_type :store_credit
 
-        belongs_to :category, serializer: :store_credit_category
+        belongs_to :category
         has_many :store_credit_events
         belongs_to :credit_type,
                    id_method_name: :type_id,

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

@@ -4,8 +4,8 @@ module Spree
       class VariantSerializer < BaseSerializer
         set_type :variant
 
-        attributes :name, :sku, :price, :currency, :display_price, :weight, :height,
-                   :width, :depth, :is_master, :options_text, :slug, :description
+        attributes :sku, :price, :currency, :display_price, :weight, :height,
+                   :width, :depth, :is_master, :options_text
 
         attribute :purchasable,   &:purchasable?
         attribute :in_stock,      &:in_stock?

data/app/views/spree/api/v1/products/show.rabl

@@ -6,6 +6,10 @@ attributes *product_attributes
 node(:display_price) { |p| p.display_price.to_s }
 node(:has_variants, &:has_variants?)
 node(:taxon_ids, &:taxon_ids)
+node(:display_current_currency_price) do |product|
+  price = product.price_in(current_currency)
+  Spree::Money.new(price.amount, currency: current_currency).to_s
+end
 
 child master: :master do
   extends 'spree/api/v1/variants/small'

data/config/initializers/doorkeeper.rb

@@ -3,8 +3,6 @@ Doorkeeper.configure do
   use_refresh_token
   api_only
 
-  skip_client_authentication_for_password_grant { true } if defined?(skip_client_authentication_for_password_grant)
-
   resource_owner_authenticator { current_spree_user }
 
   resource_owner_from_credentials do

data/config/routes.rb

@@ -152,7 +152,6 @@ 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 :credit_cards, controller: :credit_cards, only: %i[index show]
           resources :orders, controller: :orders, only: %i[index show]
         end
@@ -162,7 +161,6 @@ Spree::Core::Engine.add_routes do
         get '/order_status/:number', to: 'order_status#show', as: :order_status
         resources :products, only: %i[index show]
         resources :taxons,   only: %i[index show], id: /.+/
-        get '/stores/:code', to: 'stores#show', as: :store
       end
     end
 

data/docs/v2/storefront/index.yaml

@@ -49,7 +49,88 @@ paths:
           $ref: '#/components/responses/403Forbidden'
       security:
         - bearerAuth: []
-
+    post:
+      description: >-
+        Creates a new account
+        
+        This endpoint requires [Spree Auth Devise](https://github.com/spree/spree_auth_devise) gem installed
+      tags:
+        - Account
+      operationId: 'Account Creation'
+      requestBody:
+        required: true
+        content:
+          application/vnd.api+json:
+            schema:
+              type: object
+              properties:
+                user:
+                  type: object
+                  properties:
+                    email:
+                      type: string
+                      example: 'john@snow.org'
+                    password:
+                      type: string
+                      example: 'spree123'
+                    password_confirmation:
+                      type: string
+                      example: 'spree123'
+      responses:
+        '200':
+          description: ok
+          content:
+            application/vnd.api+json:
+              schema:
+                $ref: '#/components/schemas/Account'
+        '422':
+          description: Validation errors
+          content:
+            application/vnd.api+json:
+              schema:
+                $ref: '#/components/schemas/Error'
+    patch:
+      description: >-
+        Updates user account
+        
+        This endpoint requires [Spree Auth Devise](https://github.com/spree/spree_auth_devise) gem installed
+      tags:
+        - Account
+      operationId: 'Account Updates'
+      requestBody:
+        required: true
+        content:
+          application/vnd.api+json:
+            schema:
+              type: object
+              properties:
+                user:
+                  type: object
+                  properties:
+                    email:
+                      type: string
+                      example: 'john@snow.org'
+                    password:
+                      type: string
+                      example: 'spree123'
+                    password_confirmation:
+                      type: string
+                      example: 'spree123'
+      responses:
+        '200':
+          description: ok
+          content:
+            application/vnd.api+json:
+              schema:
+                $ref: '#/components/schemas/Account'
+        '422':
+          description: Validation errors
+          content:
+            application/vnd.api+json:
+              schema:
+                $ref: '#/components/schemas/Error'
+      security:
+        - bearerAuth: []
   '/account/credit_cards':
     get:
       description: >-
@@ -1125,14 +1206,6 @@ components:
             company:
               type: string
               example: 'Google Inc.'
-    AddressList:
-      required:
-        - data
-      properties:
-        data:
-          type: array
-          items:
-            $ref: '#/components/schemas/Address'
     Cart:
       required:
         - data
@@ -1299,18 +1372,6 @@ components:
         display_tax_total:
           type: string
           example: '$10.00'
-        pre_tax_item_amount:
-          type: string
-          example: '17.00'
-        display_pre_tax_item_amount:
-          type: string
-          example: '$17.00'
-        pre_tax_total:
-          type: string
-          example: '20.00'
-        display_pre_tax_total:
-          type: string
-          example: '$20.00'
         item_count:
           type: number
           example: 2
@@ -1523,12 +1584,6 @@ components:
             display_discounted_amount:
               type: string
               example: '$125.00'
-            pre_tax_amount:
-              type: string
-              example: '125.0'
-            display_pre_tax_amount:
-              type: string
-              example: '$125.00'
             promo_total:
               type: string
               example: '-5.0'
@@ -2029,10 +2084,6 @@ components:
     VariantAttributes:
       type: object
       properties:
-        name:
-          type: string
-          example: 'Example product'
-          description: 'Product name'
         sku:
           type: string
           example: 'SKU-1001'
@@ -2064,14 +2115,6 @@ components:
         options_text:
           type: string
           example: 'Size: small, Color: red'
-        slug:
-          type: string
-          example: 'example-product'
-          description: 'Product slug'
-        description:
-          type: string
-          example: 'Example description'
-          description: 'Product description'
         purchasable:
           type: boolean
           example: true

data/lib/spree/api/controller_setup.rb

@@ -6,7 +6,6 @@ module Spree
       def self.included(klass)
         klass.class_eval do
           include CanCan::ControllerAdditions
-          include Spree::Core::ControllerHelpers::Auth
 
           prepend_view_path Rails.root + 'app/views'
           append_view_path File.expand_path('../../../app/views', File.dirname(__FILE__))

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, 401, 404, 403, 422].each do |status_code|
+[200, 201, 400, 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)

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

@@ -27,8 +27,6 @@ shared_examples 'returns valid cart JSON' do
     expect(json_response['data']).to have_type('cart')
     expect(json_response['data']).to have_attribute(:number).with_value(order.number)
     expect(json_response['data']).to have_attribute(:state).with_value(order.state)
-    expect(json_response['data']).to have_attribute(:payment_state).with_value(order.payment_state)
-    expect(json_response['data']).to have_attribute(:shipment_state).with_value(order.shipment_state)
     expect(json_response['data']).to have_attribute(:token).with_value(order.token)
     expect(json_response['data']).to have_attribute(:total).with_value(order.total.to_s)
     expect(json_response['data']).to have_attribute(:item_total).with_value(order.item_total.to_s)
@@ -50,10 +48,6 @@ shared_examples 'returns valid cart JSON' do
     expect(json_response['data']).to have_attribute(:promo_total).with_value(order.promo_total.to_s)
     expect(json_response['data']).to have_attribute(:display_promo_total).with_value(order.display_promo_total.to_s)
     expect(json_response['data']).to have_attribute(:display_total).with_value(order.display_total.to_s)
-    expect(json_response['data']).to have_attribute(:pre_tax_item_amount).with_value(order.pre_tax_item_amount.to_s)
-    expect(json_response['data']).to have_attribute(:display_pre_tax_item_amount).with_value(order.display_pre_tax_item_amount.to_s)
-    expect(json_response['data']).to have_attribute(:pre_tax_total).with_value(order.pre_tax_total.to_s)
-    expect(json_response['data']).to have_attribute(:display_pre_tax_total).with_value(order.display_pre_tax_total.to_s)
     expect(json_response['data']).to have_relationships(:user, :line_items, :variants, :billing_address, :shipping_address, :payments, :shipments, :promotions)
   end
 end

data/spree_api.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.email         = ["ryan@spreecommerce.com"]
   s.summary       = %q{Spree's API}
   s.description   = %q{Spree's API}
-  s.homepage      = 'http://spreecommerce.org'
+  s.homepage      = 'https://spreecommerce.org'
   s.license       = 'BSD-3-Clause'
 
   s.metadata = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 4.1.15
+  version: 4.2.0.beta
 platform: ruby
 authors:
 - Ryan Bigg
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-21 00:00:00.000000000 Z
+date: 2020-09-07 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.1.15
+        version: 4.2.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.15
+        version: 4.2.0.beta
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -133,7 +133,6 @@ files:
 - app/controllers/spree/api/v1/variants_controller.rb
 - app/controllers/spree/api/v1/zones_controller.rb
 - app/controllers/spree/api/v2/base_controller.rb
-- app/controllers/spree/api/v2/storefront/account/addresses_controller.rb
 - app/controllers/spree/api/v2/storefront/account/credit_cards_controller.rb
 - app/controllers/spree/api/v2/storefront/account/orders_controller.rb
 - app/controllers/spree/api/v2/storefront/account_controller.rb
@@ -142,7 +141,6 @@ files:
 - app/controllers/spree/api/v2/storefront/countries_controller.rb
 - app/controllers/spree/api/v2/storefront/order_status_controller.rb
 - app/controllers/spree/api/v2/storefront/products_controller.rb
-- app/controllers/spree/api/v2/storefront/stores_controller.rb
 - app/controllers/spree/api/v2/storefront/taxons_controller.rb
 - app/helpers/spree/api/api_helpers.rb
 - app/helpers/spree/api/v2/collection_options_helpers.rb
@@ -168,12 +166,9 @@ files:
 - app/serializers/spree/v2/storefront/shipment_serializer.rb
 - app/serializers/spree/v2/storefront/shipping_rate_serializer.rb
 - app/serializers/spree/v2/storefront/state_serializer.rb
-- app/serializers/spree/v2/storefront/stock_location_serializer.rb
-- app/serializers/spree/v2/storefront/store_credit_category_serializer.rb
 - app/serializers/spree/v2/storefront/store_credit_event_serializer.rb
 - app/serializers/spree/v2/storefront/store_credit_serializer.rb
 - app/serializers/spree/v2/storefront/store_credit_type_serializer.rb
-- app/serializers/spree/v2/storefront/store_serializer.rb
 - app/serializers/spree/v2/storefront/taxon_image_serializer.rb
 - app/serializers/spree/v2/storefront/taxon_serializer.rb
 - app/serializers/spree/v2/storefront/taxonomy_serializer.rb
@@ -302,15 +297,15 @@ files:
 - script/rails
 - spec/fixtures/thinking-cat.jpg
 - spree_api.gemspec
-homepage: http://spreecommerce.org
+homepage: https://spreecommerce.org
 licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.1.15
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.beta
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.1.15
-post_install_message:
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.beta
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -321,12 +316,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: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Spree's API
 test_files: []

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

@@ -1,77 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Storefront
-        module Account
-          class AddressesController < ::Spree::Api::V2::BaseController
-            before_action :require_spree_current_user
-
-            def index
-              render_serialized_payload { serialize_collection(collection) }
-            end
-
-            def create
-              result = create_service.call(user: spree_current_user, address_params: address_params)
-              render_result(result)
-            end
-
-            def update
-              result = update_service.call(address: resource, address_params: address_params)
-              render_result(result)
-            end
-
-            private
-
-            def collection
-              collection_finder.new(scope: scope, params: params).execute
-            end
-
-            def resource
-              @resource ||= scope.find(params[:id])
-            end
-
-            def scope
-              spree_current_user.addresses
-            end
-
-            def collection_finder
-              Spree::Api::Dependencies.storefront_address_finder.constantize
-            end
-
-            def collection_serializer
-              Spree::Api::Dependencies.storefront_address_serializer.constantize
-            end
-
-            def resource_serializer
-              Spree::Api::Dependencies.storefront_address_serializer.constantize
-            end
-
-            def serialize_collection(collection)
-              collection_serializer.new(collection).serializable_hash
-            end
-
-            def create_service
-              Spree::Api::Dependencies.storefront_account_create_address_service.constantize
-            end
-
-            def update_service
-              Spree::Api::Dependencies.storefront_account_update_address_service.constantize
-            end
-
-            def address_params
-              params.require(:address).permit(permitted_address_attributes)
-            end
-
-            def render_result(result)
-              if result.success?
-                render_serialized_payload { serialize_resource(result.value) }
-              else
-                render_error_payload(result.error)
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,27 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Storefront
-        class StoresController < ::Spree::Api::V2::BaseController
-          def show
-            render_serialized_payload { serialize_resource(resource) }
-          end
-
-          private
-
-          def scope
-            Spree::Store
-          end
-
-          def resource
-            scope.find_by!(code: params[:code])
-          end
-
-          def resource_serializer
-            Spree::Api::Dependencies.storefront_store_serializer.constantize
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-module Spree
-  module V2
-    module Storefront
-      class StockLocationSerializer < BaseSerializer
-        set_type :stock_location
-
-        attributes :name
-      end
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-module Spree
-  module V2
-    module Storefront
-      class StoreCreditCategorySerializer < BaseSerializer
-        set_type :store_credit_category
-
-        attributes :name
-      end
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-module Spree
-  module V2
-    module Storefront
-      class StoreSerializer < BaseSerializer
-        set_type :store
-
-        attributes :name, :url, :meta_description, :meta_keywords, :seo_title, :default_currency, :default, :supported_currencies, :facebook,
-                   :twitter, :instagram, :default_locale, :customer_support_email, :default_country_id, :description,
-                   :address, :contact_phone, :contact_email
-      end
-    end
-  end
-end