Use TOTP service in login

OHFLesvos · Apr 21, 2022 · 9a43330 · 9a43330
1 parent 285d378
commit 9a43330
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -5,13 +5,13 @@
 use App\Events\UserSelfRegistered;
 use App\Http\Controllers\Controller;
 use App\Models\User;
+use App\Services\TOTPService;
 use Exception;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
-use OTPHP\TOTP;
 use Socialite;
 
 class LoginController extends Controller
@@ -87,7 +87,7 @@ public function showLoginForm()
      *
      * @throws \Illuminate\Validation\ValidationException
      */
-    public function login(Request $request)
+    public function login(Request $request, TOTPService $totp)
     {
         $this->validateLogin($request);
 
@@ -108,9 +108,8 @@ public function login(Request $request)
             $validator = Validator::make($request->all(), [
                 'code' => 'required|numeric',
             ])
-                ->after(function ($validator) use ($user, $request) {
-                    $otp = TOTP::create($user->tfa_secret);
-                    if (! $otp->verify($request->code, null, 1)) {
+                ->after(function ($validator) use ($user, $request, $totp) {
+                    if (!$totp->verify($user->tfa_secret, $request->code, null, 1)) {
                         $validator->errors()->add('code', __('Invalid code, please repeat.'));
                     }
                 });