Redesign remember-my-choice checkbox in WAYF (#2095)

* Redesign remember-my-choice checkbox in WAYF

Update the WAYF "remember my choice" checkbox to match the new visual
design (checkbox before label, adjusted margins, plain black text
instead of bold blue) and add an accessible tooltip on the per-SP
variant that explains how long a choice is remembered and how to reset
it, using the existing tooltip pattern from consent's attribute list.

- rememberChoice.html.twig is reordered so the checkbox comes before
  its label, and now branches on rememberChoicePerIdp: the per-SP
  variant shows duration-aware copy ("remembered for 90 days") plus a
  tooltip toggle, while the global variant keeps its existing text
  unchanged. The tooltip reuses the same checkbox-toggle + CSS sibling
  selector approach as Consent/Attributes/tooltip.html.twig, so no new
  JavaScript is needed: wayf/mouseBehaviour.js's existing
  handleAriaPressed() already runs on every WAYF page load.
- rememberChoicePerIdp and rememberChoiceDuration were already
  threaded through WayfViewModel/WayfViewModelFactory/WayfRenderer for
  #2065 but never reached the template: wayf.html.twig and
  remainingIdps.html.twig now forward both values into
  rememberChoice.html.twig.
- RememberChoiceDurationFormatter turns
  wayf.remember_choice_per_idp_lifetime (seconds) into a translated
  "N days"/"N minutes" string, computed once in WayfViewModelFactory
  and only when rememberChoicePerIdp is true, so the translator isn't
  invoked on every WAYF render for SPs that don't use the feature.
- New translation keys were added to languages/messages.{en,nl,pt}.php
  rather than theme/*/translations, matching where the existing
  remember_choice key already lives.
- WayfController's functional-testing fixture gained a
  rememberChoicePerIdp query param (defaulting to false, preserving
  existing behaviour) so both the per-SP and global variants can be
  exercised manually and from Cypress.
- New Cypress coverage in wayf.general.spec.js checks the per-SP
  checkbox and tooltip toggle render correctly and that the global
  variant has no tooltip element.

Refs: #2066

* Wire WAYF tooltip aria handlers

# If applied, this commit will
Wire the generic tooltip ARIA handlers into the WAYF callback, add a Cypress regression test for the remember-choice tooltip toggle, and restore the spec to run fully by removing a stray it.only.

# Why is this change needed?
Prior to this change, the WAYF remember-choice tooltip never updated its aria-hidden and aria-expanded state when the label was clicked, so assistive technology received incorrect state.

# How does it address the issue?
This change invokes the existing tooltip accessibility handlers during WAYF initialization and adds a regression test that checks the ARIA state changes.

# Provide links to any relevant tickets, articles or other resources
Found during review of PR #2095.

* Handle Enter on WAYF tooltip toggle

# If applied, this commit will
Make the remember-choice tooltip open when its label is focused and Enter is pressed, and add a Cypress regression test for that keyboard interaction.

# Why is this change needed?
Prior to this change, pressing Enter on the focused WAYF tooltip label did nothing because the Enter handler ignored tooltip labels.

# How does it address the issue?
This change routes tooltip labels through the existing click helper in the WAYF Enter handler so the keyboard interaction follows the same path as a mouse click.

# Provide links to any relevant tickets, articles or other resources
Found during review of PR #2095.

* Remove explanatory class docblock restating what the test renders

* Fix tooltip click target and keyboard submit in WAYF remember choice

# If applied, this commit will...
Fix two bugs in the per-IdP remember-choice tooltip introduced by the
tooltip redesign, and restore the test scoping that was accidentally
removed while doing so.

# Why is this change needed?
Prior to this change, the tooltip label had no explicit display value,
so it defaulted to inline and its width/height rules from the tooltip
mixin had no effect, collapsing it to a zero-size element that could
not be clicked. Separately, pressing Enter while the tooltip label was
focused triggered the browser's native implicit submission of the
surrounding WAYF form, navigating away instead of just opening the
tooltip.

# How does it address the issue?
This change sets the tooltip label to display: inline-block so its
sizing rules apply, matching the equivalent consent flow styling, and
calls preventDefault on the Enter keydown for the tooltip case so only
the intended click behaviour runs. It also restores it.only on the
unrelated site notice test, which had been dropped as a side effect of
an earlier change in this branch and unintentionally widened this PR's
test run to unrelated, pre-existing failures out of scope here.

# Provide links to any relevant tickets, articles or other resources
#2095

* Let rememberChoicePerIdp render the mock WAYF checkbox on its own

# Why is this change needed?
Prior to this change, the mock WAYF page only showed the remember my choice
checkbox in per-SP mode when both rememberChoiceFeature and
rememberChoicePerIdp were passed. In production only one mode can be enabled,
so the per-SP mode never has the global flag set. The parameter was also
missing from the testing docs.

# How does it address the issue?
This change makes rememberChoicePerIdp imply the feature, like in production,
and documents both modes and example links in docs/testing.md and
docs/js_testing.md.

* Split the WAYF remember-my-choice template per mode

# If applied, this commit will...
Render the global and the per-SP remember-my-choice checkbox from two
separate templates, selected by a thin if/elseif in rememberChoice.html.twig.

# Why is this change needed?
Prior to this change, one template held both variants and nested the per-SP
checkbox inside the rememberChoiceFeature flag. The two modes are mutually
exclusive, so the per-SP variant should not depend on the flag of the global
variant, and the nesting hid that either/or relationship.

# How does it address the issue?
This change moves each variant into its own partial
(rememberChoiceGlobal and rememberChoicePerIdp). The per-SP variant is
rendered whenever rememberChoicePerIdp is set, the global variant only
otherwise. The markup of both variants is unchanged. The render test now also
covers the per-SP variant without the global flag and the case where both are
disabled.

# Provide links to any relevant tickets, articles or other resources
Review feedback on the remember-my-choice checkbox pull request.

* Fix double aria-pressed flip on the WAYF tooltip toggle

Prior to this change, the per-SP remember-choice tooltip checkbox had
aria-pressed flipped twice per label click on the WAYF. mouseBehaviour()
attached changeAriaPressed to every input[aria-pressed], and
toggleTooltipPressedStates() flips it as well. The attribute therefore
ended at its original value while aria-expanded changed, giving screen
readers a wrong pressed state.

This change skips tooltip toggles in the generic aria-pressed handler of
mouseBehaviour(), leaving toggleTooltipPressedStates() as the only owner,
as on the consent page. The per-SP tooltip tests move to their own spec
so they run regardless of the it.only in wayf.general.spec.js, and now
assert aria-pressed in both states.

Author: kayjoosten

config/services/services.yml

@@ -4,9 +4,15 @@ services:
 
     OpenConext\EngineBlock\Service\Wayf\IdpSplitter:
 
+    OpenConext\EngineBlockBundle\Service\RememberChoiceDurationFormatter:
+        autowire: true
+        arguments:
+            $lifetimeInSeconds: '%wayf.remember_choice_per_idp_lifetime%'
+
     OpenConext\EngineBlockBundle\Service\WayfViewModelFactory:
         arguments:
             $wayfExtension: '@OpenConext\EngineBlockBundle\Twig\Extensions\Extension\Wayf'
+            $durationFormatter: '@OpenConext\EngineBlockBundle\Service\RememberChoiceDurationFormatter'
 
     OpenConext\EngineBlockBundle\Service\WayfRenderer:
         autowire: true

docs/js_testing.md

@@ -42,7 +42,8 @@ parameters can be used to manipulate the behaviour of the wayf that is rendered.
 | **Query parameter** | **Default value** | **Explanation** |
 |---|----|----|
 | displayUnconnectedIdpsWayf | (bool) false | Type: boolean. Display unconnected IdPs on the WAYF. |
-| rememberChoiceFeature | (bool) false | Type: boolean. Display the remember choice feature. |
+| rememberChoiceFeature | (bool) false | Type: boolean. Display the remember choice feature in global mode. |
+| rememberChoicePerIdp | (bool) false | Type: boolean. Display the remember choice feature in per-SP mode. Implies rememberChoiceFeature. |
 | cutoffPointForShowingUnfilteredIdps | (int) 100 | Type: integer. The number of IdPs to display on the WAYF before cutting them off. |
 | showIdpBanner | (bool) true | Type: boolean. Show the EduId (default IdP) banner on the WAYF or not |
 | defaultIdpEntityId | (string) null | Type: string. The entityId of the default IdP (EduId) |

docs/testing.md

@@ -20,7 +20,8 @@ The functional-testing route renders the WAYF page with synthetic IdP data, cont
 | `showIdPBanner` | bool | `true` | Whether to show the default IdP banner |
 | `displayUnconnectedIdpsWayf` | bool | `false` | Show unconnected IdPs with a "Request access" button |
 | `backLink` | bool | `false` | Show "Return to service provider" back link |
-| `rememberChoiceFeature` | bool | `false` | Show "Remember my choice" checkbox |
+| `rememberChoiceFeature` | bool | `false` | Show "Remember my choice" checkbox (global mode: the choice is stored in the `rememberchoice` cookie) |
+| `rememberChoicePerIdp` | bool | `false` | Show "Remember my choice" checkbox in per-SP mode (the choice is stored in the `rememberedidps` cookie). Implies `rememberChoiceFeature`, like in production where only one of the two modes can be enabled |
 | `cutoffPointForShowingUnfilteredIdps` | int | `100` | Hide the IdP list until the user searches when list length exceeds this value |
 
 #### Baseline
@@ -38,7 +39,8 @@ The functional-testing route renders the WAYF page with synthetic IdP data, cont
 
 #### UI features
 - [Back link](https://engine.dev.openconext.local/functional-testing/wayf?backLink=true)
-- [Remember my choice](https://engine.dev.openconext.local/functional-testing/wayf?rememberChoiceFeature=true)
+- [Remember my choice (global mode)](https://engine.dev.openconext.local/functional-testing/wayf?rememberChoiceFeature=true)
+- [Remember my choice (per-SP mode)](https://engine.dev.openconext.local/functional-testing/wayf?rememberChoicePerIdp=true)
 - [Default IdP banner](https://engine.dev.openconext.local/functional-testing/wayf?defaultIdpEntityId=https%3A%2F%2Fexample.com%2FentityId%2F3&showIdPBanner=true&addDiscoveries=false)
 
 #### Preferred IdPs

languages/messages.en.php

@@ -86,6 +86,11 @@
 
     // Remove cookies
     'remember_choice'           => 'Remember my choice',
+    'remember_choice_per_idp'   => 'Remember my choice for this service for %duration%',
+    'remember_choice_duration_days' => '%count% days',
+    'remember_choice_duration_minutes' => '%count% minutes',
+    'remember_choice_tooltip_screenreader' => 'Why do we remember your choice?',
+    'remember_choice_per_idp_tooltip' => 'If you enable this option, you won\'t need to choose how you want to log into this service for the next %duration%. The login screen will then be skipped. <strong>Please note</strong>: do you sometimes use a different account to log in? If so, please disable this option. You can reverse this setting later at <a href="http://profile.surfconext.nl/">profile.surfconext.nl</a>.',
     'cookie_removal_header'     => 'Remove cookies',
     'cookie_remove_button'      => 'Remove',
     'cookie_remove_all_button'  => 'Remove all',

languages/messages.nl.php

@@ -85,6 +85,11 @@
 
     // Remove cookies
     'remember_choice'           => 'Onthoud mijn keuze',
+    'remember_choice_per_idp'   => 'Onthoud mijn keuze voor deze dienst voor %duration%',
+    'remember_choice_duration_days' => '%count% dagen',
+    'remember_choice_duration_minutes' => '%count% minuten',
+    'remember_choice_tooltip_screenreader' => 'Waarom onthouden we jouw keuze?',
+    'remember_choice_per_idp_tooltip' => 'Als je deze optie aanzet, hoef je de komende %duration% voor deze dienst niet meer te kiezen hoe je wilt inloggen. Het inlogscherm wordt dan overgeslagen. <strong>Let op</strong>: gebruik je soms een ander account om in te loggen? Zet de optie dan uit. Je kunt de keuze later weer terugdraaien op <a href="http://profile.surfconext.nl/">profile.surfconext.nl</a>.',
     'cookie_removal_header'     => 'Cookies verwijderen',
     'cookie_remove_button'      => 'Verwijderen',
     'cookie_remove_all_button'  => 'Alles verwijderen',

languages/messages.pt.php

@@ -82,6 +82,11 @@
 
     // Remove cookies
     'remember_choice'           => 'Relembrar a minha escolha',
+    'remember_choice_per_idp'   => 'Relembrar a minha escolha para este serviço durante %duration%',
+    'remember_choice_duration_days' => '%count% dias',
+    'remember_choice_duration_minutes' => '%count% minutos',
+    'remember_choice_tooltip_screenreader' => 'Porque é que relembramos a sua escolha?',
+    'remember_choice_per_idp_tooltip' => 'Se ativar esta opção, não terá de escolher como pretende iniciar sessão nos próximos %duration%. O ecrã de início de sessão será então ignorado. Atenção: por vezes utiliza uma conta diferente para iniciar sessão? Nesse caso, desative esta opção. Pode reverter esta opção mais tarde em <a href="http://profile.surfconext.nl/">profile.surfconext.nl</a>.',
     'cookie_removal_header'     => 'Remover cookies',
     'cookie_remove_button'      => 'Remover',
     'cookie_remove_all_button'  => 'Remover todos',

src/OpenConext/EngineBlockBundle/Service/RememberChoiceDurationFormatter.php

@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Copyright 2026 SURFnet B.V.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+declare(strict_types=1);
+
+namespace OpenConext\EngineBlockBundle\Service;
+
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final class RememberChoiceDurationFormatter
+{
+    private const SECONDS_PER_MINUTE = 60;
+    private const SECONDS_PER_DAY = 86400;
+
+    public function __construct(
+        private readonly TranslatorInterface $translator,
+        private readonly int $lifetimeInSeconds,
+    ) {
+    }
+
+    public function format(): string
+    {
+        if ($this->lifetimeInSeconds < self::SECONDS_PER_DAY) {
+            $minutes = intdiv($this->lifetimeInSeconds, self::SECONDS_PER_MINUTE);
+            return $this->translator->trans('remember_choice_duration_minutes', ['%count%' => $minutes]);
+        }
+
+        $days = intdiv($this->lifetimeInSeconds, self::SECONDS_PER_DAY);
+        return $this->translator->trans('remember_choice_duration_days', ['%count%' => $days]);
+    }
+}

src/OpenConext/EngineBlockBundle/Service/WayfViewModelFactory.php

@@ -28,6 +28,7 @@ class WayfViewModelFactory
 {
     public function __construct(
         private readonly Wayf $wayfExtension,
+        private readonly RememberChoiceDurationFormatter $durationFormatter,
     ) {
     }
 
@@ -70,6 +71,7 @@ public function create(
             regularIdpList: $regularIdpList,
             preferredIdpList: $preferredIdpList,
             rememberChoicePerIdp: $rememberChoicePerIdp,
+            rememberChoiceDuration: $rememberChoicePerIdp ? $this->durationFormatter->format() : '',
         );
     }
 }

src/OpenConext/EngineBlockBundle/ViewModel/WayfViewModel.php

@@ -53,6 +53,7 @@ public function __construct(
         /** @var WayfIdp[] */
         public array $preferredIdpList,
         public bool $rememberChoicePerIdp = false,
+        public string $rememberChoiceDuration = '',
     ) {
     }
 

src/OpenConext/EngineBlockFunctionalTestingBundle/Controllers/WayfController.php

@@ -44,6 +44,7 @@ public function wayfAction(Request $request)
         $displayUnconnectedIdpsWayf = $request->query->getBoolean('displayUnconnectedIdpsWayf');
         $addDiscoveries = $request->query->getBoolean('addDiscoveries', true);
         $rememberChoiceFeature = $request->query->getBoolean('rememberChoiceFeature');
+        $rememberChoicePerIdp = $request->query->getBoolean('rememberChoicePerIdp');
         $cutoffPointForShowingUnfilteredIdps = $request->query->getInt('cutoffPointForShowingUnfilteredIdps', 100);
         $showIdPBanner = $request->query->getBoolean('showIdPBanner', true);
         $defaultIdpEntityId = $request->query->get('defaultIdpEntityId', '');
@@ -66,10 +67,11 @@ public function wayfAction(Request $request)
             shouldDisplayBanner: $showIdPBanner,
             backLink: $backLink,
             cutoffPoint: $cutoffPointForShowingUnfilteredIdps,
-            rememberChoice: $rememberChoiceFeature,
+            rememberChoice: $rememberChoiceFeature || $rememberChoicePerIdp,
             showRequestAccess: $displayUnconnectedIdpsWayf,
             requestId: 'bogus-request-id',
             serviceProvider: TestEntitySeeder::buildSp(),
+            rememberChoicePerIdp: $rememberChoicePerIdp,
         );
 
         return new Response($output);