Use middleware

Author: Linus Juhlin

components/auth/app/Middleware/StartSession.php

@@ -3,6 +3,7 @@
 namespace App\Middleware;
 
 use Closure;
+use Symfony\Component\HttpFoundation\Cookie;
 
 class StartSession
 {
@@ -16,21 +17,31 @@ class StartSession
      */
     public function handle($request, Closure $next, $guard = null)
     {
+        $container = \App::getInstance();
+
         if (session_status() == PHP_SESSION_NONE) {
             // In order to maintain the session between requests, we need to populate the
             // session ID from the supplied cookie
-            $cookieName = \App::getInstance()['session']->getName();
+            $cookieName = $container['session']->getName();
 
             if (isset($_COOKIE[$cookieName])) {
                 if ($sessionId = $_COOKIE[$cookieName]) {
-                    \App::getInstance()['session']->setId($sessionId);
+                    $container['session']->setId($sessionId);
                 }
             }
 
             // Boot the session
-            \App::getInstance()['session']->start();
+            $container['session']->start();
         }
 
-        return $next($request);
+        $response = $next($request);
+
+        $response->headers->setCookie(new Cookie(
+            $container['session']->getName(), $container['session']->getId(), 
+        ));
+
+        $container['session']->save();
+
+        return $response;
     }
 }

components/auth/index.php

@@ -161,6 +161,7 @@
 
 // Global middlewares
 $globalMiddleware = [
+    \App\Middleware\StartSession::class,
 ];
 
 // Array middlewares
@@ -180,19 +181,6 @@
 // Create a request from server variables
 $request = Request::capture();
 
-// In order to maintain the session between requests, we need to populate the
-// session ID from the supplied cookie
-$cookieName = $container['session']->getName();
-
-if (isset($_COOKIE[$cookieName])) {
-    if ($sessionId = $_COOKIE[$cookieName]) {
-        $container['session']->setId($sessionId);
-    }
-}
-
-// Boot the session
-$container['session']->start();
-
 // Dispatching the request:
 // When it comes to dispatching the request, you have two options:
 // a) you either send the request directly through the router
@@ -210,12 +198,6 @@
         return $router->dispatch($request);
     });
 
-$response->headers->setCookie(new Cookie(
-    $container['session']->getName(), $container['session']->getId(), 
-));
-
-$container['session']->save();
-
 // Send the response back to the browser
 $response->send();