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.

Remove `load_and_authorize_resource` (#12791)

Damian Kaczmarczyk7059b29403eb
diff --git a/storefront/app/controllers/spree/addresses_controller.rb b/storefront/app/controllers/spree/addresses_controller.rb
index 0a36e994cd..3f5b5122cc 100644
--- a/storefront/app/controllers/spree/addresses_controller.rb
+++ b/storefront/app/controllers/spree/addresses_controller.rb
@@ -1,7 +1,7 @@
module Spree
class AddressesController < Spree::StoreController
helper Spree::AddressesHelper
- load_and_authorize_resource class: Spree::Address
+ before_action :load_and_authorize_address, except: [:index]
def create
order_token = params[:order_token]
@@ -98,6 +98,18 @@ module Spree
Spree::Dependencies.address_update_service.constantize
end
+ def load_and_authorize_address
+ action = params[:action].to_sym
+
+ @address ||= if [:new, :create].include?(action)
+ Spree::Address.new(country: current_store.default_country, user: try_spree_current_user)
+ else
+ Spree::Address.find(params[:id])
+ end
+
+ authorize! action, @address
+ end
+
def address_changes_except
[]
end