Consolidate additional routes

These templates were not using the 'new' translation key convention yet.
(the old translation keys are not removed, because `invalid-acs-location` still references them).

Author: johanib

languages/messages.en.php

@@ -178,6 +178,8 @@
     'error_authorization_policy_violation_info_no_idp_name'       => 'Message from your %organisationNoun%: ',
     'error_no_message'              => 'Error - No message received',
     'error_no_message_desc'         => 'We were expecting a SAML message, but did not get one. Something went wrong. Please try again.',
+    'error_unable_to_receive_message'      => 'Error - No message received',
+    'error_unable_to_receive_message_desc' => 'We were expecting a SAML message, but did not get one. Something went wrong. Please try again.',
     'error_invalid_acs_location'    => 'The given "Assertion Consumer Service" is unknown or invalid.',
     'error_invalid_acs_binding'     => 'Error - Invalid ACS binding type',
     'error_invalid_acs_binding_desc'     => 'The provided or configured "Assertion Consumer Service" Binding Type is unknown or invalid.',
@@ -263,13 +265,13 @@
     'error_clock_issue_title' => 'Error - The Assertion is not yet valid or has expired',
     'error_clock_issue_desc' => 'This is likely because the difference in time between %idpName% and %suiteName% it too large. Please verify that the time on the %organisationNoun% is correct.',
     'error_clock_issue_desc_no_idp_name' => 'This is likely because the difference in time between %organisationNoun% and %suiteName% it too large. Please verify that the time on the IdP is correct.',
-    'error_stepup_callout_unknown_title' => 'Error - Unknown strong authentication failure',
+    'error_stepup_callout_unknown' => 'Error - Unknown strong authentication failure',
     'error_stepup_callout_unknown_desc' => 'Logging in with strong authentication has failed and we don\'t know exactly why . Please try again first by going back to the service and logging in again . If this doesn\'t work, please contact the service desk of your %organisationNoun%.',
     'error_stepup_callout_unmet_loa_title' => 'Error - No suitable token found',
     'error_stepup_callout_unmet_loa_desc' => 'To continue to this service, a registered token with a certain level of assurance is required. Currently, you either haven\'t registered a token at all, or the level of assurance of the token you did register is too low. See the link below for more information about the registration process.',
     'error_stepup_callout_unmet_loa_link_text' => 'Read more about the registration process.',
     'error_stepup_callout_unmet_loa_link_target' => 'https://support.surfconext.nl/stepup-noauthncontext-en',
-    'error_stepup_callout_user_cancelled_title' => 'Error - Logging in cancelled',
+    'error_stepup_callout_user_cancelled' => 'Error - Logging in cancelled',
     'error_stepup_callout_user_cancelled_desc' => 'You have aborted the login process. Go back to the service if you want to try again.',
     'error_metadata_entity_id_not_found' => 'Metadata can not be generated',
     'error_metadata_entity_id_not_found_desc' => 'The following error occurred: %message%',

languages/messages.nl.php

@@ -178,6 +178,8 @@
     'error_authorization_policy_violation_info_no_idp_name'       => 'Bericht van je %organisationNoun%: ',
     'error_no_message'                  => 'Fout - Geen bericht ontvangen',
     'error_no_message_desc'             => 'We verwachtten een SAML bericht, maar we hebben er geen ontvangen. Er is iets fout gegaan. Probeer het alstublieft opnieuw.',
+    'error_unable_to_receive_message'      => 'Fout - Geen bericht ontvangen',
+    'error_unable_to_receive_message_desc' => 'We verwachtten een SAML bericht, maar we hebben er geen ontvangen. Er is iets fout gegaan. Probeer het alstublieft opnieuw.',
     'error_invalid_acs_location'        => 'De opgegeven "Assertion Consumer Service" is onjuist of bestaat niet.',
     'error_invalid_acs_binding'        => 'Fout - Onjuist ACS binding type',
     'error_invalid_acs_binding_desc'        => 'Het opgegeven of geconfigureerde "Assertion Consumer Service" Binding Type is onjuist of bestaat niet.',
@@ -261,13 +263,13 @@
     'error_clock_issue_title' => 'Fout - De Assertion is nog niet geldig of is verlopen',
     'error_clock_issue_desc' => 'Dit komt waarschijnlijk doordat de tijd tussen %idpName% en %suiteName% te ver uiteen loopt. Controleer de tijd op de %organisationNoun%.',
     'error_clock_issue_desc_no_idp_name' => 'Dit komt waarschijnlijk doordat de tijd tussen de %organisationNoun% en %suiteName% te ver uiteen loopt. Controleer de tijd op de IdP.',
-    'error_stepup_callout_unknown_title' => 'Fout - Onbekend sterke authenticatie probleem',
+    'error_stepup_callout_unknown' => 'Fout - Onbekend sterke authenticatie probleem',
     'error_stepup_callout_unknown_desc' => 'Inloggen met sterke authenticatie is niet gelukt en we weten niet precies waarom. Probeer het eerst eens opnieuw door terug te gaan naar de dienst en opnieuw in te loggen. Lukt dit niet, neem dan contact op met de helpdesk van je %organisationNoun%.',
     'error_stepup_callout_unmet_loa_title' => 'Fout - Geen geschikt token gevonden',
     'error_stepup_callout_unmet_loa_desc' => 'Om toegang te krijgen tot deze dienst heb je een geregistreerd token nodig met een bepaald zekerheidsniveau. Je hebt nu ofwel geen token geregistreerd, of het zekerheidsniveau van het token dat je hebt geregistreerd is te laag. Volg de link hieronder voor meer informatie over het registratieproces.',
     'error_stepup_callout_unmet_loa_link_text' => 'Lees meer over het registratieproces.',
     'error_stepup_callout_unmet_loa_link_target' => 'https://support.surfconext.nl/stepup-noauthncontext-nl',
-    'error_stepup_callout_user_cancelled_title' => 'Fout - Inloggen afgebroken',
+    'error_stepup_callout_user_cancelled' => 'Fout - Inloggen afgebroken',
     'error_stepup_callout_user_cancelled_desc' => 'Je hebt het inloggen afgebroken. Ga terug naar de dienst als je het opnieuw wilt proberen.',
     'error_metadata_entity_id_not_found' => 'Metadata kan niet gegenereerd worden',
     'error_metadata_entity_id_not_found_desc' => 'De volgende fout is opgetreden: %message%',

languages/messages.pt.php

@@ -176,6 +176,8 @@
     'error_authorization_policy_violation_info_no_idp_name'       => 'Mensagem da sua %organisationNoun%: ',
     'error_no_message'              => 'Erro - Não foi recebido nenhuma mensagem',
     'error_no_message_desc'         => 'Estávamos a aguardar uma mensagem, mas não chegou nenhuma? Alguma coisa correu mal. Tente de novo por favor.',
+    'error_unable_to_receive_message'      => 'Erro - Não foi recebido nenhuma mensagem',
+    'error_unable_to_receive_message_desc' => 'Estávamos a aguardar uma mensagem, mas não chegou nenhuma? Alguma coisa correu mal. Tente de novo por favor.',
     'error_invalid_acs_location'    => 'O "Serviço de Consumidor de Asserção" fornecido é desconhecido ou inválido.',
     'error_invalid_acs_binding'     => 'O ACS "Binding Type" é inválido',
     'error_invalid_acs_binding_desc'     => 'O "Binding Type" do "Serviço de Consumidor de Asserção" fornecido ou configurado é desconhecido ou inválido.',
@@ -255,13 +257,13 @@
     'error_clock_issue_title' => 'Erro - A asserção ainda não é válida ou pode ter expirado',
     'error_clock_issue_desc' => '<p>Por favor, verifique se a hora no IdP está correta.</p>',
     'error_clock_issue_desc_no_idp_name' => '<p>Por favor, verifique se a hora no IdP está correta.</p>',
-    'error_stepup_callout_unknown_title' => 'Erro - falha por autenticação forte desconhecida',
+    'error_stepup_callout_unknown' => 'Erro - falha por autenticação forte desconhecida',
     'error_stepup_callout_unknown_desc' => 'O login com autenticação forte falhou e não sabemos exatamente qual o motivo. Tente aceder de novo ao serviço e efetuar uma nova autenticação. Se voltar a não funcionar, entre em contato com o suporte técnico da sua %organisationNoun%.',
     'error_stepup_callout_unmet_loa_title' => 'Erro - não foi encontrado nenhum token adequado',
     'error_stepup_callout_unmet_loa_desc' => 'Para continuar neste serviço, é necessário que o token registado tenho um determinado nível de confiança. Atualmente, você não tem um token registado, ou o nível de confiança do seu token é muito baixo. Veja o endereço abaixo para mais informações sobre o processo de registo.',
     'error_stepup_callout_unmet_loa_link_text' => 'Leia mais sobre o processo de registro.',
     'error_stepup_callout_unmet_loa_link_target' => 'https://support.surfconext.nl/stepup-noauthncontext',
-    'error_stepup_callout_user_cancelled_title' => 'Erro - Carregamento cancelado',
+    'error_stepup_callout_user_cancelled' => 'Erro - Carregamento cancelado',
     'error_stepup_callout_user_cancelled_desc' => 'Você cancelou o processo de autenticação. Volte ao serviço se você pretender tentar de novo.',
     'error_metadata_entity_id_not_found' => 'Metadata can not be generated',
     'error_metadata_entity_id_not_found_desc' => 'The following error occurred: %message%',

src/OpenConext/EngineBlockBundle/Controller/FeedbackController.php

@@ -52,17 +52,12 @@ public function __construct(
     #[Route(
         path: '/authentication/feedback/unable-to-receive-message',
         name: 'authentication_feedback_unable_to_receive_message',
+        defaults: [
+            'pageIdentifier' => 'unable-to-receive-message',
+            'statusCode' => 400
+        ],
         methods: ['GET']
-    )
-    ]
-    public function unableToReceiveMessageAction()
-    {
-        return new Response(
-            $this->twig->render('@theme/Authentication/View/Feedback/unable-to-receive-message.html.twig'),
-            400
-        );
-    }
-
+    )]
     #[Route(
         path: '/authentication/feedback/unsolicited-response',
         name: 'authentication_feedback_unsolicited_response',
@@ -126,6 +121,24 @@ public function unableToReceiveMessageAction()
         ],
         methods: ['GET']
     )]
+    #[Route(
+        path: '/authentication/feedback/stepup-callout-unknown',
+        name: 'authentication_feedback_stepup_callout_unknown',
+        defaults: [
+            'pageIdentifier' => 'stepup-callout-unknown',
+            'statusCode' => 400
+        ],
+        methods: ['GET']
+    )]
+    #[Route(
+        path: '/authentication/feedback/stepup-callout-user-cancelled',
+        name: 'authentication_feedback_stepup_callout_user_cancelled',
+        defaults: [
+            'pageIdentifier' => 'stepup-callout-user-cancelled',
+            'statusCode' => 400
+        ],
+        methods: ['GET']
+    )]
     public function feedbackAction(string $pageIdentifier, int $statusCode): Response
     {
         return new Response(
@@ -493,19 +506,6 @@ public function clockIssueAction()
         );
     }
 
-    #[Route(
-        path: '/authentication/feedback/stepup-callout-user-cancelled',
-        name: 'authentication_feedback_stepup_callout_user_cancelled',
-        methods: ['GET']
-    )]
-    public function stepupCalloutUserCancelledAction(Request $request)
-    {
-        return new Response(
-            $this->twig->render('@theme/Authentication/View/Feedback/stepup-callout-user-cancelled.html.twig'),
-            400
-        );
-    }
-
     #[Route(path: '/authentication/feedback/stepup-callout-unmet-loa', name: 'authentication_feedback_stepup_callout_unmet_loa', methods: ['GET'])]
     public function stepupCalloutUnmetLoaAction(Request $request)
     {
@@ -515,15 +515,6 @@ public function stepupCalloutUnmetLoaAction(Request $request)
         );
     }
 
-    #[Route(path: '/authentication/feedback/stepup-callout-unknown', name: 'authentication_feedback_stepup_callout_unknown', methods: ['GET'])]
-    public function stepupCalloutUnknownAction(Request $request)
-    {
-        return new Response(
-            $this->twig->render('@theme/Authentication/View/Feedback/stepup-callout-unknown.html.twig'),
-            400
-        );
-    }
-
     private function setFeedbackInformationOnSession(array $customFeedbackInfo): void
     {
         $this->feedbackStateHelper->mergeFeedbackInfo($customFeedbackInfo);

src/OpenConext/EngineBlockFunctionalTestingBundle/Features/FeedbackFooters.feature

@@ -53,6 +53,18 @@ Feature:
     When I go to Engineblock URL "/authentication/feedback/session-lost"
     Then I should see "your session was lost"
 
+  Scenario: The unable-to-receive-message feedback route renders correctly
+    When I go to Engineblock URL "/authentication/feedback/unable-to-receive-message"
+    Then I should see "No message received"
+
+  Scenario: The stepup-callout-unknown feedback route renders correctly
+    When I go to Engineblock URL "/authentication/feedback/stepup-callout-unknown"
+    Then I should see "Unknown strong authentication failure"
+
+  Scenario: The stepup-callout-user-cancelled feedback route renders correctly
+    When I go to Engineblock URL "/authentication/feedback/stepup-callout-user-cancelled"
+    Then I should see "Logging in cancelled"
+
   Scenario: When a IdP specific error page is shown and a translation is not configured the support emailaddress of the IdP should be hidden
     Given The clock on the IdP "Dummy Idp" is ahead
     And I have configured the following translations:

theme/base/templates/modules/Authentication/View/Feedback/generic-error.html.twig

@@ -1,5 +1,11 @@
 {% extends '@theme/Default/View/Error/error.html.twig' %}
 
+{#
+ # Possible translation keys: error_session_lost, error_session_not_started, error_unsolicited_response,
+ #   error_invalid_acs_binding, error_received_error_status_code, error_unable_to_receive_message,
+ #   error_unknown_requesterid_in_authnrequest, error_authentication_limit_exceeded,
+ #   error_stepup_callout_unknown, error_stepup_callout_user_cancelled
+ #}
 {% set _key = 'error_' ~ pageIdentifier|replace({'-': '_'}) %}
 {% set pageTitle = (_key)|trans %}
 {% block pageTitle %}{{ pageTitle }}{% endblock %}