Add last updated

Author: cicnavi

src/Federation/EntityCollection.php

@@ -20,6 +20,7 @@ public function __construct(
         protected readonly EntityCollectionPaginator $entityCollectionPaginator,
         protected array $entities,
         protected ?string $nextPageToken = null,
+        protected ?int $lastUpdated = null,
     ) {
     }
 

src/Federation/EntityCollection/EntityCollectionFetcher.php

@@ -27,7 +27,7 @@ public function __construct(
      * @param non-empty-string $endpointUri
      * @param array{
      *   entity_type?: string[],
-     *   trust_mark_type?: string,
+     *   trust_mark_type?: string[],
      *   query?: string,
      *   trust_anchor?: string,
      *   entity_claims?: string[],

src/Federation/Factories/EntityCollectionFactory.php

@@ -23,13 +23,14 @@ public function __construct(
      * @param array<string, array<string, mixed>> $entities  Keyed by entity ID,
      * value is JWT payload
      */
-    public function build(array $entities): EntityCollection
+    public function build(array $entities, ?int $lastUpdated): EntityCollection
     {
         return new EntityCollection(
             $this->entityCollectionFilter,
             $this->entityCollectionSorter,
             $this->entityCollectionPaginator,
             $entities,
+            $lastUpdated,
         );
     }
 }

src/Federation/FederationDiscovery.php

@@ -46,7 +46,10 @@ public function discover(
                     'Returning discovered entities from entity collection store.',
                     ['trustAnchorId' => $trustAnchorId],
                 );
-                return $this->entityCollectionFactory->build($cachedEntities);
+                return $this->entityCollectionFactory->build(
+                    $cachedEntities,
+                    $this->entityCollectionStore->getLastUpdated($trustAnchorId),
+                );
             }
         }
 
@@ -56,6 +59,7 @@ public function discover(
         );
 
         $discoveredEntities = [];
+        $lastUpdated = null;
         try {
             // Step 1: Fetch TA config
             $taConfig = $this->entityStatementFetcher->fromCacheOrWellKnownEndpoint($trustAnchorId);
@@ -71,7 +75,8 @@ public function discover(
             ksort($discoveredEntities);
 
             $this->entityCollectionStore->store($trustAnchorId, $discoveredEntities, $ttl);
-            $this->entityCollectionStore->storeLastUpdated($trustAnchorId, time(), $ttl);
+            $lastUpdated = time();
+            $this->entityCollectionStore->storeLastUpdated($trustAnchorId, $lastUpdated, $ttl);
 
             $this->logger?->info('Federation discovery completed.', [
                 'trustAnchorId' => $trustAnchorId,
@@ -84,7 +89,7 @@ public function discover(
             ]);
         }
 
-        return $this->entityCollectionFactory->build($discoveredEntities);
+        return $this->entityCollectionFactory->build($discoveredEntities, $lastUpdated);
     }