WIP

Author: cicnavi

docs/3-federation.md

@@ -1,4 +1,4 @@
-# OpenID Federation Tools (draft 47)
+# OpenID Federation Tools
 
 To use it, create an instance of the class `\SimpleSAML\OpenID\Federation`.
 

docs/5-federation-discovery.md

@@ -20,10 +20,8 @@
 use SimpleSAML\OpenID\Factories\HttpClientDecoratorFactory;
 use SimpleSAML\OpenID\Factories\JwsSerializerManagerDecoratorFactory;
 use SimpleSAML\OpenID\Federation\EntityCollection\CacheEntityCollectionStore;
-use SimpleSAML\OpenID\Federation\EntityCollection\EntityCollectionFetcher;
 use SimpleSAML\OpenID\Federation\EntityCollection\EntityCollectionFilter;
 use SimpleSAML\OpenID\Federation\EntityCollection\EntityCollectionPaginator;
-use SimpleSAML\OpenID\Federation\EntityCollection\EntityCollectionResponseFactory;
 use SimpleSAML\OpenID\Federation\EntityCollection\EntityCollectionSorter;
 use SimpleSAML\OpenID\Federation\EntityCollection\EntityCollectionStoreInterface;
 use SimpleSAML\OpenID\Federation\EntityCollection\InMemoryEntityCollectionStore;
@@ -77,16 +75,12 @@ class Federation
 
     protected ?FederationDiscovery $federationDiscovery = null;
 
-    protected ?EntityCollectionFetcher $entityCollectionFetcher = null;
-
     protected ?EntityCollectionFilter $entityCollectionFilter = null;
 
     protected ?EntityCollectionSorter $entityCollectionSorter = null;
 
     protected ?EntityCollectionPaginator $entityCollectionPaginator = null;
 
-    protected ?EntityCollectionResponseFactory $entityCollectionBuilder = null;
-
     protected ?EntityStatementFetcher $entityStatementFetcher = null;
 
     protected ?MetadataPolicyResolver $metadataPolicyResolver = null;
@@ -399,6 +393,8 @@ public function federationDiscovery(): FederationDiscovery
                 $this->entityCollectionStore(),
                 $this->maxCacheDurationDecorator(),
                 $this->entityCollectionFactory(),
+                $this->artifactFetcher(),
+                $this->helpers(),
                 $this->logger,
                 $this->maxDiscoveryDepth,
             );
@@ -408,16 +404,6 @@ public function federationDiscovery(): FederationDiscovery
     }
 
 
-    public function entityCollectionFetcher(): EntityCollectionFetcher
-    {
-        return $this->entityCollectionFetcher ??= new EntityCollectionFetcher(
-            $this->artifactFetcher(),
-            $this->helpers(),
-            $this->logger,
-        );
-    }
-
-
     public function entityCollectionFilter(): EntityCollectionFilter
     {
         return $this->entityCollectionFilter ??= new EntityCollectionFilter($this->helpers());
@@ -438,18 +424,6 @@ public function entityCollectionPaginator(): EntityCollectionPaginator
     }
 
 
-    public function entityCollectionResponseFactory(): EntityCollectionResponseFactory
-    {
-        return $this->entityCollectionBuilder ??= new EntityCollectionResponseFactory(
-            $this->federationDiscovery(),
-            $this->entityCollectionFilter(),
-            $this->entityCollectionSorter(),
-            $this->entityCollectionPaginator(),
-            $this->entityCollectionStore(),
-        );
-    }
-
-
     public function helpers(): Helpers
     {
         return $this->helpers ??= new Helpers();

src/Federation.php

@@ -4,6 +4,7 @@
 
 namespace SimpleSAML\OpenID\Federation;
 
+use SimpleSAML\OpenID\Codebooks\ClaimsEnum;
 use SimpleSAML\OpenID\Federation\EntityCollection\EntityCollectionFilter;
 use SimpleSAML\OpenID\Federation\EntityCollection\EntityCollectionPaginator;
 use SimpleSAML\OpenID\Federation\EntityCollection\EntityCollectionSorter;
@@ -34,6 +35,60 @@ public function getEntities(): array
     }
 
 
+    public function getLastUpdated(): ?int
+    {
+        return $this->lastUpdated;
+    }
+
+
+    /**
+     * @return array{
+     *     entities: array<int, array<string, mixed>>,
+     *     next?: string,
+     *     last_updated?: int
+     * }
+     */
+    public function toCollectionEndpointResponseArray(): array
+    {
+        $entities = [];
+        foreach ($this->entities as $payload) {
+            $metadata = $payload[ClaimsEnum::Metadata->value] ?? [];
+            if (!is_array($metadata)) {
+                $metadata = [];
+            }
+
+            $entry = [
+                ClaimsEnum::EntityId->value => $payload[ClaimsEnum::Sub->value] ?? '',
+                ClaimsEnum::EntityTypes->value => array_keys($metadata),
+            ];
+
+            if ($metadata !== []) {
+                $entry[ClaimsEnum::UiInfos->value] = $metadata;
+            }
+
+            if (isset($payload[ClaimsEnum::TrustMarks->value])) {
+                $entry[ClaimsEnum::TrustMarks->value] = $payload[ClaimsEnum::TrustMarks->value];
+            }
+
+            $entities[] = $entry;
+        }
+
+        $data = [
+            ClaimsEnum::Entities->value => $entities,
+        ];
+
+        if (!is_null($this->nextPageToken)) {
+            $data[ClaimsEnum::Next->value] = $this->nextPageToken;
+        }
+
+        if (!is_null($this->lastUpdated)) {
+            $data[ClaimsEnum::LastUpdated->value] = $this->lastUpdated;
+        }
+
+        return $data;
+    }
+
+
     /**
      * Apply filters to the collection. Supported criteria keys:
      * - entity_type: array of entity types to include