Merge pull request #3 from Magmusacy/messages

Add live displaying of logged in users

Author: Magmusacy

backend/chatapp/src/main/java/com/magmusacy/chat/chatapp/auth/AuthService.java

@@ -23,12 +23,10 @@ public class AuthService {
     private final JwtService jwtService;
     private final AuthenticationManager authenticationManager;
     private final PasswordEncoder passwordEncoder;
-    private final SimpMessagingTemplate messagingTemplate;
 
     public AuthenticationResponse register(RegisterRequest request) {
         User user = userService.createUser(request, passwordEncoder);
         String jwtToken = jwtService.generateToken(user);
-        messagingTemplate.convertAndSend("/topic/users", userService.findAllUsers());
         return new AuthenticationResponse((jwtToken));
     }
 
@@ -38,9 +36,7 @@ public AuthenticationResponse login(LoginRequest request) {
         );
 
         User user = userService.findByEmail(request.email());
-        user.setIsOnline(true);
         String jwtToken = jwtService.generateToken(user);
-        messagingTemplate.convertAndSend("/topic/users", userService.findAllUsers());
         return new AuthenticationResponse((jwtToken));
     }
 }

backend/chatapp/src/main/java/com/magmusacy/chat/chatapp/config/JwtInterceptor.java

@@ -42,9 +42,6 @@ public Message<?> preSend(Message<?> message, MessageChannel channel) {
                                 userDetails, null, userDetails.getAuthorities()
                         );
 
-                        User user = userService.findByEmail(username);
-                        userService.handleUserLogin(user);
-
 //                       This could be authToken.getPrincipal() ???
                         accessor.setUser(authToken);
                     }
@@ -54,14 +51,6 @@ public Message<?> preSend(Message<?> message, MessageChannel channel) {
             }
         }
 
-        if (StompCommand.DISCONNECT.equals(accessor.getCommand())) {
-            Principal potentialUser = accessor.getUser();
-            if (potentialUser != null) {
-                User user = userService.findByEmail(potentialUser.getName());
-                userService.handleUserLogout(user);
-            }
-        }
-
         return message;
     }
 }

backend/chatapp/src/main/java/com/magmusacy/chat/chatapp/config/WebSocketConfig.java

@@ -24,7 +24,7 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
 
     @Override
     public void configureMessageBroker(MessageBrokerRegistry config) {
-        config.enableSimpleBroker("/user", "/topic");
+        config.enableSimpleBroker("/queue", "/topic");
         config.setApplicationDestinationPrefixes("/app");
         config.setUserDestinationPrefix("/user");
     }

backend/chatapp/src/main/java/com/magmusacy/chat/chatapp/config/WebSocketEventListener.java

@@ -0,0 +1,51 @@
+package com.magmusacy.chat.chatapp.config;
+
+import com.magmusacy.chat.chatapp.user.User;
+import com.magmusacy.chat.chatapp.user.UserDTO;
+import com.magmusacy.chat.chatapp.user.UserService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.event.EventListener;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.messaging.SessionConnectEvent;
+import org.springframework.web.socket.messaging.SessionDisconnectEvent;
+import org.springframework.web.socket.messaging.SessionSubscribeEvent;
+
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+public class WebSocketEventListener {
+    private final UserService userService;
+    private final SimpMessagingTemplate messagingTemplate;
+
+    @EventListener
+    public void handleWebSocketConnectListener(SessionConnectEvent event) {
+        System.out.println(event);
+        String email = event.getUser().getName();
+        User user = userService.findByEmail(email);
+        userService.handleUserLogin(user);
+        List<UserDTO> users = userService.findAllUsers();
+        messagingTemplate.convertAndSend("/topic/users", users);
+    }
+
+    @EventListener
+    public void handleWebSocketDisconnectListener(SessionDisconnectEvent event) {
+        System.out.println(event);
+        String email = event.getUser().getName();
+        User user = userService.findByEmail(email);
+        userService.handleUserLogout(user);
+        List<UserDTO> users = userService.findAllUsers();
+        messagingTemplate.convertAndSend("/topic/users", users);
+    }
+
+    @EventListener
+    public void handleWebSocketSubscribeListener(SessionSubscribeEvent event) {
+        String destination = (String) event.getMessage().getHeaders().get("simpDestination");
+        if (destination != null && destination.startsWith("/user/queue/users")) {
+            List<UserDTO> users = userService.findAllUsers();
+            if (event.getUser() == null) return;
+            messagingTemplate.convertAndSendToUser(event.getUser().getName(), "/queue/users", users);
+        }
+    }
+}

backend/chatapp/src/main/java/com/magmusacy/chat/chatapp/user/User.java

@@ -26,7 +26,7 @@ public class User implements UserDetails {
     private String email;
     private String name;
     private String password;
-    private Boolean isOnline;
+    private Boolean isOnline = false;
     private LocalDateTime lastSeen;
 
     @Transient

backend/chatapp/src/main/java/com/magmusacy/chat/chatapp/user/UserController.java

@@ -3,14 +3,9 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.http.ResponseEntity;
-import org.springframework.messaging.handler.annotation.MessageMapping;
-import org.springframework.messaging.handler.annotation.Payload;
-import org.springframework.messaging.handler.annotation.SendTo;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 
-import java.util.List;
-
 @Controller
 @RequiredArgsConstructor
 public class UserController {

backend/chatapp/src/main/java/com/magmusacy/chat/chatapp/user/UserService.java

@@ -2,6 +2,7 @@
 
 import com.magmusacy.chat.chatapp.auth.dto.RegisterRequest;
 import lombok.RequiredArgsConstructor;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
@@ -16,7 +17,6 @@
 @Service
 @RequiredArgsConstructor
 public class UserService implements UserDetailsService {
-
     private final UserRepository userRepository;
 
     public User createUser(RegisterRequest request, PasswordEncoder passwordEncoder) {