Skip to content

W-20504299: refactor of clientSecret(Stripe) and shippingPreference(PayPal) #3524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sf-mkosak wants to merge 1 commit into
base: t/team404/sfp-on-pwa
Choose a base branch
from
Open

W-20504299: refactor of clientSecret(Stripe) and shippingPreference(PayPal) #3524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/template-retail-react-app/app/components/sf-payments-express-buttons/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,9 @@ const SFPaymentsExpressButtons = ({
}
}
return {
client_secret: updatedPaymentInstrument.paymentReference.clientSecret,
client_secret:
updatedPaymentInstrument.paymentReference.gatewayProperties?.stripe
Copy link

@amittapalli amittapalli Dec 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I actually addressed this in my PR since it was blocking me testing the fail order if I didn't.

?.clientSecret,
id: updatedPaymentInstrument.paymentReference.paymentReferenceId
}
}
Expand Down
3 changes: 2 additions & 1 deletion packages/template-retail-react-app/app/pages/checkout/partials/sf-payments-sheet.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,8 @@ const SFPaymentsSheet = forwardRef((props, ref) => {

// Track created payment intent
const paymentIntent = {
client_secret: orderPaymentInstrument.paymentReference.clientSecret,
client_secret:
orderPaymentInstrument.paymentReference.gatewayProperties?.stripe?.clientSecret,
Copy link
Author

@sf-mkosak sf-mkosak Dec 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is obviously very stripe specific. I dont think the branch supports Adyen in any way yet but keep me honest

Copy link

@amittapalli amittapalli Dec 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I actually addressed this in my PR since it was blocking me testing the fail order if I didn't. I created a separate util function so that we can add gateway specific logic the instead

id: orderPaymentInstrument.paymentReference.paymentReferenceId
}

Expand Down
49 changes: 42 additions & 7 deletions packages/template-retail-react-app/app/pages/checkout/partials/sf-payments-sheet.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,12 @@ describe('SFPaymentsSheet', () => {
paymentInstrumentId: 'PI123',
paymentMethodId: 'Salesforce Payments',
paymentReference: {
clientSecret: 'secret123',
gateway: 'stripe',
gatewayProperties: {
stripe: {
clientSecret: 'secret123'
}
},
paymentReferenceId: 'ref123'
}
}
Expand All @@ -478,7 +483,12 @@ describe('SFPaymentsSheet', () => {
paymentInstrumentId: 'PI123',
paymentMethodId: 'Salesforce Payments',
paymentReference: {
clientSecret: 'secret123',
gateway: 'stripe',
gatewayProperties: {
stripe: {
clientSecret: 'secret123'
}
},
paymentReferenceId: 'ref123'
}
}
Expand Down Expand Up @@ -533,7 +543,12 @@ describe('SFPaymentsSheet', () => {
paymentInstrumentId: 'PI123',
paymentMethodId: 'Salesforce Payments',
paymentReference: {
clientSecret: 'secret123',
gateway: 'stripe',
gatewayProperties: {
stripe: {
clientSecret: 'secret123'
}
},
paymentReferenceId: 'ref123'
}
}
Expand Down Expand Up @@ -602,7 +617,12 @@ describe('SFPaymentsSheet', () => {
paymentInstrumentId: 'PI123',
paymentMethodId: 'Salesforce Payments',
paymentReference: {
clientSecret: 'secret123',
gateway: 'stripe',
gatewayProperties: {
stripe: {
clientSecret: 'secret123'
}
},
paymentReferenceId: 'ref123'
}
}
Expand All @@ -617,7 +637,12 @@ describe('SFPaymentsSheet', () => {
paymentInstrumentId: 'PI123',
paymentMethodId: 'Salesforce Payments',
paymentReference: {
clientSecret: 'secret123',
gateway: 'stripe',
gatewayProperties: {
stripe: {
clientSecret: 'secret123'
}
},
paymentReferenceId: 'ref123'
}
}
Expand Down Expand Up @@ -664,7 +689,12 @@ describe('SFPaymentsSheet', () => {
paymentInstrumentId: 'PI123',
paymentMethodId: 'Salesforce Payments',
paymentReference: {
clientSecret: 'secret123',
gateway: 'stripe',
gatewayProperties: {
stripe: {
clientSecret: 'secret123'
}
},
paymentReferenceId: 'ref123'
}
}
Expand All @@ -682,7 +712,12 @@ describe('SFPaymentsSheet', () => {
paymentInstrumentId: 'PI123',
paymentMethodId: 'Salesforce Payments',
paymentReference: {
clientSecret: 'secret123',
gateway: 'stripe',
gatewayProperties: {
stripe: {
clientSecret: 'secret123'
}
},
paymentReferenceId: 'ref123'
}
}
Expand Down
19 changes: 14 additions & 5 deletions packages/template-retail-react-app/app/utils/sf-payments-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,23 @@ export const createPaymentInstrumentBody = (
zoneId,
shippingPreference
) => {
const paymentReferenceRequest = {
paymentMethodType: paymentMethodType,
zoneId: zoneId ?? 'default'
}

if (shippingPreference != null) {
paymentReferenceRequest.gatewayProperties = {
paypal: {
shippingPreference
}
}
}

return {
paymentMethodId: 'Salesforce Payments',
amount: amount,
paymentReferenceRequest: {
paymentMethodType: paymentMethodType,
zoneId: zoneId ?? 'default',
shippingPreference: shippingPreference
}
paymentReferenceRequest
}
}

Expand Down
9 changes: 7 additions & 2 deletions packages/template-retail-react-app/app/utils/sf-payments-utils.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,12 @@ describe('sf-payments-utils', () => {
paymentInstrumentId: 'test-id',
paymentReference: {
paymentReferenceId: 'ref-123',
clientSecret: 'secret-abc'
gateway: 'stripe',
gatewayProperties: {
stripe: {
clientSecret: 'secret-abc'
}
}
},
customProperty: 'custom-value'
}
Expand Down Expand Up @@ -1112,7 +1117,7 @@ describe('sf-payments-utils', () => {
'GET_FROM_FILE'
)

expect(result.paymentReferenceRequest.shippingPreference).toBe('GET_FROM_FILE')
expect(result.paymentReferenceRequest.gatewayProperties.paypal.shippingPreference).toBe('GET_FROM_FILE')
})
})
})
Loading