AC-9797: 2FA functionality enhancement

Author: Rizwan Khan

TwoFactorAuth/Controller/Adminhtml/Authy/Authpost.php

@@ -91,8 +91,8 @@ class Authpost extends AbstractAction implements HttpPostActionInterface
      * @param TfaInterface $tfa
      * @param AlertInterface $alert
      * @param DataObjectFactory $dataObjectFactory
-     * @param UserResource $userResource
-     * @param ScopeConfigInterface $scopeConfig
+     * @param UserResource|null $userResource
+     * @param ScopeConfigInterface|null $scopeConfig
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -104,8 +104,8 @@ public function __construct(
         TfaInterface $tfa,
         AlertInterface $alert,
         DataObjectFactory $dataObjectFactory,
-        UserResource $userResource,
-        ScopeConfigInterface $scopeConfig
+        ?UserResource $userResource  = null,
+        ?ScopeConfigInterface $scopeConfig  = null
     ) {
         parent::__construct($context);
         $this->tfa = $tfa;
@@ -141,7 +141,7 @@ public function execute()
             if (!$this->allowApiRetries()) { //locked the user
                 $lockThreshold = $this->scopeConfig->getValue(self::XML_PATH_2FA_LOCK_EXPIRE);
                 if ($this->userResource->lock($user->getId(), 0, $lockThreshold)) {
-                    $result->setData(['success' => false, 'message' => "User is disabled temporarily!"]);
+                    $result->setData(['success' => false, 'message' => "Your account is temporarily disabled."]);
                     return $result;
                 }
             }
@@ -189,10 +189,6 @@ private function allowApiRetries() : bool
         $verifyAttempts = $this->session->getOtpAttempt();
         $verifyAttempts = $verifyAttempts === null ? 1 : $verifyAttempts+1;
         $this->session->setOtpAttempt($verifyAttempts);
-        if ($verifyAttempts > $maxRetries) {
-            return false;
-        }
-
-        return true;
+        return  $maxRetries >= $verifyAttempts;
     }
 }

TwoFactorAuth/Controller/Adminhtml/Google/Authpost.php

@@ -93,8 +93,8 @@ class Authpost extends AbstractAction implements HttpPostActionInterface
      * @param TfaInterface $tfa
      * @param AlertInterface $alert
      * @param DataObjectFactory $dataObjectFactory
-     * @param UserResource $userResource
-     * @param ScopeConfigInterface $scopeConfig
+     * @param UserResource|null $userResource
+     * @param ScopeConfigInterface|null $scopeConfig
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -106,8 +106,8 @@ public function __construct(
         TfaInterface $tfa,
         AlertInterface $alert,
         DataObjectFactory $dataObjectFactory,
-        UserResource $userResource,
-        ScopeConfigInterface $scopeConfig
+        ?UserResource $userResource = null,
+        ?ScopeConfigInterface $scopeConfig  = null
     ) {
         parent::__construct($context);
         $this->tfa = $tfa;
@@ -136,7 +136,7 @@ public function execute()
         if (!$this->allowApiRetries()) { //locked the user
             $lockThreshold = $this->scopeConfig->getValue(self::XML_PATH_2FA_LOCK_EXPIRE);
             if ($this->userResource->lock($user->getId(), 0, $lockThreshold)) {
-                $response->setData(['success' => false, 'message' => "User is disabled temporarily!"]);
+                $response->setData(['success' => false, 'message' => "Your account is temporarily disabled."]);
                 return $response;
             }
         }
@@ -183,10 +183,6 @@ private function allowApiRetries() : bool
         $verifyAttempts = $this->session->getOtpAttempt();
         $verifyAttempts = $verifyAttempts === null ? 1 : $verifyAttempts+1;
         $this->session->setOtpAttempt($verifyAttempts);
-        if ($verifyAttempts > $maxRetries) {
-            return false;
-        }
-
-        return true;
+        return  $maxRetries >= $verifyAttempts;
     }
 }

TwoFactorAuth/etc/adminhtml/system.xml

@@ -37,13 +37,13 @@
                 </field>
                 <field canRestore="1" id="twofactorauth_retry" translate="label" type="text" sortOrder="40"
                        showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Configuration for 2FA retry attempts</label>
+                    <label>Configuration for TwoFactorAuth retry attempts</label>
                     <comment>Security configurations for TwoFactorAuth page.</comment>
                 </field>
                 <field canRestore="1" id="auth_lock_expire" translate="label" type="text" sortOrder="40"
                        showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Configuration for TwoFactorAuth lock expire time</label>
-                    <comment>TwoFactor Authentication Configuration.</comment>
+                    <comment>TwoFactorAuth Configuration.</comment>
                 </field>
             </group>
             <group id="google" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0"