Make cache key base configurable.

madpilot78 · Aug 17, 2024 · 741594a · 741594a
1 parent cdb1977
commit 741594a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/Auth/Session.php b/src/Auth/Session.php
@@ -14,8 +14,8 @@
 
 class Session implements SessionInterface
 {
-    private const string SESSION_CACHE_KEY = 'madpilot78:FreeBoxPHP:SessionToken';
-    private const string PERMISSIONS_CACHE_KEY = 'madpilot78:FreeBoxPHP:Permissions';
+    private const string SESSION_KEY = 'SessionToken';
+    private const string PERMISSIONS_KEY = 'Permissions';
 
     public function __construct(
         private AuthManagerInterface $authManager,
@@ -30,8 +30,8 @@ private function login(): string
     {
         $this->logger->debug('FreeBoxPHP starting Auth\Session::login()');
 
-        $session_token = $this->cache->get(self::SESSION_CACHE_KEY);
-        $permissions = $this->cache->get(self::PERMISSIONS_CACHE_KEY);
+        $session_token = $this->cache->get($this->config->cacheKeyBase . self::SESSION_KEY);
+        $permissions = $this->cache->get($this->config->cacheKeyBase . self::PERMISSIONS_KEY);
 
         if (isset($session_token) && isset($permissions)) {
             $this->authManager
@@ -68,8 +68,16 @@ private function login(): string
             ->setSessionToken($result['session_token'])
             ->setPermissions($result['permissions']);
 
-        $this->cache->set(self::SESSION_CACHE_KEY, $result['session_token'], $this->config->tokenTTL);
-        $this->cache->set(self::PERMISSIONS_CACHE_KEY, $result['permissions'], $this->config->tokenTTL);
+        $this->cache->set(
+            $this->config->cacheKeyBase . self::SESSION_KEY,
+            $result['session_token'],
+            $this->config->tokenTTL
+        );
+        $this->cache->set(
+            $this->config->cacheKeyBase . self::PERMISSIONS_KEY,
+            $result['permissions'],
+            $this->config->tokenTTL
+        );
 
         $this->logger->debug('FreeBoxPHP ending Auth\Session::login() after query');
 

diff --git a/src/Configuration.php b/src/Configuration.php
@@ -24,6 +24,7 @@
     public const BoxType DEFAULT_BOX_TYPE = BoxType::Free;
     public const int DEFAULT_TIMEOUT = 30;
     public const string CERT_PATH = '/data';
+    public const string CACHE_KEY_BASE = 'madpilot78:FreeBoxPHP:';
     public const int TOKEN_TTL = 7200;
 
     public ?string $certFile;
@@ -41,6 +42,7 @@ public function __construct(
         public ?ContainerInterface $container = null,
         public int $timeout = self::DEFAULT_TIMEOUT,
         public int $tokenTTL = self::TOKEN_TTL,
+        public string $cacheKeyBase = self::CACHE_KEY_BASE,
         ?CacheInterface $cache = null,
         string $deviceName = self::DEFAULT_DEVICENAME,
         ?string $certFile = '',