Corrected code to actually work with psr-15 middleware pattern.

Danack · Jun 14, 2023 · 9479fed · 9479fed
1 parent 67ec814
commit 9479fed
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 12 deletions.
diff --git a/lib/Asm/Bridge/SlimSessionMiddleware.php b/lib/Asm/Bridge/SlimSessionMiddleware.php
@@ -31,23 +31,34 @@ public function __construct(
 
     public function process(Request $request, RequestHandlerInterface $handler): ResponseInterface
     {
-        $session = $this->sessionManager->createSession($request);
-        $this->requestSessionStorage->store($session);
-//        $response = $next($request, $response);
+        $session = $this->sessionManager->openSessionFromCookie($request);
+
+        if ($session) {
+            $this->requestSessionStorage->store($session);
+        }
+
         $response = $handler->handle($request);
 
-        $session->save();
-        $headers = $session->getHeaders(
-            \Asm\SessionManager::CACHE_PRIVATE,
-            '/'
+        // Session could have been opened inside request
+        $session = $this->requestSessionStorage->get();
+
+        if ($session) {
+            $session->save();
+            $headersArrays = $session->getHeaders(
+                \Asm\SessionManager::CACHE_PRIVATE,
+                '/'
             //        $domain = false,
             //        $secure = false,
             //        $httpOnly = true
-        );
+            );
+
+            foreach ($headersArrays as $nameAndValue) {
+                $name = $nameAndValue[0];
+                $value = $nameAndValue[1];
 
-        foreach ($headers as $key => $value) {
-            /** @var ResponseInterface $response */
-            $response = $response->withAddedHeader($key, $value);
+                /** @var ResponseInterface $response */
+                $response = $response->withAddedHeader($name, $value);
+            }
         }
 
         return $response;

diff --git a/lib/Asm/Predis/PredisDriver.php b/lib/Asm/Predis/PredisDriver.php
@@ -275,7 +275,10 @@ public function save(
             $sessionLifeTime
         );
 
-        if ($written !== true) {
+        /** @var $written \Predis\Response\Status */
+
+        if ($written->getPayload() !== 'OK') {
+            // TODO - handle this more gracefully...
             throw new AsmException("Failed to save data", AsmException::IO_ERROR);
         }
     }

diff --git a/lib/Asm/RequestSessionStorage.php b/lib/Asm/RequestSessionStorage.php
@@ -4,11 +4,14 @@
 
 use Asm\Session;
 
+
 /**
  * Allows an active session to be stored back from the Asm middleware
  * so it can be accessed by your application.
  */
 interface RequestSessionStorage
 {
     public function store(Session $session);
+
+    public function get(): Session|null;
 }