Refactor the last remaining error_no_message to the new format.

Author: johanib

CHANGELOG.md

@@ -15,6 +15,27 @@ the EngineBlock wiki.
 Features:
 * Added `coin:azure_domain_hint` configuration option for IdPs. When set, EngineBlock appends a `whr=<domain>` query parameter to the HTTP-Redirect AuthnRequest sent to the IdP, allowing Microsoft Azure / EntraID to skip the account picker (#1864).
 
+### Translation key changes
+#### `error_invalid_acs_location`
+
+The `error_invalid_acs_location` translation key has changed meaning. Previously it held the **error description** text. It now holds the **page title**.
+
+If you have overridden this key in your theme translations (`theme/{name}/translations/messages.*.php`), rename it to `error_invalid_acs_location_desc` and add a new `error_invalid_acs_location` entry for the page title.
+
+**Before:**
+```php
+'error_invalid_acs_location' => 'Your custom description text.',
+```
+
+**After:**
+```php
+'error_invalid_acs_location'      => 'Error - Invalid ACS location',
+'error_invalid_acs_location_desc' => 'Your custom description text.',
+```
+
+See https://github.com/OpenConext/OpenConext-engineblock/issues/1758
+
+
 ## UNRELEASED 7.2.0
 Upgrade to Symfony 7.4
 Upgrade to `doctrine/dbal` 4

languages/messages.en.php

@@ -176,11 +176,10 @@
     'error_authorization_policy_violation_desc_no_name' => 'You cannot use this service because your %organisationNoun% limits access to this service (the "Service Provider") with an authorization policy. Please contact the helpdesk of your %organisationNoun% if you think you should be allowed access to this service.',
     'error_authorization_policy_violation_info'       => 'Message from %idpName%: ',
     '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_location'    => 'Error - Invalid ACS location',
+    'error_invalid_acs_location_desc' => '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.',
     'error_unsupported_signature_method' => 'Error - Signature method is not supported',

languages/messages.nl.php

@@ -176,11 +176,10 @@
     'error_authorization_policy_violation_desc_no_name'       => 'Neem contact op met de helpdesk van je eigen %organisationNoun% als je toegang tot deze dienst wilt. Vermeld daarbij op welke dienst je probeerde in te loggen en dat je werd tegengehouden door een autorisatieregel van %suiteName%, geconfigureerd door jouw eigen %organisationNoun%.',
     'error_authorization_policy_violation_info'       => 'Bericht van %idpName%: ',
     '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_location'        => 'Fout - Ongeldige ACS locatie',
+    'error_invalid_acs_location_desc'   => '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.',
     'error_unsupported_signature_method' => 'Fout - Ondertekeningsmethode wordt niet ondersteund',

languages/messages.pt.php

@@ -174,11 +174,10 @@
     'error_authorization_policy_violation_desc_no_name'       => 'Você autenticu-se com sucesso na sua %organisationNoun%, mas infelizmente você não pode utilizar este serviço (o "Fornecedor de Serviço") porque não tem acesso. A sua %organisationNoun% limita o acesso a este serviço com uma política de autorização. Entre em contacto com o suporte da sua %organisationNoun% se acha que deve ser-lhe concedido acesso ao serviço.',
     'error_authorization_policy_violation_info'       => 'Mensagem da %idpName%: ',
     '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_location'    => 'Erro - Localização ACS inválida',
+    'error_invalid_acs_location_desc' => '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.',
     'error_unsupported_signature_method' => 'O método de assinatura não é suportado',

src/OpenConext/EngineBlockBundle/Controller/FeedbackController.php

@@ -139,6 +139,15 @@ public function __construct(
         ],
         methods: ['GET']
     )]
+    #[Route(
+        path: '/authentication/feedback/invalidAcsLocation',
+        name: 'authentication_feedback_invalid_acs_location',
+        defaults: [
+            'pageIdentifier' => 'invalid-acs-location',
+            'statusCode' => 400
+        ],
+        methods: ['GET']
+    )]
     public function feedbackAction(string $pageIdentifier, int $statusCode): Response
     {
         return new Response(
@@ -166,14 +175,6 @@ public function noIdpsAction()
         return new Response($this->twig->render('@theme/Authentication/View/Feedback/no-idps.html.twig'));
     }
 
-    #[Route(path: '/authentication/feedback/invalidAcsLocation', name: 'authentication_feedback_invalid_acs_location', methods: ['GET'])]
-    public function invalidAcsLocationAction()
-    {
-        return new Response(
-            $this->twig->render('@theme/Authentication/View/Feedback/invalid-acs-location.html.twig'),
-            400
-        );
-    }
 
     #[Route(
         path: '/authentication/feedback/unsupportedSignatureMethod',

src/OpenConext/EngineBlockFunctionalTestingBundle/Features/FeedbackFooters.feature

@@ -65,6 +65,10 @@ Feature:
     When I go to Engineblock URL "/authentication/feedback/stepup-callout-user-cancelled"
     Then I should see "Logging in cancelled"
 
+  Scenario: The invalid-acs-location feedback route renders correctly
+    When I go to Engineblock URL "/authentication/feedback/invalidAcsLocation"
+    Then I should see "Invalid ACS location"
+
   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

@@ -4,7 +4,8 @@
  # 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
+ #   error_stepup_callout_unknown, error_stepup_callout_user_cancelled,
+ #   error_invalid_acs_location
  #}
 {% set _key = 'error_' ~ pageIdentifier|replace({'-': '_'}) %}
 {% set pageTitle = (_key)|trans %}