✨ feat: 웹소켓 연결 시, 사용자 정보 주입 (#68)

* ✨ feat: 핸드쉐이크 추가

* ✨ feat: StompHeaderAccessor로 사용자 정보 추출

* chore: Java 스타일 수정

* ♻️  refactor: roomService에서 웹소켓을 통한 Player 객체 생성 로직 변경

* chore: Java 스타일 수정

* ♻️ refactor: roomServiceTests 로직 변경

* chore: Java 스타일 수정

* ♻️ refactor: authentication 추가

* chore: Java 스타일 수정

---------

Co-authored-by: github-actions <>

Author: LimKangHyun

backend/src/main/java/io/f1/backend/domain/game/app/RoomService.java

@@ -37,6 +37,7 @@
 import io.f1.backend.domain.question.entity.Question;
 import io.f1.backend.domain.quiz.app.QuizService;
 import io.f1.backend.domain.quiz.entity.Quiz;
+import io.f1.backend.domain.user.dto.UserPrincipal;
 import io.f1.backend.global.exception.CustomException;
 import io.f1.backend.global.exception.errorcode.RoomErrorCode;
 
@@ -116,11 +117,12 @@ public void enterRoom(RoomValidationRequest request) {
         }
     }
 
-    public RoomInitialData initializeRoomSocket(Long roomId, String sessionId) {
+    public RoomInitialData initializeRoomSocket(
+            Long roomId, String sessionId, UserPrincipal principal) {
 
         Room room = findRoom(roomId);
 
-        Player player = createPlayer();
+        Player player = createPlayer(principal);
 
         Map<String, Player> playerSessionMap = room.getPlayerSessionMap();
         Map<Long, String> userIdSessionMap = room.getUserIdSessionMap();
@@ -157,7 +159,7 @@ public RoomInitialData initializeRoomSocket(Long roomId, String sessionId) {
                 systemNoticeResponse);
     }
 
-    public RoomExitData exitRoom(Long roomId, String sessionId) {
+    public RoomExitData exitRoom(Long roomId, String sessionId, UserPrincipal principal) {
 
         Object lock = roomLocks.computeIfAbsent(roomId, k -> new Object());
 
@@ -166,7 +168,7 @@ public RoomExitData exitRoom(Long roomId, String sessionId) {
 
             String destination = getDestination(roomId);
 
-            Player removePlayer = getRemovePlayer(room, sessionId);
+            Player removePlayer = getRemovePlayer(room, sessionId, principal);
 
             /* 방 삭제 */
             if (isLastPlayer(room, sessionId)) {
@@ -251,10 +253,10 @@ public RoundResult chat(Long roomId, String sessionId, ChatMessage chatMessage)
                 .build();
     }
 
-    private Player getRemovePlayer(Room room, String sessionId) {
+    private Player getRemovePlayer(Room room, String sessionId, UserPrincipal principal) {
         Player removePlayer = room.getPlayerSessionMap().get(sessionId);
         if (removePlayer == null) {
-            room.removeUserId(getCurrentUserId());
+            room.removeUserId(principal.getUserId());
             throw new CustomException(RoomErrorCode.SOCKET_SESSION_NOT_FOUND);
         }
         return removePlayer;
@@ -264,6 +266,10 @@ private static String getDestination(Long roomId) {
         return "/sub/room/" + roomId;
     }
 
+    private Player createPlayer(UserPrincipal principal) {
+        return new Player(principal.getUserId(), principal.getUserNickname());
+    }
+
     private Player createPlayer() {
         return new Player(getCurrentUserId(), getCurrentUserNickname());
     }

backend/src/main/java/io/f1/backend/domain/game/websocket/GameSocketController.java

@@ -11,13 +11,15 @@
 import io.f1.backend.domain.game.dto.RoundResult;
 import io.f1.backend.domain.game.dto.request.DefaultWebSocketRequest;
 import io.f1.backend.domain.game.dto.request.GameStartRequest;
+import io.f1.backend.domain.user.dto.UserPrincipal;
 
 import lombok.RequiredArgsConstructor;
 
 import org.springframework.messaging.Message;
 import org.springframework.messaging.handler.annotation.DestinationVariable;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
+import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Controller;
 
 @Controller
@@ -33,8 +35,10 @@ public void initializeRoomSocket(@DestinationVariable Long roomId, Message<?> me
 
         String websocketSessionId = getSessionId(message);
 
+        UserPrincipal principal = getSessionUser(message);
+
         RoomInitialData roomInitialData =
-                roomService.initializeRoomSocket(roomId, websocketSessionId);
+                roomService.initializeRoomSocket(roomId, websocketSessionId, principal);
         String destination = roomInitialData.destination();
 
         messageSender.send(
@@ -51,8 +55,9 @@ public void initializeRoomSocket(@DestinationVariable Long roomId, Message<?> me
     public void exitRoom(@DestinationVariable Long roomId, Message<?> message) {
 
         String websocketSessionId = getSessionId(message);
+        UserPrincipal principal = getSessionUser(message);
 
-        RoomExitData roomExitData = roomService.exitRoom(roomId, websocketSessionId);
+        RoomExitData roomExitData = roomService.exitRoom(roomId, websocketSessionId, principal);
 
         String destination = roomExitData.getDestination();
 
@@ -110,4 +115,10 @@ private static String getSessionId(Message<?> message) {
         StompHeaderAccessor accessor = StompHeaderAccessor.wrap(message);
         return accessor.getSessionId();
     }
+
+    private static UserPrincipal getSessionUser(Message<?> message) {
+        StompHeaderAccessor accessor = StompHeaderAccessor.wrap(message);
+        Authentication auth = (Authentication) accessor.getUser();
+        return (UserPrincipal) auth.getPrincipal();
+    }
 }

backend/src/main/java/io/f1/backend/global/config/WebSocketConfig.java

@@ -8,6 +8,7 @@
 import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
 import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
 import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+import org.springframework.web.socket.server.support.HttpSessionHandshakeInterceptor;
 
 @Configuration
 @RequiredArgsConstructor
@@ -18,7 +19,9 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
 
     @Override
     public void registerStompEndpoints(StompEndpointRegistry registry) {
-        registry.addEndpoint("/ws/game-room").setAllowedOriginPatterns("*");
+        registry.addEndpoint("/ws/game-room")
+                .addInterceptors(new HttpSessionHandshakeInterceptor())
+                .setAllowedOriginPatterns("*");
     }
 
     @Override

backend/src/test/java/io/f1/backend/domain/game/app/RoomServiceTests.java

@@ -11,6 +11,7 @@
 import io.f1.backend.domain.game.model.RoomSetting;
 import io.f1.backend.domain.game.store.RoomRepository;
 import io.f1.backend.domain.quiz.app.QuizService;
+import io.f1.backend.domain.user.dto.UserPrincipal;
 import io.f1.backend.domain.user.entity.User;
 import io.f1.backend.global.util.SecurityUtils;
 
@@ -29,6 +30,7 @@
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
@@ -142,9 +144,11 @@ void exitRoom_synchronized() throws Exception {
             executorService.submit(
                     () -> {
                         try {
+                            UserPrincipal principal =
+                                    new UserPrincipal(user, Collections.emptyMap());
                             SecurityUtils.setAuthentication(user);
                             log.info("room.getHost().getId() = {}", room.getHost().getId());
-                            roomService.exitRoom(roomId, sessionId);
+                            roomService.exitRoom(roomId, sessionId, principal);
                         } catch (Exception e) {
                             e.printStackTrace();
                         } finally {