MC-41001: CAPTCHA fields not displaying after unsuccessful number of attempts in Checkout for 3rd-party payment providers

Author: victor-v-rad

app/code/Magento/Captcha/Plugin/FrontendOrderPlacementPlugin.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Captcha\Plugin;
+
+use Magento\Captcha\Helper\Data as HelperCaptcha;
+use Magento\Captcha\Model\ResourceModel\LogFactory;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\OrderManagementInterface;
+
+/**
+ * Reset attempts for frontend checkout
+ */
+class FrontendOrderPlacementPlugin
+{
+    /**
+     * Form ID
+     */
+    private const FORM_ID = 'payment_processing_request';
+
+    /**
+     * @var HelperCaptcha
+     */
+    private HelperCaptcha $helper;
+
+    /**
+     * @var LogFactory
+     */
+    private $resLogFactory;
+
+    /**
+     * ResetAttemptForFrontendAccountEditObserver constructor
+     *
+     * @param HelperCaptcha $helper
+     * @param LogFactory $resLogFactory
+     */
+    public function __construct(
+        HelperCaptcha $helper,
+        LogFactory $resLogFactory
+    ) {
+        $this->helper = $helper;
+        $this->resLogFactory = $resLogFactory;
+    }
+
+    /**
+     * Reset attempts for frontend checkout
+     *
+     * @param OrderManagementInterface $subject
+     * @param OrderInterface $result
+     * @param OrderInterface $order
+     * @return OrderInterface
+     */
+    public function afterPlace(
+        OrderManagementInterface $subject,
+        OrderInterface $result,
+        OrderInterface $order
+    ): OrderInterface {
+        $captchaModel = $this->helper->getCaptcha(self::FORM_ID);
+        $captchaModel->setShowCaptchaInSession(false);
+        $this->resLogFactory->create()->deleteUserAttempts($order->getCustomerEmail());
+        return $result;
+    }
+}

app/code/Magento/Captcha/composer.json

@@ -10,6 +10,7 @@
         "magento/module-backend": "*",
         "magento/module-checkout": "*",
         "magento/module-customer": "*",
+        "magento/module-sales": "*",
         "magento/module-store": "*",
         "magento/module-authorization": "*",
         "laminas/laminas-captcha": "^2.7.1",

app/code/Magento/Captcha/etc/frontend/di.xml

@@ -34,4 +34,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Sales\Api\OrderManagementInterface">
+        <plugin name="frontend_order_placement_reset_captcha_attempt" type="Magento\Captcha\Plugin\FrontendOrderPlacementPlugin"/>
+    </type>
 </config>

app/code/Magento/Captcha/etc/frontend/sections.xml

@@ -10,4 +10,10 @@
     <action name="customer/ajax/login">
         <section name="captcha"/>
     </action>
+    <action name="rest/*/V1/carts/*/payment-information">
+        <section name="captcha"/>
+    </action>
+    <action name="rest/*/V1/guest-carts/*/payment-information">
+        <section name="captcha"/>
+    </action>
 </config>

app/code/Magento/Captcha/etc/module.xml

@@ -10,6 +10,7 @@
         <sequence>
             <module name="Magento_Customer"/>
             <module name="Magento_Checkout"/>
+            <module name="Magento_Sales"/>
         </sequence>
     </module>
 </config>

app/code/Magento/Captcha/etc/webapi_rest/di.xml

@@ -0,0 +1,12 @@
+<?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\Sales\Api\OrderManagementInterface">
+        <plugin name="frontend_order_placement_reset_captcha_attempt" type="Magento\Captcha\Plugin\FrontendOrderPlacementPlugin"/>
+    </type>
+</config>

app/code/Magento/Captcha/view/frontend/web/js/view/checkout/defaultCaptcha.js

@@ -21,6 +21,7 @@ define([
         },
         dataScope: 'global',
         currentCaptcha: null,
+        subscribedFormIds: [],
 
         /**
          * @return {*}
@@ -74,9 +75,12 @@ define([
          * @param {Object} captcha
          */
         subscribeCustomerData: function (formId, captcha) {
-            customerData.get('captcha').subscribe(function (captchaData) {
-                this.checkCustomerData(formId, captchaData, captcha);
-            }.bind(this));
+            if (this.subscribedFormIds.includes(formId) === false) {
+                this.subscribedFormIds.push(formId);
+                customerData.get('captcha').subscribe(function (captchaData) {
+                    this.checkCustomerData(formId, captchaData, captcha);
+                }.bind(this));
+            }
         },
 
         /**