Add cache to access token repository

Author: cicnavi

config-templates/module_oidc.php

@@ -298,6 +298,8 @@
     ModuleConfig::OPTION_PROTOCOL_USER_ENTITY_CACHE_DURATION => null, // Fallback to session duration
     // Cache duration for client entities, with given default.
     ModuleConfig::OPTION_PROTOCOL_CLIENT_ENTITY_CACHE_DURATION => 'PT10M', // 10 minutes
+    // Cache duration for Authorization Code, Access Token, and Refresh Token will fall back to their TTL.
+
 
     /**
      * Cron related options.

src/Repositories/AccessTokenRepository.php

@@ -98,7 +98,7 @@ public function getNewToken(
      */
     public function persistNewAccessToken(OAuth2AccessTokenEntityInterface $accessTokenEntity): void
     {
-        if (!$accessTokenEntity instanceof AccessTokenEntity) {
+        if (!($accessTokenEntity instanceof AccessTokenEntity)) {
             throw new Error('Invalid AccessTokenEntity');
         }
 
@@ -112,6 +112,14 @@ public function persistNewAccessToken(OAuth2AccessTokenEntityInterface $accessTo
             $stmt,
             $accessTokenEntity->getState(),
         );
+
+        $this->protocolCache?->set(
+            $accessTokenEntity->getState(),
+            $this->helpers->dateTime()->getSecondsToExpirationTime(
+                $accessTokenEntity->getExpiryDateTime()->getTimestamp(),
+            ),
+            $this->getCacheKey((string)$accessTokenEntity->getIdentifier()),
+        );
     }
 
     /**
@@ -121,6 +129,13 @@ public function persistNewAccessToken(OAuth2AccessTokenEntityInterface $accessTo
      */
     public function findById(string $tokenId): ?AccessTokenEntity
     {
+        /** @var ?array $cachedState */
+        $cachedState = $this->protocolCache?->get(null, $this->getCacheKey($tokenId));
+
+        if (is_array($cachedState)) {
+            return $this->accessTokenEntityFactory->fromState($cachedState);
+        }
+
         $stmt = $this->database->read(
             "SELECT * FROM {$this->getTableName()} WHERE id = :id",
             [
@@ -136,7 +151,17 @@ public function findById(string $tokenId): ?AccessTokenEntity
         $data = current($rows);
         $data['client'] = $this->clientRepository->findById((string)$data['client_id']);
 
-        return $this->accessTokenEntityFactory->fromState($data);
+        $accessTokenEntity = $this->accessTokenEntityFactory->fromState($data);
+
+        $this->protocolCache?->set(
+            $accessTokenEntity->getState(),
+            $this->helpers->dateTime()->getSecondsToExpirationTime(
+                $accessTokenEntity->getExpiryDateTime()->getTimestamp(),
+            ),
+            $this->getCacheKey((string)$accessTokenEntity->getIdentifier()),
+        );
+
+        return $accessTokenEntity;
     }
 
     /**
@@ -209,5 +234,13 @@ private function update(AccessTokenEntity $accessTokenEntity): void
             $stmt,
             $accessTokenEntity->getState(),
         );
+
+        $this->protocolCache?->set(
+            $accessTokenEntity->getState(),
+            $this->helpers->dateTime()->getSecondsToExpirationTime(
+                $accessTokenEntity->getExpiryDateTime()->getTimestamp(),
+            ),
+            $this->getCacheKey((string)$accessTokenEntity->getIdentifier()),
+        );
     }
 }