spree_core 4.3.3 → 4.4.0.rc1

data/db/migrate/20210915064321_add_metadata_to_spree_orders.rb

@@ -0,0 +1,13 @@
+class AddMetadataToSpreeOrders < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_orders do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_orders, :public_metadata, :jsonb
+        add_column :spree_orders, :private_metadata, :jsonb
+      else
+        add_column :spree_orders, :public_metadata, :json
+        add_column :spree_orders, :private_metadata, :json
+      end
+    end
+  end
+end

data/db/migrate/20210915064322_add_metadata_to_spree_products.rb

@@ -0,0 +1,13 @@
+class AddMetadataToSpreeProducts < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_products do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_products, :public_metadata, :jsonb
+        add_column :spree_products, :private_metadata, :jsonb
+      else
+        add_column :spree_products, :public_metadata, :json
+        add_column :spree_products, :private_metadata, :json
+      end
+    end
+  end
+end

data/db/migrate/20210915064323_add_metadata_to_spree_variants.rb

@@ -0,0 +1,13 @@
+class AddMetadataToSpreeVariants < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_variants do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_variants, :public_metadata, :jsonb
+        add_column :spree_variants, :private_metadata, :jsonb
+      else
+        add_column :spree_variants, :public_metadata, :json
+        add_column :spree_variants, :private_metadata, :json
+      end
+    end
+  end
+end

data/db/migrate/20210915064324_add_metadata_to_spree_line_items.rb

@@ -0,0 +1,13 @@
+class AddMetadataToSpreeLineItems < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_line_items do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_line_items, :public_metadata, :jsonb
+        add_column :spree_line_items, :private_metadata, :jsonb
+      else
+        add_column :spree_line_items, :public_metadata, :json
+        add_column :spree_line_items, :private_metadata, :json
+      end
+    end
+  end
+end

data/db/migrate/20210915064325_add_metadata_to_spree_shipments.rb

@@ -0,0 +1,13 @@
+class AddMetadataToSpreeShipments < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_shipments do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_shipments, :public_metadata, :jsonb
+        add_column :spree_shipments, :private_metadata, :jsonb
+      else
+        add_column :spree_shipments, :public_metadata, :json
+        add_column :spree_shipments, :private_metadata, :json
+      end
+    end
+  end
+end

data/db/migrate/20210915064326_add_metadata_to_spree_payments.rb

@@ -0,0 +1,13 @@
+class AddMetadataToSpreePayments < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_payments do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_payments, :public_metadata, :jsonb
+        add_column :spree_payments, :private_metadata, :jsonb
+      else
+        add_column :spree_payments, :public_metadata, :json
+        add_column :spree_payments, :private_metadata, :json
+      end
+    end
+  end
+end

data/db/migrate/20210915064327_add_metadata_to_spree_taxons_and_taxonomies.rb

@@ -0,0 +1,18 @@
+class AddMetadataToSpreeTaxonsAndTaxonomies < ActiveRecord::Migration[5.2]
+  def change
+    %i[
+      spree_taxons
+      spree_taxonomies
+    ].each do |table_name|
+      change_table table_name do |t|
+        if t.respond_to? :jsonb
+          add_column table_name, :public_metadata, :jsonb
+          add_column table_name, :private_metadata, :jsonb
+        else
+          add_column table_name, :public_metadata, :json
+          add_column table_name, :private_metadata, :json
+        end
+      end
+    end
+  end
+end

data/db/migrate/20210915064328_add_metadata_to_spree_stock_transfers.rb

@@ -0,0 +1,13 @@
+class AddMetadataToSpreeStockTransfers < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_stock_transfers do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_stock_transfers, :public_metadata, :jsonb
+        add_column :spree_stock_transfers, :private_metadata, :jsonb
+      else
+        add_column :spree_stock_transfers, :public_metadata, :json
+        add_column :spree_stock_transfers, :private_metadata, :json
+      end
+    end
+  end
+end

data/db/migrate/20210915064329_add_metadata_to_spree_multiple_tables.rb

@@ -0,0 +1,30 @@
+class AddMetadataToSpreeMultipleTables < ActiveRecord::Migration[5.2]
+  def change
+    %i[
+      spree_assets
+      spree_option_types
+      spree_option_values
+      spree_properties
+      spree_promotions
+      spree_payment_methods
+      spree_shipping_methods
+      spree_prototypes
+      spree_refunds
+      spree_customer_returns
+      spree_users
+      spree_addresses
+      spree_credit_cards
+      spree_store_credits
+    ].each do |table_name|
+      change_table table_name do |t|
+        if t.respond_to? :jsonb
+          add_column table_name, :public_metadata, :jsonb
+          add_column table_name, :private_metadata, :jsonb
+        else
+          add_column table_name, :public_metadata, :json
+          add_column table_name, :private_metadata, :json
+        end
+      end
+    end
+  end
+end

data/db/migrate/20210920090344_add_deleted_at_to_spree_stores.rb

@@ -0,0 +1,8 @@
+class AddDeletedAtToSpreeStores < ActiveRecord::Migration[5.2]
+  def change
+    unless column_exists?(:spree_stores, :deleted_at)
+      add_column :spree_stores, :deleted_at, :datetime
+      add_index :spree_stores, :deleted_at
+    end
+  end
+end

data/db/migrate/20210921070812_rename_column_access_hash_to_token.rb

@@ -0,0 +1,8 @@
+class RenameColumnAccessHashToToken < ActiveRecord::Migration[5.2]
+  def change
+    if table_exists?(:spree_wishlists)
+      rename_column(:spree_wishlists, :access_hash, :token) if column_exists?(:spree_wishlists, :access_hash)
+      add_reference(:spree_wishlists, :store, index: true) unless column_exists?(:spree_wishlists, :store_id)
+    end
+  end
+end

data/db/migrate/20210921070813_create_spree_wishlists.rb

@@ -0,0 +1,18 @@
+class CreateSpreeWishlists < ActiveRecord::Migration[5.2]
+  def change
+    create_table :spree_wishlists, if_not_exists: true do |t|
+      t.belongs_to :user
+      t.belongs_to :store
+
+      t.column :name, :string
+      t.column :token, :string, null: false
+      t.column :is_private, :boolean, default: true, null: false
+      t.column :is_default, :boolean, default: false, null: false
+
+      t.timestamps
+    end
+
+    add_index :spree_wishlists, :token, unique: true
+    add_index :spree_wishlists, [:user_id, :is_default] unless index_exists?(:spree_wishlists, [:user_id, :is_default])
+  end
+end

data/db/migrate/20210921070814_create_spree_wished_products.rb

@@ -0,0 +1,16 @@
+class CreateSpreeWishedProducts < ActiveRecord::Migration[5.2]
+  def change
+    create_table :spree_wished_products, if_not_exists: true do |t|
+      t.references :variant
+      t.belongs_to :wishlist
+
+      t.column :quantity, :integer, default: 1, null: false
+
+      t.timestamps
+    end
+
+    add_index :spree_wished_products, [:variant_id, :wishlist_id], unique: true unless index_exists?(:spree_wished_products, [:variant_id, :wishlist_id])
+    add_index :spree_wished_products, :variant_id unless index_exists?(:spree_wished_products, :variant_id)
+    add_index :spree_wished_products, :wishlist_id unless index_exists?(:spree_wished_products, :wishlist_id)
+  end
+end

data/db/migrate/20210921070815_rename_spree_wished_products_to_spree_wished_items.rb

@@ -0,0 +1,5 @@
+class RenameSpreeWishedProductsToSpreeWishedItems < ActiveRecord::Migration[5.2]
+  def change
+    rename_table :spree_wished_products, :spree_wished_items
+  end
+end

data/db/migrate/20210921090344_add_unique_stock_item_stock_location_variant_deleted_at_index.rb

@@ -0,0 +1,5 @@
+class AddUniqueStockItemStockLocationVariantDeletedAtIndex < ActiveRecord::Migration[5.2]
+  def change
+    add_index :spree_stock_items, [:stock_location_id, :variant_id, :deleted_at], name: 'stock_item_by_loc_var_id_deleted_at', unique: true
+  end
+end

data/db/migrate/20210929090344_create_stock_item_stock_location_id_variant_id_coalesce_deleted_at_unique_index.rb

@@ -0,0 +1,32 @@
+class CreateStockItemStockLocationIdVariantIdCoalesceDeletedAtUniqueIndex < ActiveRecord::Migration[5.2]
+  def change
+    remove_index :spree_stock_items, name: :stock_item_by_loc_var_id_deleted_at
+    reversible do |dir|
+      dir.up do
+        execute <<-SQL
+          CREATE UNIQUE INDEX stock_item_by_loc_var_id_deleted_at
+          ON spree_stock_items(
+            stock_location_id,
+            variant_id,
+            (COALESCE(deleted_at, CAST('1970-01-01' AS #{deleted_at_data_type})))
+          );
+        SQL
+      end
+
+      dir.down do
+        remove_index :spree_stock_items, name: :stock_item_by_loc_var_id_deleted_at
+      end
+    end
+  end
+
+  private
+
+  def deleted_at_data_type
+    case ActiveRecord::Base.connection.adapter_name
+    when 'Mysql2'
+      'DATETIME'
+    when 'PostgreSQL'
+      'TIMESTAMP'
+    end
+  end
+end

data/db/migrate/20210929091444_create_spree_digital_links.rb

@@ -0,0 +1,13 @@
+class CreateSpreeDigitalLinks < ActiveRecord::Migration[5.2]
+  def change
+    create_table :spree_digital_links, if_not_exists: true do |t|
+      t.belongs_to :digital
+      t.belongs_to :line_item
+      t.string :secret
+      t.integer :access_counter
+
+      t.timestamps
+    end
+    add_index :spree_digital_links, :secret, unique: true unless index_exists?(:spree_digital_links, :secret)
+  end
+end

data/db/migrate/20210929093238_create_spree_digitals.rb

@@ -0,0 +1,9 @@
+class CreateSpreeDigitals < ActiveRecord::Migration[5.2]
+  def change
+    create_table :spree_digitals, if_not_exists: true do |t|
+      t.belongs_to :variant
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20210930143043_rename_secret_to_token_on_spree_digital_links.rb

@@ -0,0 +1,5 @@
+class RenameSecretToTokenOnSpreeDigitalLinks < ActiveRecord::Migration[5.2]
+  def change
+    rename_column :spree_digital_links, :secret, :token
+  end
+end

data/db/migrate/20210930155649_add_settings_to_spree_stores.rb

@@ -0,0 +1,11 @@
+class AddSettingsToSpreeStores < ActiveRecord::Migration[5.2]
+  def change
+    change_table :spree_stores do |t|
+      if t.respond_to? :jsonb
+        add_column :spree_stores, :settings, :jsonb
+      else
+        add_column :spree_stores, :settings, :json
+      end
+    end
+  end
+end

data/db/seeds.rb

@@ -1,5 +1 @@
-# Loads seed data out of default dir
-default_path = File.join(File.dirname(__FILE__), 'default')
-
-Rake::Task['db:load_dir'].reenable
-Rake::Task['db:load_dir'].invoke(default_path)
+Spree::Seeds::All.call

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -29,7 +29,7 @@ module Spree
       # calling slice on a Thor::CoreExtensions::HashWithIndifferentAccess
       # object has been known to return nil
       opts = {}.merge(options).slice(*PASSTHROUGH_OPTIONS)
-      opts[:database] = 'sqlite3' if opts[:database].blank?
+      opts[:database] = 'postgresql' if opts[:database].blank?
       opts[:force] = true
       opts[:skip_bundle] = true
       opts[:skip_gemfile] = true

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -8,18 +8,7 @@ end %>
 <% db_username = ENV['DB_USERNAME'] %>
 <% db_host = ENV['DB_HOST'] %>
 <% case ENV['DB']
-  when 'sqlite' %>
-development:
-  adapter: sqlite3
-  database: db/spree_development.sqlite3
-test:
-  adapter: sqlite3
-  database: db/spree_test.sqlite3
-  timeout: 10000
-production:
-  adapter: sqlite3
-  database: db/spree_production.sqlite3
-<% when 'mysql' %>
+  when 'mysql' %>
 mysql: &mysql
   adapter: mysql2
   encoding: utf8
@@ -68,13 +57,26 @@ production:
   <<: *postgres
   database: <%= database_prefix %><%= lib_name %>_spree_production
 <% else %>
+postgres: &postgres
+  adapter: postgresql
+  <% unless db_username.blank? %>
+  username: <%= db_username || 'postgres' %>
+  <% end %>
+  <% unless db_password.blank? %>
+  password: <%= db_password %>
+  <% end %>
+  <% unless db_host.blank? %>
+  host: <%= db_host %>
+  <% end %>
+  min_messages: warning
+
 development:
-  adapter: sqlite3
-  database: db/spree_development.sqlite3
+  <<: *postgres
+  database: <%= database_prefix %><%= lib_name %>_spree_development
 test:
-  adapter: sqlite3
-  database: db/spree_test.sqlite3
+  <<: *postgres
+  database: <%= database_prefix %><%= lib_name %>_spree_test
 production:
-  adapter: sqlite3
-  database: db/spree_production.sqlite3
+  <<: *postgres
+  database: <%= database_prefix %><%= lib_name %>_spree_production
 <% end %>

data/{app/models/spree → lib/spree/core}/app_dependencies.rb

@@ -13,7 +13,12 @@ module Spree
       :products_finder, :taxon_finder, :line_item_by_variant_finder, :cart_estimate_shipping_rates_service,
       :account_create_address_service, :account_update_address_service, :account_create_service, :account_update_service,
       :address_finder, :collection_sorter, :error_handler, :current_store_finder, :cart_empty_service, :cart_destroy_service,
-      :classification_reposition_service, :credit_cards_destroy_service, :cart_associate_service, :cart_change_currency_service
+      :classification_reposition_service, :credit_cards_destroy_service, :cart_associate_service, :cart_change_currency_service,
+      :line_item_create_service, :line_item_update_service, :line_item_destroy_service,
+      :order_approve_service, :order_cancel_service, :shipment_change_state_service, :shipment_update_service,
+      :shipment_create_service, :shipment_add_item_service, :shipment_remove_item_service,
+      :payment_create_service, :address_create_service, :address_update_service,
+      :checkout_select_shipping_method_service
     ].freeze
 
     attr_accessor *INJECTION_POINTS
@@ -54,6 +59,18 @@ module Spree
       @checkout_add_store_credit_service = 'Spree::Checkout::AddStoreCredit'
       @checkout_remove_store_credit_service = 'Spree::Checkout::RemoveStoreCredit'
       @checkout_get_shipping_rates_service = 'Spree::Checkout::GetShippingRates'
+      @checkout_select_shipping_method_service = 'Spree::Checkout::SelectShippingMethod'
+
+      # order
+      @order_approve_service = 'Spree::Orders::Approve'
+      @order_cancel_service = 'Spree::Orders::Cancel'
+
+      # shipment
+      @shipment_change_state_service = 'Spree::Shipments::ChangeState'
+      @shipment_create_service = 'Spree::Shipments::Create'
+      @shipment_update_service = 'Spree::Shipments::Update'
+      @shipment_add_item_service = 'Spree::Shipments::AddItem'
+      @shipment_remove_item_service = 'Spree::Shipments::RemoveItem'
 
       # sorter
       @collection_sorter = 'Spree::BaseSorter'
@@ -64,20 +81,31 @@ module Spree
       @collection_paginator = 'Spree::Shared::Paginate'
 
       # coupons
-      # TODO: we should split this service into 2 seperate - Add and Remove
+      # TODO: we should split this service into 2 separate - Add and Remove
       @coupon_handler = 'Spree::PromotionHandler::Coupon'
 
       # account
       @account_create_service = 'Spree::Account::Create'
       @account_update_service = 'Spree::Account::Update'
-      @account_create_address_service = 'Spree::Account::Addresses::Create'
-      @account_update_address_service = 'Spree::Account::Addresses::Update'
+
+      # addresses
+      @address_create_service = 'Spree::Addresses::Create'
+      @address_update_service = 'Spree::Addresses::Update'
 
       # credit cards
       @credit_cards_destroy_service = 'Spree::CreditCards::Destroy'
 
+      # classifications
       @classification_reposition_service = 'Spree::Classifications::Reposition'
 
+      # line items
+      @line_item_create_service = 'Spree::LineItems::Create'
+      @line_item_update_service = 'Spree::LineItems::Update'
+      @line_item_destroy_service = 'Spree::LineItems::Destroy'
+
+      @payment_create_service = 'Spree::Payments::Create'
+
+      # errors
       @error_handler = 'Spree::ErrorReporter'
     end
 

data/lib/spree/core/controller_helpers/auth.rb

@@ -14,7 +14,7 @@ module Spree
           end
         end
 
-        # Needs to be overriden so that we use Spree's Ability rather than anyone else's.
+        # 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(try_spree_current_user)
         end
@@ -34,8 +34,8 @@ module Spree
         end
 
         def current_oauth_token
-          get_last_access_token = ->(user) { Doorkeeper::AccessToken.active_for(user).where(expires_in: nil).last }
-          create_access_token = ->(user) { Doorkeeper::AccessToken.create!(resource_owner_id: user.id) }
+          get_last_access_token = ->(user) { Spree::OauthAccessToken.active_for(user).where(expires_in: nil).last }
+          create_access_token = ->(user) { Spree::OauthAccessToken.create!(resource_owner: user) }
           user = try_spree_current_user
           return unless user
 
@@ -82,7 +82,7 @@ module Spree
             redirect_to spree.forbidden_path
           else
             store_location
-            if request.fullpath.match(Spree.admin_path) && defined?(spree.admin_login_path)
+            if Spree.respond_to?(:admin_path) && request.fullpath.match(Spree.admin_path) && defined?(spree.admin_login_path)
               redirect_to spree.admin_login_path
             elsif respond_to?(:spree_login_path)
               redirect_to spree_login_path

data/lib/spree/core/controller_helpers/common.rb

@@ -17,6 +17,9 @@ module Spree
           attr_writer :title
 
           def title
+            ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+              ControllerHelpers::Common is deprecated and will be removed in Spree 5.0.
+            DEPRECATION
             title_string = @title.present? ? @title : accurate_title
             if title_string.present?
               if Spree::Config[:always_put_site_name_in_title] && !title_string.include?(default_title)
@@ -30,11 +33,17 @@ module Spree
           end
 
           def default_title
+            ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+              ControllerHelpers::Common is deprecated and will be removed in Spree 5.0.
+            DEPRECATION
             current_store.name
           end
 
           # this is a hook for subclasses to provide title
           def accurate_title
+            ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+              ControllerHelpers::Common is deprecated and will be removed in Spree 5.0.
+            DEPRECATION
             current_store.seo_title
           end
 
@@ -56,7 +65,12 @@ module Spree
           # Default layout is: +app/views/spree/layouts/spree_application+
           #
           def get_layout
-            layout ||= Spree::Config[:layout]
+            ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+              ControllerHelpers::Common is deprecated and will be removed in Spree 5.0.
+            DEPRECATION
+            return unless defined?(Spree::Frontend)
+
+            layout ||= Spree::Frontend::Config[:layout]
           end
         end
       end

data/lib/spree/core/controller_helpers/currency.rb

@@ -20,7 +20,7 @@ module Spree
                                 elsif current_store.present?
                                   current_store.default_currency
                                 else
-                                  Spree::Config[:currency]
+                                  Spree::Store.default.default_currency
                                 end&.upcase
         end
 

data/lib/spree/core/engine.rb

@@ -30,7 +30,8 @@ module Spree
           Spree::Calculator::Shipping::FlatRate,
           Spree::Calculator::Shipping::FlexiRate,
           Spree::Calculator::Shipping::PerItem,
-          Spree::Calculator::Shipping::PriceSack
+          Spree::Calculator::Shipping::PriceSack,
+          Spree::Calculator::Shipping::DigitalDelivery,
         ]
 
         app.config.spree.calculators.tax_rates = [
@@ -41,7 +42,8 @@ module Spree
       initializer 'spree.register.stock_splitters', before: :load_config_initializers do |app|
         app.config.spree.stock_splitters = [
           Spree::Stock::Splitter::ShippingCategory,
-          Spree::Stock::Splitter::Backordered
+          Spree::Stock::Splitter::Backordered,
+          Spree::Stock::Splitter::Digital
         ]
       end
 
@@ -121,7 +123,10 @@ module Spree
           :password,
           :password_confirmation,
           :number,
-          :verification_value
+          :verification_value,
+          :client_id,
+          :client_secret,
+          :refresh_token
         ]
       end
 
@@ -131,7 +136,8 @@ module Spree
 
       initializer 'spree.core.checking_deprecated_preferences' do
         Spree::Config.deprecated_preferences.each do |pref|
-          warn "[DEPRECATION] Spree::Config[:#{pref[:name]}] is deprecated. #{pref[:message]}"
+          # FIXME: we should only notify about deprecated preferences that are in use, not all of them
+          # warn "[DEPRECATION] Spree::Config[:#{pref[:name]}] is deprecated. #{pref[:message]}"
         end
       end
 

data/lib/spree/core/importer/product.rb

@@ -32,7 +32,7 @@ module Spree
             variants_attrs.each do |variant_attribute|
               # update the variant if the id is present in the payload
               if variant_attribute['id'].present?
-                product.variants.find(variant_attribute['id'].to_i).update(variant_attribute)
+                product.variants.find(variant_attribute['id']).update(variant_attribute)
               else
                 # make sure the product is assigned before the options=
                 product.variants.create({ product: product }.merge(variant_attribute))

data/lib/spree/core/number_generator.rb

@@ -16,8 +16,6 @@ module Spree
         generator_instance = self
 
         host.class_eval do
-          validates(:number, presence: true, uniqueness: { allow_blank: true })
-
           before_validation do |instance|
             instance.number ||= generate_permalink(host)
           end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '4.3.3'.freeze
+  VERSION = '4.4.0.rc1'.freeze
 
   def self.version
     VERSION

data/lib/spree/core.rb

@@ -18,13 +18,14 @@ require 'mini_magick'
 require 'ransack'
 require 'state_machines-activerecord'
 require 'active_storage_validations'
+require 'activerecord-typedstore'
 
 # This is required because ActiveModel::Validations#invalid? conflicts with the
 # invalid state of a Payment. In the future this should be removed.
 StateMachines::Machine.ignore_method_conflicts = true
 
 module Spree
-  mattr_accessor :user_class
+  mattr_accessor :user_class, :admin_user_class, :private_storage_service_name
 
   def self.user_class(constantize: true)
     if @@user_class.is_a?(Class)
@@ -34,19 +35,24 @@ module Spree
     end
   end
 
-  def self.admin_path
-    Spree::Config[:admin_path]
-  end
+  def self.admin_user_class(constantize: true)
+    @@admin_user_class ||= @@user_class
 
-  # Used to configure admin_path for Spree
-  #
-  # Example:
-  #
-  # write the following line in `config/initializers/spree.rb`
-  #   Spree.admin_path = '/custom-path'
+    if @@admin_user_class.is_a?(Class)
+      raise 'Spree.admin_user_class MUST be a String or Symbol object, not a Class object.'
+    elsif @@admin_user_class.is_a?(String) || @@admin_user_class.is_a?(Symbol)
+      constantize ? @@admin_user_class.to_s.constantize : @@admin_user_class.to_s
+    end
+  end
 
-  def self.admin_path=(path)
-    Spree::Config[:admin_path] = path
+  def self.private_storage_service_name
+    if @@private_storage_service_name
+      if @@private_storage_service_name.is_a?(String) || @@private_storage_service_name.is_a?(Symbol)
+        @@private_storage_service_name.to_sym
+      else
+        raise 'Spree.private_storage_service_name MUST be a String or Symbol object.'
+      end
+    end
   end
 
   # Used to configure Spree.
@@ -97,9 +103,11 @@ require 'spree/localized_number'
 require 'spree/money'
 require 'spree/permitted_attributes'
 require 'spree/service_module'
-require 'spree/dependencies_helper'
 require 'spree/database_type_utilities'
 
+require 'spree/core/dependencies_helper'
+require 'spree/core/app_dependencies'
+
 require 'spree/core/importer'
 require 'spree/core/query_filters'
 require 'spree/core/product_duplicator'