Fix 404 when using ECE and 3D Secure (#3643)

* Fix 404 when using ECE and 3D Secure

* Add changelog and readme entries

* Update jest tests

* Update JSDoc for confirmIntent

Author: annemirasol

changelog.txt

@@ -1,6 +1,7 @@
 *** Changelog ***
 
 = 9.0.0 - xxxx-xx-xx =
+* Fix - Fix 404 that happens when using ECE and 3D Secure auth is triggered.
 * Fix - Set correct payment method when using Link and a card that is 3D Secure authenticated.
 * Fix - Fix total calculation for custom product types when using the Payment Request Button.
 * Fix - Fix order attribution metadata not included in PRBs or Express Checkout Element.
@@ -16,7 +17,7 @@
 * Fix - Return 'is_live' as true in account summary response when test mode is disabled in gateway settings and charge is enabled in Stripe account.
 * Fix - Prevents notices being displayed on WordPress 6.7 due to loading translations too early (only shown on stores with WP_DEBUG enabled).
 * Fix - Prevent showing the shipping options on express checkout modal for virtual product variations.
-* Fix - Do not assume payment is using a saved card when retrying a failed payment. 
+* Fix - Do not assume payment is using a saved card when retrying a failed payment.
 * Tweak - Update links to plugin documentation and Stripe documentation.
 
 = 8.9.0 - 2024-11-14 =

client/api/index.js

@@ -290,7 +290,8 @@ export default class WCStripeAPI {
 	 *
 	 * @param {string} redirectUrl The redirect URL, returned from the server.
 	 * @param {string} paymentMethodToSave The ID of a Payment Method if it should be saved (optional).
-	 * @return {string|true} A redirect URL on success, or `true` if no confirmation is needed.
+	 * @return {Object|true} An object containing the redirect URL on success and a flag indicating
+	 *   if the page is the Pay for order page, or `true` if no confirmation is needed.
 	 */
 	confirmIntent( redirectUrl, paymentMethodToSave ) {
 		const partials = redirectUrl.match(

client/express-checkout/__tests__/event-handler.test.js

@@ -384,9 +384,12 @@ describe( 'Express checkout event handlers', () => {
 				result: 'success',
 				redirect: 'https://example.com/redirect',
 			} );
-			api.confirmIntent.mockResolvedValue(
-				'https://example.com/confirmation_redirect'
-			);
+			api.confirmIntent.mockReturnValue( {
+				request: Promise.resolve(
+					'https://example.com/confirmation_redirect'
+				),
+				isOrderPage: false,
+			} );
 
 			await onConfirmHandler(
 				api,
@@ -415,9 +418,12 @@ describe( 'Express checkout event handlers', () => {
 				result: 'success',
 				redirect: 'https://example.com/redirect',
 			} );
-			api.confirmIntent.mockRejectedValue(
-				new Error( 'Intent confirmation error' )
-			);
+			api.confirmIntent.mockReturnValue( {
+				request: Promise.reject(
+					new Error( 'Intent confirmation error' )
+				),
+				isOrderPage: false,
+			} );
 
 			await onConfirmHandler(
 				api,
@@ -513,9 +519,12 @@ describe( 'Express checkout event handlers', () => {
 				result: 'success',
 				redirect: 'https://example.com/redirect',
 			} );
-			api.confirmIntent.mockResolvedValue(
-				'https://example.com/confirmation_redirect'
-			);
+			api.confirmIntent.mockReturnValue( {
+				request: Promise.resolve(
+					'https://example.com/confirmation_redirect'
+				),
+				isOrderPage: false,
+			} );
 
 			await onConfirmHandler(
 				api,
@@ -545,9 +554,12 @@ describe( 'Express checkout event handlers', () => {
 				result: 'success',
 				redirect: 'https://example.com/redirect',
 			} );
-			api.confirmIntent.mockRejectedValue(
-				new Error( 'Intent confirmation error' )
-			);
+			api.confirmIntent.mockReturnValue( {
+				request: Promise.reject(
+					new Error( 'Intent confirmation error' )
+				),
+				isOrderPage: false,
+			} );
 
 			await onConfirmHandler(
 				api,

client/express-checkout/event-handler.js

@@ -103,7 +103,8 @@ export const onConfirmHandler = async (
 		if ( confirmationRequest === true ) {
 			completePayment( orderResponse.redirect );
 		} else {
-			const redirectUrl = await confirmationRequest;
+			const { request } = confirmationRequest;
+			const redirectUrl = await request;
 
 			completePayment( redirectUrl );
 		}

readme.txt

@@ -111,6 +111,7 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 == Changelog ==
 
 = 9.0.0 - xxxx-xx-xx =
+* Fix - Fix 404 that happens when using ECE and 3D Secure auth is triggered.
 * Fix - Set correct payment method when using Link and a card that is 3D Secure authenticated.
 * Fix - Fix total calculation for custom product types when using the Payment Request Button.
 * Fix - Fix order attribution metadata not included in PRBs or Express Checkout Element.
@@ -126,7 +127,7 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 * Fix - Return 'is_live' as true in account summary response when test mode is disabled in gateway settings and charge is enabled in Stripe account.
 * Fix - Prevents notices being displayed on WordPress 6.7 due to loading translations too early (only shown on stores with WP_DEBUG enabled).
 * Fix - Prevent showing the shipping options on express checkout modal for virtual product variations.
-* Fix - Do not assume payment is using a saved card when retrying a failed payment. 
+* Fix - Do not assume payment is using a saved card when retrying a failed payment.
 * Tweak - Update links to plugin documentation and Stripe documentation.
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).