From 8196324f7357c48d18959db0a6e932cc4c36dbcc Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Mon, 29 Aug 2016 22:46:57 +0800
Subject: [PATCH] write data from cookie to session in a parent middleware

---
 app/Http/Middleware/CheckAuthenticated.php      |  5 -----
 app/Http/Middleware/EncryptCookies.php          | 12 ++++++++++++
 app/Http/Middleware/RedirectIfAuthenticated.php |  5 -----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/Http/Middleware/CheckAuthenticated.php b/app/Http/Middleware/CheckAuthenticated.php
index 0dd8fe20..e65da8dd 100644
--- a/app/Http/Middleware/CheckAuthenticated.php
+++ b/app/Http/Middleware/CheckAuthenticated.php
@@ -13,11 +13,6 @@ class CheckAuthenticated
 {
     public function handle($request, \Closure $next, $return_user = false)
     {
-        if (isset($_COOKIE['uid']) && isset($_COOKIE['token'])) {
-            Session::put('uid'  , $_COOKIE['uid']);
-            Session::put('token', $_COOKIE['token']);
-        }
-
         if (Session::has('uid')) {
             $user = new User(session('uid'));
 
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
index 3aa15f8d..e908ed83 100644
--- a/app/Http/Middleware/EncryptCookies.php
+++ b/app/Http/Middleware/EncryptCookies.php
@@ -2,6 +2,8 @@
 
 namespace App\Http\Middleware;
 
+use Closure;
+use Session;
 use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter;
 
 class EncryptCookies extends BaseEncrypter
@@ -14,4 +16,14 @@ class EncryptCookies extends BaseEncrypter
     protected $except = [
         //
     ];
+
+    public function handle($request, Closure $next)
+    {
+        if (isset($_COOKIE['uid']) && isset($_COOKIE['token'])) {
+            Session::put('uid'  , $_COOKIE['uid']);
+            Session::put('token', $_COOKIE['token']);
+        }
+
+        return parent::handle($request, $next);
+    }
 }
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
index 65083e51..4daacb67 100644
--- a/app/Http/Middleware/RedirectIfAuthenticated.php
+++ b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -9,11 +9,6 @@ class RedirectIfAuthenticated
 {
     public function handle($request, \Closure $next)
     {
-        if (isset($_COOKIE['uid']) && isset($_COOKIE['token'])) {
-            Session::put('uid'  , $_COOKIE['uid']);
-            Session::put('token', $_COOKIE['token']);
-        }
-
         if (session()->has('uid')) {
             if (session('token') != (new User(session('uid')))->getToken())
             {