Minor patches

fleetbase · Jan 22, 2024 · 32bd87c · 32bd87c
1 parent c65620e
commit 32bd87c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/Http/Controllers/Internal/v1/AuthController.php b/src/Http/Controllers/Internal/v1/AuthController.php
@@ -56,9 +56,6 @@ public function login(LoginRequest $request)
             return response()->error('No user found by the provided identity.', 401, ['code' => 'no_user']);
         }
 
-        // Create token
-        $token = $user->createToken($user->uuid);
-
         // Check if 2FA enabled
         if (TwoFactorAuth::isEnabled($user)) {
             $twoFaSession = TwoFactorAuth::start($user);
@@ -69,6 +66,9 @@ public function login(LoginRequest $request)
             ]);
         }
 
+        // Create token
+        $token = $user->createToken($user->uuid);
+
         return response()->json(['token' => $token->plainTextToken]);
 
         if (Auth::isInvalidPassword($password, $user->password)) {

diff --git a/src/Http/Controllers/Internal/v1/InstallerController.php b/src/Http/Controllers/Internal/v1/InstallerController.php
@@ -2,10 +2,8 @@
 
 namespace Fleetbase\Http\Controllers\Internal\v1;
 
-use App\Models\User;
 use Fleetbase\Http\Controllers\Controller;
 use Fleetbase\Models\Setting;
-use Fleetbase\Support\TwoFactorAuth;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;