Clean code

Author: kvyaceslav

app/Http/Controllers/API/Auth/LoginController.php

@@ -7,7 +7,6 @@
 use App\Http\Requests\AuthRequest;
 use App\Http\Traits\HttpResponses;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Auth;
 
 class LoginController extends Controller
 {
@@ -19,8 +18,8 @@ class LoginController extends Controller
      */
     public function login(AuthRequest $request): JsonResponse
     {
-        if (Auth::attempt($request->all())) {
-            $user = Auth::user();
+        if (auth()->attempt($request->all())) {
+            $user = auth()->user();
 
             $user->tokens()->delete();
 
@@ -37,7 +36,7 @@ public function login(AuthRequest $request): JsonResponse
      */
     public function logout(): JsonResponse
     {
-        $user = Auth::user();
+        $user = auth()->user();
 
         $user->tokens()->delete();
 
@@ -49,7 +48,7 @@ public function logout(): JsonResponse
      */
     public function details(): JsonResponse
     {
-        $user = Auth::user();
+        $user = auth()->user();
 
         return $this->success($user, '');
     }

app/Http/Middleware/ApiAuthenticate.php

@@ -2,13 +2,12 @@
 
 namespace App\Http\Middleware;
 
-use Closure;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\Response;
 use App\Constants\AuthConstants;
 use App\Http\Controllers\Controller;
 use App\Http\Traits\HttpResponses;
-use Illuminate\Support\Facades\Auth;
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
 
 class ApiAuthenticate extends Controller
 {
@@ -22,7 +21,8 @@ class ApiAuthenticate extends Controller
     public function handle(Request $request, Closure $next): Response
     {
         if ($user = auth('sanctum')->user()) {
-            Auth::login($user);
+            auth()->login($user);
+            
             return $next($request);
         }
 

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -5,22 +5,24 @@
 use App\Providers\RouteServiceProvider;
 use Closure;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 use Symfony\Component\HttpFoundation\Response;
 
 class RedirectIfAuthenticated
 {
     /**
      * Handle an incoming request.
      *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     * @param Request $request
+     * @param Closure(Request): (Response) $next
+     * @param string ...$guards
+     * @return Response
      */
     public function handle(Request $request, Closure $next, string ...$guards): Response
     {
         $guards = empty($guards) ? [null] : $guards;
 
         foreach ($guards as $guard) {
-            if (Auth::guard($guard)->check()) {
+            if (auth()->guard($guard)->check()) {
                 return redirect(RouteServiceProvider::HOME);
             }
         }

app/Http/Traits/Access.php

@@ -3,7 +3,6 @@
 namespace App\Http\Traits;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Auth;
 
 trait Access
 {
@@ -13,6 +12,6 @@ trait Access
      */
     protected function canAccess(Model $model): bool
     {
-        return !($model->user_id !== Auth::id());
+        return !($model->user_id !== auth()->id());
     }
 }

app/Models/Category.php

@@ -8,7 +8,6 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Illuminate\Support\Facades\Auth;
 
 class Category extends Model
 {
@@ -43,7 +42,7 @@ public function user(): BelongsTo
      */
     public function scopeForUser(Builder $query): Builder
     {
-        return $query->where('user_id', Auth::id());
+        return $query->where('user_id', auth()->id());
     }
 
     /**
@@ -53,6 +52,6 @@ public function scopeForUser(Builder $query): Builder
      */
     public function scopeForUserByIds(Builder $query, array $ids): Collection
     {
-        return $query->find($ids)->where('user_id', Auth::id());
+        return $query->find($ids)->where('user_id', auth()->id());
     }
 }

app/Models/Product.php

@@ -6,7 +6,6 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
-use Illuminate\Support\Facades\Auth;
 
 class Product extends Model
 {
@@ -34,6 +33,6 @@ public function categories(): BelongsToMany
      */
     public function scopeForUser(Builder $query): Builder
     {
-        return $query->where('user_id', Auth::id());
+        return $query->where('user_id', auth()->id());
     }
 }