Only clear customer cache when an action has been performed (#4542)

* Only clear customer cache when an action has been performed
* Prevents endless loops of clearing the cache and then reloading the customer data.

---------

Co-authored-by: Diego Curbelo <[email protected]>
Co-authored-by: Copilot <[email protected]>

Author: 3 people

changelog.txt

@@ -21,6 +21,7 @@
 * Fix - Free trial subscription orders with payment methods that require redirection (eg: iDeal, Bancontact)
 * Tweak - Update checkout error message for invalid API key to be more generic and user-friendly
 * Tweak - Disable Amazon Pay in the merchant's Payment Method Configuration object if it is still behind a feature flag
+* Fix - Only clear customer cache when an action has been performed
 
 = 9.7.1 - 2025-07-28 =
 * Add - Add state mapping for Lithuania in express checkout

includes/class-wc-stripe-customer.php

@@ -744,9 +744,8 @@ public function delete_source( $source_id ) {
 
 		$response = WC_Stripe_API::detach_payment_method_from_customer( $this->get_id(), $source_id );
 
-		$this->clear_cache( $source_id );
-
 		if ( empty( $response->error ) ) {
+			$this->clear_cache( $source_id );
 			do_action( 'wc_stripe_delete_source', $this->get_id(), $response );
 
 			return true;
@@ -767,9 +766,8 @@ public function detach_payment_method( $payment_method_id ) {
 
 		$response = WC_Stripe_API::detach_payment_method_from_customer( $this->get_id(), $payment_method_id );
 
-		$this->clear_cache( $payment_method_id );
-
 		if ( empty( $response->error ) ) {
+			$this->clear_cache( $payment_method_id );
 			do_action( 'wc_stripe_detach_payment_method', $this->get_id(), $response );
 
 			return true;
@@ -792,9 +790,8 @@ public function set_default_source( $source_id ) {
 			'POST'
 		);
 
-		$this->clear_cache();
-
 		if ( empty( $response->error ) ) {
+			$this->clear_cache();
 			do_action( 'wc_stripe_set_default_source', $this->get_id(), $response );
 
 			return true;
@@ -819,9 +816,8 @@ public function set_default_payment_method( $payment_method_id ) {
 			'POST'
 		);
 
-		$this->clear_cache();
-
 		if ( empty( $response->error ) ) {
+			$this->clear_cache();
 			do_action( 'wc_stripe_set_default_payment_method', $this->get_id(), $response );
 
 			return true;

includes/payment-tokens/class-wc-stripe-payment-tokens.php

@@ -560,22 +560,24 @@ private function is_valid_payment_method_type_for_gateway( $payment_method_type,
 	 * @return  WC_Payment_Token   The WC object for the payment token.
 	 */
 	private function add_token_to_user( $payment_method, WC_Stripe_Customer $customer, $payment_method_ids = [] ) {
-		// Clear cached payment methods.
-		$customer->clear_cache();
-
 		$payment_method_type = $this->get_original_payment_method_type( $payment_method );
 		$gateway_id          = self::UPE_REUSABLE_GATEWAYS_BY_PAYMENT_METHOD[ $payment_method_type ];
 
 		$found_token = $this->get_duplicate_token( $payment_method, $customer->get_user_id(), $gateway_id );
 		if ( $found_token ) {
 			// Update the token with the new payment method ID if the current payment method ID is not in the list of payment method IDs retrieved from Stripe.
 			if ( ! in_array( $found_token->get_token(), $payment_method_ids, true ) ) {
+				// Clear cached payment methods.
+				$customer->clear_cache();
 				$found_token->set_token( $payment_method->id );
 				$found_token->save();
 			}
 			return $found_token;
 		}
 
+		// Clear cached payment methods.
+		$customer->clear_cache();
+
 		switch ( $payment_method_type ) {
 			case WC_Stripe_UPE_Payment_Method_CC::STRIPE_ID:
 				$token = new WC_Stripe_Payment_Token_CC();

readme.txt

@@ -130,5 +130,6 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 * Fix - Free trial subscription orders with payment methods that require redirection (eg: iDeal, Bancontact)
 * Tweak - Update checkout error message for invalid API key to be more generic and user-friendly
 * Tweak - Disable Amazon Pay in the merchant's Payment Method Configuration object if it is still behind a feature flag
+* Fix - Only clear customer cache when an action has been performed
 
 [See changelog for full details across versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).