Fix address autocomplete token fetch logic (#61140)

marcinbot · github-actions · web-flow · commit c7a66edd3090 · 2025-09-26T13:49:06.000+01:00
* Fix address autocomplete token fetch logic

* Add changefile(s) from automation for the following project(s): woocommerce

* Fix lint

* Fix lint

---------

Co-authored-by: github-actions &lt;github-actions@github.com&gt;
diff --git a/plugins/woocommerce/changelog/61140-fix-address-autocomplete-fetch b/plugins/woocommerce/changelog/61140-fix-address-autocomplete-fetch
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Fix address autocomplete token fetch logic
diff --git a/plugins/woocommerce/src/Internal/AddressProvider/AbstractAutomatticAddressProvider.php b/plugins/woocommerce/src/Internal/AddressProvider/AbstractAutomatticAddressProvider.php
@@ -55,6 +55,8 @@ public function can_telemetry() {
 	 * Loads up a JWT from cache or from the implementor side.
 	 *
 	 * @return void
+	 *
+	 * phpcs:ignore Squiz.Commenting.FunctionCommentThrowTag.Missing -- As we wrap the throw in a try/catch.
 	 */
 	public function load_jwt() {
 
@@ -83,6 +85,8 @@ public function load_jwt() {
 				// Clear retry data on success.
 				$this->delete_cached_option( 'jwt_retry_data' );
 				return;
+			} else {
+				throw new \Exception( 'Invalid JWT received from address service.' );
 			}
 		} catch ( \Exception $e ) {
 			$retry_data['attempts'] = isset( $retry_data['attempts'] ) ? $retry_data['attempts'] + 1 : 1;
@@ -261,6 +265,10 @@ public static function get_asset_url( $path ) {
 	 * Enqueues the checkout script, checks if it's already registered or not so we don't duplicate, and prints out the JWT to the page to be consumed.
 	 */
 	public function load_scripts() {
+		if ( ! is_checkout() ) {
+			return;
+		}
+
 		if ( ! $this->get_jwt() ) {
 			return;
 		}
