fix: start session in middleware

darkalchemy · Feb 18, 2020 · df4ddef · df4ddef
1 parent 7574a26
commit df4ddef
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Slim-Auth
 A Slim 4 Skeleton.
 
-![GitHub commits since tagged version](https://img.shields.io/github/commits-since/darkalchemy/Slim-Auth/0.3.2)
+![GitHub commits since tagged version](https://img.shields.io/github/commits-since/darkalchemy/Slim-Auth/0.3.3)
 [![GitHub Issues](https://img.shields.io/github/issues/darkalchemy/Slim-Auth)](https://github.com/darkalchemy/Slim-Auth/issues)
 [![GitHub license](https://img.shields.io/github/license/darkalchemy/Slim-Auth.svg)](https://github.com/darkalchemy/Slim-Auth/blob/master/LICENSE)
 [![Total Downloads](https://img.shields.io/packagist/dt/darkalchemy/Slim-Auth.svg)](https://packagist.org/packages/darlachemy/slim-auth)
@@ -19,11 +19,12 @@ npm is required
 [delight-im/PHP-I18N](https://github.com/delight-im/PHP-I18N) for generating the files needed for poedit  
 [jobby](https://github.com/jobbyphp/jobby) to run all background jobs through cron  
 [Eloquent/ORM](https://github.com/illuminate/database) for database storage  
-[EmailValidator](https://github.com/egulias/EmailValidator/tree/master) for validating emails  
+[EmailValidator](https://github.com/egulias/EmailValidator/tree/master) for validating emails
+[Middlewares/Trailing-slash](https://github.com/middlewares/trailing-slash) to remove any trailing slashes in the url  
 [Monolog](https://github.com/Seldaek/monolog) for logging  
 [PHPMailer](https://github.com/PHPMailer/PHPMailer) for sending email  
 [Phinx](https://phinx.org/) for database migrations  
-[Odan/Session](https://github.com/odan/session) for managing the session(start session in middleware is not working)  
+[Odan/Session](https://github.com/odan/session) for managing the session  
 [Odan/Twig-Translation](https://github.com/odan/twig-translation) (partial usage) for compiling twig templates  
 [Selective/Config](https://github.com/selective-php/config) to manage config settings  
 [Slim/CSRF](https://github.com/slimphp/Slim-Csrf) to protect against csrf  

diff --git a/app/Middleware/SessionMiddleware.php b/app/Middleware/SessionMiddleware.php
@@ -15,7 +15,9 @@ class SessionMiddleware implements MiddlewareInterface
     protected SessionInterface $session;
 
     /**
-     * RedirectIfAuthenticated constructor.
+     * SessionMiddleware constructor.
+     *
+     * @param SessionInterface $session
      */
     public function __construct(SessionInterface $session)
     {
@@ -25,10 +27,6 @@ public function __construct(SessionInterface $session)
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $response = $handler->handle($request);
-        if (!$this->session->isStarted()) {
-            $this->session->start();
-        }
-
         if (!$this->session->has('regen') || $this->session->get('regen') < time()) {
             $this->session->regenerateId();
             $this->session->set('regen', time() + 300);

diff --git a/bootstrap/app.php b/bootstrap/app.php
@@ -37,7 +37,6 @@
 } catch (NotFoundException $e) {
     dd($e->getMessage());
 }
-$session->start();
 
 try {
     $i18n = $container->get(I18n::class);

diff --git a/bootstrap/middleware.php b/bootstrap/middleware.php
@@ -23,7 +23,7 @@
     $app->addMiddleware($container->get(WhoopsMiddleware::class));
     $app->addMiddleware($container->get(CheckMailMiddleware::class));
     $app->addMiddleware($container->get(SetLocaleMiddleware::class));
-    $app->addMiddleware($container->get(SessionMiddleware::class));
     $app->addRoutingMiddleware();
     $app->addMiddleware($container->get(TrailingSlash::class));
+    $app->addMiddleware($container->get(SessionMiddleware::class));
 };
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "slim-auth",
-    "version": "0.3.2",
+    "version": "0.3.3",
     "description": "",
     "main": "index.js",
     "directories": {