AC-9797: 2FA functionality enhancement

Author: Rizwan Khan

TwoFactorAuth/Block/Provider/Authy/Auth.php

@@ -8,12 +8,37 @@
 namespace Magento\TwoFactorAuth\Block\Provider\Authy;
 
 use Magento\Backend\Block\Template;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
  * @api
  */
 class Auth extends Template
 {
+    /**
+     * Config path for the 2FA Attempts
+     */
+    private const XML_PATH_2FA_RETRY_ATTEMPTS = 'twofactorauth/general/twofactorauth_retry';
+
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param ScopeConfigInterface $scopeConfig
+     * @param array $data
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        ScopeConfigInterface $scopeConfig,
+        array $data = []
+    ) {
+        parent::__construct($context, $data);
+        $this->scopeConfig = $scopeConfig;
+    }
+
     /**
      * @inheritdoc
      */
@@ -34,6 +59,9 @@ public function getJsLayout()
         $this->jsLayout['components']['tfa-auth']['successUrl'] =
             $this->getUrl($this->_urlBuilder->getStartupPageUrl());
 
+        $this->jsLayout['components']['tfa-auth']['attempts'] =
+            $this->scopeConfig->getValue(self::XML_PATH_2FA_RETRY_ATTEMPTS);
+
         return parent::getJsLayout();
     }
 }

TwoFactorAuth/etc/config.xml

@@ -11,6 +11,7 @@
         <twofactorauth>
             <general>
                 <force_providers></force_providers>
+                <twofactorauth_retry>10</twofactorauth_retry>
             </general>
             <authy>
                 <onetouch_message>Login request to your Magento Admin</onetouch_message>

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

@@ -12,6 +12,7 @@ define([
 ], function ($, ko, Component, error) {
     'use strict';
 
+    let attempts = 0;
     return Component.extend({
         selectedMethod: ko.observable(''),
         waitingText: ko.observable(''),
@@ -190,12 +191,27 @@ define([
             this.success(false);
         },
 
+        /**
+         * Get Retry Attempts
+         * @returns {int}
+         */
+        getRetryAttempts: function () {
+            return this.attempts;
+        },
+
         /**
          * Verify authy code
          */
         verifyCode: function () {
             var me = this;
 
+            attempts++;
+            if (attempts > this.getRetryAttempts()) {
+                console.log('Maximum otp retries are done.');
+                location.href = $('.tfa-logout-link').attr('href');
+                return;
+            }
+
             this.waitingText('Please wait...');
 
             $.post(this.getPostUrl(), {