Use MDUI entries for description & information URL (#19)

* Use MDUI entries for description & information URL

* Remove legacy `url.about` and `descr_purpose` options

Author: ghalse

docs/consent.md

@@ -194,7 +194,8 @@ The following options can be used when configuring the Consent module:
 
 `showNoConsentAboutService`
 :   Whether we will show a link to more information about the service from the
-    no consent page (configured in the SP metadata as `url.about`). Defaults to `true`.
+    no consent page (configured in the SP metadata as the MDUI `InformationURL`).
+    Defaults to `true`.
 
 ### External options
 

src/Controller/ConsentController.php

@@ -185,7 +185,12 @@ public function getconsent(Request $request)
         $t->data['stateId'] = $stateId;
         $t->data['source'] = $state['Source'];
         $t->data['destination'] = $state['Destination'];
-        $t->data['descr_purpose'] = $t->getEntityPropertyTranslation('descr_purpose', $state['Destination']);
+
+        if (isset($state['Destination']['description'])) {
+            $t->data['descr_purpose'] = $state['Destination']['description'];
+        } elseif (isset($state['Destination']['UIInfo']['Description'])) {
+            $t->data['descr_purpose'] = $state['Destination']['UIInfo']['Description'];
+        }
 
         // Fetch privacy policy
         if (
@@ -260,8 +265,8 @@ public function noconsent(Request $request): Template
 
         $aboutService = null;
         if (!isset($state['consent:showNoConsentAboutService']) || $state['consent:showNoConsentAboutService']) {
-            if (isset($state['Destination']['url.about'])) {
-                $aboutService = $state['Destination']['url.about'];
+            if (isset($state['Destination']['UIInfo']['InformationURL'])) {
+                $aboutService = reset($state['Destination']['UIInfo']['InformationURL']);
             }
         }
 

templates/consentform.twig

@@ -9,7 +9,7 @@
 <p>{{ '%SPNAME% requires that the information below is transferred.'|trans({'%SPNAME%': destination|entityDisplayName() }) }}</p>
 
 {% if descr_purpose is defined and descr_purpose != "" %}
-    <p>{{ 'The purpose of %SPNAME% is %SPDESC%'|trans({'%SPNAME%': destination|entityDisplayName(), '%SPDESC%': descr_purpose }) }}</p>
+    <p>{{ 'The purpose of %SPNAME% is %SPDESC%'|trans({'%SPNAME%': destination|entityDisplayName(), '%SPDESC%': descr_purpose|translateFromArray }) }}</p>
 {% endif %}
 
 <form id="consent_yes" action="{{ moduleURL('consent/getconsent') }}" method="GET">

tests/src/Controller/ConsentControllerTest.php

@@ -172,7 +172,9 @@ public static function loadState(string $id, string $stage, bool $allowMissing =
                     'Destination' => [
                         'entityid' => 'urn:some:sp',
                         'name' => 'Some destination',
-                        'url.about' => 'https://example.org/about',
+                        'UIInfo' =>[
+                            'InformationURL' => ['https://example.org/about' ],
+                        ],
                     ],
                 ];
             }