refactor: clean up _wcpay_feature_tokenized_cart_ece feature (#10784)

Author: frosso

changelog/chore-remove-deprecated-non-tokenized-ece

@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+update: remove `_wcpay_feature_tokenized_cart_ece` feature flag; remove `client/express-checkout` in favor of `client/tokenized-express-checkout`

client/checkout/api/index.js

@@ -3,12 +3,11 @@
 /**
  * Internal dependencies
  */
-import { getConfig, getUPEConfig } from 'utils/checkout';
+import { getConfig, getUPEConfig } from 'wcpay/utils/checkout';
 import {
 	getExpressCheckoutConfig,
 	buildAjaxURL,
-	getExpressCheckoutAjaxURL,
-} from 'utils/express-checkout';
+} from 'wcpay/utils/express-checkout';
 import { getAppearance } from 'checkout/upe-styles';
 import { getAppearanceType } from '../utils';
 
@@ -348,115 +347,6 @@ export default class WCPayAPI {
 			} );
 	}
 
-	/**
-	 * Updates cart with selected shipping option.
-	 *
-	 * @param {Object} shippingOption Shipping option.
-	 * @return {Promise} Promise for the request to the server.
-	 */
-	expressCheckoutECEUpdateShippingDetails( shippingOption ) {
-		return this.request(
-			getExpressCheckoutAjaxURL( 'ece_update_shipping_method' ),
-			{
-				security: getExpressCheckoutConfig( 'nonce' )?.update_shipping,
-				shipping_method: [ shippingOption.id ],
-				is_product_page:
-					getExpressCheckoutConfig( 'button_context' ) === 'product',
-			}
-		);
-	}
-
-	/**
-	 * Get cart items and total amount.
-	 *
-	 * @return {Promise} Promise for the request to the server.
-	 */
-	expressCheckoutECEGetCartDetails() {
-		return this.request(
-			getExpressCheckoutAjaxURL( 'ece_get_cart_details' ),
-			{
-				security: getExpressCheckoutConfig( 'nonce' )?.get_cart_details,
-			}
-		);
-	}
-
-	/**
-	 * Add product to cart from variable product page.
-	 *
-	 * @param {Object} productData Product data.
-	 * @return {Promise} Promise for the request to the server.
-	 */
-	expressCheckoutECEAddToCart( productData ) {
-		return this.request( getExpressCheckoutAjaxURL( 'add_to_cart' ), {
-			security: getExpressCheckoutConfig( 'nonce' )?.add_to_cart,
-			...productData,
-		} );
-	}
-
-	/**
-	 * Get selected product data from variable product page.
-	 *
-	 * @param {Object} productData Product data.
-	 * @return {Promise} Promise for the request to the server.
-	 */
-	expressCheckoutECEGetSelectedProductData( productData ) {
-		return this.request(
-			getExpressCheckoutAjaxURL( 'ece_get_selected_product_data' ),
-			{
-				security: getExpressCheckoutConfig( 'nonce' )
-					?.get_selected_product_data,
-				...productData,
-			}
-		);
-	}
-
-	/**
-	 * Submits shipping address to get available shipping options
-	 * from Express Checkout ECE payment method.
-	 *
-	 * @param {Object} shippingAddress Shipping details.
-	 * @return {Promise} Promise for the request to the server.
-	 */
-	expressCheckoutECECalculateShippingOptions( shippingAddress ) {
-		return this.request(
-			getExpressCheckoutAjaxURL( 'ece_get_shipping_options' ),
-			{
-				security: getExpressCheckoutConfig( 'nonce' )?.shipping,
-				is_product_page:
-					getExpressCheckoutConfig( 'button_context' ) === 'product',
-				...shippingAddress,
-			}
-		);
-	}
-
-	/**
-	 * Creates order based on Express Checkout ECE payment method.
-	 *
-	 * @param {Object} paymentData Order data.
-	 * @return {Promise} Promise for the request to the server.
-	 */
-	expressCheckoutECECreateOrder( paymentData ) {
-		return this.request( getExpressCheckoutAjaxURL( 'ece_create_order' ), {
-			_wpnonce: getExpressCheckoutConfig( 'nonce' )?.checkout,
-			...paymentData,
-		} );
-	}
-
-	/**
-	 * Pays for an order based on the Express Checkout payment method.
-	 *
-	 * @param {integer} order The order ID.
-	 * @param {Object} paymentData Order data.
-	 * @return {Promise} Promise for the request to the server.
-	 */
-	expressCheckoutECEPayForOrder( order, paymentData ) {
-		return this.request( getExpressCheckoutAjaxURL( 'ece_pay_for_order' ), {
-			_wpnonce: getExpressCheckoutConfig( 'nonce' )?.pay_for_order,
-			order,
-			...paymentData,
-		} );
-	}
-
 	initWooPay( userEmail, woopayUserSession ) {
 		if ( ! this.isWooPayRequesting ) {
 			this.isWooPayRequesting = true;

client/checkout/api/test/index.test.js

@@ -3,19 +3,14 @@
  */
 import WCPayAPI from '..';
 import request from 'wcpay/checkout/utils/request';
-import {
-	buildAjaxURL,
-	getExpressCheckoutAjaxURL,
-	getExpressCheckoutConfig,
-} from 'wcpay/utils/express-checkout';
+import { buildAjaxURL } from 'wcpay/utils/express-checkout';
 import { getConfig } from 'wcpay/utils/checkout';
 
 jest.mock( 'wcpay/checkout/utils/request', () =>
 	jest.fn( () => Promise.resolve( {} ).finally( () => {} ) )
 );
 jest.mock( 'wcpay/utils/express-checkout', () => ( {
 	buildAjaxURL: jest.fn(),
-	getExpressCheckoutAjaxURL: jest.fn(),
 	getExpressCheckoutConfig: jest.fn(),
 } ) );
 jest.mock( 'wcpay/utils/checkout', () => ( {
@@ -146,20 +141,6 @@ describe( 'WCPayAPI', () => {
 		expect( api.isWooPayRequesting ).toBe( false );
 	} );
 
-	test( 'express checkout pay for order is initialized correctly', async () => {
-		getExpressCheckoutAjaxURL.mockReturnValue( 'https://example.org/' );
-		getExpressCheckoutConfig.mockReturnValue( { pay_for_order: '1234' } );
-
-		const api = new WCPayAPI( {}, request );
-		await api.expressCheckoutECEPayForOrder( '12', { foo: 'bar' } );
-
-		expect( request ).toHaveBeenLastCalledWith( 'https://example.org/', {
-			_wpnonce: '1234',
-			order: '12',
-			foo: 'bar',
-		} );
-	} );
-
 	test( 'WooPay should not support global theme styles', async () => {
 		buildAjaxURL.mockReturnValue( 'https://example.org/' );
 		getConfig.mockImplementation( ( key ) => {

client/checkout/blocks/index.js

@@ -21,11 +21,7 @@ import enqueueFraudScripts from 'fraud-scripts';
 import {
 	expressCheckoutElementApplePay,
 	expressCheckoutElementGooglePay,
-} from '../../express-checkout/blocks';
-import {
-	tokenizedExpressCheckoutElementApplePay,
-	tokenizedExpressCheckoutElementGooglePay,
-} from 'wcpay/tokenized-express-checkout/blocks';
+} from 'wcpay/express-checkout/blocks';
 
 import { getDeferredIntentCreationUPEFields } from './payment-elements';
 import { handleWooPayEmailInput } from '../woopay/email-input-iframe';
@@ -131,17 +127,8 @@ if ( getUPEConfig( 'isWooPayEnabled' ) ) {
 }
 
 if ( getUPEConfig( 'isPaymentRequestEnabled' ) ) {
-	if ( getUPEConfig( 'isTokenizedCartEceEnabled' ) ) {
-		registerExpressPaymentMethod(
-			tokenizedExpressCheckoutElementApplePay( api )
-		);
-		registerExpressPaymentMethod(
-			tokenizedExpressCheckoutElementGooglePay( api )
-		);
-	} else {
-		registerExpressPaymentMethod( expressCheckoutElementApplePay( api ) );
-		registerExpressPaymentMethod( expressCheckoutElementGooglePay( api ) );
-	}
+	registerExpressPaymentMethod( expressCheckoutElementApplePay( api ) );
+	registerExpressPaymentMethod( expressCheckoutElementGooglePay( api ) );
 }
 window.addEventListener( 'load', () => {
 	enqueueFraudScripts( getUPEConfig( 'fraudServices' ) );