refactor: Moved Sesion and Caching to Middleware

Author: usernane

webfiori/framework/App.php

@@ -18,19 +18,19 @@
 use webfiori\file\exceptions\FileException;
 use webfiori\file\File;
 use webfiori\framework\autoload\ClassLoader;
-use webfiori\framework\cache\Cache;
 use webfiori\framework\config\ConfigurationDriver;
 use webfiori\framework\config\Controller;
 use webfiori\framework\exceptions\InitializationException;
 use webfiori\framework\handlers\APICallErrHandler;
 use webfiori\framework\handlers\CLIErrHandler;
 use webfiori\framework\handlers\HTTPErrHandler;
 use webfiori\framework\middleware\AbstractMiddleware;
+use webfiori\framework\middleware\CacheMiddleware;
 use webfiori\framework\middleware\MiddlewareManager;
+use webfiori\framework\middleware\StartSessionMiddleware;
 use webfiori\framework\router\Router;
 use webfiori\framework\router\RouterUri;
 use webfiori\framework\scheduler\TasksManager;
-use webfiori\framework\session\SessionsManager;
 use webfiori\http\Request;
 use webfiori\http\Response;
 /**
@@ -154,7 +154,6 @@ private function __construct() {
         {
             register_shutdown_function(function()
             {
-                SessionsManager::validateStorage();
                 $uriObj = Router::getRouteUri();
 
                 if ($uriObj !== null) {
@@ -163,14 +162,6 @@ private function __construct() {
                     }
                 }
             });
-            try {
-                $sessionsCookiesHeaders = SessionsManager::getCookiesHeaders();
-
-                foreach ($sessionsCookiesHeaders as $headerVal) {
-                    Response::addHeader('set-cookie', $headerVal);
-                }
-            } catch (Error $exc) {
-            }
 
             $uriObj = Router::getRouteUri();
 
@@ -180,21 +171,11 @@ private function __construct() {
                 foreach ($uriObj->getMiddleware() as $mw) {
                     $mw->after(Request::get(), Response::get());
                 }
-                App::cacheResponse($uriObj->getUri(true, true), $uriObj->getCacheDuration());
             }
         });
         //class is now initialized
         self::$ClassStatus = self::STATUS_INITIALIZED;
     }
-    public static function cacheResponse(string $key, int $duration) {
-        Cache::get($key, function () {
-            return [
-                'headers' => Response::getHeaders(),
-                'http-code' => Response::getCode(),
-                'body' => Response::getBody()
-            ];
-        }, $duration);
-    }
     /**
      * Register CLI commands or background tasks.
      *
@@ -317,7 +298,8 @@ public static function handle() {
                 App::getRunner()->start();
             } else {
                //route user request.
-               SessionsManager::start('wf-session');
+               MiddlewareManager::register(new StartSessionMiddleware());
+               MiddlewareManager::register(new CacheMiddleware());
                Router::route(Request::getRequestedURI());
                Response::send();
             }
@@ -538,7 +520,8 @@ private function checkStandardLibs() {
             'webfiori/file' => 'webfiori\\file\\File',
             'webfiori/mailer' => 'webfiori\\email\\SMTPAccount',
             'webfiori/cli' => 'webfiori\\cli\\CLICommand',
-            'webfiori/err' => 'webfiori\\error\\ErrorHandlerException'
+            'webfiori/err' => 'webfiori\\error\\ErrorHandlerException',
+            'webfiori/cache' => 'webfiori\\cache\\Cache'
         ];
 
         foreach ($standardLibsClasses as $lib => $class) {

webfiori/framework/middleware/CacheMiddleware.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace webfiori\framework\middleware;
+
+use webfiori\cache\Cache;
+use webfiori\framework\router\Router;
+use webfiori\framework\session\SessionsManager;
+use webfiori\http\Request;
+use webfiori\http\Response;
+
+
+class CacheMiddleware extends AbstractMiddleware {
+    public function __construct() {
+        parent::__construct('cache');
+        $this->setPriority(50);
+        $this->addToGroups(['web', 'api']);
+    }
+    public function after(Request $request, Response $response) {
+        $uriObj = Router::getRouteUri();
+        
+        if ($uriObj !== null) {
+            $request->getRequestedURI();
+            
+            //Following steps are used to make cached response unique per user.
+            $session = SessionsManager::getActiveSession();
+            if ($session !== null) {
+                $key .= $session->getId();
+            } 
+            $authHeader = $request->getAuthHeader();
+            $key .= $authHeader['scheme'].$authHeader['credentials'];
+            //End
+            
+            Cache::get($key, function (Response $response) {
+                return [
+                    'headers' => $response->getHeaders(),
+                    'http-code' => $response->getCode(),
+                    'body' => $response->getBody()
+                ];
+            }, $uriObj->getCacheDuration(), [$response]);
+        }
+    }
+
+    public function afterSend(Request $request, Response $response) {
+        
+    }
+
+    public function before(Request $request, Response $response) {
+        
+    }
+}

webfiori/framework/middleware/StartSessionMiddleware.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace webfiori\framework\middleware;
+
+use Error;
+use webfiori\framework\session\SessionsManager;
+use webfiori\http\Request;
+use webfiori\http\Response;
+
+class StartSessionMiddleware extends AbstractMiddleware {
+
+    public function __construct() {
+        parent::__construct('start-session');
+        $this->setPriority(PHP_INT_MAX);
+        $this->addToGroup('web');
+    }
+    public function after(Request $request, Response $response) {
+        try {
+            $sessionsCookiesHeaders = SessionsManager::getCookiesHeaders();
+
+            foreach ($sessionsCookiesHeaders as $headerVal) {
+                Response::addHeader('set-cookie', $headerVal);
+            }
+        } catch (Error $exc) {
+        }
+    }
+
+    public function afterSend(Request $request, Response $response) {
+        SessionsManager::validateStorage();
+    }
+
+    public function before(Request $request, Response $response) {
+        SessionsManager::start('wf-session');
+    }
+}

webfiori/framework/router/Router.php

@@ -12,10 +12,10 @@
 
 use Error;
 use Exception;
+use webfiori\cache\Cache;
 use webfiori\cli\Runner;
 use webfiori\file\exceptions\FileException;
 use webfiori\file\File;
-use webfiori\framework\cache\Cache;
 use webfiori\framework\exceptions\RoutingException;
 use webfiori\framework\ui\HTTPCodeView;
 use webfiori\framework\ui\StarterPage;