spree_stripe 6.0.0.beta4 → 6.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 761c677448596680810cd6380436150bd4ed2451322f2942e8033511c777176f
-  data.tar.gz: 7d19dd53fe7b8c742df6d141ff166870f15c093c57081c90cd0d86efd572fb4b
+  metadata.gz: b65629d2703ce9659457a090c9baf88ef3f7685550a64e6a8c8e3c296531ad15
+  data.tar.gz: a82e689658e39723dd178006b7937793f128fbff6436a48f1e4ddb2e4f74eed1
 SHA512:
-  metadata.gz: 36dc8fdf7281243405d91bf3e466429cba10b146430c93e46f10883391b47163fb5d03159314940f29c285ec380c9bc4d6fe80f89e2b535ef5850bc6873424f3
-  data.tar.gz: 05ce651862abfee5a54a2716674edfc958016a8ff868ca7a98d31439e11e20207e4885568c2517a3e3ce42449d97d02c9b791742fc3e2b629305f30d960f0ef1
+  metadata.gz: a5bb7beea57c85809530e0601431e0292943b18636cbaeecffeba60b73cd1493ec13b9b825af477462eed2022b5ae85410461c5259b7258768121c38d451f6b3
+  data.tar.gz: 5972312842ff35f2ca34fdfdded24cd3f95ea89146951536ae9b53b8111013f6bfba70480cc399cd18b4940153f64651046aa998eac0c61b27189165c19016a4

data/app/models/spree_stripe/gateway/payment_sessions.rb

@@ -15,6 +15,18 @@ module SpreeStripe
       MANUAL_CAPTURE_METHOD = 'manual'.freeze
       SETUP_FUTURE_USAGE = 'off_session'.freeze
 
+      # Not a decision about the intent. A timeout and an outage may not have
+      # arrived; a rate limit was turned away before Stripe looked; a bad key
+      # or a missing permission never reached the intent. A refusal of the
+      # cancel itself is an InvalidRequestError and stays out of this list.
+      RETRYABLE_STRIPE_ERRORS = [
+        Stripe::APIConnectionError,
+        Stripe::RateLimitError,
+        Stripe::APIError,
+        Stripe::AuthenticationError,
+        Stripe::PermissionError
+      ].freeze
+
       def session_required?
         true
       end
@@ -23,17 +35,29 @@ module SpreeStripe
         Spree::PaymentSessions::Stripe
       end
 
+      # Opens a new session on every call. Each earlier session that can still
+      # be paid is canceled first: every open intent can be paid on its own,
+      # so a reloaded checkout would charge the buyer twice. A session Stripe
+      # has already accepted, a card charge still in flight, or one this cart
+      # has already completed is left as it is and the request fails, because
+      # that money is not dropped to make room for another session.
+      #
       # @param order [Spree::Cart, Spree::Order]
       # @return [Spree::PaymentSessions::Stripe]
+      # @raise [Spree::Core::GatewayError] when a session has already been
+      #   paid, or an earlier one could not be canceled
       def create_payment_session(order:, amount: nil, external_data: {})
         total = amount.presence || order.total_minus_store_credits
         amount_in_cents = Spree::Money.new(total, currency: order.currency).cents
 
-        raise Spree::Core::GatewayError, Spree.t('stripe.payment_session_errors.zero_amount') if amount_in_cents.zero?
+        raise Spree::Core::GatewayError, I18n.t('spree.stripe.payment_session_errors.zero_amount') if amount_in_cents.zero?
 
-        gateway_customer = fetch_or_create_customer(order: order)
         stripe_payment_method_id = external_data[:stripe_payment_method_id] || external_data['stripe_payment_method_id']
 
+        replace_open_sessions(order)
+
+        gateway_customer = fetch_or_create_customer(order: order)
+
         response = create_payment_intent(
           amount_in_cents, order,
           payment_method_id: stripe_payment_method_id,
@@ -110,6 +134,29 @@ module SpreeStripe
         payment_session
       end
 
+      # Stripe refuses once money has moved, and that refusal is raised so the
+      # session is never shown as canceled while its money stands. An intent
+      # already canceled at Stripe, or unknown to the account the keys now
+      # reach, can no longer be paid, so its session is canceled all the same.
+      # A timeout, a rate limit, an outage, or rejected credentials is raised
+      # as Stripe's own error: wrapped as a refusal, the unused-session job
+      # would count the intent handled while the buyer can still pay it.
+      #
+      # @param payment_session [Spree::PaymentSessions::Stripe]
+      # @return [Boolean] whether the session was canceled
+      # @raise [Spree::Core::GatewayError] when Stripe refuses
+      # @raise [Stripe::StripeError] when Stripe could not be asked
+      def cancel_payment_session(payment_session:)
+        cancel_payment_intent(payment_session.external_id)
+        payment_session.cancel
+      rescue *RETRYABLE_STRIPE_ERRORS
+        raise
+      rescue Stripe::StripeError => error
+        raise Spree::Core::GatewayError, error.message unless payment_intent_unpayable?(payment_session.external_id)
+
+        payment_session.cancel
+      end
+
       def retrieve_payment_intent(payment_intent_id)
         send_request { |opts| Stripe::PaymentIntent.retrieve({ id: payment_intent_id, expand: ['payment_method'] }, opts) }
       end
@@ -170,6 +217,60 @@ module SpreeStripe
 
       private
 
+      # Nothing is canceled until every still-payable intent has been read. A
+      # later one that Stripe has already accepted must not be reached after
+      # an earlier one was dropped. A completed session is the same refusal
+      # with no provider call: the cart already has its payment.
+      def replace_open_sessions(order)
+        sessions = order.payment_sessions.where(payment_method: self)
+        if sessions.exists?(status: 'completed')
+          raise Spree::Core::GatewayError, I18n.t('spree.stripe.payment_session_errors.payment_in_progress')
+        end
+
+        # A failed confirm leaves the intent payable. It is canceled with the
+        # open ones, unless its charge is still in flight.
+        open_sessions = sessions.active.order(:id).to_a + sessions.where(status: 'failed').order(:id).to_a
+        return if open_sessions.empty?
+
+        open_sessions.each do |payment_session|
+          payment_intent = find_payment_intent(payment_session.external_id)
+          next unless payment_intent && payment_intent_in_progress?(payment_intent)
+
+          raise Spree::Core::GatewayError, I18n.t('spree.stripe.payment_session_errors.payment_in_progress')
+        end
+
+        open_sessions.each do |payment_session|
+          cancel_payment_session(payment_session: payment_session)
+        end
+      rescue *RETRYABLE_STRIPE_ERRORS => error
+        # Checkout speaks GatewayError. The unused-session job does not: it
+        # retries these, and has to see them unwrapped.
+        raise Spree::Core::GatewayError, error.message
+      end
+
+      # A card can sit in `processing` while its charge is in flight.
+      # `payment_intent_accepted?` does not record that yet, and canceling
+      # the intent can drop or refund the charge.
+      def payment_intent_in_progress?(payment_intent)
+        payment_intent.status == 'processing' || payment_intent_accepted?(payment_intent)
+      end
+
+      # nil when the account the keys now reach has no such intent.
+      def find_payment_intent(payment_intent_id)
+        retrieve_payment_intent(payment_intent_id)
+      rescue Stripe::InvalidRequestError => error
+        raise Spree::Core::GatewayError, error.message unless error.code == 'resource_missing'
+      rescue *RETRYABLE_STRIPE_ERRORS
+        raise
+      rescue Stripe::StripeError => error
+        raise Spree::Core::GatewayError, error.message
+      end
+
+      def payment_intent_unpayable?(payment_intent_id)
+        payment_intent = find_payment_intent(payment_intent_id)
+        payment_intent.nil? || payment_intent.status == 'canceled'
+      end
+
       # @param order [Spree::Cart, Spree::Order]
       # @return [Spree::PaymentResponse]
       def create_payment_intent(amount_in_cents, order, payment_method_id: nil, customer_profile_id: nil)

data/app/models/spree_stripe/gateway.rb

@@ -22,6 +22,14 @@ module SpreeStripe
     validates :preferred_secret_key, :preferred_publishable_key, presence: true
     validate :validate_secret_key, unless: -> { Rails.env.test? }, if: -> { preferred_secret_key.present? }
 
+    def self.logo_url
+      'https://spreecommerce.org/docs/images/integrations/logos/stripe.png'
+    end
+
+    def self.docs_url
+      'https://spreecommerce.org/docs/integrations/payments/stripe'
+    end
+
     def provider_class
       self.class
     end
@@ -50,12 +58,10 @@ module SpreeStripe
     #
     # @return [Boolean]
     def only_webhook_registration_changed?
-      before, after = saved_change_to_preferences
-      return false unless before.is_a?(Hash) && after.is_a?(Hash)
-
-      changed = (before.keys | after.keys).reject { |key| before[key] == after[key] }
+      return false if previously_new_record?
 
-      changed.any? && changed.all? { |key| WEBHOOK_REGISTRATION_PREFERENCES.include?(key.to_sym) }
+      changed = previously_changed_preference_names
+      changed.any? && changed.all? { |key| WEBHOOK_REGISTRATION_PREFERENCES.include?(key) }
     end
 
     # Endpoints are registered per Stripe account, so a rotated key leaves the
@@ -67,10 +73,7 @@ module SpreeStripe
       # read as every key having changed.
       return false if previously_new_record?
 
-      # The preference macro's own reader rather than a hand-rolled diff: it
-      # reads the change through indifferent access, so it answers the same
-      # whether the serialized hash came back with symbol or string keys.
-      preferred_secret_key_previously_changed?
+      saved_change_to_preferred_secret_key?
     end
 
     def gateway_dashboard_payment_url(payment)
@@ -302,14 +305,14 @@ module SpreeStripe
     def validate_secret_key
       Stripe::Refund.list({ limit: 0 }, api_options)
     rescue Stripe::AuthenticationError
-      errors.add(:base, :secret_key_invalid, message: Spree.t('stripe.errors.secret_key_invalid'))
+      errors.add(:base, :secret_key_invalid, message: I18n.t('spree.stripe.errors.secret_key_invalid'))
     rescue Stripe::PermissionError => e
       return unless e.error&.code == 'secret_key_required'
 
       errors.add(:base, :publishable_key_provided,
-                 message: Spree.t('stripe.errors.publishable_key_provided'))
+                 message: I18n.t('spree.stripe.errors.publishable_key_provided'))
     rescue Stripe::StripeError
-      errors.add(:base, :stripe_unavailable, message: Spree.t('stripe.errors.stripe_unavailable'))
+      errors.add(:base, :stripe_unavailable, message: I18n.t('spree.stripe.errors.stripe_unavailable'))
     end
 
     def build_customer_payload(order: nil, customer: nil)

data/app/models/spree_stripe/payment_sources/bank_transfer.rb

@@ -6,11 +6,11 @@ module SpreeStripe
       end
 
       def self.display_name
-        Spree.t(:bank_transfer)
+        I18n.t('spree.bank_transfer')
       end
 
       def name
-        Spree.t(:bank_transfer)
+        I18n.t('spree.bank_transfer')
       end
     end
   end

data/config/locales/en.yml

@@ -7,6 +7,6 @@ en:
         publishable_key_provided: You have provided your publishable key instead of your secret key
         secret_key_invalid: Secret key is invalid
         stripe_unavailable: Something went wrong with Stripe. Try again later.
-      payment_could_not_be_processed: Your payment could not be processed. Please try again.
       payment_session_errors:
+        payment_in_progress: A payment for this checkout is already in progress.
         zero_amount: Payment session amount must be greater than zero

data/lib/spree_stripe/engine.rb

@@ -5,12 +5,6 @@ module SpreeStripe
     isolate_namespace Spree
     engine_name 'spree_stripe'
 
-    config.paths.add 'app/subscribers', eager_load: true
-
-    config.generators do |g|
-      g.test_framework :rspec
-    end
-
     # Core assigns the payment method registry in its own after_initialize, so
     # appending has to happen in a later one — engine callbacks run in load order.
     config.after_initialize do

data/lib/tasks/migrate_webhook_keys.rake

@@ -40,11 +40,14 @@ module SpreeStripe
           next
         end
 
+        # Through the preference writers, so the signing secret lands in the
+        # encrypted column; saved without callbacks, which would re-register
+        # the endpoint the secret belongs to.
+        gateway.preferred_webhook_endpoint_id = key.stripe_id
+        gateway.preferred_webhook_signing_secret = key.signing_secret
         gateway.update_columns(
-          preferences: gateway.preferences.merge(
-            webhook_endpoint_id: key.stripe_id,
-            webhook_signing_secret: key.signing_secret
-          ),
+          preferences: gateway.preferences,
+          secret_preferences: gateway.secret_preferences,
           updated_at: Time.current
         )
         migrated += 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_stripe
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta4
+  version: 6.0.0.rc1
 platform: ruby
 authors:
 - Vendo Connect Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-24 00:00:00.000000000 Z
+date: 2026-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta4
+        version: 6.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta4
+        version: 6.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: stripe
   requirement: !ruby/object:Gem::Requirement
@@ -110,9 +110,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v6.0.0.beta4
+  changelog_uri: https://github.com/spree/spree/releases/tag/v6.0.0.rc1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v6.0.0.beta4
+  source_code_uri: https://github.com/spree/spree/tree/v6.0.0.rc1
 post_install_message:
 rdoc_options: []
 require_paths: