Merge branch 'develop' into tweak/avoid-account-cache-busting-on-page…

…-load
woocommerce · Feb 6, 2025 · 04de346 · 04de346
2 parents e06cf60 + 6a91f17
commit 04de346
Show file tree

Hide file tree

Showing 5 changed files with 147 additions and 41 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -41,6 +41,7 @@
 * Fix - Improve the appearance of Stripe elements in checkout pages to match the store theme.
 * Fix - Hide ECE button for synced subscription variations.
 * Fix - Use the original shipping address for Amazon Pay pay for orders.
+* Tweak - Improve settings page load by delaying oauth URL generation.
 * Tweak - Update the Woo logo in the Configure connection modal
 
 = 9.1.1 - 2025-01-10 =

diff --git a/client/settings/stripe-auth-account/stripe-auth-actions.js b/client/settings/stripe-auth-account/stripe-auth-actions.js
@@ -1,6 +1,6 @@
-/* global wc_stripe_settings_params */
+/* global wc_stripe_settings_params, ajaxurl */
 import { __ } from '@wordpress/i18n';
-import { React } from 'react';
+import { React, useState, useEffect } from 'react';
 import { Button, ExternalLink } from '@wordpress/components';
 import interpolateComponents from 'interpolate-components';
 import ConfigureWebhookButton from './configure-webhook-button';
@@ -16,46 +16,86 @@ import InlineNotice from 'wcstripe/components/inline-notice';
  * @return {JSX.Element} The rendered StripeAuthActions component.
  */
 const StripeAuthActions = ( { testMode, displayWebhookConfigure } ) => {
-	const oauthUrl = testMode // eslint-disable-next-line camelcase
-		? wc_stripe_settings_params.stripe_test_oauth_url // eslint-disable-next-line camelcase
-		: wc_stripe_settings_params.stripe_oauth_url;
+	const [ oauthUrls, setOauthUrls ] = useState( {
+		oauth_url: '',
+		test_oauth_url: '',
+	} );
+	const [ isLoading, setIsLoading ] = useState( true );
+	const [ error, setError ] = useState( null );
 
-	return oauthUrl ? (
-		<div className="woocommerce-stripe-auth__actions">
-			<Button
-				variant="primary"
-				href={ oauthUrl }
-				text={
-					testMode
-						? __(
-								'Create or connect a test account',
-								'woocommerce-gateway-stripe'
-						  )
-						: __(
-								'Create or connect an account',
+	useEffect( () => {
+		const fetchOAuthUrls = async () => {
+			try {
+				const response = await jQuery.ajax( {
+					url: ajaxurl,
+					method: 'POST',
+					data: {
+						action: 'wc_stripe_get_oauth_urls',
+						nonce: wc_stripe_settings_params.oauth_nonce, // eslint-disable-line camelcase
+					},
+				} );
+
+				if ( response.success ) {
+					setOauthUrls( response.data );
+				} else {
+					setError(
+						response.data?.message ||
+							__(
+								'Failed to fetch OAuth URLs',
 								'woocommerce-gateway-stripe'
-						  )
+							)
+					);
 				}
-			/>
+			} catch ( err ) {
+				setError(
+					__(
+						'Failed to fetch OAuth URLs',
+						'woocommerce-gateway-stripe'
+					)
+				);
+			} finally {
+				setIsLoading( false );
+			}
+		};
+
+		fetchOAuthUrls();
+	}, [] );
+
+	const oauthUrl = testMode ? oauthUrls.test_oauth_url : oauthUrls.oauth_url;
+	const buttonText = testMode
+		? __( 'Create or connect a test account', 'woocommerce-gateway-stripe' )
+		: __( 'Create or connect an account', 'woocommerce-gateway-stripe' );
+
+	return (
+		<div className="woocommerce-stripe-auth__actions">
+			{ error ? (
+				<InlineNotice isDismissible={ false } status="error">
+					{ interpolateComponents( {
+						mixedString: __(
+							'An issue occurred generating a connection to Stripe, please ensure your server has a valid SSL certificate and try again.{{br /}}For assistance, refer to our {{Link}}documentation{{/Link}}.',
+							'woocommerce-gateway-stripe'
+						),
+						components: {
+							br: <br />,
+							Link: (
+								<ExternalLink href="https://woocommerce.com/document/stripe/setup-and-configuration/connecting-to-stripe/" />
+							),
+						},
+					} ) }
+				</InlineNotice>
+			) : (
+				<Button
+					variant="primary"
+					href={ oauthUrl }
+					text={ buttonText }
+					disabled={ isLoading }
+					isBusy={ isLoading }
+				/>
+			) }
 			{ displayWebhookConfigure && (
 				<ConfigureWebhookButton testMode={ testMode } />
 			) }
 		</div>
-	) : (
-		<InlineNotice isDismissible={ false } status="error">
-			{ interpolateComponents( {
-				mixedString: __(
-					'An issue occurred generating a connection to Stripe, please ensure your server has a valid SSL certificate and try again.{{br /}}For assistance, refer to our {{Link}}documentation{{/Link}}.',
-					'woocommerce-gateway-stripe'
-				),
-				components: {
-					br: <br />,
-					Link: (
-						<ExternalLink href="https://woocommerce.com/document/stripe/setup-and-configuration/connecting-to-stripe/" />
-					),
-				},
-			} ) }
-		</InlineNotice>
 	);
 };
 

diff --git a/includes/admin/class-wc-stripe-settings-controller.php b/includes/admin/class-wc-stripe-settings-controller.php
@@ -42,6 +42,9 @@ public function __construct( WC_Stripe_Account $account, ?WC_Stripe_Payment_Gate
 		add_action( 'woocommerce_admin_field_payment_gateways', [ $this, 'hide_gateways_on_settings_page' ], 5 );
 
 		add_action( 'update_option_woocommerce_gateway_order', [ $this, 'set_stripe_gateways_in_list' ] );
+
+		// Add AJAX handler for OAuth URLs
+		add_action( 'wp_ajax_wc_stripe_get_oauth_urls', [ $this, 'ajax_get_oauth_urls' ] );
 	}
 
 	/**
@@ -113,6 +116,53 @@ public function admin_options( WC_Stripe_Payment_Gateway $gateway ) {
 		echo $account_data_exists ? '<div id="wc-stripe-account-settings-container"></div>' : '<div id="wc-stripe-new-account-container"></div>';
 	}
 
+	/**
+	 * AJAX handler to get OAuth URLs for the configuration modal
+	 */
+	public function ajax_get_oauth_urls() {
+		// Check nonce and capabilities
+		if ( ! check_ajax_referer( 'wc_stripe_get_oauth_urls', 'nonce', false ) ||
+			! current_user_can( 'manage_woocommerce' ) ) {
+			wp_send_json_error( [ 'message' => __( 'You do not have permission to do this.', 'woocommerce-gateway-stripe' ) ] );
+			return;
+		}
+
+		$oauth_url      = woocommerce_gateway_stripe()->connect->get_oauth_url();
+		$test_oauth_url = woocommerce_gateway_stripe()->connect->get_oauth_url( '', 'test' );
+
+		wp_send_json_success(
+			[
+				'oauth_url'      => is_wp_error( $oauth_url ) ? '' : $oauth_url,
+				'test_oauth_url' => is_wp_error( $test_oauth_url ) ? '' : $test_oauth_url,
+			]
+		);
+	}
+
+	/**
+	 * Determines if OAuth URLs need to be generated.
+	 * URLs are needed for new accounts or accounts not connected via OAuth.
+	 *
+	 * @return bool True if OAuth URLs are needed
+	 */
+	public function needs_oauth_urls() {
+		$settings      = WC_Stripe_Helper::get_stripe_settings();
+		$has_live_keys = ! empty( $settings['publishable_key'] ) && ! empty( $settings['secret_key'] );
+		$has_test_keys = ! empty( $settings['test_publishable_key'] ) && ! empty( $settings['test_secret_key'] );
+
+		// If no keys at all, we need OAuth URLs for new account setup
+		if ( ! $has_live_keys && ! $has_test_keys ) {
+			return true;
+		}
+
+		$stripe_connect = woocommerce_gateway_stripe()->connect;
+
+		// Check each mode only if it has keys
+		$needs_live_oauth = $has_live_keys && ! $stripe_connect->is_connected_via_oauth( 'live' );
+		$needs_test_oauth = $has_test_keys && ! $stripe_connect->is_connected_via_oauth( 'test' );
+
+		return $needs_live_oauth || $needs_test_oauth;
+	}
+
 	/**
 	 * Load admin scripts.
 	 */
@@ -137,8 +187,6 @@ public function admin_scripts( $hook_suffix ) {
 			return;
 		}
 
-		$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-
 		// Webpack generates an assets file containing a dependencies array for our built JS file.
 		$script_asset_path = WC_STRIPE_PLUGIN_PATH . '/build/upe_settings.asset.php';
 		$script_asset      = file_exists( $script_asset_path )
@@ -162,11 +210,17 @@ public function admin_scripts( $hook_suffix ) {
 			$script_asset['version']
 		);
 
-		$oauth_url = woocommerce_gateway_stripe()->connect->get_oauth_url();
-		$oauth_url = is_wp_error( $oauth_url ) ? '' : $oauth_url;
+		$oauth_url      = '';
+		$test_oauth_url = '';
 
-		$test_oauth_url = woocommerce_gateway_stripe()->connect->get_oauth_url( '', 'test' );
-		$test_oauth_url = is_wp_error( $test_oauth_url ) ? '' : $test_oauth_url;
+		// Get URLs at page load only if account doesn't exist or if account exists but not connected via OAuth
+		if ( $this->needs_oauth_urls() ) {
+			$oauth_url = woocommerce_gateway_stripe()->connect->get_oauth_url();
+			$oauth_url = is_wp_error( $oauth_url ) ? '' : $oauth_url;
+
+			$test_oauth_url = woocommerce_gateway_stripe()->connect->get_oauth_url( '', 'test' );
+			$test_oauth_url = is_wp_error( $test_oauth_url ) ? '' : $test_oauth_url;
+		}
 
 		$message = sprintf(
 		/* translators: 1) Html strong opening tag 2) Html strong closing tag */
@@ -191,6 +245,7 @@ public function admin_scripts( $hook_suffix ) {
 			'are_apms_deprecated'       => WC_Stripe_Feature_Flags::are_apms_deprecated(),
 			'is_ece_enabled'            => WC_Stripe_Feature_Flags::is_stripe_ece_enabled(),
 			'is_amazon_pay_available'   => WC_Stripe_Feature_Flags::is_amazon_pay_available(),
+			'oauth_nonce'               => wp_create_nonce( 'wc_stripe_get_oauth_urls' ),
 		];
 		wp_localize_script(
 			'woocommerce_stripe_admin',

diff --git a/readme.txt b/readme.txt
@@ -151,6 +151,7 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 * Fix - Improve the appearance of Stripe elements in checkout pages to match the store theme.
 * Fix - Hide ECE button for synced subscription variations.
 * Fix - Use the original shipping address for Amazon Pay pay for orders.
+* Tweak - Improve settings page load by delaying oauth URL generation.
 * Tweak - Update the Woo logo in the Configure connection modal
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).
diff --git a/tests/phpunit/admin/test-class-wc-stripe-settings-controller.php b/tests/phpunit/admin/test-class-wc-stripe-settings-controller.php
@@ -109,4 +109,13 @@ public function test_add_buttons_action_is_called_on_order_admin_page() {
 		$output = ob_get_clean();
 		$this->assertStringMatchesFormat( '%aclass="button button-disabled"%a', $output );
 	}
+
+	/**
+	 * Test that needs_oauth_urls returns true for new accounts with no keys
+	 */
+	public function test_needs_oauth_urls_new_account() {
+		WC_Stripe_Helper::delete_main_stripe_settings();
+
+		$this->assertTrue( $this->controller->needs_oauth_urls() );
+	}
 }