spree_stripe 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29e7b17d5c521a1ecabbff665256fabda9299e5f5121d2b60f23ba102f386b7b
-  data.tar.gz: ab6a21916a2b08f1772227bb5f9261e286f9c9350d7b775f220de530bdb8f6f9
+  metadata.gz: 6ec2a5a3cd5e0a0b8e5160018ad055ff16dd27a2eea3e8404e4906e83b9e0758
+  data.tar.gz: b51ad1b1e21337ad780f5e2269c1850b0fd1dfb39ac778db187ae0629c933944
 SHA512:
-  metadata.gz: 765382a672704ba2660861fd1f145b43ca0418c534c63e817db38983f6cdf84d770e3ea2e870e40765a22b3ad0a7e44e4b0d368c79518ad3a10c17357f7666bf
-  data.tar.gz: 1aec94ce6369b320efc11e2697560c4c07106ac67f3f66227e4fa0d1d48a15cda0972ffe892e3c6bcd35f0230718eed32459a845e685242f713dd3e4b0f2eacf
+  metadata.gz: f3f47966c0982f865f7dfa55074f4df6c2f8c90e2c5bdb656012266eb7c46ed690260b47fab15d7fabf0889fbaef8d22fbd153548d23f4316bcc6cdca4353d64
+  data.tar.gz: 4c9696c085fa47b26f0eb6c6dd06f4b855e0de02dd7ec583efea2c552e8be03c9d9f2952500001357ae04c06e0315a65374846a833d2267a7b6ed89b4b25e325

data/app/controllers/spree_stripe/confirm_payments_controller.rb

@@ -0,0 +1,52 @@
+# Stripe redirects here after payment confirmation. Mirrors the Next.js storefront's server-side
+# completion: finalizes the payment session + order via existing services, then
+# redirects to the confirmation page. Completion is idempotent — an already-completed
+# order (e.g. the webhook won the race) is treated as success.
+module SpreeStripe
+  class ConfirmPaymentsController < (defined?(Spree::StoreController) ? Spree::StoreController : Spree::BaseController)
+    include Spree::CheckoutAnalyticsHelper if defined?(Spree::CheckoutAnalyticsHelper)
+
+    # GET /stripe/confirm_payment/:id?session=ps_...&redirect_status=...
+    def show
+      @order = current_store.orders.find_by_prefix_id!(params[:id])
+
+      return redirect_to_cart_canceled if @order.canceled?
+      return redirect_to_complete if @order.completed?
+
+      payment_session = @order.payment_sessions.find_by_prefix_id!(params[:session])
+      payment_session.payment_method.complete_payment_session(
+        payment_session: payment_session,
+        params: { session_result: params[:redirect_status] }
+      )
+
+      return handle_failure(payment_session.errors.full_messages.to_sentence) unless payment_session.completed?
+
+      Spree::Dependencies.carts_complete_service.constantize.call(cart: @order) unless @order.completed?
+
+      if @order.reload.completed?
+        track_checkout_completed if respond_to?(:track_checkout_completed)
+        redirect_to_complete
+      else
+        handle_failure
+      end
+    rescue Spree::Core::GatewayError => e
+      handle_failure(e.message)
+    end
+
+    private
+
+    def redirect_to_complete
+      redirect_to spree.checkout_complete_path(@order.token), status: :see_other
+    end
+
+    def redirect_to_cart_canceled
+      flash[:error] = Spree.t(:order_canceled)
+      redirect_to spree.cart_path, status: :see_other
+    end
+
+    def handle_failure(message = nil)
+      flash[:error] = message.presence || Spree.t('stripe.payment_could_not_be_processed')
+      redirect_to spree.checkout_state_path(@order.token, 'payment'), status: :see_other
+    end
+  end
+end

data/app/helpers/spree_stripe/base_helper.rb

@@ -4,10 +4,32 @@ module SpreeStripe
       @current_stripe_gateway ||= current_store.stripe_gateway
     end
 
-    def current_stripe_payment_intent
+    # Server-side payment session for the current order, used for the legacy
+    # Rails storefront payment flow: reuses the order's pending Stripe
+    # session (keeping its amount in sync) or creates one. Memoized per request.
+    # @return [Spree::PaymentSessions::Stripe, nil]
+    def current_stripe_payment_session
       return if current_stripe_gateway.nil?
 
-      @current_stripe_payment_intent ||= SpreeStripe::CreatePaymentIntent.new.call(@order, current_stripe_gateway)
+      @current_stripe_payment_session ||= SpreeStripe::CreatePaymentSession.new.call(@order, current_stripe_gateway)
+    end
+
+    # The cart-prefixed id the v3 Store API addresses carts by (e.g. `cart_xxx`).
+    # Must match Spree::Api::V3::CartSerializer's encoding exactly.
+    # @return [String]
+    def stripe_cart_prefixed_id(order)
+      "cart_#{Spree::PrefixedId::SQIDS.encode([order.id])}"
+    end
+
+    # The store's publishable Spree API key, used by the storefront JS as the
+    # `X-Spree-API-Key` header for v3 Store API calls. Creates one on first use
+    # when the store has no active publishable key yet.
+    # @return [String]
+    def current_store_publishable_api_key
+      @current_store_publishable_api_key ||= (
+        current_store.api_keys.publishable.active.first ||
+          current_store.api_keys.create!(key_type: 'publishable', name: 'Storefront')
+      ).plaintext_token
     end
   end
 end