fix: Apple Pay domain verification automatic registration

jimmyn · jimmyn · commit 354e290998bf · 2025-10-03T20:38:12.000+02:00
- Fix hook to use correct gateway (monei_apple_google instead of monei)
- Fix POST field check to use woocommerce_monei_apple_google_enabled
- Replace wp_remote_get() with direct readfile() for better performance
- Remove esc_html() from file output to preserve raw binary content
- Add proper Content-Type and Content-Disposition headers

The automatic domain registration now works when enabling Apple/Google Pay
in WooCommerce settings, and the verification file is served correctly.
diff --git a/src/Services/MoneiApplePayVerificationService.php b/src/Services/MoneiApplePayVerificationService.php
@@ -22,7 +22,7 @@ class MoneiApplePayVerificationService {
 	public function __construct( MoneiPaymentServices $moneiPaymentServices ) {
 		$this->moneiPaymentServices = $moneiPaymentServices;
 		add_action( 'parse_request', array( $this, 'expose_on_domain_association_request' ), 1 );
-		add_filter( 'woocommerce_update_options_payment_gateways_monei', array( $this, 'apple_domain_register' ) );
+		add_filter( 'woocommerce_update_options_payment_gateways_monei_apple_google', array( $this, 'apple_domain_register' ) );
 	}
 
 	/**
@@ -33,11 +33,12 @@ public function apple_domain_register() {
 			return;
 		}
 
-		if ( ! isset( $_POST['woocommerce_monei_apple_google_pay'] ) ) {
+		// Check if Apple/Google Pay is being enabled
+		if ( ! isset( $_POST['woocommerce_monei_apple_google_enabled'] ) ) {
 			return;
 		}
         //phpcs:ignore WordPress.Security.NonceVerification, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
-		if ( ! wc_clean( wp_unslash( $_POST['woocommerce_monei_apple_google_pay'] ) ) ) {
+		if ( 'yes' !== wc_clean( wp_unslash( $_POST['woocommerce_monei_apple_google_enabled'] ) ) ) {
 			return;
 		}
 
@@ -58,12 +59,15 @@ public function apple_domain_register() {
 	 */
 	public function expose_on_domain_association_request( $wp ) {
 		if ( isset( $wp->request ) && ( self::DOMAIN_ASSOCIATION_DIR . '/' . self::DOMAIN_ASSOCIATION_FILE_NAME ) === $wp->request ) {
-			$path     = WC_Monei()->plugin_url() . '/' . self::DOMAIN_ASSOCIATION_FILE_NAME;
-			$args     = array( 'headers' => array( 'Content-Type' => 'text/plain;charset=utf-8' ) );
-			$response = wp_remote_get( $path, $args );
-			if ( ! is_wp_error( $response ) && is_array( $response ) ) {
-				$body = $response['body'];
-				echo esc_html( $response['body'] );
+			$file_path = WC_Monei()->plugin_path() . '/' . self::DOMAIN_ASSOCIATION_FILE_NAME;
+
+			if ( file_exists( $file_path ) ) {
+				header( 'Content-Type: text/plain' );
+				header( 'Content-Disposition: inline; filename="' . self::DOMAIN_ASSOCIATION_FILE_NAME . '"' );
+				readfile( $file_path );
+			} else {
+				status_header( 404 );
+				echo 'Apple Pay domain verification file not found';
 			}
 			exit;
 		}
