fix: handle error objects properly in classic checkout and hooks

jimmyn · jimmyn · commit fee6b068de65 · 2025-10-10T10:30:58.000+02:00
Convert error objects to strings before displaying to users.
result.error and event.error may be objects with .message property.

- Extract error.message when available
- Fall back to error if it's already a string
- Use descriptive fallback messages
- Apply to monei-cc-classic.js onChange, place_order, place_order_page
- Apply to monei-card-input-hooks.js onChange and createToken
diff --git a/assets/js/helpers/monei-card-input-hooks.js b/assets/js/helpers/monei-card-input-hooks.js
@@ -106,7 +106,12 @@ export const useMoneiCardInput = ( config ) => {
 				},
 				onChange( event ) {
 					if ( event.isTouched && event.error ) {
-						setError( event.error );
+						const errorMessage =
+							event.error.message ||
+							( typeof event.error === 'string'
+								? event.error
+								: 'Validation error' );
+						setError( errorMessage );
 						setIsValid( false );
 						if ( containerRef.current ) {
 							containerRef.current.classList.add( 'is-invalid' );
@@ -162,7 +167,12 @@ export const useMoneiCardInput = ( config ) => {
 			const result = await monei.createToken( cardInputRef.current );
 
 			if ( result.error ) {
-				setError( result.error );
+				const errorMessage =
+					result.error.message ||
+					( typeof result.error === 'string'
+						? result.error
+						: 'Token creation failed' );
+				setError( errorMessage );
 				return null;
 			}
 
diff --git a/assets/js/monei-cc-classic.js b/assets/js/monei-cc-classic.js
@@ -193,7 +193,12 @@
 				onChange( event ) {
 					// Handle real-time validation errors.
 					if ( event.isTouched && event.error ) {
-						wc_monei_form.print_errors( event.error );
+						const errorMessage =
+							event.error.message ||
+							( typeof event.error === 'string'
+								? event.error
+								: 'Validation error' );
+						wc_monei_form.print_errors( errorMessage );
 					} else {
 						wc_monei_form.clear_errors();
 					}
@@ -233,7 +238,12 @@
 						if ( result.error ) {
 							// Error displayed via print_errors
 							// Inform the user if there was an error.
-							wc_monei_form.print_errors( result.error );
+							const errorMessage =
+								result.error.message ||
+								( typeof result.error === 'string'
+									? result.error
+									: 'Payment error' );
+							wc_monei_form.print_errors( errorMessage );
 						} else {
 							// Token created successfully
 							// Create monei token and append it to DOM
@@ -267,7 +277,12 @@
 						if ( result.error ) {
 							// Error displayed via print_errors
 							// Inform the user if there was an error.
-							wc_monei_form.print_errors( result.error );
+							const errorMessage =
+								result.error.message ||
+								( typeof result.error === 'string'
+									? result.error
+									: 'Payment error' );
+							wc_monei_form.print_errors( errorMessage );
 						} else {
 							// Token created successfully
 							// Create monei token and append it to DOM
diff --git a/src/Gateways/Blocks/MoneiAppleGoogleBlocksSupport.php b/src/Gateways/Blocks/MoneiAppleGoogleBlocksSupport.php
@@ -37,6 +37,11 @@ public function is_active() {
 			return false;
 		}
 
+		// Hide when neither Apple nor Google is available
+		if ( ! $this->gateway->isAppleAvailable() && ! $this->gateway->isGoogleAvailable() ) {
+			return false;
+		}
+
 		return 'yes' === ( $this->get_setting( 'enabled' ) ?? 'no' );
 	}
 
diff --git a/src/Services/MoneiApplePayVerificationService.php b/src/Services/MoneiApplePayVerificationService.php
@@ -47,7 +47,23 @@ public function apple_domain_register() {
 		}
 
 		try {
-			$domain = isset($_SERVER['HTTP_HOST']) ? sanitize_text_field($_SERVER['HTTP_HOST']) : str_replace(array('https://', 'http://'), '', get_site_url());  // @codingStandardsIgnoreLine
+			// Extract domain from HTTP_HOST or get_site_url()
+			if ( isset( $_SERVER['HTTP_HOST'] ) ) {
+				// Parse HTTP_HOST to remove port portion and get host only
+				$host_parts = explode( ':', $_SERVER['HTTP_HOST'] );
+				$domain     = sanitize_text_field( $host_parts[0] );
+			} else {
+				// Use wp_parse_url to extract host from get_site_url()
+				$parsed_url = wp_parse_url( get_site_url() );
+				$domain     = isset( $parsed_url['host'] ) ? sanitize_text_field( $parsed_url['host'] ) : '';
+			}
+
+			// Ensure domain is not empty before registering
+			if ( empty( $domain ) ) {
+				WC_Monei_Logger::log( 'Apple Pay domain registration failed: empty domain', 'error' );
+				WC_Admin_Settings::add_error( __( 'Apple Pay domain registration failed: unable to determine domain.', 'monei' ) );
+				return;
+			}
 
 			$this->moneiPaymentServices->register_apple_domain( $domain );
 

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,11 @@ public function is_active() {`
`37`	`37`	`return false;`
`38`	`38`	`}`
`39`	`39`
	`40`	`+ // Hide when neither Apple nor Google is available`
	`41`	`+ if ( ! $this->gateway->isAppleAvailable() && ! $this->gateway->isGoogleAvailable() ) {`
	`42`	`+ return false;`
	`43`	`+ }`
	`44`	`+`
`40`	`45`	`return 'yes' === ( $this->get_setting( 'enabled' ) ?? 'no' );`
`41`	`46`	`}`
`42`	`47`