[11.x] Remove deprecated functionality and simplify some feature tests (#1559)

* Drop JWT v3

* wip

Author: driesvints

src/Http/Controllers/AccessTokenController.php

@@ -3,7 +3,6 @@
 namespace Laravel\Passport\Http\Controllers;
 
 use Laravel\Passport\TokenRepository;
-use Lcobucci\JWT\Parser as JwtParser;
 use League\OAuth2\Server\AuthorizationServer;
 use Nyholm\Psr7\Response as Psr7Response;
 use Psr\Http\Message\ServerRequestInterface;
@@ -26,28 +25,16 @@ class AccessTokenController
      */
     protected $tokens;
 
-    /**
-     * The JWT parser instance.
-     *
-     * @var \Lcobucci\JWT\Parser
-     *
-     * @deprecated This property will be removed in a future Passport version.
-     */
-    protected $jwt;
-
     /**
      * Create a new controller instance.
      *
      * @param  \League\OAuth2\Server\AuthorizationServer  $server
      * @param  \Laravel\Passport\TokenRepository  $tokens
-     * @param  \Lcobucci\JWT\Parser  $jwt
      * @return void
      */
     public function __construct(AuthorizationServer $server,
-                                TokenRepository $tokens,
-                                JwtParser $jwt)
+                                TokenRepository $tokens)
     {
-        $this->jwt = $jwt;
         $this->server = $server;
         $this->tokens = $tokens;
     }

src/PersonalAccessTokenFactory.php

@@ -35,8 +35,6 @@ class PersonalAccessTokenFactory
      * The JWT token parser instance.
      *
      * @var \Lcobucci\JWT\Parser
-     *
-     * @deprecated This property will be removed in a future Passport version.
      */
     protected $jwt;
 
@@ -126,7 +124,7 @@ protected function dispatchRequestToAuthorizationServer(ServerRequestInterface $
      * @param  array  $response
      * @return \Laravel\Passport\Token
      */
-    protected function findAccessToken(array $response)
+    public function findAccessToken(array $response)
     {
         return $this->tokens->find(
             $this->jwt->parse($response['access_token'])->claims()->get('jti')

tests/Feature/AccessTokenControllerTest.php

@@ -7,13 +7,11 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 use Laravel\Passport\Client;
-use Laravel\Passport\ClientRepository;
 use Laravel\Passport\Database\Factories\ClientFactory;
 use Laravel\Passport\HasApiTokens;
 use Laravel\Passport\Passport;
+use Laravel\Passport\PersonalAccessTokenFactory;
 use Laravel\Passport\Token;
-use Laravel\Passport\TokenRepository;
-use Lcobucci\JWT\Configuration;
 
 class AccessTokenControllerTest extends PassportTestCase
 {
@@ -78,10 +76,7 @@ public function testGettingAccessTokenWithClientCredentialsGrant()
         $expiresInSeconds = 31536000;
         $this->assertEqualsWithDelta($expiresInSeconds, $decodedResponse['expires_in'], 5);
 
-        $jwtAccessToken = Configuration::forUnsecuredSigner()->parser()->parse($decodedResponse['access_token']);
-        $this->assertTrue($this->app->make(ClientRepository::class)->findActive($jwtAccessToken->claims()->get('aud'))->is($client));
-
-        $token = $this->app->make(TokenRepository::class)->find($jwtAccessToken->claims()->get('jti'));
+        $token = $this->app->make(PersonalAccessTokenFactory::class)->findAccessToken($decodedResponse);
         $this->assertInstanceOf(Token::class, $token);
         $this->assertTrue($token->client->is($client));
         $this->assertFalse($token->revoked);
@@ -171,11 +166,7 @@ public function testGettingAccessTokenWithPasswordGrant()
         $expiresInSeconds = 31536000;
         $this->assertEqualsWithDelta($expiresInSeconds, $decodedResponse['expires_in'], 5);
 
-        $jwtAccessToken = Configuration::forUnsecuredSigner()->parser()->parse($decodedResponse['access_token']);
-        $this->assertTrue($this->app->make(ClientRepository::class)->findActive($jwtAccessToken->claims()->get('aud'))->is($client));
-        $this->assertTrue($this->app->make('auth')->createUserProvider()->retrieveById($jwtAccessToken->claims()->get('sub'))->is($user));
-
-        $token = $this->app->make(TokenRepository::class)->find($jwtAccessToken->claims()->get('jti'));
+        $token = $this->app->make(PersonalAccessTokenFactory::class)->findAccessToken($decodedResponse);
         $this->assertInstanceOf(Token::class, $token);
         $this->assertFalse($token->revoked);
         $this->assertTrue($token->user->is($user));

tests/Unit/AccessTokenControllerTest.php

@@ -5,7 +5,6 @@
 use Laravel\Passport\Exceptions\OAuthServerException;
 use Laravel\Passport\Http\Controllers\AccessTokenController;
 use Laravel\Passport\TokenRepository;
-use Lcobucci\JWT\Parser;
 use League\OAuth2\Server\AuthorizationServer;
 use League\OAuth2\Server\Exception\OAuthServerException as LeagueException;
 use Mockery as m;
@@ -26,7 +25,6 @@ public function test_a_token_can_be_issued()
         $request = m::mock(ServerRequestInterface::class);
         $response = m::type(ResponseInterface::class);
         $tokens = m::mock(TokenRepository::class);
-        $jwt = m::mock(Parser::class);
 
         $psrResponse = new Response();
         $psrResponse->getBody()->write(json_encode(['access_token' => 'access-token']));
@@ -36,22 +34,21 @@ public function test_a_token_can_be_issued()
             ->with($request, $response)
             ->andReturn($psrResponse);
 
-        $controller = new AccessTokenController($server, $tokens, $jwt);
+        $controller = new AccessTokenController($server, $tokens);
 
         $this->assertSame('{"access_token":"access-token"}', $controller->issueToken($request)->getContent());
     }
 
     public function test_exceptions_are_handled()
     {
         $tokens = m::mock(TokenRepository::class);
-        $jwt = m::mock(Parser::class);
 
         $server = m::mock(AuthorizationServer::class);
         $server->shouldReceive('respondToAccessTokenRequest')->with(
             m::type(ServerRequestInterface::class), m::type(ResponseInterface::class)
         )->andThrow(LeagueException::invalidCredentials());
 
-        $controller = new AccessTokenController($server, $tokens, $jwt);
+        $controller = new AccessTokenController($server, $tokens);
 
         $this->expectException(OAuthServerException::class);