Merge branch 'fix-localhost-pro-account' into develop

mysociety · Feb 20, 2025 · 1c79af7 · 1c79af7
2 parents b77da22 + 9d40aa5
commit 1c79af7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/app/models/pro_account.rb b/app/models/pro_account.rb
@@ -51,9 +51,12 @@ def update_stripe_customer
     @subscriptions = nil unless stripe_customer
 
     attributes = {}
-    attributes[:email] = user.email if stripe_customer.try(:email) != user.email
     attributes[:source] = @token.id if @token
 
+    if stripe_customer&.email != user.email && user.email !~ /@localhost$/
+      attributes[:email] = user.email
+    end
+
     @stripe_customer = (
       if attributes.empty?
         stripe_customer
@@ -64,7 +67,7 @@ def update_stripe_customer
       end
     )
 
-    update(stripe_customer_id: @stripe_customer.id)
+    update(stripe_customer_id: @stripe_customer&.id)
   end
 
   private

diff --git a/spec/models/pro_account_spec.rb b/spec/models/pro_account_spec.rb
@@ -88,6 +88,15 @@
       ).from(old_source)
     end
 
+    context 'when user uses localhost development email' do
+      before { user.update(email: 'user@localhost') }
+
+      it 'does not create Stripe customer' do
+        expect(Stripe::Customer).to_not receive(:create)
+        pro_account.update_stripe_customer
+      end
+    end
+
     context 'with pro_pricing disabled' do
       it 'does not store Stripe customer ID' do
         with_feature_disabled(:pro_pricing) do