ACP2E-1338: Google reCaptcha in Incorrect position

Author: bubasuma

ReCaptchaCheckout/view/frontend/web/js/reCaptchaCheckout.js

@@ -18,7 +18,7 @@ define(
             },
 
             /**
-             * Render reCAPTCHA
+             * Render reCAPTCHA for payment method
              *
              * @param {Object} method
              */
@@ -32,7 +32,7 @@ define(
             },
 
             /**
-             * Get reCAPTCHA ID
+             * Get reCAPTCHA ID for payment method
              *
              * @param {Object} method
              * @returns {String}
@@ -55,12 +55,14 @@ define(
              * @inheritdoc
              */
             initCaptcha: function () {
-                var $wrapper, $recaptchaResponseInput;
+                var $wrapper,
+                    $recaptchaResponseInput;
 
                 this._super();
-                // Since there will be multiple recaptcha in the payment form,
-                // they may override each other if the form is submitted.
-                // The recaptcha response will be collected in the callback: reCaptchaCallback()
+                // Since there will be multiple reCaptcha in the payment form,
+                // they may override each other if the form data is serialized and submitted.
+                // Instead, the reCaptcha response will be collected in the callback: reCaptchaCallback()
+                // and sent in the request header X-ReCaptcha
                 $wrapper = $('#' + this.getReCaptchaId() + '-wrapper');
                 $recaptchaResponseInput = $wrapper.find('[name=g-recaptcha-response]');
                 if ($recaptchaResponseInput.length) {

ReCaptchaPaypal/Model/ReCaptchaSession.php

@@ -18,7 +18,7 @@
 class ReCaptchaSession
 {
     private const PAYPAL_PAYFLOWPRO_RECAPTCHA = 'paypal_payflowpro_recaptcha';
-    private const REPLAY_TIMEOUT = 120;
+    private const TIMEOUT = 120;
 
     /**
      * @var TimezoneInterface
@@ -51,7 +51,7 @@ public function __construct(
     }
 
     /**
-     * Saves quote_id and datetime the reCaptcha was verified
+     * Saves quote_id and datetime the reCaptcha was verified in session
      *
      * @return bool
      */
@@ -72,7 +72,7 @@ public function save(): bool
     }
 
     /**
-     * Checks whether the reCaptcha extended time has not expired
+     * Checks whether the time since reCaptcha was verified is not more than the timeout
      *
      * @param int $quoteId
      * @return bool
@@ -83,7 +83,7 @@ public function isValid(int $quoteId): bool
         $data = $this->transparentSession->getData(self::PAYPAL_PAYFLOWPRO_RECAPTCHA) ?? [];
         if (isset($data['quote_id'])
             && (int) $data['quote_id'] === $quoteId
-            && ($data['verified_at'] + self::REPLAY_TIMEOUT) >= $this->timezone->date()->getTimestamp()
+            && ($data['verified_at'] + self::TIMEOUT) >= $this->timezone->date()->getTimestamp()
         ) {
             $this->transparentSession->unsetData(self::PAYPAL_PAYFLOWPRO_RECAPTCHA);
             $result = true;

ReCaptchaPaypal/Plugin/ReplayPayflowReCaptchaForPlaceOrder.php

@@ -68,10 +68,12 @@ public function afterGetConfigFor(
             $bodyParams = $this->request->getBodyParams();
             $paymentMethod = $bodyParams['paymentMethod'] ?? $bodyParams['payment_method'] ?? [];
             $cartId = $bodyParams['cartId'] ?? $bodyParams['cart_id'] ?? null;
-            if (isset($paymentMethod['method']) && $paymentMethod['method'] === Config::METHOD_PAYFLOWPRO) {
-                if ($cartId && $this->reCaptchaSession->isValid((int) $cartId)) {
-                    return null;
-                }
+            if (isset($paymentMethod['method'])
+                && $paymentMethod['method'] === Config::METHOD_PAYFLOWPRO
+                && $cartId
+                && $this->reCaptchaSession->isValid((int) $cartId)
+            ) {
+                return null;
             }
         }