Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Allow payment session lookup by external_id (#13935)

Damian Legawiec6b1aaed1e4c6
diff --git a/spree/api/app/controllers/spree/api/v3/store/carts/payment_sessions_controller.rb b/spree/api/app/controllers/spree/api/v3/store/carts/payment_sessions_controller.rb
index 5950bdb504..25d06d6f52 100644
--- a/spree/api/app/controllers/spree/api/v3/store/carts/payment_sessions_controller.rb
+++ b/spree/api/app/controllers/spree/api/v3/store/carts/payment_sessions_controller.rb
@@ -77,7 +77,8 @@ module Spree
private
def set_payment_session
- @payment_session = @cart.payment_sessions.find_by_prefix_id!(params[:id])
+ @payment_session = @cart.payment_sessions.find_by_prefix_id(params[:id]) ||
+ @cart.payment_sessions.find_by!(external_id: params[:id])
end
def serialize_resource(resource)
diff --git a/spree/api/spec/controllers/spree/api/v3/store/carts/payment_sessions_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/store/carts/payment_sessions_controller_spec.rb
index 09db54c54a..c7aef8b730 100644
--- a/spree/api/spec/controllers/spree/api/v3/store/carts/payment_sessions_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/store/carts/payment_sessions_controller_spec.rb
@@ -81,6 +81,13 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentSessionsController, type: :c
expect(json_response['external_data']).to eq({ 'client_secret' => 'secret_123' })
end
+ it 'finds payment session by external_id' do
+ get :show, params: { cart_id: order.prefixed_id, id: payment_session.external_id }
+
+ expect(response).to have_http_status(:ok)
+ expect(json_response['id']).to eq(payment_session.prefixed_id)
+ end
+
context 'error handling' do
it 'returns not found for non-existent payment session' do
get :show, params: { cart_id: order.prefixed_id, id: 'ps_invalid' }
@@ -99,6 +106,18 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentSessionsController, type: :c
expect(response).to have_http_status(:not_found)
end
+
+ it 'returns not found for external_id from another order' do
+ other_user = create(:user)
+ other_order = create(:order_with_line_items, user: other_user, store: store, state: 'payment')
+ other_session = create(:bogus_payment_session,
+ order: other_order,
+ payment_method: payment_method)
+
+ get :show, params: { cart_id: order.prefixed_id, id: other_session.external_id }
+
+ expect(response).to have_http_status(:not_found)
+ end
end
end
@@ -119,5 +138,13 @@ RSpec.describe Spree::Api::V3::Store::Carts::PaymentSessionsController, type: :c
expect(response).to have_http_status(:ok)
expect(json_response['status']).to eq('completed')
end
+
+ it 'completes the payment session by external_id' do
+ patch :complete, params: { cart_id: order.prefixed_id, id: payment_session.external_id, session_result: 'success' }
+
+ expect(response).to have_http_status(:ok)
+ expect(json_response['status']).to eq('completed')
+ expect(json_response['id']).to eq(payment_session.prefixed_id)
+ end
end
end