Fix disable access token saving feature

Author: Orkin

psalm.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <psalm
-        totallyTyped="true"
-        forbidEcho="true"
-        strictBinaryOperands="true"
-        phpVersion="7.1"
-        allowStringToStandInForClass="true"
-        rememberPropertyAssignmentsAfterCall="false"
-        checkForThrowsInGlobalScope="true"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns="https://getpsalm.org/schema/config"
-        xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-        errorBaseline=".psalm.baseline.xml"
+    totallyTyped="true"
+    forbidEcho="true"
+    strictBinaryOperands="true"
+    phpVersion="7.1"
+    allowStringToStandInForClass="true"
+    rememberPropertyAssignmentsAfterCall="false"
+    checkForThrowsInGlobalScope="true"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    errorBaseline=".psalm.baseline.xml"
 >
     <projectFiles>
         <directory name="src"/>

src/DependencyInjection/LeagueOAuth2ServerExtension.php

@@ -55,7 +55,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         $config = $this->processConfiguration(new Configuration(), $configs);
 
-        $this->configureAccessTokenSaving($loader, $config['authorization_server']);
+        $this->configureAccessTokenSaving($loader, $container, $config['authorization_server']);
         $this->configurePersistence($loader, $container, $config);
         $this->configureAuthorizationServer($container, $config['authorization_server']);
         $this->configureResourceServer($container, $config['resource_server']);
@@ -208,7 +208,7 @@ private function configureGrants(ContainerBuilder $container, array $config): vo
         ;
     }
 
-    private function configureAccessTokenSaving(LoaderInterface $loader, array $config): void
+    private function configureAccessTokenSaving(LoaderInterface $loader, ContainerBuilder $container, array $config): void
     {
         if ($config['persist_access_token']) {
             $loader->load('access_token/default.php');

src/Manager/Doctrine/AccessTokenManager.php

@@ -15,24 +15,40 @@ final class AccessTokenManager implements AccessTokenManagerInterface
      */
     private $entityManager;
 
-    public function __construct(EntityManagerInterface $entityManager)
+    /** @var bool */
+    private $persistAccessToken;
+
+    public function __construct(EntityManagerInterface $entityManager, bool $persistAccessToken)
     {
         $this->entityManager = $entityManager;
+        $this->persistAccessToken = $persistAccessToken;
     }
 
     public function find(string $identifier): ?AccessToken
     {
+        if (!$this->persistAccessToken) {
+            return null;
+        }
+
         return $this->entityManager->find(AccessToken::class, $identifier);
     }
 
     public function save(AccessToken $accessToken): void
     {
+        if (!$this->persistAccessToken) {
+            return;
+        }
+
         $this->entityManager->persist($accessToken);
         $this->entityManager->flush();
     }
 
     public function clearExpired(): int
     {
+        if (!$this->persistAccessToken) {
+            return 0;
+        }
+
         /** @var int */
         return $this->entityManager->createQueryBuilder()
             ->delete(AccessToken::class, 'at')

src/Resources/config/access_token/null.php

@@ -2,20 +2,15 @@
 
 declare(strict_types=1);
 
-use League\Bundle\OAuth2ServerBundle\Manager\AccessTokenManagerInterface;
-use League\Bundle\OAuth2ServerBundle\Manager\Null\AccessTokenManager;
 use League\Bundle\OAuth2ServerBundle\Repository\AccessTokenRepository;
 use League\Bundle\OAuth2ServerBundle\Repository\NullAccessTokenRepository;
 use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $container): void {
     $container->services()
+
         ->set('league.oauth2_server.repository.access_token', NullAccessTokenRepository::class)
         ->alias(AccessTokenRepositoryInterface::class, 'league.oauth2_server.repository.access_token')
-        ->alias(AccessTokenRepository::class, 'league.oauth2_server.repository.access_token')
-
-        ->set('league.oauth2_server.manager.null.access_token', AccessTokenManager::class)
-        ->alias(AccessTokenManagerInterface::class, 'league.oauth2_server.manager.null.access_token')
-        ->alias(AccessTokenManager::class, 'league.oauth2_server.manager.null.access_token');
+        ->alias(AccessTokenRepository::class, 'league.oauth2_server.repository.access_token');
 };

tests/Acceptance/DoctrineAccessTokenManagerTest.php

@@ -6,7 +6,6 @@
 
 use Doctrine\ORM\EntityManagerInterface;
 use League\Bundle\OAuth2ServerBundle\Manager\Doctrine\AccessTokenManager as DoctrineAccessTokenManager;
-use League\Bundle\OAuth2ServerBundle\Manager\Null\AccessTokenManager as NullAccessTokenManager;
 use League\Bundle\OAuth2ServerBundle\Model\AccessToken;
 use League\Bundle\OAuth2ServerBundle\Model\Client;
 use League\Bundle\OAuth2ServerBundle\Model\RefreshToken;
@@ -22,7 +21,7 @@ public function testClearExpired(): void
         /** @var EntityManagerInterface $em */
         $em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
 
-        $doctrineAccessTokenManager = new DoctrineAccessTokenManager($em);
+        $doctrineAccessTokenManager = new DoctrineAccessTokenManager($em, true);
 
         $client = new Client('client', 'client', 'secret');
         $em->persist($client);
@@ -48,12 +47,12 @@ public function testClearExpiredWithoutSavingAccessToken(): void
         /** @var EntityManagerInterface $em */
         $em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
 
+        $doctrineAccessTokenManager = new DoctrineAccessTokenManager($em, false);
+
         $client = new Client('name', 'client', 'secret');
         $em->persist($client);
         $em->flush();
 
-        $doctrineAccessTokenManager = new NullAccessTokenManager();
-
         $testData = $this->buildClearExpiredTestData($client);
 
         /** @var AccessToken $token */
@@ -105,7 +104,7 @@ public function testClearExpiredWithRefreshToken(): void
     {
         /** @var EntityManagerInterface $em */
         $em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
-        $doctrineAccessTokenManager = new DoctrineAccessTokenManager($em);
+        $doctrineAccessTokenManager = new DoctrineAccessTokenManager($em, true);
 
         $client = new Client('client', 'client', 'secret');
         $em->persist($client);
@@ -133,13 +132,12 @@ public function testClearExpiredWithRefreshTokenWithoutSavingAccessToken(): void
     {
         /** @var EntityManagerInterface $em */
         $em = $this->client->getContainer()->get('doctrine.orm.entity_manager');
+        $doctrineAccessTokenManager = new DoctrineAccessTokenManager($em, false);
 
         $client = new Client('name', 'client', 'secret');
         $em->persist($client);
         $em->flush();
 
-        $doctrineAccessTokenManager = new NullAccessTokenManager();
-
         $testData = $this->buildClearExpiredTestDataWithRefreshToken($client, false);
 
         /** @var RefreshToken $token */