ACP2E-1338: Google reCaptcha in Incorrect position

Author: bubasuma

ReCaptchaPaypal/Plugin/ReplayPayflowReCaptchaForPlaceOrder.php

@@ -9,6 +9,7 @@
 
 use Magento\Framework\Webapi\Rest\Request;
 use Magento\Paypal\Model\Config;
+use Magento\Quote\Model\QuoteIdMaskFactory;
 use Magento\ReCaptchaCheckout\Model\WebapiConfigProvider;
 use Magento\ReCaptchaPaypal\Model\ReCaptchaSession;
 use Magento\ReCaptchaUi\Model\IsCaptchaEnabledInterface;
@@ -34,19 +35,27 @@ class ReplayPayflowReCaptchaForPlaceOrder
      */
     private ReCaptchaSession $reCaptchaSession;
 
+    /**
+     * @var QuoteIdMaskFactory
+     */
+    private QuoteIdMaskFactory $quoteIdMaskFactory;
+
     /**
      * @param IsCaptchaEnabledInterface $isCaptchaEnabled
      * @param Request $request
      * @param ReCaptchaSession $reCaptchaSession
+     * @param QuoteIdMaskFactory $quoteIdMaskFactory
      */
     public function __construct(
         IsCaptchaEnabledInterface $isCaptchaEnabled,
         Request $request,
-        ReCaptchaSession $reCaptchaSession
+        ReCaptchaSession $reCaptchaSession,
+        QuoteIdMaskFactory $quoteIdMaskFactory
     ) {
         $this->isCaptchaEnabled = $isCaptchaEnabled;
         $this->request = $request;
         $this->reCaptchaSession = $reCaptchaSession;
+        $this->quoteIdMaskFactory = $quoteIdMaskFactory;
     }
 
     /**
@@ -71,9 +80,14 @@ public function afterGetConfigFor(
             if (isset($paymentMethod['method'])
                 && $paymentMethod['method'] === Config::METHOD_PAYFLOWPRO
                 && $cartId
-                && $this->reCaptchaSession->isValid((int) $cartId)
             ) {
-                return null;
+                // check if it is guest cart, then resolve cart id by mask ID
+                if (!is_numeric($cartId)) {
+                    $cartId = $this->quoteIdMaskFactory->create()->load($cartId, 'masked_id')->getQuoteId();
+                }
+                if ($this->reCaptchaSession->isValid((int) $cartId)) {
+                    return null;
+                }
             }
         }
 

ReCaptchaPaypal/composer.json

@@ -8,6 +8,7 @@
         "magento/module-re-captcha-validation-api": "*",
         "magento/module-checkout": "*",
         "magento/module-re-captcha-webapi-api": "*",
+        "magento/module-quote": "*",
         "magento/module-paypal": "*",
         "magento/module-re-captcha-checkout": "*"
     },