Skip to content

fix(checkout): PI-4524 fix default instrument setup on additional action for Adyen v3 #3091

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
bc-wpietrzak wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix(checkout): PI-4524 fix default instrument setup on additional action for Adyen v3 #3091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4079a2
fix(checkout): PI-4524 fix default instrument setup for Adyen v3
bc-wpietrzak Nov 28, 2025
1af761d
fix(checkout): PI-4524 fix default instrument setup for Adyen v3
bc-wpietrzak Nov 28, 2025
cdfcf16
fix(checkout): PI-4524 fix default instrument setup for Adyen v3
bc-wpietrzak Nov 28, 2025
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
40 changes: 40 additions & 0 deletions packages/adyen-integration/src/adyenv3/adyenv3-payment-strategy.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,46 @@ describe('AdyenV3PaymentStrategy', () => {
expect(adyenCheckout.createFromAction).toHaveBeenCalledTimes(1);
});

it('should call submitPayment with payment instrument data when setting a vaulted card as default and additional action is completed', async () => {
jest.spyOn(paymentIntegrationService, 'submitPayment')
.mockReturnValueOnce(Promise.reject(challengeShopperError))
.mockImplementationOnce(jest.fn());

options = getInitializeOptionsWithUndefinedWidgetSize();

await strategy.initialize(options);
await strategy.execute({
useStoreCredit: false,
payment: {
methodId: 'scheme',
paymentData: { instrumentId: '123', shouldSetAsDefaultInstrument: true },
},
});

expect(paymentIntegrationService.submitPayment).toHaveBeenCalledTimes(2);
expect(paymentIntegrationService.submitPayment).toHaveBeenNthCalledWith(
2,
expect.objectContaining({
methodId: 'scheme',
paymentData: expect.objectContaining({
formattedPayload: expect.objectContaining({
bigpay_token: {
credit_card_number_confirmation: 'ENCRYPTED_CARD_NUMBER',
expiry_month: 'ENCRYPTED_EXPIRY_MONTH',
expiry_year: 'ENCRYPTED_EXPIRY_YEAR',
token: '123',
verification_value: 'ENCRYPTED_CVV',
},
}),
instrumentId: '123',
nonce: '{"resultCode":"ChallengeShopper","action":"adyenAction"}',
shouldSaveInstrument: undefined,
shouldSetAsDefaultInstrument: true,
}),
}),
);
});

it('returns 3DS2 ChallengeShopper flow with default widget size', async () => {
jest.spyOn(paymentIntegrationService, 'submitPayment')
.mockReturnValueOnce(Promise.reject(challengeShopperError))
Expand Down
30 changes: 27 additions & 3 deletions packages/adyen-integration/src/adyenv3/adyenv3-payment-strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,8 @@ export default class Adyenv3PaymentStrategy implements PaymentStrategy {
error,
shouldSaveInstrument,
shouldSetAsDefaultInstrument,
paymentData.instrumentId,
bigpayToken,
);

return;
Expand Down Expand Up @@ -461,6 +463,8 @@ export default class Adyenv3PaymentStrategy implements PaymentStrategy {
error: unknown,
shouldSaveInstrument?: boolean,
shouldSetAsDefaultInstrument?: boolean,
paymentToken?: string,
bigpayToken?: Record<string, unknown>,
): Promise<PaymentIntegrationSelectors | void> {
if (
!isRequestError(error) ||
Expand All @@ -472,19 +476,39 @@ export default class Adyenv3PaymentStrategy implements PaymentStrategy {
const payment = await this._handleAction(error.body.provider_data);

try {
const basePaymentData = {
...payment.paymentData,
shouldSaveInstrument,
shouldSetAsDefaultInstrument,
};

const tokenData =
shouldSetAsDefaultInstrument && !shouldSaveInstrument
? {
instrumentId: paymentToken,
formattedPayload: {
bigpay_token: {
...bigpayToken,
token: paymentToken,
},
},
}
: {};

await this._paymentIntegrationService.submitPayment({
...payment,
paymentData: {
...payment.paymentData,
shouldSaveInstrument,
shouldSetAsDefaultInstrument,
...basePaymentData,
...tokenData,
},
});
} catch (paymentError) {
return this._processAdditionalAction(
paymentError,
shouldSaveInstrument,
shouldSetAsDefaultInstrument,
paymentToken,
bigpayToken,
);
}
}
Expand Down