Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Add Spree Security placeholders (#11562)

Damian Legawiecf9fd1b558ada
diff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rb
index 3f890eb0f8..7175d52a85 100644
--- a/core/app/models/spree/address.rb
+++ b/core/app/models/spree/address.rb
@@ -3,10 +3,12 @@ module Spree
require 'validates_zipcode'
include Metadata
-
if defined?(Spree::Webhooks)
include Spree::Webhooks::HasWebhooks
end
+ if defined?(Spree::Security::Addresses)
+ include Spree::Security::Addresses
+ end
if Rails::VERSION::STRING >= '6.1'
serialize :preferences, Hash, default: {}
diff --git a/core/app/models/spree/credit_card.rb b/core/app/models/spree/credit_card.rb
index 938772c33d..ce121de734 100644
--- a/core/app/models/spree/credit_card.rb
+++ b/core/app/models/spree/credit_card.rb
@@ -5,6 +5,9 @@ module Spree
if defined?(Spree::Webhooks)
include Spree::Webhooks::HasWebhooks
end
+ if defined?(Spree::Security::CreditCards)
+ include Spree::Security::CreditCards
+ end
acts_as_paranoid
diff --git a/core/app/models/spree/digital_link.rb b/core/app/models/spree/digital_link.rb
index b3d0b0e7b2..31d717585c 100644
--- a/core/app/models/spree/digital_link.rb
+++ b/core/app/models/spree/digital_link.rb
@@ -5,6 +5,9 @@ module Spree
if defined?(Spree::Webhooks)
include Spree::Webhooks::HasWebhooks
end
+ if defined?(Spree::Security::DigitalLinks)
+ include Spree::Security::DigitalLinks
+ end
belongs_to :digital
belongs_to :line_item
diff --git a/core/app/models/spree/log_entry.rb b/core/app/models/spree/log_entry.rb
index dd049c7ebc..20da2fe73a 100644
--- a/core/app/models/spree/log_entry.rb
+++ b/core/app/models/spree/log_entry.rb
@@ -1,5 +1,9 @@
module Spree
class LogEntry < Spree::Base
+ if defined?(Spree::Security::LogEntries)
+ include Spree::Security::LogEntries
+ end
+
belongs_to :source, polymorphic: true
# Fix for #1767
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index 3bbef78d1b..ed47aee22d 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -28,6 +28,9 @@ module Spree
if defined?(Spree::Webhooks)
include Spree::Webhooks::HasWebhooks
end
+ if defined?(Spree::Security::Orders)
+ include Spree::Security::Orders
+ end
MEMOIZED_METHODS = %w(tax_zone)
diff --git a/core/app/models/spree/preference.rb b/core/app/models/spree/preference.rb
index 4a38e0f687..750f9735e2 100644
--- a/core/app/models/spree/preference.rb
+++ b/core/app/models/spree/preference.rb
@@ -3,4 +3,8 @@ class Spree::Preference < Spree::Base
validates :key, presence: true,
uniqueness: { case_sensitive: false, allow_blank: true, scope: spree_base_uniqueness_scope }
+
+ if defined?(Spree::Security::Preferences)
+ include Spree::Security::Preferences
+ end
end
diff --git a/core/app/models/spree/promotion.rb b/core/app/models/spree/promotion.rb
index 43be4631df..45c435177a 100644
--- a/core/app/models/spree/promotion.rb
+++ b/core/app/models/spree/promotion.rb
@@ -5,6 +5,9 @@ module Spree
if defined?(Spree::Webhooks)
include Spree::Webhooks::HasWebhooks
end
+ if defined?(Spree::Security::Promotions)
+ include Spree::Security::Promotions
+ end
MATCH_POLICIES = %w(all any)
UNACTIVATABLE_ORDER_STATES = ['complete', 'awaiting_return', 'returned']
diff --git a/core/app/models/spree/refund.rb b/core/app/models/spree/refund.rb
index adf40a1d56..7871c5e298 100644
--- a/core/app/models/spree/refund.rb
+++ b/core/app/models/spree/refund.rb
@@ -4,6 +4,9 @@ module Spree
if defined?(Spree::Webhooks)
include Spree::Webhooks::HasWebhooks
end
+ if defined?(Spree::Security::Refunds)
+ include Spree::Security::Refunds
+ end
with_options inverse_of: :refunds do
belongs_to :payment
diff --git a/core/app/models/spree/shipment.rb b/core/app/models/spree/shipment.rb
index 4a68289865..f78f958c00 100644
--- a/core/app/models/spree/shipment.rb
+++ b/core/app/models/spree/shipment.rb
@@ -9,6 +9,9 @@ module Spree
if defined?(Spree::Webhooks)
include Spree::Webhooks::HasWebhooks
end
+ if defined?(Spree::Security::Shipments)
+ include Spree::Security::Shipments
+ end
with_options inverse_of: :shipments do
belongs_to :address, class_name: 'Spree::Address'
diff --git a/core/app/models/spree/stock_location.rb b/core/app/models/spree/stock_location.rb
index 2ed2ef5d19..95c890f5eb 100644
--- a/core/app/models/spree/stock_location.rb
+++ b/core/app/models/spree/stock_location.rb
@@ -4,6 +4,9 @@ module Spree
if defined?(Spree::Webhooks)
include Spree::Webhooks::HasWebhooks
end
+ if defined?(Spree::Security::StockLocations)
+ include Spree::Security::StockLocations
+ end
has_many :shipments
has_many :stock_items, dependent: :delete_all, inverse_of: :stock_location
diff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rb
index 479a74fc23..6fa40d529f 100644
--- a/core/app/models/spree/store.rb
+++ b/core/app/models/spree/store.rb
@@ -3,6 +3,9 @@ module Spree
if defined?(Spree::Webhooks)
include Spree::Webhooks::HasWebhooks
end
+ if defined?(Spree::Security::Stores)
+ include Spree::Security::Stores
+ end
typed_store :settings, coder: ActiveRecord::TypedStore::IdentityCoder do |s|
# Spree Digital Asset Configurations