pay 11.7.2 → 12.0.0

data/lib/pay/engine.rb

@@ -17,6 +17,10 @@ module Pay
       end
     end
 
+    initializer "pay.deprecator" do |app|
+      app.deprecators[:pay] = Pay.deprecator if app.respond_to?(:deprecators)
+    end
+
     initializer "pay.receipts" do
       if defined?(::Receipts::VERSION)
         raise "[Pay] receipts gem must be version ~> 2" unless Pay::Engine.version_matches?(required: "~> 2", current: ::Receipts::VERSION)

data/lib/pay/errors.rb

@@ -3,6 +3,10 @@ module Pay
   class Error < StandardError
   end
 
+  # Raised when a payment processor cannot perform an operation, such as pausing a Braintree subscription
+  class NotSupportedError < Error
+  end
+
   class PaymentError < Error
     attr_reader :payment
 

data/lib/pay/lemon_squeezy.rb

@@ -1,7 +1,10 @@
 module Pay
   module LemonSqueezy
     class Error < Pay::Error
-      delegate :message, to: :cause
+      # Wrapped processor errors report the original message; errors raised with a string keep theirs
+      def message
+        cause&.message || super
+      end
     end
 
     module Webhooks
@@ -38,12 +41,6 @@ module Pay
       owner.to_sgid.to_s
     end
 
-    def self.owner_from_passthrough(passthrough)
-      GlobalID::Locator.locate_signed passthrough
-    rescue JSON::ParserError
-      nil
-    end
-
     def self.configure_webhooks
       Pay::Webhooks.configure do |events|
         events.subscribe "lemon_squeezy.order_created", Pay::LemonSqueezy::Webhooks::Order.new

data/lib/pay/paddle_billing.rb

@@ -1,7 +1,10 @@
 module Pay
   module PaddleBilling
     class Error < Pay::Error
-      delegate :message, to: :cause
+      # Wrapped processor errors report the original message; errors raised with a string keep theirs
+      def message
+        cause&.message || super
+      end
     end
 
     module Webhooks

data/lib/pay/paddle_classic.rb

@@ -1,7 +1,10 @@
 module Pay
   module PaddleClassic
     class Error < Pay::Error
-      delegate :message, to: :cause
+      # Wrapped processor errors report the original message; errors raised with a string keep theirs
+      def message
+        cause&.message || super
+      end
     end
 
     module Webhooks

data/lib/pay/payment.rb

@@ -1,16 +1,22 @@
 module Pay
   class Payment
-    attr_reader :intent
+    # The Stripe Connect account the intent lives on, if any. Needed to look the intent up again
+    # and to initialize Stripe.js on the SCA confirmation page.
+    attr_reader :intent, :stripe_account
 
     delegate :id, :amount, :client_secret, :currency, :customer, :status, :confirm, to: :intent
 
-    def self.from_id(id)
-      intent = id.start_with?("seti_") ? ::Stripe::SetupIntent.retrieve(id) : ::Stripe::PaymentIntent.retrieve(id)
-      new(intent)
+    def self.from_id(id, stripe_account: nil)
+      options = {stripe_account: stripe_account}.compact
+      intent = id.start_with?("seti_") ? ::Stripe::SetupIntent.retrieve(id, options) : ::Stripe::PaymentIntent.retrieve(id, options)
+      new(intent, stripe_account: stripe_account)
+    rescue ::Stripe::StripeError => e
+      raise Pay::Stripe::Error, e
     end
 
-    def initialize(intent)
+    def initialize(intent, stripe_account: nil)
       @intent = intent
+      @stripe_account = stripe_account
     end
 
     def requires_payment_method?
@@ -25,22 +31,10 @@ module Pay
       status == "canceled"
     end
 
-    def cancelled?
-      canceled?
-    end
-
     def succeeded?
       status == "succeeded"
     end
 
-    def payment_intent?
-      intent.is_a?(::Stripe::PaymentIntent)
-    end
-
-    def setup_intent?
-      intent.is_a?(::Stripe::SetupIntent)
-    end
-
     def amount_with_currency
       Pay::Currency.format(amount, currency: currency)
     end

data/lib/pay/receipts.rb

@@ -3,7 +3,6 @@ module Pay
     def receipt_filename
       "receipt-#{created_at.strftime("%Y-%m-%d")}.pdf"
     end
-    alias_method :filename, :receipt_filename
 
     def receipt
       receipt_pdf.render

data/lib/pay/stripe/webhooks/checkout_session_completed.rb

@@ -3,7 +3,7 @@ module Pay
     module Webhooks
       class CheckoutSessionCompleted
         def call(event)
-          locate_owner(event.data.object)
+          locate_owner(event.data.object, stripe_account: event.try(:account))
 
           # By the time CheckoutSessionCompleted is fired, we probably missed the original events
           # Instead, we can sync the payment intent or subscription during this event to ensure they're in the database
@@ -18,11 +18,15 @@ module Pay
           end
         end
 
-        def locate_owner(object)
-          return if object.client_reference_id.nil?
+        # Associates the Stripe customer from the session with the record referenced by client_reference_id
+        #
+        # Sessions in payment or setup mode don't always create a Stripe customer (for example Payment Links with
+        # customer_creation: if_required), so skip those rather than clearing an existing processor_id
+        def locate_owner(object, stripe_account: nil)
+          return if object.client_reference_id.nil? || object.customer.nil?
 
           owner = Pay::Stripe.find_by_client_reference_id(object.client_reference_id)
-          owner&.add_payment_processor(:stripe, processor_id: object.customer)
+          owner&.add_payment_processor(:stripe, processor_id: object.customer, stripe_account: stripe_account)
         end
       end
     end

data/lib/pay/stripe/webhooks/invoice_updated.rb

@@ -19,10 +19,13 @@ module Pay
           return unless subscription
 
           # Grab the local latest_invoice from the subscription stripe_object
+          # It may be an expanded object, a bare ID, or nil for a subscription that hasn't been invoiced yet
           latest_invoice = subscription.stripe_object.try(:latest_invoice)
+          latest_invoice_id = latest_invoice.try(:id) || latest_invoice
+          return if latest_invoice_id.blank?
 
           # Compare the local invoice id to the event invoice id and sync if they are the same
-          if latest_invoice.id.to_s == invoice.id.to_s
+          if latest_invoice_id.to_s == invoice.id.to_s
             Pay::Stripe::Subscription.sync(subscription_id, stripe_account: event.try(:account))
           end
         rescue ::Stripe::StripeError => e

data/lib/pay/stripe/webhooks/payment_action_required.rb

@@ -13,13 +13,14 @@ module Pay
           pay_subscription = Pay::Subscription.find_by_processor_and_id(:stripe, subscription_id)
           return if pay_subscription.nil? || pay_subscription.status == "incomplete"
 
-          invoice_payment = ::Stripe::InvoicePayment.list({invoice: invoice.id, status: :open}).first
+          invoice_payment = ::Stripe::InvoicePayment.list({invoice: invoice.id, status: :open}, {stripe_account: event.try(:account)}.compact).first
 
           if invoice_payment && Pay.send_email?(:payment_action_required, pay_subscription)
             Pay.mailer.with(
               pay_customer: pay_subscription.customer,
               pay_subscription: pay_subscription,
-              payment_intent_id: invoice_payment.payment.payment_intent
+              payment_intent_id: invoice_payment.payment.payment_intent,
+              stripe_account: event.try(:account)
             ).payment_action_required.deliver_later
           end
         end

data/lib/pay/stripe/webhooks/subscription_created.rb

@@ -1,10 +1,8 @@
 module Pay
   module Stripe
     module Webhooks
-      class SubscriptionCreated
-        def call(event)
-          Pay::Stripe::Subscription.sync(event.data.object.id, stripe_account: event.try(:account))
-        end
+      # If a subscription is manually created on Stripe, we want to sync it the same way as an update
+      class SubscriptionCreated < SubscriptionUpdated
       end
     end
   end

data/lib/pay/stripe/webhooks/subscription_deleted.rb

@@ -1,11 +1,8 @@
 module Pay
   module Stripe
     module Webhooks
-      class SubscriptionDeleted
-        def call(event)
-          # Canceled subscriptions are still accessible via the API, so we can sync their details
-          Pay::Stripe::Subscription.sync(event.data.object.id, stripe_account: event.try(:account))
-        end
+      # Canceled subscriptions are still accessible via the API, so they sync the same way as an update
+      class SubscriptionDeleted < SubscriptionUpdated
       end
     end
   end

data/lib/pay/stripe.rb

@@ -175,12 +175,12 @@ module Pay
       when "subscription"
         Pay::Stripe::Subscription.sync(checkout_session.subscription, stripe_account: stripe_account)
       end
-    rescue ::Stripe::InvalidRequestError
+    rescue ::Stripe::InvalidRequestError => e
       if try > retries
-        raise
+        raise Pay::Stripe::Error, e
       else
         try += 1
-        sleep 0.15**try
+        sleep 0.15 * try
         retry
       end
     end

data/lib/pay/sync.rb

@@ -0,0 +1,29 @@
+module Pay
+  # Shared skeleton for the processor Charge.sync, Subscription.sync, and PaymentMethod.sync class methods
+  module Sync
+    # Runs the sync block, retrying it when a webhook and an API call race to
+    # create the same record. The block retrieves the processor's object itself
+    # when the caller didn't pass one in, so each retry gets a fresh read.
+    def sync_with_retries(retries: 1)
+      try = 0
+      begin
+        yield
+      rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
+        try += 1
+        raise if try > retries
+        sleep 0.15 * try
+        retry
+      end
+    end
+
+    # The Pay::Customer for this processor, or nil when the ID is blank or the customer isn't in the database
+    def find_pay_customer(processor_id)
+      Pay::Customer.find_by(processor: pay_processor, processor_id: processor_id) if processor_id.present?
+    end
+
+    # "stripe" for Pay::Stripe::Charge, "paddle_billing" for Pay::PaddleBilling::Subscription, and so on
+    def pay_processor
+      name.deconstantize.demodulize.underscore
+    end
+  end
+end

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "11.7.2"
+  VERSION = "12.0.0"
 end

data/lib/pay.rb

@@ -12,6 +12,7 @@ module Pay
   autoload :NanoId, "pay/nano_id"
   autoload :Payment, "pay/payment"
   autoload :Receipts, "pay/receipts"
+  autoload :Sync, "pay/sync"
   autoload :Currency, "pay/currency"
 
   # Payment processors
@@ -75,15 +76,16 @@ module Pay
   @@emails.subscription_trial_will_end = true
   @@emails.subscription_trial_ended = true
 
+  mattr_writer :mailer
   @@mailer = "Pay::UserMailer"
 
-  def self.mailer=(value)
-    @@mailer = value
-    @@mailer_ref = nil
+  # Resolved on every call rather than memoized, so code reloading in development returns the current class
+  def self.mailer
+    @@mailer.constantize
   end
 
-  def self.mailer
-    @@mailer_ref ||= @@mailer&.constantize
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new("13.0", "Pay")
   end
 
   mattr_accessor :parent_mailer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 11.7.2
+  version: 12.0.0
 platform: ruby
 authors:
 - Jason Charnes
@@ -42,6 +42,7 @@ files:
 - app/assets/stylesheets/pay/application.css
 - app/controllers/pay/application_controller.rb
 - app/controllers/pay/payments_controller.rb
+- app/controllers/pay/webhooks/base_controller.rb
 - app/controllers/pay/webhooks/braintree_controller.rb
 - app/controllers/pay/webhooks/lemon_squeezy_controller.rb
 - app/controllers/pay/webhooks/paddle_billing_controller.rb
@@ -115,9 +116,9 @@ files:
 - lib/pay/attributes.rb
 - lib/pay/billable/sync_customer.rb
 - lib/pay/braintree.rb
+- lib/pay/braintree/webhooks/subscription.rb
 - lib/pay/braintree/webhooks/subscription_canceled.rb
 - lib/pay/braintree/webhooks/subscription_charged_successfully.rb
-- lib/pay/braintree/webhooks/subscription_charged_unsuccessfully.rb
 - lib/pay/braintree/webhooks/subscription_expired.rb
 - lib/pay/braintree/webhooks/subscription_trial_ended.rb
 - lib/pay/braintree/webhooks/subscription_went_active.rb
@@ -165,6 +166,7 @@ files:
 - lib/pay/stripe/webhooks/subscription_renewing.rb
 - lib/pay/stripe/webhooks/subscription_trial_will_end.rb
 - lib/pay/stripe/webhooks/subscription_updated.rb
+- lib/pay/sync.rb
 - lib/pay/version.rb
 - lib/pay/webhooks.rb
 - lib/pay/webhooks/delegator.rb
@@ -189,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.18
+rubygems_version: 4.0.21
 specification_version: 4
 summary: Payments engine for Ruby on Rails
 test_files: []

data/lib/pay/braintree/webhooks/subscription_charged_unsuccessfully.rb

@@ -1,24 +0,0 @@
-# A subscription successfully moves to the next billing cycle. This will also occur when either a new transaction is created mid-cycle due to proration on an upgrade or a billing cycle is skipped due to the presence of a negative balance that covers the cost of the subscription.
-
-module Pay
-  module Braintree
-    module Webhooks
-      class SubscriptionChargedUnsuccessfully
-        def call(event)
-          # subscription = event.subscription
-          # return if subscription.nil?
-
-          # pay_subscription = Pay::Subscription.find_by_processor_and_id(:braintree, subscription.id)
-          # return unless pay_subscription.present?
-
-          # pay_customer = pay_subscription.customer
-          # pay_charge = Pay::Braintree::Billable.new(pay_customer).save_transaction(subscription.transactions.first)
-
-          # if Pay.send_emails
-          #  Pay.mailer.with(pay_customer: pay_charge.customer, charge: pay_charge).receipt.deliver_later
-          # end
-        end
-      end
-    end
-  end
-end