Revert "Added AuthenticationException to extend the behaviour of Laravel's default exception handler (#1633)"

driesvints · driesvints · commit db543b0cc13e · 2023-02-20T10:20:04.000+01:00
This reverts commit 08b1dab.
diff --git a/src/Exceptions/AuthenticationException.php b/src/Exceptions/AuthenticationException.php
diff --git a/src/Http/Controllers/AuthorizationController.php b/src/Http/Controllers/AuthorizationController.php
@@ -2,13 +2,13 @@
 
 namespace Laravel\Passport\Http\Controllers;
 
+use Illuminate\Auth\AuthenticationException;
 use Illuminate\Contracts\Auth\StatefulGuard;
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Laravel\Passport\Bridge\User;
 use Laravel\Passport\ClientRepository;
 use Laravel\Passport\Contracts\AuthorizationViewResponse;
-use Laravel\Passport\Exceptions\AuthenticationException;
 use Laravel\Passport\Passport;
 use Laravel\Passport\TokenRepository;
 use League\OAuth2\Server\AuthorizationServer;
@@ -208,7 +208,7 @@ protected function denyRequest($authRequest, $user = null)
      *
      * @param  \Illuminate\Http\Request  $request
      *
-     * @throws \Laravel\Passport\Exceptions\AuthenticationException
+     * @throws \Illuminate\Auth\AuthenticationException
      */
     protected function promptForLogin($request)
     {
diff --git a/src/Http/Middleware/CheckClientCredentials.php b/src/Http/Middleware/CheckClientCredentials.php
@@ -2,7 +2,7 @@
 
 namespace Laravel\Passport\Http\Middleware;
 
-use Laravel\Passport\Exceptions\AuthenticationException;
+use Illuminate\Auth\AuthenticationException;
 use Laravel\Passport\Exceptions\MissingScopeException;
 
 class CheckClientCredentials extends CheckCredentials
@@ -13,7 +13,7 @@ class CheckClientCredentials extends CheckCredentials
      * @param  \Laravel\Passport\Token  $token
      * @return void
      *
-     * @throws \Laravel\Passport\Exceptions\AuthenticationException
+     * @throws \Illuminate\Auth\AuthenticationException
      */
     protected function validateCredentials($token)
     {
diff --git a/src/Http/Middleware/CheckClientCredentialsForAnyScope.php b/src/Http/Middleware/CheckClientCredentialsForAnyScope.php
@@ -2,7 +2,7 @@
 
 namespace Laravel\Passport\Http\Middleware;
 
-use Laravel\Passport\Exceptions\AuthenticationException;
+use Illuminate\Auth\AuthenticationException;
 use Laravel\Passport\Exceptions\MissingScopeException;
 
 class CheckClientCredentialsForAnyScope extends CheckCredentials
@@ -13,7 +13,7 @@ class CheckClientCredentialsForAnyScope extends CheckCredentials
      * @param  \Laravel\Passport\Token  $token
      * @return void
      *
-     * @throws \Laravel\Passport\Exceptions\AuthenticationException
+     * @throws \Illuminate\Auth\AuthenticationException
      */
     protected function validateCredentials($token)
     {
diff --git a/src/Http/Middleware/CheckCredentials.php b/src/Http/Middleware/CheckCredentials.php
@@ -3,7 +3,7 @@
 namespace Laravel\Passport\Http\Middleware;
 
 use Closure;
-use Laravel\Passport\Exceptions\AuthenticationException;
+use Illuminate\Auth\AuthenticationException;
 use Laravel\Passport\TokenRepository;
 use League\OAuth2\Server\Exception\OAuthServerException;
 use League\OAuth2\Server\ResourceServer;
@@ -47,7 +47,7 @@ public function __construct(ResourceServer $server, TokenRepository $repository)
      * @param  mixed  ...$scopes
      * @return mixed
      *
-     * @throws \Laravel\Passport\Exceptions\AuthenticationException
+     * @throws \Illuminate\Auth\AuthenticationException
      */
     public function handle($request, Closure $next, ...$scopes)
     {
@@ -93,7 +93,7 @@ protected function validate($psr, $scopes)
      * @param  \Laravel\Passport\Token  $token
      * @return void
      *
-     * @throws \Laravel\Passport\Exceptions\AuthenticationException
+     * @throws \Illuminate\Auth\AuthenticationException
      */
     abstract protected function validateCredentials($token);
 
diff --git a/src/Http/Middleware/CheckForAnyScope.php b/src/Http/Middleware/CheckForAnyScope.php
@@ -2,7 +2,7 @@
 
 namespace Laravel\Passport\Http\Middleware;
 
-use Laravel\Passport\Exceptions\AuthenticationException;
+use Illuminate\Auth\AuthenticationException;
 use Laravel\Passport\Exceptions\MissingScopeException;
 
 class CheckForAnyScope
@@ -15,7 +15,7 @@ class CheckForAnyScope
      * @param  mixed  ...$scopes
      * @return \Illuminate\Http\Response
      *
-     * @throws \Laravel\Passport\Exceptions\AuthenticationException|\Laravel\Passport\Exceptions\MissingScopeException
+     * @throws \Illuminate\Auth\AuthenticationException|\Laravel\Passport\Exceptions\MissingScopeException
      */
     public function handle($request, $next, ...$scopes)
     {
diff --git a/src/Http/Middleware/CheckScopes.php b/src/Http/Middleware/CheckScopes.php
@@ -2,7 +2,7 @@
 
 namespace Laravel\Passport\Http\Middleware;
 
-use Laravel\Passport\Exceptions\AuthenticationException;
+use Illuminate\Auth\AuthenticationException;
 use Laravel\Passport\Exceptions\MissingScopeException;
 
 class CheckScopes
@@ -15,7 +15,7 @@ class CheckScopes
      * @param  mixed  ...$scopes
      * @return \Illuminate\Http\Response
      *
-     * @throws \Laravel\Passport\Exceptions\AuthenticationException|\Laravel\Passport\Exceptions\MissingScopeException
+     * @throws \Illuminate\Auth\AuthenticationException|\Laravel\Passport\Exceptions\MissingScopeException
      */
     public function handle($request, $next, ...$scopes)
     {
diff --git a/tests/Unit/AuthorizationControllerTest.php b/tests/Unit/AuthorizationControllerTest.php
@@ -7,7 +7,6 @@
 use Laravel\Passport\Bridge\Scope;
 use Laravel\Passport\Client;
 use Laravel\Passport\ClientRepository;
-use Laravel\Passport\Exceptions\AuthenticationException;
 use Laravel\Passport\Exceptions\OAuthServerException;
 use Laravel\Passport\Http\Controllers\AuthorizationController;
 use Laravel\Passport\Http\Responses\AuthorizationViewResponse;
@@ -337,7 +336,7 @@ public function test_authorization_denied_if_unauthenticated_and_request_has_pro
 
     public function test_logout_and_prompt_login_if_request_has_prompt_equals_to_login()
     {
-        $this->expectException(AuthenticationException::class);
+        $this->expectException('Illuminate\Auth\AuthenticationException');
 
         $server = m::mock(AuthorizationServer::class);
         $response = m::mock(AuthorizationViewResponse::class);
@@ -368,7 +367,7 @@ public function test_logout_and_prompt_login_if_request_has_prompt_equals_to_log
 
     public function test_user_should_be_authenticated()
     {
-        $this->expectException(AuthenticationException::class);
+        $this->expectException('Illuminate\Auth\AuthenticationException');
 
         $server = m::mock(AuthorizationServer::class);
         $response = m::mock(AuthorizationViewResponse::class);
diff --git a/tests/Unit/CheckClientCredentialsForAnyScopeTest.php b/tests/Unit/CheckClientCredentialsForAnyScopeTest.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Http\Request;
 use Laravel\Passport\Client;
-use Laravel\Passport\Exceptions\AuthenticationException;
 use Laravel\Passport\Http\Middleware\CheckClientCredentialsForAnyScope;
 use Laravel\Passport\Token;
 use Laravel\Passport\TokenRepository;
@@ -86,7 +85,7 @@ public function test_request_is_passed_along_if_token_has_any_required_scope()
 
     public function test_exception_is_thrown_when_oauth_throws_exception()
     {
-        $this->expectException(AuthenticationException::class);
+        $this->expectException('Illuminate\Auth\AuthenticationException');
 
         $tokenRepository = m::mock(TokenRepository::class);
         $resourceServer = m::mock(ResourceServer::class);
diff --git a/tests/Unit/CheckClientCredentialsTest.php b/tests/Unit/CheckClientCredentialsTest.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Http\Request;
 use Laravel\Passport\Client;
-use Laravel\Passport\Exceptions\AuthenticationException;
 use Laravel\Passport\Http\Middleware\CheckClientCredentials;
 use Laravel\Passport\Token;
 use Laravel\Passport\TokenRepository;
@@ -85,7 +84,7 @@ public function test_request_is_passed_along_if_token_and_scope_are_valid()
 
     public function test_exception_is_thrown_when_oauth_throws_exception()
     {
-        $this->expectException(AuthenticationException::class);
+        $this->expectException('Illuminate\Auth\AuthenticationException');
 
         $tokenRepository = m::mock(TokenRepository::class);
         $resourceServer = m::mock(ResourceServer::class);
diff --git a/tests/Unit/CheckForAnyScopeTest.php b/tests/Unit/CheckForAnyScopeTest.php
@@ -2,7 +2,6 @@
 
 namespace Laravel\Passport\Tests\Unit;
 
-use Laravel\Passport\Exceptions\AuthenticationException;
 use Laravel\Passport\Http\Middleware\CheckForAnyScope as CheckScopes;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
@@ -48,7 +47,7 @@ public function test_exception_is_thrown_if_token_doesnt_have_scope()
 
     public function test_exception_is_thrown_if_no_authenticated_user()
     {
-        $this->expectException(AuthenticationException::class);
+        $this->expectException('Illuminate\Auth\AuthenticationException');
 
         $middleware = new CheckScopes;
         $request = m::mock();
@@ -61,7 +60,7 @@ public function test_exception_is_thrown_if_no_authenticated_user()
 
     public function test_exception_is_thrown_if_no_token()
     {
-        $this->expectException(AuthenticationException::class);
+        $this->expectException('Illuminate\Auth\AuthenticationException');
 
         $middleware = new CheckScopes;
         $request = m::mock();
diff --git a/tests/Unit/CheckScopesTest.php b/tests/Unit/CheckScopesTest.php
@@ -2,7 +2,6 @@
 
 namespace Laravel\Passport\Tests\Unit;
 
-use Laravel\Passport\Exceptions\AuthenticationException;
 use Laravel\Passport\Http\Middleware\CheckScopes;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
@@ -47,7 +46,7 @@ public function test_exception_is_thrown_if_token_doesnt_have_scope()
 
     public function test_exception_is_thrown_if_no_authenticated_user()
     {
-        $this->expectException(AuthenticationException::class);
+        $this->expectException('Illuminate\Auth\AuthenticationException');
 
         $middleware = new CheckScopes;
         $request = m::mock();
@@ -60,7 +59,7 @@ public function test_exception_is_thrown_if_no_authenticated_user()
 
     public function test_exception_is_thrown_if_no_token()
     {
-        $this->expectException(AuthenticationException::class);
+        $this->expectException('Illuminate\Auth\AuthenticationException');
 
         $middleware = new CheckScopes;
         $request = m::mock();

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Laravel\Passport\Http\Middleware;`
`4`	`4`
`5`		`-use Laravel\Passport\Exceptions\AuthenticationException;`
	`5`	`+use Illuminate\Auth\AuthenticationException;`
`6`	`6`	`use Laravel\Passport\Exceptions\MissingScopeException;`
`7`	`7`
`8`	`8`	`class CheckClientCredentials extends CheckCredentials`
`@@ -13,7 +13,7 @@ class CheckClientCredentials extends CheckCredentials`
`13`	`13`	`* @param \Laravel\Passport\Token $token`
`14`	`14`	`* @return void`
`15`	`15`	`*`
`16`		`- * @throws \Laravel\Passport\Exceptions\AuthenticationException`
	`16`	`+ * @throws \Illuminate\Auth\AuthenticationException`
`17`	`17`	`*/`
`18`	`18`	`protected function validateCredentials($token)`
`19`	`19`	`{`