change user is not loggedin exception name

softdzx · Apr 1, 2018 · d6a0313 · d6a0313
1 parent 5bb071f
commit d6a0313
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/src/core/Directus/Application/Http/Middlewares/AuthenticationMiddleware.php b/src/core/Directus/Application/Http/Middlewares/AuthenticationMiddleware.php
@@ -6,7 +6,7 @@
 use Directus\Application\Http\Request;
 use Directus\Application\Http\Response;
 use Directus\Authentication\Exception\InvalidUserCredentialsException;
-use Directus\Authentication\Exception\UserIsNotLoggedInException;
+use Directus\Authentication\Exception\UserNotAuthenticatedException;
 use Directus\Authentication\User\User;
 use Directus\Authentication\User\UserInterface;
 use Directus\Database\TableGateway\BaseTableGateway;
@@ -27,7 +27,7 @@ class AuthenticationMiddleware extends AbstractMiddleware
      * @return Response
      *
      * @throws InvalidUserCredentialsException
-     * @throws UserIsNotLoggedInException
+     * @throws UserNotAuthenticatedException
      */
     public function __invoke(Request $request, Response $response, callable $next)
     {
@@ -62,7 +62,7 @@ public function __invoke(Request $request, Response $response, callable $next)
         $authenticated = $this->authenticate($request);
         $publicGroupId = $this->getPublicGroupId();
         if (!$authenticated && !$publicGroupId) {
-            throw new UserIsNotLoggedInException();
+            throw new UserNotAuthenticatedException();
         }
 
         // =============================================================================

diff --git a/src/core/Directus/Authentication/Exception/UserIsNotLoggedInException.php b/src/core/Directus/Authentication/Exception/UserIsNotLoggedInException.php
diff --git a/src/core/Directus/Authentication/Exception/UserNotAuthenticatedException.php b/src/core/Directus/Authentication/Exception/UserNotAuthenticatedException.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Directus\Authentication\Exception;
+
+use Directus\Exception\Exception;
+
+class UserNotAuthenticatedException extends Exception
+{
+    const ERROR_CODE = 108;
+
+    public function __construct($message = 'User not authenticated')
+    {
+        parent::__construct($message, static::ERROR_CODE);
+    }
+}
diff --git a/tests/api/Authentication/ProviderTest.php b/tests/api/Authentication/ProviderTest.php
@@ -60,15 +60,15 @@ public function testSecretKey()
     }
 
     /**
-     * @expectedException \Directus\Authentication\Exception\UserIsNotLoggedInException
+     * @expectedException \Directus\Authentication\Exception\UserNotAuthenticatedException
      */
     public function testAuthenticationEnforcement()
     {
         $this->provider->getUserAttributes();
     }
 
     /**
-     * @expectedException \Directus\Authentication\Exception\UserIsNotLoggedInException
+     * @expectedException \Directus\Authentication\Exception\UserNotAuthenticatedException
      */
     public function testAuthenticationEnforcement2()
     {