SECURITY-10331: add getSessionData to cache client

ROAD-4845

Co-authored-by: Krisztian <[email protected]>

Author: dsztanko

src/CachedClient.php

@@ -23,19 +23,27 @@ public function __construct(ClientInterface $client, CacheInterface $cache)
         $this->cache = $cache;
     }
 
-    public function isValid(string $msid): bool
+    public function isValid(string $id): bool
     {
-        $cachedResult = $this->cache->get($msid);
+        $cachedResult = $this->cache->get($id);
         if ($cachedResult) {
             return $cachedResult;
         }
 
-        $result = $this->client->isValid($msid);
-        $this->cache->set($msid, $result);
+        $result = $this->client->isValid($id);
+        $this->cache->set($id, $result);
 
         return $result;
     }
 
+    public function getSessionData(string $sessionDataToken): array
+    {
+        return $this->client->getSessionData($sessionDataToken);
+    }
+
+    /**
+     * @deprecated - this functionality will be removed in the future
+     */
     public function filterInvalid(array $msids): array
     {
         $result = $this->client->filterInvalid($msids);

src/ClientInterface.php

@@ -4,7 +4,7 @@
 
 interface ClientInterface
 {
-    public function isValid(string $msid): bool;
+    public function isValid(string $id): bool;
 
     public function filterInvalid(array $msids): array;
 }

tests/CachedClientTest.php

@@ -15,7 +15,7 @@ class CachedClientTest extends TestCase
 
     private CacheInterface|MockObject $cacheMock;
 
-    private string $msid;
+    private string $id;
 
     private bool $value;
 
@@ -32,7 +32,7 @@ protected function setUp(): void
 
         $this->client = new CachedClient($this->clientMock, $this->cacheMock);
 
-        $this->msid = 'msid';
+        $this->id = 'msid';
         $this->value = true;
 
         $this->msids = ['msid1', 'msid2', 'msid3'];
@@ -45,24 +45,24 @@ public function isValidShouldReturnTheCachedResultIfExists()
         $this->mockCachedValue();
         $this->expectClientIsValidNotCalled();
 
-        $this->assertEquals($this->value, $this->client->isValid($this->msid));
+        $this->assertEquals($this->value, $this->client->isValid($this->id));
     }
 
     #[Test]
     public function isValidShouldReturnTheClientsResponseIfThereIsNoCache()
     {
         $this->mockClientValue();
 
-        $this->assertEquals($this->value, $this->client->isValid($this->msid));
+        $this->assertEquals($this->value, $this->client->isValid($this->id));
     }
 
     #[Test]
     public function isValidShouldCacheTheClientsResponse()
     {
         $this->mockClientValue();
-        $this->expectValueCached($this->msid, $this->value);
+        $this->expectValueCached($this->id, $this->value);
 
-        $this->client->isValid($this->msid);
+        $this->client->isValid($this->id);
     }
 
     #[Test]
@@ -87,7 +87,7 @@ private function mockCachedValue()
         $this->cacheMock
             ->expects($this->once())
             ->method('get')
-            ->with($this->msid)
+            ->with($this->id)
             ->willReturn($this->value);
     }
 
@@ -96,7 +96,7 @@ private function mockClientValue()
         $this->clientMock
             ->expects($this->once())
             ->method('isValid')
-            ->with($this->msid)
+            ->with($this->id)
             ->willReturn($this->value);
     }