Solucionado bug con la autenticación en 2 pasos

Author: Carlos Garcia

Core/Controller/EditUser.php

@@ -100,8 +100,8 @@ protected function createViews()
         $this->setSettings($mvn, 'btnOptions', false);
         $this->setSettings($mvn, 'btnPrint', false);
 
-        // add two factor authentication tab
-        $this->createViewsTwofactor();
+        // add two-factor authentication tab
+        $this->createViewsTwoFactor();
 
         // add roles tab
         if ($this->user->admin) {
@@ -115,7 +115,7 @@ protected function createViews()
         $this->createViewsEmails();
     }
 
-    protected function createViewsTwofactor(string $viewName = 'UserTwoFactor'): void
+    protected function createViewsTwoFactor(string $viewName = 'UserTwoFactor'): void
     {
         $this->addHtmlView($viewName, 'Tab\UserTwoFactor', 'User', 'two-factor-auth', 'fa-solid fa-key');
     }
@@ -308,7 +308,8 @@ protected function loadData($viewName, $view)
                     // prevent user self-destruction
                     $this->setSettings($viewName, 'btnDelete', false);
                 }
-                // is the user is admin, hide the EditRoleUser tab
+
+                // if the user is admin, hide the EditRoleUser tab
                 if ($view->model->admin && array_key_exists('EditRoleUser', $this->views)) {
                     $this->setSettings('EditRoleUser', 'active', false);
                 }

Core/Controller/Login.php

@@ -44,10 +44,12 @@ class Login implements ControllerInterface
     /** @var string */
     public $title = 'Login';
 
+    /** @var string */
+    public $two_factor_user;
+
     /** @var boolean */
     private $two_factor_view = false;
 
-
     public function __construct(string $className, string $url = '')
     {
     }
@@ -310,6 +312,7 @@ protected function loginAction(Request $request): void
         }
 
         if ($user->two_factor_enabled) {
+            $this->two_factor_user = $user->nick;
             $this->two_factor_view = true;
             return;
         }
@@ -320,7 +323,9 @@ protected function loginAction(Request $request): void
     protected function validCodeAction(Request $request): void
     {
         $user = new User();
-        $user->loadFromCode($request->request->get('fsNick'));
+        if (!$user->loadFromCode($request->request->get('fsNick'))) {
+            Tools::log()->warning('user-not-found');
+        }
 
         if (!TwoFactorManager::verifyCode($user->two_factor_secret_key, $request->request->get('fsCode'))) {
             Tools::log()->warning('login-2fa-fail');

Core/View/Login/TwoFactor.html.twig

@@ -8,18 +8,18 @@
                 <form action="{{ asset('login') }}" method="post" class="form">
                     {{ formToken() }}
                     <input type="hidden" name="action" value="valid-totp">
-                    <input type="hidden" name="fsNick" value="{{ fsc.user.nick }}">
+                    <input type="hidden" name="fsNick" value="{{ fsc.two_factor_user }}">
                     <div class="card mt-4">
                         <a href="{{ asset('login') }}">
                             {% set idfile = settings('default','idloginimage', 0) %}
                             {{ _self.loadLogo(idfile) }}
                         </a>
                         <div class="card-body">
-                            <p class="card-text text-center">Ingrese el codigo TOTP</p>
+                            <p class="card-text text-center">Ingrese el código TOTP</p>
                             <div class="mb-3">
                                 <div class="input-group">
                                     <span class="input-group-text">
-                                            <i class="fa-solid fa-user fa-fw" aria-hidden="true"></i>
+                                        <i class="fa-solid fa-user fa-fw" aria-hidden="true"></i>
                                     </span>
                                     <input type="text" name="fsCode" class="form-control" maxlength="50"
                                            placeholder="{{ trans('code') }}" required autocomplete="off"

Core/View/Tab/UserTwoFactor.html.twig

@@ -17,8 +17,8 @@
             <div class="input-group mb-3">
                 <input type="text" class="form-control" name="codetime" placeholder="{{ trans('code') }}" required/>
                 <button class="btn btn-primary" type="submit">
-                        {{ trans('save') }}
-                    </button>
+                    {{ trans('save') }}
+                </button>
             </div>
         </form>
     </div>