Merge pull request #148 from kakao-tech-campus-2nd-step3/week10

[HOTFIX]
kakao-tech-campus-2nd-step3 · Nov 15, 2024 · 2fed890 · 2fed890
2 parents 9437c10 + 3d3984f
commit 2fed890
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/boomerang/src/main/java/boomerang/global/config/WebSocketConfig.java b/boomerang/src/main/java/boomerang/global/config/WebSocketConfig.java
@@ -30,6 +30,8 @@ public WebSocketConfig(JwtUtil jwtUtil, MemberService memberService, ChatRoomSer
     @Override
     public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
         registry.addHandler(new ChatWebSocketHandler(chatRoomService), "/ws/chat/*")
-                .addInterceptors(new WebSocketHandshakeInterceptor(jwtUtil, memberService, chatRoomService, consultationService));
+                .addInterceptors(new WebSocketHandshakeInterceptor(jwtUtil, memberService, chatRoomService, consultationService))
+                .setAllowedOrigins("http://localhost:8080", "http://localhost:5173", "http://54.252.224.76:80")
+                .withSockJS();
     }
 }
diff --git a/boomerang/src/main/java/boomerang/global/config/WebSocketStompBrokerConfig.java b/boomerang/src/main/java/boomerang/global/config/WebSocketStompBrokerConfig.java
@@ -35,12 +35,6 @@ public void registerStompEndpoints(StompEndpointRegistry registry) {
                 .addInterceptors(new JwtHandshakeInterceptor(jwtUtil))
                 .setHandshakeHandler(new WebSocketHandShakeHandler())
                 .withSockJS();
-
-        registry.addEndpoint("/ws/chat/{roomId}")
-                .setAllowedOrigins("http://localhost:8080", "http://localhost:5173", "http://54.252.224.76:80")
-                .addInterceptors(new JwtHandshakeInterceptor(jwtUtil))
-                .setHandshakeHandler(new WebSocketHandShakeHandler())
-                .withSockJS();
     }
 
 }