Add retry to sync_checkout_session to handle subscriptions that have a slight delay after completing the session

Author: excid3

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ### Unreleased
 
+* Add `retry` to `Pay::Stripe.sync_checkout_session`
+  Subscriptions aren't instantly attached to a Checkout Session, so this retry gives a chance for completion.
+  This helps build a more seamless experience when redirecting after a successful checkout so the next page knows the user has subscribed successfully.
+
 ### 11.1.0
 
 * Add text parts to emails

app/models/pay/stripe/charge.rb

@@ -65,11 +65,13 @@ def self.sync(charge_id, object: nil, stripe_account: nil, try: 0, retries: 1)
           create!(attrs.merge(customer: pay_customer, processor_id: object.id))
         end
       rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
-        try += 1
-        raise unless try <= retries
-
-        sleep 0.1
-        retry
+        if try > retries
+          raise
+        else
+          try += 1
+          sleep 0.15**try
+          retry
+        end
       end
 
       def api_record

app/models/pay/stripe/payment_method.rb

@@ -41,12 +41,12 @@ def self.sync(id, object: nil, stripe_account: nil, try: 0, retries: 1)
         pay_payment_method.update!(attributes)
         pay_payment_method
       rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
-        try += 1
-        if try <= retries
-          sleep 0.1
-          retry
-        else
+        if try > retries
           raise
+        else
+          try += 1
+          sleep 0.15**try
+          retry
         end
       end
 

lib/pay/stripe.rb

@@ -142,16 +142,25 @@ def self.find_by_client_reference_id(client_reference_id)
       nil
     end
 
-    def self.sync_checkout_session(session_id, stripe_account: nil)
+    # Subscriptions aren't always immediately associated, so we want to retry by default
+    def self.sync_checkout_session(session_id, stripe_account: nil, try: 0, retries: 5)
       checkout_session = ::Stripe::Checkout::Session.retrieve({id: session_id, expand: ["payment_intent.latest_charge"]}, {stripe_account: stripe_account}.compact)
       case checkout_session.mode
       when "payment"
         if (id = checkout_session.payment_intent.try(:latest_charge)&.id)
-          Pay::Stripe::Charge.sync(id, stripe_account: stripe_account)
+          Pay::Stripe::Charge.sync(id, stripe_account: stripe_account, retries: 5)
         end
       when "subscription"
         Pay::Stripe::Subscription.sync(checkout_session.subscription, stripe_account: stripe_account)
       end
+    rescue ::Stripe::InvalidRequestError
+      if try > retries
+        raise
+      else
+        try += 1
+        sleep 0.15**try
+        retry
+      end
     end
   end
 end