ACP2E-1338: Google reCaptcha in Incorrect position

Author: bubasuma

ReCaptchaPaypal/Block/LayoutProcessor/Checkout/Onepage.php

@@ -9,6 +9,7 @@
 
 use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
 use Magento\Framework\Exception\InputException;
+use Magento\Paypal\Model\Config;
 use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;
 use Magento\ReCaptchaUi\Model\UiConfigResolverInterface;
 
@@ -56,7 +57,12 @@ public function process($jsLayout)
             if ($this->isCaptchaEnabled->isCaptchaEnabledFor('place_order')) {
                 $jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
                 ['payment']['children']['payments-list']['children']['before-place-order']['children']
-                ['place-order-recaptcha']['skipPayments']['payflowpro'] = true;
+                ['place-order-recaptcha']['skipPayments'] += [
+                    Config::METHOD_EXPRESS => true,
+                    Config::METHOD_PAYFLOWPRO => true,
+                    Config::METHOD_WPP_PE_EXPRESS => true,
+                    Config::METHOD_WPP_PE_BML => true,
+                ];
             }
         } else {
             if (isset($jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']

ReCaptchaPaypal/Plugin/SkipPlaceOrderRecaptchaValidation.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\ReCaptchaPaypal\Plugin;
+
+use Magento\Framework\Webapi\Rest\Request;
+use Magento\Paypal\Model\Config;
+use Magento\ReCaptchaCheckout\Model\WebapiConfigProvider;
+use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;
+use Magento\ReCaptchaValidationApi\Api\Data\ValidationConfigInterface;
+use Magento\ReCaptchaWebapiApi\Api\Data\EndpointInterface;
+
+class SkipPlaceOrderRecaptchaValidation
+{
+    private const PAYPAL_PAYFLOWPRO_CAPTCHA_ID = 'paypal_payflowpro';
+
+    /**
+     * @var IsCaptchaEnabledInterface
+     */
+    private IsCaptchaEnabledInterface $isCaptchaEnabled;
+
+    /**
+     * @var Request
+     */
+    private Request $request;
+
+    /**
+     * @param IsCaptchaEnabledInterface $isCaptchaEnabled
+     * @param Request $request
+     */
+    public function __construct(
+        IsCaptchaEnabledInterface $isCaptchaEnabled,
+        Request $request
+    ) {
+        $this->isCaptchaEnabled = $isCaptchaEnabled;
+        $this->request = $request;
+    }
+
+    /**
+     * Skip captcha validation for "place order" button if captcha is enabled for payflow
+     *
+     * @param WebapiConfigProvider $subject
+     * @param ValidationConfigInterface $result
+     * @param EndpointInterface $endpoint
+     * @return ValidationConfigInterface
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetConfigFor(
+        WebapiConfigProvider $subject,
+        ?ValidationConfigInterface $result,
+        EndpointInterface $endpoint
+    ): ?ValidationConfigInterface {
+
+        if ($result && $this->isCaptchaEnabled->isCaptchaEnabledFor(self::PAYPAL_PAYFLOWPRO_CAPTCHA_ID)) {
+            $bodyParams = $this->request->getBodyParams();
+            $paymentMethod = $bodyParams['paymentMethod'] ?? $bodyParams['payment_method'] ?? [];
+            if (isset($paymentMethod['method']) && $paymentMethod['method'] === Config::METHOD_PAYFLOWPRO) {
+                return null;
+            }
+        }
+
+        return $result;
+    }
+}

ReCaptchaPaypal/composer.json

@@ -7,7 +7,9 @@
         "magento/module-re-captcha-ui": "*",
         "magento/module-re-captcha-validation-api": "*",
         "magento/module-checkout": "*",
-        "magento/module-re-captcha-webapi-api": "*"
+        "magento/module-re-captcha-webapi-api": "*",
+        "magento/module-paypal": "*",
+        "magento/module-re-captcha-checkout": "*"
     },
     "type": "magento2-module",
     "license": "OSL-3.0",

ReCaptchaPaypal/etc/webapi_rest/di.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\ReCaptchaCheckout\Model\WebapiConfigProvider">
+        <plugin name="skip_place_order_recaptcha_validation" type="Magento\ReCaptchaPaypal\Plugin\SkipPlaceOrderRecaptchaValidation"/>
+    </type>
+</config>