WIP

Author: cicnavi

src/Controllers/Admin/FederationTestController.php

@@ -189,11 +189,10 @@ public function federationDiscovery(Request $request): Response
             throw new OidcException('Empty Trust Anchor ID.');
 
             try {
-                $entities = $this->federationWithArrayLogger->federationDiscovery()->discoverAndFetch(
+                $entities = $this->federationWithArrayLogger->federationDiscovery()->discoverEntityIds(
                     trustAnchorId: $trustAnchorId,
-                    forceRefresh: true,
+                    //                    forceRefresh: true, // TODO make optional in form
                 );
-
             } catch (\Throwable $exception) {
                 $this->arrayLogger->error(sprintf(
                     'Error during entity discovery under Trust Anchor %s. Error was %s',
@@ -205,13 +204,21 @@ public function federationDiscovery(Request $request): Response
 
         $logMessages = $this->arrayLogger->getEntries();
 
+        try {
+            $trustAnchorIds = $this->moduleConfig->getFederationTrustAnchorIds();
+        } catch (\Throwable $exception) {
+            $this->arrayLogger->error('Module config error: ' . $exception->getMessage());
+            $trustAnchorIds = [];
+        }
+
         return $this->templateFactory->build(
             'oidc:tests/federation-discovery.twig',
             compact(
                 'trustAnchorId',
                 'logMessages',
                 'isFormSubmitted',
                 'entities',
+                'trustAnchorIds',
             ),
             RoutesEnum::AdminTestFederationDiscovery->value,
         );

src/Controllers/Federation/EntityStatementController.php

@@ -95,8 +95,6 @@ public function configuration(): Response
                             ClaimsEnum::OrganizationUri->value => $this->moduleConfig->getOrganizationUri(),
                         ],
                     )),
-                    ClaimsEnum::FederationFetchEndpoint->value => $this->routes->urlFederationFetch(),
-                    ClaimsEnum::FederationListEndpoint->value => $this->routes->urlFederationList(),
                     // TODO v7 mivanci Add when ready. Use ClaimsEnum for keys.
                     // https://openid.net/specs/openid-federation-1_0.html#name-federation-entity
                     //'federation_resolve_endpoint',

templates/tests/federation-discovery.twig

@@ -8,6 +8,18 @@
         {{ 'You can use the form below to test Federation Discovery under given Trust Anchor.'|trans }}
         {{ 'Log messages will show if any warnings or errors were raised during the process.'|trans }}
     </p>
+    <p>
+        {% if trustAnchorIds|default %}
+            {{ 'Curently configured Trust Anchors for this entity:'|trans }}
+            <ul>
+                {% for trustAnchor in trustAnchorIds %}
+                    <li>{{ trustAnchor }}</li>
+                {% endfor %}
+            </ul>
+        {% else %}
+            {{ 'No Trust Anchors are currently configured for this entity.'|trans }}
+        {% endif %}
+    </p>
 
     <form method="post"
           action="{{ routes.urlAdminTestFederationDiscovery }}"
@@ -22,7 +34,7 @@
                    required=""
                    value="{{ trustAnchorId|default }}"
             >
-            <span class="pure-form-message"></span>
+            <span class="pure-form-message">Use any Trust Anchor ID for discovery</span>
 
             <br>
             <button type="submit" class="pure-button ">{{ (actionText|default('Submit'))|trans }}</button>
@@ -42,13 +54,15 @@
         </p>
 
         <h4>{{ 'Entities'|trans }}</h4>
+        <p>
         {% if entities|default %}
             <code class="code-box code-box-content">
                 {{- entities|json_encode(constant('JSON_PRETTY_PRINT') b-or constant('JSON_UNESCAPED_SLASHES')) -}}
             </code>
         {% else %}
             {{ 'No entities were found during the process.'|trans }}
         {% endif %}
+        </p>
 
     {% endif %}