#558: Use js to fetch 4xx logout url

CHANGELOG.md

@@ -8,6 +8,7 @@ Nedenfor ses dato for release og beskrivelse af opgaver som er implementeret.
 
 * Opdaterede til [OS2Forms Organisation
   2.0.1](https://github.com/itk-dev/os2forms_organisation/releases/tag/2.0.1).
+* Opdaterede 4xx page logout link
 
 ## [2.7.3] 2024-01-16
 

README.md

@@ -148,7 +148,7 @@ environment, as its data contains personal data.
 
 If developers need an actual database for local development, the stg-environment
 can be made ready for download by ensuring that you delete all submissions and
-other informations that can have personal character, before downloading.
+other information that can have personal character, before downloading.
 
 ## Coding standards
 

web/themes/custom/os2forms_selvbetjening_theme/assets/logout-suggestion.js

@@ -0,0 +1,19 @@
+window.addEventListener('load', function () {
+  const elem = document.getElementById('logout_suggestion')
+  let url = elem.getAttribute('href')
+  url = replaceUrlParam(url, 'destination', window.location.pathname)
+  elem.setAttribute('href', url)
+}, false)
+
+// @see https://stackoverflow.com/a/20420424
+function replaceUrlParam (url, paramName, paramValue) {
+  if (paramValue == null) {
+    paramValue = ''
+  }
+  const pattern = new RegExp('\\b(' + paramName + '=).*?(&|#|$)')
+  if (url.search(pattern) >= 0) {
+    return url.replace(pattern, '$1' + paramValue + '$2')
+  }
+  url = url.replace(/[?#]$/, '')
+  return url + (url.indexOf('?') > 0 ? '&' : '?') + paramName + '=' + paramValue
+}

web/themes/custom/os2forms_selvbetjening_theme/os2forms_selvbetjening_theme.libraries.yml

@@ -3,3 +3,8 @@ global-styling:
   css:
     theme:
       build/app.css: {}
+
+logout-suggestion:
+  version: 1.x
+  js:
+    assets/logout-suggestion.js: {}

web/themes/custom/os2forms_selvbetjening_theme/os2forms_selvbetjening_theme.theme

@@ -8,5 +8,4 @@
 function os2forms_selvbetjening_theme_preprocess_page(&$variables): void {
   $variables['site_logo'] = theme_get_setting('logo.url');
   $variables['site_name'] = \Drupal::config('system.site')->get('name');
-  $variables['request_uri'] = \Drupal::service('request_stack')->getCurrentRequest()->getRequestUri();
 }

web/themes/custom/os2forms_selvbetjening_theme/templates/page/page--4xx.html.twig

@@ -2,11 +2,13 @@
 
 {# Content #}
 {% block page_content %}
+  {{ attach_library('os2forms_selvbetjening_theme/logout-suggestion') }}
+
   {{ page.content }}
   {% if logged_in %}
     <p>
-      {% set url = path('user.logout', {destination: request_uri}) %}
-      {{ 'Here is a suggestion to what you can do. Try to log out of <a href=":url">@siteName</a>'|t({':url': url, '@siteName': site_name}) }}
+      {% set url = path('user.logout') %}
+      {{ 'Here is a suggestion to what you can do. Try to log out of <a id="logout_suggestion" href=":url">@siteName</a>'|t({':url': url, '@siteName': site_name}) }}
     </p>
   {% endif %}
 {% endblock %}