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.

Use `has_secure_token` for Order token generation (#12280)

Damian Legawiec0e3ad47b217f
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index e14ee2eeae..7ea9acb448 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -20,7 +20,6 @@ module Spree
include Spree::Order::Emails
include Spree::Order::Webhooks
include Spree::Core::NumberGenerator.new(prefix: 'R')
- include Spree::Core::TokenGenerator
include Spree::NumberIdentifier
include Spree::NumberAsParam
@@ -34,6 +33,8 @@ module Spree
include Spree::VendorConcern
end
+ has_secure_token :token, length: 35
+
MEMOIZED_METHODS = %w(tax_zone)
extend Spree::DisplayMoney
@@ -147,7 +148,6 @@ module Spree
before_validation :clone_billing_address, if: :use_billing?
attr_accessor :use_billing
- before_create :create_token
before_create :link_by_email
before_update :ensure_updated_shipments, :homogenize_line_item_currencies, if: :currency_changed?
@@ -762,10 +762,6 @@ module Spree
self.currency ||= store.default_currency
end
- def create_token
- self.token ||= generate_token
- end
-
def collect_payment_methods(store = nil)
if store.present?
Spree::Deprecation.warn('The `store` parameter is deprecated and will be removed in Spree 5. Order is already associated with Store')
diff --git a/core/lib/spree/core/controller_helpers/auth.rb b/core/lib/spree/core/controller_helpers/auth.rb
index 88f4e87974..1050303c61 100644
--- a/core/lib/spree/core/controller_helpers/auth.rb
+++ b/core/lib/spree/core/controller_helpers/auth.rb
@@ -6,7 +6,6 @@ module Spree
include Spree::Core::TokenGenerator
included do
- before_action :set_token
if defined?(helper_method)
helper_method :try_spree_current_user
end