Revize 9ec6ad3a

re #41 custom logout endpoint

server/src/main/java/org/danekja/ymanager/WebSecurityConfiguration.java

@@ -37 +37 @@
     protected void configure(HttpSecurity http) throws Exception {
         http.cors()
                 .and()
-                .csrf().disable()
-                .authorizeRequests()
+            .csrf().disable()
+            .logout().disable()
+            .authorizeRequests()
                 .mvcMatchers("/login/*").permitAll()
                 .anyRequest().authenticated()
                 .and()
-                .exceptionHandling().authenticationEntryPoint(restAuthenticationEntryPoint)
+            .exceptionHandling()
+                .authenticationEntryPoint(restAuthenticationEntryPoint)
                 .and()
-                .oauth2Login()
+            .oauth2Login()
                 .userInfoEndpoint().oidcUserService(googleOauthUserService);
     }
 

server/src/main/java/org/danekja/ymanager/ws/rest/LoginController.java

@@ -2 +2 @@
 
 import org.danekja.ymanager.business.AuthorizationService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.logout.LogoutHandler;
+import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 import org.springframework.security.web.savedrequest.HttpSessionRequestCache;
 import org.springframework.security.web.savedrequest.RequestCache;
 import org.springframework.stereotype.Controller;
@@ -18 +22 @@
     @Autowired
     private AuthorizationService authorizationService;
 
-    private RequestCache requestCache = new HttpSessionRequestCache();
+    private final RequestCache requestCache = new HttpSessionRequestCache();
+    private final LogoutHandler logoutHandler = new SecurityContextLogoutHandler();
 
     /**
      * Hackity way of providing connecting apps with means to say where to redirect after login.
@@ -51 +56 @@
 
         }
     }
+
+    @GetMapping("logout")
+    public void logout(HttpServletRequest request, HttpServletResponse response) {
+        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+        if (auth != null) {
+            logoutHandler.logout(request, response, auth);
+        }
+    }
 }