AC-10982::[2FA] Integrate with Duo Web SDK to support Universal Prompt-WEB API tests fixes

Author: glo05363

TwoFactorAuth/Block/Adminhtml/System/Config/Providers.php

@@ -46,7 +46,16 @@ protected function _getElementHtml(AbstractElement $element)
             '#twofactorauth_general_force_providers' => [
                 'Magento_TwoFactorAuth/js/system/config/providers' => [
                     'modalTitleText' => $this->getModalTitleText(),
-                    'modalContentBody' => $this->getModalContentBody()
+                    'modalContentBody' => $this->getModalContentBody(),
+                    'duoProviderValue' => 'duo_security',
+                    'duoFields' => [
+                        'twofactorauth_duo_client_id',
+                        'twofactorauth_duo_client_secret',
+                        'twofactorauth_duo_api_hostname',
+                        'twofactorauth_duo_failmode',
+                        'twofactorauth_duo_integration_key',
+                        'twofactorauth_duo_secret_key',
+                    ]
                 ]
             ]
         ];

TwoFactorAuth/Model/Provider/Engine/DuoSecurity.php

@@ -161,7 +161,6 @@ public function getApiHostname(): string
      */
     private function getClientSecret(): string
     {
-        // return default value if client secret is not set as per Duo Library
         return $this->encryptor->decrypt(
             $this->scopeConfig->getValue(static::XML_PATH_CLIENT_SECRET)
         );
@@ -174,7 +173,6 @@ private function getClientSecret(): string
      */
     private function getClientId(): string
     {
-        // return default value if client id is not set as per Duo Library
         return $this->scopeConfig->getValue(static::XML_PATH_CLIENT_ID);
     }
 

TwoFactorAuth/etc/config.xml

@@ -19,7 +19,6 @@
                 <api_key backend_model="Magento\Config\Model\Config\Backend\Encrypted"/>
             </authy>
             <duo>
-                <client_secret backend_model="Magento\Config\Model\Config\Backend\Encrypted"/>
                 <secret_key backend_model="Magento\Config\Model\Config\Backend\Encrypted"/>
             </duo>
             <google>

TwoFactorAuth/view/adminhtml/web/js/system/config/providers.js

@@ -12,9 +12,50 @@ define([
     'use strict';
 
     return function (config, element) {
-
         var $element = $(element),
-            initialValue = $element.val();
+            initialValue = $element.val(),
+            duoProviderValue = config.duoProviderValue,
+            duoFields = config.duoFields;
+
+        $element.on('change', function () {
+            var selectedValues = $element.val() || [];
+
+            if (selectedValues.includes(duoProviderValue)) {
+                addRequiredAttributes(duoFields);
+            } else {
+                removeRequiredAttributes(duoFields);
+            }
+        });
+
+        /**
+         * Adds the "required" attribute to each Duo field
+         *
+         * @param {Array} fields - List of field IDs to mark as required
+         */
+        function addRequiredAttributes(fields) {
+            fields.forEach(function (fieldId) {
+                var $field = $('#' + fieldId);
+                if ($field.length) {
+                    $field.attr('required', 'required');
+                    $field.addClass('required-entry');
+                }
+            });
+        }
+
+        /**
+         * Removes the "required" attribute from each Duo field
+         *
+         * @param {Array} fields - List of field IDs to unmark as required
+         */
+        function removeRequiredAttributes(fields) {
+            fields.forEach(function (fieldId) {
+                var $field = $('#' + fieldId);
+                if ($field.length) {
+                    $field.removeAttr('required');
+                    $field.removeClass('required-entry');
+                }
+            });
+        }
 
         element.on('blur', function () {
             var currentValue = $element.val();
@@ -32,28 +73,18 @@ define([
                     text: $t('Cancel'),
                     class: 'action-secondary action-dismiss',
 
-                    /**
-                     * Close modal and trigger 'cancel' action on click
-                     */
                     click: function (event) {
                         this.closeModal(event);
                     }
                 }, {
                     text: $t('Confirm'),
                     class: 'action-primary action-accept',
 
-                    /**
-                     * Close modal and trigger 'confirm' action on click
-                     */
                     click: function (event) {
                         this.closeModal(event, true);
                     }
                 }],
                 actions: {
-
-                    /**
-                     * Revert back to original Enabled setting
-                     */
                     cancel: function () {
                         $element.val(initialValue);
                     }
@@ -62,3 +93,4 @@ define([
         });
     };
 });
+