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.

Fix newsletter subscribers verify endpoint with multi DB setup (#13083)

Damian Legawiecc72b104a6486
diff --git a/storefront/app/controllers/spree/newsletter_subscribers_controller.rb b/storefront/app/controllers/spree/newsletter_subscribers_controller.rb
index 35f67f6b4e..6e879e5295 100644
--- a/storefront/app/controllers/spree/newsletter_subscribers_controller.rb
+++ b/storefront/app/controllers/spree/newsletter_subscribers_controller.rb
@@ -25,7 +25,11 @@ module Spree
# GET /newsletter_subscribers/verify?token=VERIFICATION_TOKEN
def verify
- subscriber = Spree::NewsletterSubscriber.verify(token: params[:token])
+ raise ActiveRecord::RecordNotFound if params[:token].blank?
+
+ subscriber = ActiveRecord::Base.connected_to(role: :writing) do
+ Spree::NewsletterSubscriber.verify(token: params[:token])
+ end
if subscriber.verified?
redirect_to spree.root_path, notice: Spree.t('storefront.newsletter_subscribers.verified')
diff --git a/storefront/spec/controllers/spree/newsletter_subscribers_controller_spec.rb b/storefront/spec/controllers/spree/newsletter_subscribers_controller_spec.rb
index 9b16504379..62803d1de3 100644
--- a/storefront/spec/controllers/spree/newsletter_subscribers_controller_spec.rb
+++ b/storefront/spec/controllers/spree/newsletter_subscribers_controller_spec.rb
@@ -177,5 +177,21 @@ RSpec.describe Spree::NewsletterSubscribersController, type: :controller do
expect(response).to redirect_to spree.root_path
end
end
+
+ context 'with blank token' do
+ let(:token) { '' }
+
+ it 'sets error flash message' do
+ subject
+
+ expect(flash[:alert]).to be_present
+ end
+
+ it 'redirects to root path for html format' do
+ request
+
+ expect(response).to redirect_to spree.root_path
+ end
+ end
end
end