Update AuthCodeGrant

Author: cicnavi

src/Factories/Grant/AuthCodeGrantFactory.php

@@ -18,12 +18,14 @@
 
 use SimpleSAML\Module\oidc\Factories\Entities\AccessTokenEntityFactory;
 use SimpleSAML\Module\oidc\Factories\Entities\AuthCodeEntityFactory;
+use SimpleSAML\Module\oidc\Factories\Entities\RefreshTokenEntityFactory;
 use SimpleSAML\Module\oidc\ModuleConfig;
 use SimpleSAML\Module\oidc\Repositories\AccessTokenRepository;
 use SimpleSAML\Module\oidc\Repositories\AuthCodeRepository;
 use SimpleSAML\Module\oidc\Repositories\RefreshTokenRepository;
 use SimpleSAML\Module\oidc\Server\Grants\AuthCodeGrant;
 use SimpleSAML\Module\oidc\Server\RequestRules\RequestRulesManager;
+use SimpleSAML\Module\oidc\Services\LoggerService;
 use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
 
 class AuthCodeGrantFactory
@@ -37,6 +39,8 @@ public function __construct(
         private readonly RequestParamsResolver $requestParamsResolver,
         private readonly AccessTokenEntityFactory $accessTokenEntityFactory,
         private readonly AuthCodeEntityFactory $authCodeEntityFactory,
+        private readonly RefreshTokenEntityFactory $refreshTokenEntityFactory,
+        private readonly LoggerService $logger,
     ) {
     }
 
@@ -54,6 +58,8 @@ public function build(): AuthCodeGrant
             $this->requestParamsResolver,
             $this->accessTokenEntityFactory,
             $this->authCodeEntityFactory,
+            $this->refreshTokenEntityFactory,
+            $this->logger,
         );
         $authCodeGrant->setRefreshTokenTTL($this->moduleConfig->getRefreshTokenDuration());
 

src/Server/Grants/AuthCodeGrant.php

@@ -21,6 +21,7 @@
 use League\OAuth2\Server\ResponseTypes\ResponseTypeInterface;
 use LogicException;
 use Psr\Http\Message\ServerRequestInterface;
+use SimpleSAML\Module\oidc\Entities\Interfaces\AccessTokenEntityInterface;
 use SimpleSAML\Module\oidc\Entities\Interfaces\AuthCodeEntityInterface;
 use SimpleSAML\Module\oidc\Entities\Interfaces\RefreshTokenEntityInterface;
 use SimpleSAML\Module\oidc\Entities\UserEntity;
@@ -754,6 +755,9 @@ protected function issueRefreshToken(
         if (! is_a($this->refreshTokenRepository, RefreshTokenRepositoryInterface::class)) {
             throw OidcServerException::serverError('Unexpected refresh token repository entity type.');
         }
+        if (! is_a($accessToken, AccessTokenEntityInterface::class)) {
+            throw OidcServerException::serverError('Unexpected access token entity type.');
+        }
 
         $maxGenerationAttempts = self::MAX_RANDOM_TOKEN_GENERATION_ATTEMPTS;
 

src/Services/Container.php

@@ -363,6 +363,8 @@ public function __construct()
             $requestParamsResolver,
             $accessTokenEntityFactory,
             $authCodeEntityFactory,
+            $refreshTokenEntityFactory,
+            $loggerService,
         );
         $this->services[AuthCodeGrant::class] = $authCodeGrantFactory->build();
 

tests/unit/src/Server/Grants/AuthCodeGrantTest.php

@@ -5,16 +5,19 @@
 namespace SimpleSAML\Test\Module\oidc\unit\Server\Grants;
 
 use DateInterval;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use SimpleSAML\Module\oidc\Factories\Entities\AccessTokenEntityFactory;
 use SimpleSAML\Module\oidc\Factories\Entities\AuthCodeEntityFactory;
+use SimpleSAML\Module\oidc\Factories\Entities\RefreshTokenEntityFactory;
 use SimpleSAML\Module\oidc\ModuleConfig;
 use SimpleSAML\Module\oidc\Repositories\Interfaces\AccessTokenRepositoryInterface;
 use SimpleSAML\Module\oidc\Repositories\Interfaces\AuthCodeRepositoryInterface;
 use SimpleSAML\Module\oidc\Repositories\Interfaces\RefreshTokenRepositoryInterface;
 use SimpleSAML\Module\oidc\Server\Grants\AuthCodeGrant;
 use SimpleSAML\Module\oidc\Server\RequestRules\RequestRulesManager;
+use SimpleSAML\Module\oidc\Services\LoggerService;
 use SimpleSAML\Module\oidc\Utils\RequestParamsResolver;
 
 /**
@@ -30,7 +33,9 @@ class AuthCodeGrantTest extends TestCase
     protected Stub $moduleConfigStub;
     protected Stub $requestParamsResolverStub;
     protected Stub $accessTokenEntityFactoryStub;
-    protected Stub $authCodeEntityFactory;
+    protected Stub $authCodeEntityFactoryStub;
+    protected Stub $refreshTokenEntityFactoryStub;
+    protected MockObject $loggerMock;
 
     /**
      * @throws \Exception
@@ -45,7 +50,9 @@ protected function setUp(): void
         $this->moduleConfigStub = $this->createStub(ModuleConfig::class);
         $this->requestParamsResolverStub = $this->createStub(RequestParamsResolver::class);
         $this->accessTokenEntityFactoryStub = $this->createStub(AccessTokenEntityFactory::class);
-        $this->authCodeEntityFactory = $this->createStub(AuthcodeEntityFactory::class);
+        $this->authCodeEntityFactoryStub = $this->createStub(AuthcodeEntityFactory::class);
+        $this->refreshTokenEntityFactoryStub = $this->createStub(RefreshTokenEntityFactory::class);
+        $this->loggerMock = $this->createMock(LoggerService::class);
     }
 
     /**
@@ -63,7 +70,9 @@ public function testCanCreateInstance(): void
                 $this->requestRulesManagerStub,
                 $this->requestParamsResolverStub,
                 $this->accessTokenEntityFactoryStub,
-                $this->authCodeEntityFactory,
+                $this->authCodeEntityFactoryStub,
+                $this->refreshTokenEntityFactoryStub,
+                $this->loggerMock,
             ),
         );
     }