Resolved conflicts

2025-01-02 15:45:37 +05:30
parent cac4a7efac 3f72e09a26
commit 8220c709f4
158 changed files with 5895 additions and 1053 deletions
--- a/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/impl/AuthenticationService.java
@@ -208,8 +208,6 @@ public class AuthenticationService {
     public void logout(HttpServletRequest request, HttpServletResponse response) {  
    	Authentication auth = SecurityContextHolder.getContext().getAuthentication();
        if (auth != null) {
-            String token = tokenProvider.extractTokenFromRequest(request);
-            tokenProvider.invalidateToken(token);
            new SecurityContextLogoutHandler().logout(request, response, auth);
        }
        SecurityContextHolder.getContext().setAuthentication(null);