AC-9797: 2FA functionality enhancement

Author: Rizwan Khan

TwoFactorAuth/Block/Provider/Authy/Auth.php

@@ -8,37 +8,12 @@
 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
      */
@@ -59,9 +34,6 @@ 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/Block/Provider/Google/Auth.php

@@ -8,37 +8,12 @@
 namespace Magento\TwoFactorAuth\Block\Provider\Google;
 
 use Magento\Backend\Block\Template;
-use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
  * @api
  */
 class Auth extends Template
 {
-    /**
-     * Config path for the 2FA Attempts
-     */
-    public 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
      */
@@ -50,9 +25,6 @@ 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();
     }
 }