AUT-2042 Send post-logout-redirect-uri as query parameter when logging out

Author: Marten332

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

@@ -46,8 +46,6 @@ 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(
@@ -89,10 +87,6 @@ public ModelAndView dashboard(@AuthenticationPrincipal OidcUser oidcUser, Exampl
             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

@@ -97,9 +97,9 @@ private String endpointUri(HttpServletRequest request, URI endSessionEndpoint, S
             if (StringUtils.isNotEmpty(locale)) {
                 builder.queryParam(UI_LOCALES_PARAMETER, locale);
             }
-            if (postLogoutRedirectUri != null) {
-                builder.queryParam("post_logout_redirect_uri", postLogoutRedirectUri);
-            }
+        }
+        if (postLogoutRedirectUri != null) {
+            builder.queryParam("post_logout_redirect_uri", postLogoutRedirectUri);
         }
 
         return builder.encode(StandardCharsets.UTF_8)

src/main/resources/templates/dashboard.html

@@ -25,7 +25,6 @@
             <form method="post" th:action="@{/oauth/logout}" id="logoutFormPost">
                 <input type="hidden" th:id="id_token_hint" name="id_token_hint" th:value="${id_token}">
                 <input th:if="${ui_locales}" type="hidden" th:id="ui_locales" name="ui_locales" th:value="${ui_locales}">
-                <input th:if="${post_logout_redirect_uri}" type="hidden" th: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" value="Log out (POST)"/>
             </form>
         </li>