fix: refctor cache

Author: Sigri44

config/packages/cache.yaml

@@ -7,6 +7,8 @@ framework:
         # Redis
         app: cache.adapter.redis
         default_redis_provider: '%env(REDIS_URL)%'
+#        app: cache.adapter.filesystem
+#        system: cache.adapter.system
 
         # Namespaced pools use the above "app" backend by default
         pools:
@@ -16,7 +18,8 @@ framework:
 #                fallbacks: 'cache.adapter.file_system'
             tokens_cache:
                 adapter: cache.app
-                default_lifetime: 86400 # 24 hours in seconds
+#                default_lifetime: 86400 # 24 hours in seconds
+                default_lifetime: "7 days"
     # TODO : Mettre le cache sur les sessions
 #    session:
 #        handler_id: Symfony\Component\HttpFoundation\Session\Storage\Handler\RedisSessionHandler

config/services.yaml

@@ -9,6 +9,8 @@ services:
     _defaults:
         autowire: true
         autoconfigure: true
+        bind:
+            'Symfony\\Contracts\\Cache\\CacheInterface $tokensCache': '@cache.pool.tokens_cache'
 
     App\:
         resource: '../src/'
@@ -45,3 +47,7 @@ services:
         class: Symfony\Component\RateLimiter\Storage\RedisStorage
         arguments:
             - '@Redis'
+
+    # Inject named cache pools for direct use via autowiring
+    Symfony\Contracts\Cache\CacheInterface $tokensCache:
+        alias: 'cache.pool.tokens_cache'

src/Controller/TokenController.php

@@ -13,6 +13,9 @@
 use Psr\Cache\InvalidArgumentException;
 //use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
+use Symfony\Contracts\Cache\CacheInterface as ContractsCacheInterface;
+use Symfony\Component\Cache\Adapter\RedisAdapter;
+use Symfony\Component\Cache\Adapter\RedisTagAwareAdapter;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -27,10 +30,12 @@ class TokenController
   use DataControllerTrait;
 
   private TokenService $tokenService;
+  private ContractsCacheInterface $tokensCache;
 
-  public function __construct(TokenService $tokenService)
+  public function __construct(TokenService $tokenService, ContractsCacheInterface $tokensCache)
   {
     $this->tokenService = $tokenService;
+    $this->tokensCache = $tokensCache;
   }
 
   /**
@@ -138,22 +143,30 @@ public function showTokens(RequestContextService $ctx): JsonResponse
     // Get current user to scope the cache key by roles
     $user = $ctx->getCurrentUser();
     $rolesKey = md5(serialize($user ? $user->getRoles() : []));
-	print_r($rolesKey);
 
     // FilesystemAdapter expects an integer TTL (in seconds). 7 days = 604800 seconds
     $ttlSeconds = 7 * 24 * 3600;
-    $cache = new FilesystemAdapter("tokens_{$rolesKey}", $ttlSeconds);
-	print_r($cache);
+//    $cache = new FilesystemAdapter("tokens_{$rolesKey}", $ttlSeconds);
+//	$client = RedisAdapter::createConnection('redis://localhost');
+//    $cache = new RedisTagAwareAdapter($client, "tokens_{$rolesKey}", $ttlSeconds);
+//	print_r($cache);
+    // Use injected named cache pool ($this->tokensCache) which is configured to use Redis
+    $cache = $this->tokensCache;
 
     // Use callback form as recommended by Symfony cache contracts.
     // The callback must return the data to cache (we store the decoded array, not a JsonResponse object).
     $tokensData = $cache->get('tokens_cache_'.$rolesKey, function (ItemInterface $item) use ($userAuth, $ttlSeconds) {
-      $item->expiresAfter($ttlSeconds);
-      $response = $this->tokenService->getTokens($userAuth);
-	  $content = $response->getContent();
-	  $decoded = json_decode($content, true);
-	  print_r($decoded);
-	  return $decoded ?: [];
+//	  $content = $response->getContent();
+//	  $decoded = json_decode($content, true);
+//	  print_r($decoded);
+//	  return $decoded ?: [];
+	    $response = $this->tokenService->getTokens($userAuth);
+	    $content = $response->getContent();
+	    $decoded = json_decode($content, true);
+	    return $decoded ?: [];
+
+//      $decoded = json_decode($content, true);
+//      return $decoded ?: [];
 
       // Fallback: if service returns array already
 //      return is_array($response) ? $response : [];

src/Service/TokenService.php

@@ -12,6 +12,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Contracts\Cache\CacheInterface;
+use Symfony\Contracts\Cache\CacheInterface as ContractsCacheInterface;
 
 /**
  * Class TokenService
@@ -22,10 +23,12 @@ class TokenService extends Service
   use NetworkControllerTrait;
 
   private CacheInterface $cache;
+  private ContractsCacheInterface $tokensCache;
 
-  public function __construct(EntityManagerInterface $entityManager, CacheInterface $cache)
+  public function __construct(EntityManagerInterface $entityManager, CacheInterface $cache, ContractsCacheInterface $tokensCache)
   {
     $this->cache = $cache;
+    $this->tokensCache = $tokensCache;
 
     parent::__construct($entityManager);
   }
@@ -85,7 +88,12 @@ public function getToken(RequestContextService $ctx, string $uuid): JsonResponse
       throw new HttpException(Response::HTTP_NOT_FOUND, 'Token not found');
     }
 
-    return new JsonResponse($token->__toArray($ctx), Response::HTTP_OK);
+    $userAuth = [
+      'isAuthenticated' => $ctx->isAuthenticated(),
+      'isAdmin' => $ctx->isAdmin()
+    ];
+
+    return new JsonResponse($token->__toArray($userAuth), Response::HTTP_OK);
   }
 
   /**
@@ -115,6 +123,12 @@ public function createToken(array $dataJson = [], bool $deprecated = false): Jso
 
       $this->createOrUpdateToken($token, $parsedJson, $count);
       $this->em->flush();
+      // Invalidate tokens cache pool after creation
+      try {
+        $this->tokensCache->clear();
+      } catch (\Throwable $e) {
+        // don't break the API if cache clear fails
+      }
     } else { // Multiple
       $tokens = $tokenRepository->findBy(['uuid' => array_column($parsedJson, 'uuid')]);
 
@@ -190,6 +204,13 @@ public function updateToken(string $contractAddress, array $dataJson = []): Json
     $this->em->persist($token);
     $this->em->flush();
 
+    // Invalidate tokens cache pool after update
+    try {
+      $this->tokensCache->clear();
+    } catch (\Throwable $e) {
+      // ignore cache errors
+    }
+
     return new JsonResponse(
       ["status" => "success", "message" => "Token updated successfully"],
       Response::HTTP_ACCEPTED
@@ -210,6 +231,13 @@ public function deleteToken(string $contractAddress): JsonResponse
     $this->em->remove($token);
     $this->em->flush();
 
+    // Invalidate tokens cache pool after delete
+    try {
+      $this->tokensCache->clear();
+    } catch (\Throwable $e) {
+      // ignore
+    }
+
     return new JsonResponse(
       ["status" => "success", "message" => "Token deleted successfully"],
       Response::HTTP_OK
@@ -230,7 +258,12 @@ public function showLatestUpdated(RequestContextService $ctx): JsonResponse
     /** @var Token $lastTokenUpdated */
     $lastTokenUpdated = $tokenRepository->getLastTokenUpdated()[0];
 
-    return new JsonResponse($lastTokenUpdated->__toArray($ctx), Response::HTTP_OK);
+    $userAuth = [
+      'isAuthenticated' => $ctx->isAuthenticated(),
+      'isAdmin' => $ctx->isAdmin()
+    ];
+
+    return new JsonResponse($lastTokenUpdated->__toArray($userAuth), Response::HTTP_OK);
   }
 
   /**