CABPI-227: remove password fields

 - add new after plugin
 - remove fields for password and confirmation

Author: dmanners

app/code/Magento/AdminAdobeIms/Plugin/RemoveCurrentUserVerificationFieldsPlugin.php

@@ -11,7 +11,6 @@
 use Magento\AdminAdobeIms\Service\ImsConfig;
 use Magento\Framework\Data\Form;
 use Magento\Framework\Data\Form\Element\AbstractElement;
-use Magento\Backend\Block\System\Account\Edit\Form as VerificationForm;
 
 class RemoveCurrentUserVerificationFieldsPlugin
 {
@@ -39,10 +38,7 @@ public function aroundAddElement(Form $subject, callable $proceed, AbstractEleme
             return $proceed($element, $after);
         }
 
-        if (
-            $element->getId() !== 'current_user_verification_fieldset'
-            && $element->getId() !== VerificationForm::IDENTITY_VERIFICATION_PASSWORD_FIELD
-        ) {
+        if ($element->getId() !== 'current_user_verification_fieldset') {
             return $proceed($element, $after);
         }
     }

app/code/Magento/AdminAdobeIms/Plugin/RemovePasswordFieldsPlugin.php

@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\AdminAdobeIms\Plugin;
+
+use Magento\AdminAdobeIms\Service\ImsConfig;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+use Magento\Framework\Data\Form\Element\Fieldset;
+
+class RemovePasswordFieldsPlugin
+{
+    /** @var ImsConfig */
+    private ImsConfig $imsConfig;
+
+    /**
+     * @param ImsConfig $imsConfig
+     */
+    public function __construct(
+        ImsConfig $imsConfig
+    ) {
+        $this->imsConfig = $imsConfig;
+    }
+
+    /**
+     * @param Fieldset $subject
+     * @param AbstractElement $result
+     * @param string $elementId
+     * @param string $type
+     * @param array $config
+     * @param bool $after
+     * @param bool $isAdvanced
+     * @return AbstractElement
+     */
+    public function afterAddField(
+        Fieldset $subject,
+        AbstractElement $result,
+        $elementId,
+        $type,
+        $config,
+        $after = false,
+        $isAdvanced = false
+    ): AbstractElement
+    {
+        if ($this->imsConfig->enabled() !== true) {
+            return $result;
+        }
+
+        if (
+            $subject->getId() === 'base_fieldset'
+            && (
+                $elementId === 'password'
+                || $elementId === 'confirmation'
+            )
+        ) {
+            $subject->removeField($elementId);
+        }
+        return $result;
+    }
+}

app/code/Magento/AdminAdobeIms/etc/adminhtml/di.xml

@@ -34,4 +34,8 @@
         <plugin name="aroundAddElement"
                 type="Magento\AdminAdobeIms\Plugin\RemoveCurrentUserVerificationFieldsPlugin"/>
     </type>
+    <type name="Magento\Framework\Data\Form\Element\Fieldset">
+        <plugin name="afterAddField"
+                type="Magento\AdminAdobeIms\Plugin\RemovePasswordFieldsPlugin"/>
+    </type>
 </config>