Split request and response application in apply auth middleware

Author: ilijastuden

src/AuthenticationResult/Transport/Transport.php

@@ -91,4 +91,14 @@ public function isApplied(): bool
     {
         return $this->is_applied_to_request && $this->is_applied_to_response;
     }
+
+    public function isAppliedToRequest(): bool
+    {
+        return $this->is_applied_to_request;
+    }
+
+    public function isAppliedToResponse(): bool
+    {
+        return $this->is_applied_to_response;
+    }
 }

src/AuthenticationResult/Transport/TransportInterface.php

@@ -28,4 +28,6 @@ public function applyToResponse(ResponseInterface $response): ResponseInterface;
     public function applyTo(ServerRequestInterface $request, ResponseInterface $response): array;
 
     public function isApplied(): bool;
+    public function isAppliedToRequest(): bool;
+    public function isAppliedToResponse(): bool;
 }

src/Middleware/ApplyAuthenticationMiddleware.php

@@ -61,15 +61,46 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         return (new ResponseFactory())->createResponse();
     }
 
-    private function apply(ServerRequestInterface $request, ResponseInterface $response): array
+    private function applyToRequest(ServerRequestInterface $request): ServerRequestInterface
+    {
+        $transport = $this->getTransportFrom($request);
+
+        if ($transport instanceof TransportInterface
+            && !$transport->isEmpty()
+            && !$transport->isAppliedToResponse()
+        ) {
+            return $transport->applyToRequest($request);
+        }
+
+        return $request;
+    }
+
+    private function applyToResponse(
+        ServerRequestInterface $request,
+        ResponseInterface $response
+    ): ResponseInterface
     {
         $transport = $this->getTransportFrom($request);
 
-        if ($transport instanceof TransportInterface && !$transport->isEmpty() && !$transport->isApplied()) {
-            [$request, $response] = $transport->applyTo($request, $response);
+        if ($transport instanceof TransportInterface
+            && !$transport->isEmpty()
+            && !$transport->isAppliedToResponse()
+        ) {
+            return $transport->applyToResponse($response);
         }
 
-        return [$request, $response];
+        return $response;
+    }
+
+    private function apply(ServerRequestInterface $request, ResponseInterface $response): array
+    {
+        $request = $this->applyToRequest($request);
+        $response = $this->applyToResponse($request, $response);
+
+        return [
+            $request,
+            $response,
+        ];
     }
 
     protected function getTransportFrom(ServerRequestInterface $request): ?TransportInterface