Replace auth()->user() with Dependency Injection (#474)

Co-authored-by: Alexander Gomzyakov <alexander.gomzyakov@gmail.com>

Author: Nima8FT

app/Http/Controllers/Personal/Comment/IndexController.php

@@ -3,14 +3,15 @@
 namespace App\Http\Controllers\Personal\Comment;
 
 use App\Http\Controllers\Controller;
+use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\View\Factory as ViewFactory;
 
 class IndexController extends Controller
 {
-    public function __invoke(ViewFactory $view_factory)
+    public function __invoke(ViewFactory $view_factory, Authenticatable $user)
     {
         /** @phpstan-ignore-next-line  */
-        $comments = auth()->user()->comments;
+        $comments = $user->comments;
 
         return $view_factory->make('personal.comment.index', ['comments' => $comments]);
     }

app/Http/Controllers/Personal/Liked/DeleteController.php

@@ -4,13 +4,14 @@
 
 use App\Http\Controllers\Controller;
 use App\Models\Post;
+use Illuminate\Contracts\Auth\Authenticatable;
 
 class DeleteController extends Controller
 {
-    public function __invoke(Post $post)
+    public function __invoke(Post $post, Authenticatable $user)
     {
         /** @phpstan-ignore-next-line  */
-        auth()->user()->likedPosts()->detach($post->id);
+        $user->likedPosts()->detach($post->id);
 
         return redirect()->route('personal.liked.index');
     }

app/Http/Controllers/Personal/Liked/IndexController.php

@@ -3,14 +3,15 @@
 namespace App\Http\Controllers\Personal\Liked;
 
 use App\Http\Controllers\Controller;
+use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\View\Factory as ViewFactory;
 
 class IndexController extends Controller
 {
-    public function __invoke(ViewFactory $view_factory)
+    public function __invoke(ViewFactory $view_factory, Authenticatable $user)
     {
         /** @phpstan-ignore-next-line  */
-        $posts = auth()->user()->likedPosts;
+        $posts = $user->likedPosts;
 
         return $view_factory->make('personal.liked.index', ['posts' => $posts]);
     }

app/Http/Controllers/Personal/Main/IndexController.php

@@ -3,16 +3,17 @@
 namespace App\Http\Controllers\Personal\Main;
 
 use App\Http\Controllers\Controller;
+use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\View\Factory as ViewFactory;
 
 class IndexController extends Controller
 {
-    public function __invoke(ViewFactory $view_factory)
+    public function __invoke(ViewFactory $view_factory, Authenticatable $user)
     {
         /** @phpstan-ignore-next-line  */
-        $data['countComments'] = count(auth()->user()->comments);
+        $data['countComments'] = count($user->comments);
         /** @phpstan-ignore-next-line  */
-        $data['countLiked']    = count(auth()->user()->likedPosts);
+        $data['countLiked']    = count($user->likedPosts);
 
         return $view_factory->make('personal.main.index', ['data' => $data]);
     }

app/Http/Controllers/Post/Comment/StoreController.php

@@ -6,15 +6,16 @@
 use App\Http\Requests\Post\Comment\StoreRequest;
 use App\Models\Comment;
 use App\Models\Post;
+use Illuminate\Contracts\Auth\Authenticatable;
 
 class StoreController extends Controller
 {
-    public function __invoke(StoreRequest $request, Post $post)
+    public function __invoke(StoreRequest $request, Post $post, Authenticatable $user)
     {
         $data            = $request->validated();
         $data['post_id'] = $post->id;
-        /** @phpstan-ignore-next-line  */
-        $data['user_id'] = auth()->user()->id;
+        /** @phpstan-ignore-next-line */
+        $data['user_id'] = $user->id;
         /** @phpstan-ignore-next-line */
         Comment::create($data);
 

app/Http/Controllers/Post/Like/StoreController.php

@@ -4,13 +4,14 @@
 
 use App\Http\Controllers\Controller;
 use App\Models\Post;
+use Illuminate\Contracts\Auth\Authenticatable;
 
 class StoreController extends Controller
 {
-    public function __invoke(Post $post)
+    public function __invoke(Post $post, Authenticatable $user)
     {
         /** @phpstan-ignore-next-line  */
-        auth()->user()->likedPosts()->toggle($post->id);
+        $user->likedPosts()->toggle($post->id);
 
         return redirect()->back();
     }

app/Http/Middleware/AdminMiddleware.php

@@ -15,8 +15,9 @@ class AdminMiddleware
      */
     public function handle(Request $request, Closure $next): Response
     {
-        /** @phpstan-ignore-next-line */
-        if (auth()->user()->isReader()) {
+        $user = $request->user();
+
+        if (! $user || ! $user->isAdministrator()) {
             abort(404);
         }
 

routes/web.php

@@ -48,10 +48,10 @@
 Route::prefix('post')->namespace('')->group(function () {
     Route::get('/{post}', [PostController::class, 'show'])->name('post.show');
 
-    Route::prefix('{post}/comments')->group(function () {
+    Route::prefix('{post}/comments')->middleware('auth')->group(function () {
         Route::post('/', 'App\Http\Controllers\Post\Comment\StoreController')->name('post.comments.store');
     });
-    Route::prefix('{post}/likes')->group(function () {
+    Route::prefix('{post}/likes')->middleware('auth')->group(function () {
         Route::post('/', 'App\Http\Controllers\Post\Like\StoreController')->name('post.likes.store');
     });
 });