Update code according to the review comment

Handle Captcha JS using LayoutProcessor for checkout

Add a condition in customer login to prevent captcha related JS

Author: engcom-Hotel

app/code/Magento/Captcha/Block/CaptchaLayoutProcessor.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright 2025 Adobe.
+ * All Rights Reserved.
+ */
+
+declare(strict_types=1);
+namespace Magento\Captcha\Block;
+
+use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
+use Magento\Captcha\Helper\Data as HelperCaptcha;
+
+class CaptchaLayoutProcessor implements LayoutProcessorInterface
+{
+    /**
+     * @param HelperCaptcha $helper
+     */
+    public function __construct(
+        private readonly HelperCaptcha $helper
+    ) {
+    }
+
+    /**
+     * Remove captcha from checkout page if it is disabled
+     *
+     * @param array $jsLayout
+     * @return array
+     */
+    public function process($jsLayout): array
+    {
+        if(!$this->helper->getConfig('enable')) {
+            if (isset($jsLayout['components']['checkout']['children']['authentication']['children']['captcha'])) {
+                unset($jsLayout['components']['checkout']['children']['authentication']['children']['captcha']);
+            }
+            if (isset($jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']['shippingAddress']['children']['customer-email']['children']['additional-login-form-fields']['children']['captcha'])) {
+                unset($jsLayout['components']['checkout']['children']['steps']['children']['shipping-step']['children']['shippingAddress']['children']['customer-email']['children']['additional-login-form-fields']['children']['captcha']);
+            }
+            if (isset($jsLayout['components']['authenticationPopup']['children']['captcha'])) {
+                unset($jsLayout['components']['authenticationPopup']['children']['captcha']);
+            }
+        }
+        return $jsLayout;
+    }
+}

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

@@ -37,7 +37,12 @@
     <type name="Magento\Sales\Api\OrderManagementInterface">
         <plugin name="reset_payment_attempts_after_order_is_placed_plugin" type="Magento\Captcha\Plugin\ResetPaymentAttemptsAfterOrderIsPlacedPlugin"/>
     </type>
-    <type name="Magento\Customer\Block\Account\AuthenticationPopup">
-        <plugin name="check_captcha_on_storefront" type="Magento\Captcha\Plugin\CheckCaptchaOnStorefront" sortOrder="10"/>
+
+    <type name="Magento\Checkout\Block\Onepage">
+        <arguments>
+            <argument name="layoutProcessors" xsi:type="array">
+                <item name="captcha_processor" xsi:type="object">Magento\Captcha\Block\CaptchaLayoutProcessor</item>
+            </argument>
+        </arguments>
     </type>
 </config>

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

@@ -1,12 +1,13 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe.
+ * All Rights Reserved.
  */
 namespace Magento\Customer\Block\Account;
 
 use Magento\Customer\Model\Form;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Customer\Model\Context;
 
 /**
  * @api
@@ -48,6 +49,16 @@ public function __construct(
      */
     public function getJsLayout()
     {
+        // Check if captcha is not enabled and user is not logged in
+        if (!$this->_scopeConfig->getValue(
+            Form::XML_PATH_CUSTOMER_CAPTCHA_ENABLED,
+            ScopeInterface::SCOPE_STORE
+        ) && !$this->isLoggedIn()) {
+            if(isset($this->jsLayout['components']['authenticationPopup']['children']['captcha'])) {
+                unset($this->jsLayout['components']['authenticationPopup']['children']['captcha']);
+            }
+        }
+
         return $this->serializer->serialize($this->jsLayout);
     }
 
@@ -122,4 +133,14 @@ public function getCustomerForgotPasswordUrl()
     {
         return $this->getUrl('customer/account/forgotpassword');
     }
+
+    /**
+     * Is logged in
+     *
+     * @return bool
+     */
+    private function isLoggedIn(): ?bool
+    {
+        return $this->httpContext->getValue(Context::CONTEXT_AUTH);
+    }
 }

app/code/Magento/Customer/Block/Account/AuthenticationPopup.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe.
+ * All Rights Reserved.
  */
 
 namespace Magento\Customer\Model;
@@ -16,6 +16,11 @@ class Form extends \Magento\Eav\Model\Form
      */
     public const XML_PATH_ENABLE_AUTOCOMPLETE = 'customer/password/autocomplete_on_storefront';
 
+    /**
+     * XML configuration paths for "Enable CAPTCHA on Storefront" property
+     */
+    public const XML_PATH_CUSTOMER_CAPTCHA_ENABLED = 'customer/captcha/enable';
+
     /**
      * Current module pathname
      *