AC-10982::[2FA] Integrate with Duo Web SDK to support Universal Prompt-WebSdk login prompt related changes

Author: glo05363

TwoFactorAuth/Block/Provider/Duo/Auth.php

@@ -82,7 +82,7 @@ public function getJsLayout()
         }
         $username = $user->getUserName();
         $prompt_uri = $this->duoSecurity->initiateAuth($username, $this->getFormKey().DuoSecurity::AUTH_SUFFIX);
-        $this->jsLayout['components']['tfa-auth']['redirectUrl'] = $prompt_uri;
+        $this->jsLayout['components']['tfa-auth']['authUrl'] = $prompt_uri;
         return parent::getJsLayout();
     }
 }

TwoFactorAuth/Model/Provider/Engine/DuoSecurity.php

@@ -241,7 +241,7 @@ public function verify(UserInterface $user, DataObject $request): bool
         try {
             $decoded_token = $this->client->exchangeAuthorizationCodeFor2FAResult($duoCode, $username);
             // Save the token in the session for later use
-            $this->session->duo_token = $decoded_token;
+            $this->session->setData('duo_token', $decoded_token);
         } catch (LocalizedException $e) {
             return false;
         }

TwoFactorAuth/Test/Integration/Controller/Adminhtml/Duo/AuthpostTest.php

@@ -20,12 +20,12 @@
 class AuthpostTest extends AbstractConfigureBackendController
 {
     /**
-     * @inheritDoc
+     * @var string
      */
     protected $uri = 'backend/tfa/duo/authpost';
 
     /**
-     * @inheritDoc
+     * @var string
      */
     protected $httpMethod = Request::METHOD_GET;
 

TwoFactorAuth/view/adminhtml/templates/tfa/provider/auth.phtml

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright 2024 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 ?>
 <div id="tfa-auth-container" data-bind="scope:'tfa-auth'">
@@ -13,7 +13,7 @@
 <script type="text/x-magento-init">
 {
     "#tfa-auth-container": {
-        "Magento_TwoFactorAuth/js/duo/api": <?= /* @noEscape */ $block->getJsLayout() ?>
+        "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
     }
 }
 </script>

TwoFactorAuth/view/adminhtml/web/js/duo/api.js

@@ -1,13 +1,12 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 
 define([
     'ko',
-    'uiComponent',
-    'Magento_TwoFactorAuth/js/duo/api'
-], function (ko, Component, duo) {
+    'uiComponent'
+], function (ko, Component) {
     'use strict';
 
     return Component.extend({
@@ -17,16 +16,24 @@ define([
             template: 'Magento_TwoFactorAuth/duo/auth'
         },
 
-        redirectUrl: '',
-        authenticateData: {},
+        authUrl: '',
+
+        getAuthUrl: function () {
+            return this.authUrl;
+        },
+
+        redirectToAuthUrl: function () {
+            var redirectUrl = this.getAuthUrl();
+            if (redirectUrl) {
+                window.location.href = redirectUrl;
+            }
+        },
 
         /**
-         * Start waiting loop
+         * After the element is rendered, bind the authUrl (optional)
          */
         onAfterRender: function () {
-            window.setTimeout(function () {
-                duo(this, null);
-            }, 1000);
-        },
+            var authUrl = this.getAuthUrl();
+        }
     });
 });

TwoFactorAuth/view/adminhtml/web/js/duo/auth.js

@@ -1,23 +1,18 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
  -->
 <div>
     <form>
         <fieldset class="admin__fieldset">
             <legend class="admin__legend"><span translate="'2FA - Duo Security'"></span></legend>
             <br/>
-
-            <iframe id="duo_iframe"
-                    data-bind="afterRender: onAfterRender"
-                    attr="{
-                        'data-host': getApiHost(),
-                        'data-sig-request': getSignature(),
-                        'data-post-action': getPostUrl()
-                    }"
-            ></iframe>
+            <button type="button" data-bind="click: redirectToAuthUrl, afterRender: onAfterRender">
+                Go to Duo Universal Prompt
+            </button>
         </fieldset>
     </form>
 </div>
+