AC-9797: 2FA functionality enhancement

Author: Rizwan Khan

TwoFactorAuth/Controller/Adminhtml/Authy/Authpost.php

@@ -93,6 +93,7 @@ class Authpost extends AbstractAction implements HttpPostActionInterface
      * @param DataObjectFactory $dataObjectFactory
      * @param UserResource $userResource
      * @param ScopeConfigInterface $scopeConfig
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         Action\Context $context,
@@ -141,7 +142,7 @@ public function execute()
             $retries = $this->verifyRetryAttempts();
             if ($retries > $maxRetries) { //locked the user
                 $lockThreshold = $this->scopeConfig->getValue(self::XML_PATH_2FA_LOCK_EXPIRE);
-                if ($this->userResource->lock($user->getId(),0, $lockThreshold)) {
+                if ($this->userResource->lock($user->getId(), 0, $lockThreshold)) {
                     $result->setData(['success' => false, 'message' => "User is disabled temporarily!"]);
                 }
             } else {
@@ -187,7 +188,7 @@ protected function _isAllowed()
     private function verifyRetryAttempts() : int
     {
         $verifyAttempts = $this->session->getOtpAttempt();
-        $verifyAttempts = is_null($verifyAttempts) ? 0 : $verifyAttempts+1;
+        $verifyAttempts = $verifyAttempts === null ? 1 : $verifyAttempts+1;
         $this->session->setOtpAttempt($verifyAttempts);
         return $verifyAttempts;
     }

TwoFactorAuth/Controller/Adminhtml/Google/Authpost.php

@@ -94,6 +94,7 @@ class Authpost extends AbstractAction implements HttpPostActionInterface
      * @param DataObjectFactory $dataObjectFactory
      * @param UserResource $userResource
      * @param ScopeConfigInterface $scopeConfig
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         Action\Context $context,
@@ -135,7 +136,7 @@ public function execute()
         $retries = $this->verifyRetryAttempts();
         if ($retries > $maxRetries) { //locked the user
             $lockThreshold = $this->scopeConfig->getValue(self::XML_PATH_2FA_LOCK_EXPIRE);
-            if ($this->userResource->lock($user->getId(),0, $lockThreshold)) {
+            if ($this->userResource->lock($user->getId(), 0, $lockThreshold)) {
                 $response->setData(['success' => false, 'message' => "User is disabled temporarily!"]);
             }
         } else {
@@ -179,7 +180,7 @@ protected function _isAllowed()
     private function verifyRetryAttempts() : int
     {
         $verifyAttempts = $this->session->getOtpAttempt();
-        $verifyAttempts = is_null($verifyAttempts) ? 0 : $verifyAttempts+1;
+        $verifyAttempts = $verifyAttempts === null ? 1 : $verifyAttempts+1;
         $this->session->setOtpAttempt($verifyAttempts);
         return $verifyAttempts;
     }

TwoFactorAuth/etc/adminhtml/system.xml

@@ -34,7 +34,7 @@
                        showInDefault="1" showInWebsite="0" showInStore="0">
                     <label>Configuration Email URL for Web API</label>
                     <comment>This can be used to override the default email configuration link that is sent when using the Magento Web API's to authenticate. Use the placeholder :tfat to indicate where the token should be injected</comment>
-                </field>x
+                </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>