Redirect back to sample app home page when user logs out

Author: Chris Dutra

Diff for: authcode/src/main/java/org/cloudfoundry/identity/samples/authcode/Application.java

@@ -1,6 +1,7 @@
 package org.cloudfoundry.identity.samples.authcode;
 
 import java.io.IOException;
+import java.net.URL;
 import java.util.Arrays;
 import java.util.Map;
 
@@ -55,6 +56,8 @@ public static void main(String[] args) {
     // property set by spring-cloud-sso-connector
     @Value("${ssoServiceUrl:placeholder}")
     private String ssoServiceUrl;
+    @Value("${security.oauth2.client.clientId}")
+    private String clientId;
 
     @Autowired(required = false)
     private OAuth2RestTemplate oauth2RestTemplate;
@@ -81,16 +84,15 @@ public String index() {
     }
 
     @RequestMapping("/authorization_code")
-    public String authCode(Model model) throws Exception {
+    public String authCode(Model model, HttpServletRequest request) throws Exception {
         if (ssoServiceUrl.equals("placeholder")) {
             model.addAttribute("header", "Warning: You need to bind to the SSO service.");
             model.addAttribute("warning", "Please bind your app to restore regular functionality");
             return "configure_warning";
         }
-        Map<?,?> userInfoResponse = oauth2RestTemplate.getForObject("{ssoServiceUrl}/userinfo", Map.class,
-                ssoServiceUrl);
+        Map<?,?> userInfoResponse = oauth2RestTemplate.getForObject("{ssoServiceUrl}/userinfo", Map.class, ssoServiceUrl);
         model.addAttribute("ssoServiceUrl",ssoServiceUrl);
-        model.addAttribute("response",toPrettyJsonString(userInfoResponse));
+        model.addAttribute("response", toPrettyJsonString(userInfoResponse));
 
         OAuth2AccessToken accessToken = oauth2RestTemplate.getOAuth2ClientContext().getAccessToken();
         if (accessToken != null) {
@@ -101,12 +103,14 @@ public String authCode(Model model) throws Exception {
     }
 
     @RequestMapping(value="/logout", method = GET)
-    public String logout(HttpServletRequest request, HttpServletResponse response) {
+    public String logout(HttpServletRequest request, HttpServletResponse response) throws IOException {
         Authentication auth = SecurityContextHolder.getContext().getAuthentication();
         if (auth != null){
             new SecurityContextLogoutHandler().logout(request, response, auth);
         }
-        return "redirect:" + ssoServiceUrl + "/logout.do";
+        URL url = new URL(request.getRequestURL().toString());
+        String urlStr = url.getProtocol() + "://" + url.getAuthority();
+        return "redirect:" + ssoServiceUrl + "/logout.do?redirect=" + urlStr + "&clientId=" + clientId;
     }
 
     private Map<String, ?> parseToken(String base64Token) throws IOException {

Diff for: authcode/src/main/resources/templates/authorization_code.html

@@ -28,7 +28,5 @@ <h2>What do you want to do?</h2>
     </li>
   </ul>
 
-
-
 </body>
 </html>

Diff for: implicit/src/main/resources/public/app.jsx

@@ -21,8 +21,8 @@ var ExampleApplication = React.createClass({
 
   render() {
     var page = null;
+    var clientId = document.getElementById("clientId").content;
     if (window.location.pathname === "/") {
-      var clientId = document.getElementById("clientId").content;
       if (clientId === "client_id_placeholder") {
         page = (
           <div>
@@ -52,7 +52,8 @@ var ExampleApplication = React.createClass({
       var token = this.prettyToken(this.getFragment("access_token"));
       var tokenType = this.getFragment("token_type");
       var profileUrl = ssoServiceUrl + '/profile';
-      var logoutUrl = ssoServiceUrl + '/logout.do';
+      const urlStr = window.location.protocol + '//' + window.location.host;
+      var logoutUrl = ssoServiceUrl + '/logout.do' + '?redirect=' + urlStr + '&client_id=' + clientId;
       page = (<div>
         <h1>Implicit sample</h1>
         <p>The server only saw a request for /implicit.html. Everything after the # in the address bar is stuff that only your browser can see.</p>
@@ -76,7 +77,7 @@ var ExampleApplication = React.createClass({
             <a id="profile" target="uaa" href={profileUrl}>See your account profile on UAA (so you can de-authorize this client)</a>
           </li>
           <li>
-            <a id="logout" target="uaa" href={logoutUrl}>Log out of UAA</a>
+            <a id="logout" href={logoutUrl}>Log out of UAA</a>
           </li>
         </ul>
       </div>);