Track last result when processing request as PSR-15 middleware

Author: ilijastuden

src/Adapter/BrowserSessionAdapter.php

@@ -122,7 +122,9 @@ public function applyToResponse(ResponseInterface $response, TransportInterface
         } elseif ($transport instanceof DeauthenticationTransportInterface
             || $transport instanceof CleanUpTransportInterface
         ) {
-            return ($this->cookies->createRemover($this->session_cookie_name))->applyToResponse($response);
+            return $this->cookies
+                ->createRemover($this->session_cookie_name)
+                    ->applyToResponse($response);
         }
 
         return $response;

src/Authentication.php

@@ -114,36 +114,38 @@ public function __invoke(
         return $response;
     }
 
+    public $lastProcessingResult;
+
     public function process(
         ServerRequestInterface $request,
         RequestHandlerInterface $handler
     ): ResponseInterface
     {
-        $auth_result = $this->authenticatedUsingAdapters($request);
+        $this->lastProcessingResult = $this->authenticatedUsingAdapters($request);
 
-        if ($auth_result instanceof TransportInterface 
-            && !$auth_result->isEmpty()
+        if ($this->lastProcessingResult instanceof TransportInterface
+            && !$this->lastProcessingResult->isEmpty()
         ) {
-            if ($auth_result instanceof AuthenticationTransportInterface) {
-                $this->setAuthenticatedUser($auth_result->getAuthenticatedUser());
-                $this->setAuthenticatedWith($auth_result->getAuthenticatedWith());
+            if ($this->lastProcessingResult instanceof AuthenticationTransportInterface) {
+                $this->setAuthenticatedUser($this->lastProcessingResult->getAuthenticatedUser());
+                $this->setAuthenticatedWith($this->lastProcessingResult->getAuthenticatedWith());
 
                 $this->triggerEvent(
                     'user_authenticated',
-                    $auth_result->getAuthenticatedUser(),
-                    $auth_result->getAuthenticatedWith()
+                    $this->lastProcessingResult->getAuthenticatedUser(),
+                    $this->lastProcessingResult->getAuthenticatedWith()
                 );
             }
 
-            $request = $auth_result->applyToRequest($request);
+            $request = $this->lastProcessingResult->applyToRequest($request);
         }
 
         $response = $handler->handle($request);
 
-        if ($auth_result instanceof TransportInterface
-            && !$auth_result->isEmpty()
+        if ($this->lastProcessingResult instanceof TransportInterface
+            && !$this->lastProcessingResult->isEmpty()
         ) {
-            $response = $auth_result->applyToResponse($response);
+            $response = $this->lastProcessingResult->applyToResponse($response);
         }
 
         return $response;
@@ -158,11 +160,14 @@ public function authorize(
     {
         try {
             $user = $authorizer->verifyCredentials($credentials);
-            $authenticated_with = $adapter->authenticate($user, $credentials);
+            $authenticatedWith = $adapter->authenticate($user, $credentials);
 
-            $this->triggerEvent('user_authorized', $user, $authenticated_with);
+            $this->triggerEvent('user_authorized', $user, $authenticatedWith);
 
-            return new AuthorizationTransport($adapter, $user, $authenticated_with, $payload);
+            $authorizationResult = new AuthorizationTransport($adapter, $user, $authenticatedWith, $payload);
+            $this->lastProcessingResult = $authorizationResult;
+
+            return $authorizationResult;
         } catch (Exception $e) {
             $this->triggerEvent('user_authorization_failed', $credentials, $e);
 
@@ -172,14 +177,18 @@ public function authorize(
 
     public function terminate(
         AdapterInterface $adapter,
-        AuthenticationResultInterface $authenticated_with
+        AuthenticationResultInterface $authenticatedWith
     ): TransportInterface
     {
-        $termination_result = $adapter->terminate($authenticated_with);
+        $terminationResult = $adapter->terminate($authenticatedWith);
+
+        $this->setAuthenticatedUser(null);
+        $this->setAuthenticatedWith(null);
 
-        $this->triggerEvent('user_deauthenticated', $authenticated_with);
+        $this->triggerEvent('user_deauthenticated', $authenticatedWith);
+        $this->lastProcessingResult = $terminationResult;
 
-        return $termination_result;
+        return $terminationResult;
     }
 
     /**
@@ -242,7 +251,7 @@ public function getAuthenticatedWith(): ?AuthenticationResultInterface
         return $this->authenticated_with;
     }
 
-    public function setAuthenticatedWith(AuthenticationResultInterface $value): AuthenticationInterface
+    public function setAuthenticatedWith(?AuthenticationResultInterface $value): AuthenticationInterface
     {
         $this->authenticated_with = $value;
 

src/AuthenticationInterface.php

@@ -36,68 +36,24 @@ public function authorize(
 
     public function terminate(
         AdapterInterface $adapter,
-        AuthenticationResultInterface $authenticated_with
+        AuthenticationResultInterface $authenticatedWith
     ): TransportInterface;
 
     /**
      * @return AdapterInterface[]|iterable
      */
     public function getAdapters(): iterable;
 
-    /**
-     * Return authenticated in user.
-     *
-     * @return AuthenticatedUserInterface
-     */
     public function getAuthenticatedUser(): ?AuthenticatedUserInterface;
-
-    /**
-     * Override authentication adapter and force set logged user for this request.
-     *
-     * @param  AuthenticatedUserInterface|null $user
-     * @return $this
-     */
     public function setAuthenticatedUser(AuthenticatedUserInterface $user = null): AuthenticationInterface;
 
-    /**
-     * @return AuthenticationResultInterface|null
-     */
     public function getAuthenticatedWith(): ?AuthenticationResultInterface;
+    public function setAuthenticatedWith(?AuthenticationResultInterface $value): AuthenticationInterface;
 
-    /**
-     * @param  AuthenticationResultInterface $value
-     * @return $this
-     */
-    public function setAuthenticatedWith(AuthenticationResultInterface $value): AuthenticationInterface;
-
-    /**
-     * @param  callable $value
-     * @return $this
-     */
     public function onUserAuthenticated(callable $value): AuthenticationInterface;
-
-    /**
-     * @param  callable $value
-     * @return $this
-     */
     public function onUserAuthorized(callable $value): AuthenticationInterface;
-
-    /**
-     * @param  callable $value
-     * @return $this
-     */
     public function onUserAuthorizationFailed(callable $value): AuthenticationInterface;
-
-    /**
-     * @param  callable $value
-     * @return $this
-     */
     public function onUserSet(callable $value): AuthenticationInterface;
-
-    /**
-     * @param  callable $value
-     * @return $this
-     */
     public function onUserDeauthenticated(callable $value): AuthenticationInterface;
 
     /**

src/AuthenticationResult/Transport/Authentication/AuthenticationTransport.php

@@ -6,56 +6,39 @@
  * (c) A51 doo <[email protected]>. All rights reserved.
  */
 
+declare(strict_types=1);
+
 namespace ActiveCollab\Authentication\AuthenticationResult\Transport\Authentication;
 
 use ActiveCollab\Authentication\Adapter\AdapterInterface;
 use ActiveCollab\Authentication\AuthenticatedUser\AuthenticatedUserInterface;
 use ActiveCollab\Authentication\AuthenticationResult\AuthenticationResultInterface;
 use ActiveCollab\Authentication\AuthenticationResult\Transport\Transport;
 
-/**
- * @package ActiveCollab\Authentication\AuthenticationResult\Transport\Authentication
- */
 class AuthenticationTransport extends Transport implements AuthenticationTransportInterface
 {
-    /**
-     * @var AuthenticatedUserInterface
-     */
     private $authenticated_user;
-
-    /**
-     * @var AuthenticationResultInterface
-     */
     private $authenticated_with;
 
-    /**
-     * AuthenticationTransport constructor.
-     *
-     * @param AdapterInterface                   $adapter
-     * @param AuthenticatedUserInterface|null    $authenticated_user
-     * @param AuthenticationResultInterface|null $authenticated_with
-     * @param mixed                              $payload
-     */
-    public function __construct(AdapterInterface $adapter, AuthenticatedUserInterface $authenticated_user = null, AuthenticationResultInterface $authenticated_with = null, $payload = null)
+    public function __construct(
+        AdapterInterface $adapter,
+        AuthenticatedUserInterface $authenticated_user = null,
+        AuthenticationResultInterface $authenticated_with = null,
+        $payload = null
+    )
     {
         parent::__construct($adapter, $payload);
 
         $this->authenticated_user = $authenticated_user;
         $this->authenticated_with = $authenticated_with;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getAuthenticatedUser()
+    public function getAuthenticatedUser(): ?AuthenticatedUserInterface
     {
         return $this->authenticated_user;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getAuthenticatedWith()
+    public function getAuthenticatedWith(): ?AuthenticationResultInterface
     {
         return $this->authenticated_with;
     }

src/AuthenticationResult/Transport/Authentication/AuthenticationTransportInterface.php

@@ -6,24 +6,16 @@
  * (c) A51 doo <[email protected]>. All rights reserved.
  */
 
+declare(strict_types=1);
+
 namespace ActiveCollab\Authentication\AuthenticationResult\Transport\Authentication;
 
 use ActiveCollab\Authentication\AuthenticatedUser\AuthenticatedUserInterface;
 use ActiveCollab\Authentication\AuthenticationResult\AuthenticationResultInterface;
 use ActiveCollab\Authentication\AuthenticationResult\Transport\TransportInterface;
 
-/**
- * @package ActiveCollab\Authentication\AuthenticationResult\Transport\Authentication
- */
 interface AuthenticationTransportInterface extends TransportInterface
 {
-    /**
-     * @return AuthenticatedUserInterface|null
-     */
-    public function getAuthenticatedUser();
-
-    /**
-     * @return AuthenticationResultInterface|null
-     */
-    public function getAuthenticatedWith();
+    public function getAuthenticatedUser(): ?AuthenticatedUserInterface;
+    public function getAuthenticatedWith(): ?AuthenticationResultInterface;
 }

src/AuthenticationResult/Transport/Authorization/AuthorizationTransport.php

@@ -6,16 +6,15 @@
  * (c) A51 doo <[email protected]>. All rights reserved.
  */
 
+declare(strict_types=1);
+
 namespace ActiveCollab\Authentication\AuthenticationResult\Transport\Authorization;
 
 use ActiveCollab\Authentication\Adapter\AdapterInterface;
 use ActiveCollab\Authentication\AuthenticatedUser\AuthenticatedUserInterface;
 use ActiveCollab\Authentication\AuthenticationResult\AuthenticationResultInterface;
 use ActiveCollab\Authentication\AuthenticationResult\Transport\Transport;
 
-/**
- * @package ActiveCollab\Authentication\AuthenticationResult\Transport\Authorization
- */
 class AuthorizationTransport extends Transport implements AuthorizationTransportInterface
 {
     /**
@@ -44,10 +43,7 @@ public function __construct(AdapterInterface $adapter, AuthenticatedUserInterfac
         $this->authenticated_with = $authenticated_with;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getAuthenticatedUser()
+    public function getAuthenticatedUser(): ?AuthenticatedUserInterface
     {
         return $this->authenticated_user;
     }

src/AuthenticationResult/Transport/Authorization/AuthorizationTransportInterface.php

@@ -6,15 +6,14 @@
  * (c) A51 doo <[email protected]>. All rights reserved.
  */
 
+declare(strict_types=1);
+
 namespace ActiveCollab\Authentication\AuthenticationResult\Transport\Authorization;
 
 use ActiveCollab\Authentication\AuthenticatedUser\AuthenticatedUserInterface;
 use ActiveCollab\Authentication\AuthenticationResult\AuthenticationResultInterface;
 use ActiveCollab\Authentication\AuthenticationResult\Transport\TransportInterface;
 
-/**
- * @package ActiveCollab\Authentication\AuthenticationResult\Transport\Authorization
- */
 interface AuthorizationTransportInterface extends TransportInterface
 {
     /**

src/AuthenticationResult/Transport/CleanUp/CleanUpTransport.php

@@ -6,13 +6,12 @@
  * (c) A51 doo <[email protected]>. All rights reserved.
  */
 
+declare(strict_types=1);
+
 namespace ActiveCollab\Authentication\AuthenticationResult\Transport\CleanUp;
 
 use ActiveCollab\Authentication\AuthenticationResult\Transport\Transport;
 
-/**
- * @package ActiveCollab\Authentication\AuthenticationResult\Transport\Deauthentication
- */
 class CleanUpTransport extends Transport implements CleanUpTransportInterface
 {
 }

src/AuthenticationResult/Transport/CleanUp/CleanUpTransportInterface.php

@@ -6,13 +6,12 @@
  * (c) A51 doo <[email protected]>. All rights reserved.
  */
 
+declare(strict_types=1);
+
 namespace ActiveCollab\Authentication\AuthenticationResult\Transport\CleanUp;
 
 use ActiveCollab\Authentication\AuthenticationResult\Transport\TransportInterface;
 
-/**
- * @package ActiveCollab\Authentication\AuthenticationResult\Transport\CleanUp
- */
 interface CleanUpTransportInterface extends TransportInterface
 {
 }

src/AuthenticationResult/Transport/Deauthentication/DeauthenticationTransport.php

@@ -6,13 +6,12 @@
  * (c) A51 doo <[email protected]>. All rights reserved.
  */
 
+declare(strict_types=1);
+
 namespace ActiveCollab\Authentication\AuthenticationResult\Transport\Deauthentication;
 
 use ActiveCollab\Authentication\AuthenticationResult\Transport\Transport;
 
-/**
- * @package ActiveCollab\Authentication\AuthenticationResult\Transport\Deauthentication
- */
 class DeauthenticationTransport extends Transport implements DeauthenticationTransportInterface
 {
 }