Fix theoretical issue with unconnected defaultIdp and the banner not showing on the functional-testing route.

johanib · johanib · commit 93c0e0b8b56c · 2026-04-28T12:07:59.000+02:00
diff --git a/src/OpenConext/EngineBlockBundle/Service/WayfRenderer.php b/src/OpenConext/EngineBlockBundle/Service/WayfRenderer.php
@@ -53,7 +53,8 @@ public function render(
     ): string {
         $split = $this->splitter->split($idpList, $preferredIdpEntityIds);
         $showPreferredIdps = !empty($split['preferred']);
-        $isDefaultIdpPreferred = in_array($defaultIdpEntityId, $preferredIdpEntityIds, true);
+        $preferredEntityIdsShown = array_map(static fn(WayfIdp $idp) => $idp->entityId, $split['preferred']);
+        $isDefaultIdpPreferred = in_array($defaultIdpEntityId, $preferredEntityIdsShown, true);
 
         $showIdPBanner = $shouldDisplayBanner
             && $this->isDefaultIdpPresent($idpList)
diff --git a/src/OpenConext/EngineBlockFunctionalTestingBundle/Helper/TestEntitySeeder.php b/src/OpenConext/EngineBlockFunctionalTestingBundle/Helper/TestEntitySeeder.php
@@ -198,6 +198,13 @@ private static function transformIdpsForWayf(array $idpEntityIds, $currentLocale
 
         $wayfIdps = [];
         foreach ($identityProviders as $identityProvider) {
+            $isDefaultIdp = $idpEntityIds[$identityProvider->entityId]['isDefaultIdp'];
+
+            // Mirror the production guard: do not show the default IdP in the disconnected section.
+            if (!$identityProvider->enabledInWayf && $isDefaultIdp) {
+                continue;
+            }
+
             $name = 'name' . ucfirst($currentLocale);
             $wayfIdps[] = new WayfIdp(
                 name: $identityProvider->$name,
@@ -206,7 +213,7 @@ private static function transformIdpsForWayf(array $idpEntityIds, $currentLocale
                 accessible: $identityProvider->enabledInWayf,
                 id: md5($identityProvider->entityId),
                 entityId: $identityProvider->entityId,
-                isDefaultIdp: $idpEntityIds[$identityProvider->entityId]['isDefaultIdp'],
+                isDefaultIdp: $isDefaultIdp,
                 discoveryHash: null,
             );
 
@@ -218,7 +225,7 @@ private static function transformIdpsForWayf(array $idpEntityIds, $currentLocale
                     accessible: $identityProvider->enabledInWayf,
                     id: md5($identityProvider->entityId),
                     entityId: $identityProvider->entityId,
-                    isDefaultIdp: $idpEntityIds[$identityProvider->entityId]['isDefaultIdp'],
+                    isDefaultIdp: $isDefaultIdp,
                     discoveryHash: $discoveryService->hash($discovery),
                 );
             }
diff --git a/tests/unit/OpenConext/EngineBlockBundle/Service/WayfRendererTest.php b/tests/unit/OpenConext/EngineBlockBundle/Service/WayfRendererTest.php
@@ -137,6 +137,51 @@ public static function bannerConditionProvider(): array
         ];
     }
 
+    public function testBannerShownWhenDefaultIdpIsInPreferredConfigButDroppedBySpitter(): void
+    {
+        $defaultId = 'https://default.example.org';
+        $otherId = 'https://other.example.org';
+
+        // Default IdP is unconnected (splitter will drop it); other preferred IdP is connected.
+        $idpList = [
+            new WayfIdp(name: null, logo: '', keywords: [], accessible: false, id: md5($defaultId), entityId: $defaultId, isDefaultIdp: true, discoveryHash: null),
+            new WayfIdp(name: null, logo: '', keywords: [], accessible: true, id: md5($otherId), entityId: $otherId, isDefaultIdp: false, discoveryHash: null),
+        ];
+
+        $capturedShowIdPBanner = null;
+
+        $this->factory->expects($this->once())
+            ->method('create')
+            ->willReturnCallback(function () use (&$capturedShowIdPBanner): WayfViewModel {
+                $namedArgs = func_get_args();
+                $capturedShowIdPBanner = $namedArgs[9];
+                return $this->buildViewModel($namedArgs[9]);
+            });
+
+        $this->twig->method('render')->willReturn('<html>');
+
+        $sp = $this->createStub(ServiceProvider::class);
+        $sp->method('getDisplayName')->willReturn('Test SP');
+
+        $this->renderer()->render(
+            idpList: $idpList,
+            preferredIdpEntityIds: [$defaultId, $otherId],
+            action: '/sso',
+            currentLocale: 'en',
+            defaultIdpEntityId: $defaultId,
+            shouldDisplayBanner: true,
+            backLink: false,
+            cutoffPoint: 100,
+            rememberChoice: false,
+            showRequestAccess: false,
+            requestId: 'req-1',
+            serviceProvider: $sp,
+        );
+
+        $this->assertTrue($capturedShowIdPBanner, 'Banner should show: default IdP was in preferred config but dropped by splitter, so it is not visible anywhere');
+    }
+
+    
     public function testSplitsIdpListBeforePassingToFactory(): void
     {
         $preferredId = 'https://preferred.example.org';
