diff --git a/src/main/java/ei/algobaroapi/domain/chat/controller/SignallingController.java b/src/main/java/ei/algobaroapi/domain/chat/controller/SignallingController.java index 8b5dde6..f6f8cb4 100644 --- a/src/main/java/ei/algobaroapi/domain/chat/controller/SignallingController.java +++ b/src/main/java/ei/algobaroapi/domain/chat/controller/SignallingController.java @@ -15,7 +15,7 @@ public class SignallingController { @MessageMapping("/peer/offer/{camKey}/{roomShortUuid}") - @SendTo("/topic/peer/offer/{camKey}/{roomShortUuid}") + @SendTo("/subscription/peer/offer/{camKey}/{roomShortUuid}") public String peerHandleOffer( @Payload String offer, @Header("Authorization") String authorization, @@ -29,7 +29,7 @@ public String peerHandleOffer( //iceCandidate 정보를 주고 받기 위한 webSocket //camKey : 각 요청하는 캠의 key , roomShortUuid : 룸 아이디 @MessageMapping("/peer/iceCandidate/{camKey}/{roomShortUuid}") - @SendTo("/topic/peer/iceCandidate/{camKey}/{roomShortUuid}") + @SendTo("/subscription/peer/iceCandidate/{camKey}/{roomShortUuid}") public String peerHandleIceCandidate( @Payload String candidate, @Header("Authorization") String authorization, @@ -42,7 +42,7 @@ public String peerHandleIceCandidate( // @MessageMapping("/peer/answer/{camKey}/{roomShortUuid}") - @SendTo("/topic/peer/answer/{camKey}/{roomShortUuid}") + @SendTo("/subscription/peer/answer/{camKey}/{roomShortUuid}") public String peerHandleAnswer( @Payload String answer, @Header("Authorization") String authorization, @@ -55,7 +55,7 @@ public String peerHandleAnswer( //camKey 를 받기위해 신호를 보내는 webSocket @MessageMapping("/call/key") - @SendTo("/topic/call/key") + @SendTo("/subscription/call/key") public String callKey( @Payload String message, @Header("Authorization") String authorization @@ -66,7 +66,7 @@ public String callKey( //자신의 camKey 를 모든 연결된 세션에 보내는 webSocket @MessageMapping("/send/key") - @SendTo("/topic/send/key") + @SendTo("/subscription/send/key") public String sendKey( @Payload String message, @Header("Authorization") String authorization diff --git a/src/main/java/ei/algobaroapi/global/socket/WebSocketChannelInterceptor.java b/src/main/java/ei/algobaroapi/global/socket/WebSocketChannelInterceptor.java index 5aee478..7ffe6ed 100644 --- a/src/main/java/ei/algobaroapi/global/socket/WebSocketChannelInterceptor.java +++ b/src/main/java/ei/algobaroapi/global/socket/WebSocketChannelInterceptor.java @@ -41,8 +41,7 @@ public Message preSend(Message message, MessageChannel channel) { } private String extractToken(StompHeaderAccessor accessor) { -// String authorization = accessor.getFirstNativeHeader(AUTHORIZATION_HEADER); - String authorization = "Bearer eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ0bmd1c0BuYXZlci5jb20iLCJyb2xlcyI6WyJST0xFX1VTRVIiXSwiaWF0IjoxNzEzNzU4ODUxLCJleHAiOjE3MTYzNTA4NTF9.5B7899g1Q6A99EeZVRRUHWTeZaaQ8L2SSEOqTtomeFI"; + String authorization = accessor.getFirstNativeHeader(AUTHORIZATION_HEADER); if (authorization == null) { log.warn("토큰이 null 입니다."); throw new IllegalArgumentException("token is null");