AUT-2094 Send ui_locales and post_logout_redirect_uri as form parameters when using POST logout in govsso mode

Author: Marten332

src/main/java/ee/ria/govsso/client/controller/ClientController.java

@@ -46,6 +46,8 @@ public class ClientController {
     private String applicationIntroLong;
     @Value("${example-client.messages.info-service}")
     private String applicationInfoService;
+    @Value("${govsso.post-logout-redirect-uri}")
+    private String postLogoutRedirectUri;
 
     @GetMapping(value = LOGIN_VIEW_MAPPING, produces = MediaType.TEXT_HTML_VALUE)
     public ModelAndView clientLoginView(
@@ -83,6 +85,14 @@ public ModelAndView dashboard(@AuthenticationPrincipal OidcUser oidcUser, Exampl
             if (AccessTokenUtil.isJwtAccessToken(accessToken)) {
                 model.addObject("access_token", accessToken);
             }
+            String locale = LogoutUtil.getUiLocale(request);
+            if (locale != null) {
+                model.addObject("ui_locales", locale);
+            }
+            String postLogoutRedirectUri = LogoutUtil.postLogoutRedirectUri(request, this.postLogoutRedirectUri);
+            if (postLogoutRedirectUri != null) {
+                model.addObject("post_logout_redirect_uri", postLogoutRedirectUri);
+            }
         }
 
         log.info("Showing dashboard for subject='{}'", oidcUser.getSubject());

src/main/java/ee/ria/govsso/client/govsso/oauth2/GovssoClientInitiatedLogoutSuccessHandler.java

@@ -94,12 +94,12 @@ private String endpointUri(HttpServletRequest request, URI endSessionEndpoint, S
 
         if (request.getMethod().equals(HttpMethod.GET.name())) {
             builder.queryParam("id_token_hint", idToken);
-        }
-        if (StringUtils.isNotEmpty(locale)) {
-            builder.queryParam(UI_LOCALES_PARAMETER, locale);
-        }
-        if (postLogoutRedirectUri != null) {
-            builder.queryParam("post_logout_redirect_uri", postLogoutRedirectUri);
+            if (StringUtils.isNotEmpty(locale)) {
+                builder.queryParam(UI_LOCALES_PARAMETER, locale);
+            }
+            if (postLogoutRedirectUri != null) {
+                builder.queryParam("post_logout_redirect_uri", postLogoutRedirectUri);
+            }
         }
 
         return builder.encode(StandardCharsets.UTF_8)

src/main/resources/templates/dashboard.html

@@ -24,8 +24,10 @@
         <li class="nav-item px-1 text-nowrap">
             <form method="post" th:action="@{/oauth/logout}" id="logoutFormPost">
                 <input  th:if="${authentication_provider == 'govsso'}"
-                        type="hidden" th:id="id_token_hint"
+                        type="hidden" id="id_token_hint"
                         name="id_token_hint" th:value="${id_token}">
+                <input th:if="${ui_locales}" type="hidden" id="ui_locales" name="ui_locales" th:value="${ui_locales}">
+                <input th:if="${post_logout_redirect_uri}" type="hidden" id="post_logout_redirect_uri" name="post_logout_redirect_uri" th:value="${post_logout_redirect_uri}">
                 <input class="btn btn-outline-secondary" name="logout_button" type="submit"
                        th:value="${authentication_provider == 'govsso' ? 'Log out (POST)' : 'Log out'}"/>
             </form>