From e1b2f1806ba9d15e920c366bb9ff38dbd24886ff Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Wed, 11 Jul 2018 16:09:22 +0800
Subject: [PATCH] add inline middleware to retrieve session

---
 app/Http/Controllers/ClosetController.php  |  5 ++++-
 app/Http/Controllers/PlayerController.php  | 18 ++++++++++++------
 app/Http/Controllers/SkinlibController.php |  8 ++++----
 app/Http/Controllers/UserController.php    |  5 ++++-
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/ClosetController.php b/app/Http/Controllers/ClosetController.php
index 382439be..40ca5482 100644
--- a/app/Http/Controllers/ClosetController.php
+++ b/app/Http/Controllers/ClosetController.php
@@ -22,7 +22,10 @@ class ClosetController extends Controller
 
     public function __construct()
     {
-        $this->closet = new Closet(session('uid'));
+        $this->middleware(function ($request, $next) {
+            $this->closet = new Closet($request->session()->get('uid'));
+            return $next($request);
+        });
     }
 
     public function index()
diff --git a/app/Http/Controllers/PlayerController.php b/app/Http/Controllers/PlayerController.php
index ea1236fe..b367c6e2 100644
--- a/app/Http/Controllers/PlayerController.php
+++ b/app/Http/Controllers/PlayerController.php
@@ -36,15 +36,21 @@ class PlayerController extends Controller
      */
     private $player;
 
-    public function __construct(Request $request, UserRepository $users)
+    public function __construct(UserRepository $users)
     {
-        $this->user = $users->get(session('uid'));
+        $this->middleware(function ($request, $next) use ($users) {
+            $uid = $request->session()->get('uid');
 
-        if ($request->has('pid')) {
-            if ($this->player = Player::find($request->pid)) {
-                $this->player->checkForInvalidTextures();
+            $this->user = $users->get($uid);
+
+            if ($request->has('pid')) {
+                if ($this->player = Player::find($request->pid)) {
+                    $this->player->checkForInvalidTextures();
+                }
             }
-        }
+
+            return $next($request);
+        });
 
         $this->middleware([CheckPlayerExist::class, CheckPlayerOwner::class], [
             'only' => ['delete', 'rename', 'setTexture', 'clearTexture', 'setPreference']
diff --git a/app/Http/Controllers/SkinlibController.php b/app/Http/Controllers/SkinlibController.php
index 6502b1d5..cef7c858 100644
--- a/app/Http/Controllers/SkinlibController.php
+++ b/app/Http/Controllers/SkinlibController.php
@@ -22,10 +22,10 @@ class SkinlibController extends Controller
 
     public function __construct(UserRepository $users)
     {
-        // Try to load user by uid stored in session.
-        // If there is no uid stored in session or the uid is invalid
-        // it will return a null value.
-        $this->user = $users->get(session('uid'));
+        $this->middleware(function ($request, $next) use ($users) {
+            $this->user = $users->get($request->session()->get('uid'));
+            return $next($request);
+        });
     }
 
     public function index()
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index c4a745bd..9a83d085 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -23,7 +23,10 @@ class UserController extends Controller
 
     public function __construct(UserRepository $users)
     {
-        $this->user = $users->get(session('uid'));
+        $this->middleware(function ($request, $next) use ($users) {
+            $this->user = $users->get($request->session()->get('uid'));
+            return $next($request);
+        });
     }
 
     public function index()