chore: /chat endpoint에 대해 jwt token verify를 skip하라

Me1tingPot · Jun 30, 2024 · 6fa622b · 6fa622b
1 parent 52a6272
commit 6fa622b
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/main/java/meltingpot/server/chat/service/WebSocketService.java b/src/main/java/meltingpot/server/chat/service/WebSocketService.java
@@ -18,16 +18,19 @@
 import meltingpot.server.exception.ResourceNotFoundException;
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
 import static meltingpot.server.util.ResponseCode.*;
 
 @Service
-@Transactional(readOnly = true)
+@Transactional
 @RequiredArgsConstructor
 public class WebSocketService {
     private final ChatMessageRepository chatMessageRepository;
@@ -121,19 +124,21 @@ private void sendNotification(Account account, ChatMessage chatMessage) {
     }
 
     public SocketSession onConnect(MessageHeaders headers) {
-        Object attributes = headers.get("simpSessionAttributes");
-        Object sessionId = headers.get("simpSessionId");
+        UsernamePasswordAuthenticationToken user = (UsernamePasswordAuthenticationToken) headers.get("simpUser");
+        String simpSessionId = headers.get("simpSessionId").toString();
 
-        if (attributes == null || sessionId == null) {
+        if (user == null) {
             throw new BadRequestException(SOCKET_CONNECT_HEADER_CHECK_FAIL);
         } else {
-            String username = attributes.toString().split("username=")[1].split("}")[0];
-            Long chatRoomId = Long.parseLong(attributes.toString().split("chatRoomId=")[1].split(",")[0]);
+            UserDetails attributes = (UserDetails) user.getPrincipal();
+
+            String username = attributes.getUsername();
+//            Long chatRoomId = Long.parseLong(attributes.toString().split("chatRoomId=")[1].split(",")[0]);
 
             SocketSession newSocketSession = SocketSession.builder()
-                    .sessionId(sessionId.toString())
+                    .sessionId(simpSessionId)
                     .username(username)
-                    .chatRoomId(chatRoomId)
+                    .chatRoomId(1l)
                     .build();
 
             return socketSessionRepository.save(newSocketSession);