Skip to content

Commit 8f9d963

Browse files
committed
[BE] refactor: filter에서 users 반환 취소 (#98)
Signed-off-by: EunJiJung <bianbbc87@gmail.com>
1 parent 936ea47 commit 8f9d963

File tree

3 files changed

+9
-23
lines changed

3 files changed

+9
-23
lines changed

src/backend/signaling-server/src/main/java/com/asyncgate/signaling_server/config/KurentoConfig.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,17 @@ public class KurentoConfig implements WebSocketMessageBrokerConfigurer {
3636
private final FilterChannelInterceptor filterChannelInterceptor;
3737
private final WebSocketHandshakeInterceptor webSocketHandshakeInterceptor;
3838

39+
@Lazy
40+
private final SimpMessagingTemplate messagingTemplate;
3941
private final WebClientUtil webClientUtil;
4042

4143
public KurentoConfig(FilterChannelInterceptor filterChannelInterceptor,
4244
WebSocketHandshakeInterceptor webSocketHandshakeInterceptor,
45+
@Lazy SimpMessagingTemplate messagingTemplate,
4346
WebClientUtil webClientUtil) {
4447
this.filterChannelInterceptor = filterChannelInterceptor;
4548
this.webSocketHandshakeInterceptor = webSocketHandshakeInterceptor;
49+
this.messagingTemplate = messagingTemplate;
4650
this.webClientUtil = webClientUtil;
4751
}
4852

@@ -56,12 +60,10 @@ public MemberServiceClient memberServiceClient() {
5660
return new MemberServiceClient(webClientUtil);
5761
}
5862

59-
/*
6063
@Bean
6164
public KurentoManager kurentoManager(KurentoClient kurentoClient, MemberServiceClient memberServiceClient) {
6265
return new KurentoManager(kurentoClient, memberServiceClient, messagingTemplate);
6366
}
64-
*/
6567

6668
@Bean
6769
public KurentoHandler kurentoHandler(KurentoManager kurentoManager) {

src/backend/signaling-server/src/main/java/com/asyncgate/signaling_server/security/filter/FilterChannelInterceptor.java

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
import com.asyncgate.signaling_server.security.constant.Constants;
44
import com.asyncgate.signaling_server.security.utility.JsonWebTokenUtil;
5-
import com.asyncgate.signaling_server.signaling.KurentoManager;
65
import io.jsonwebtoken.Claims;
76
import org.slf4j.Logger;
87
import org.slf4j.LoggerFactory;
9-
import org.springframework.context.annotation.Lazy;
108
import org.springframework.http.HttpStatus;
119
import org.springframework.messaging.Message;
1210
import org.springframework.messaging.MessageChannel;
@@ -21,17 +19,11 @@ public class FilterChannelInterceptor implements ChannelInterceptor {
2119

2220
private static final Logger log = LoggerFactory.getLogger(FilterChannelInterceptor.class);
2321
private static final String AUTHORIZATION_HEADER = "Authorization";
24-
25-
private static final String ROOM_HEADER = "room-id";
2622
private static final String BEARER_PREFIX = "Bearer ";
2723
private final JsonWebTokenUtil jsonWebTokenUtil;
2824

29-
@Lazy // ✅ Circular Dependency 방지
30-
private final KurentoManager kurentoManager;
31-
32-
public FilterChannelInterceptor(JsonWebTokenUtil jsonWebTokenUtil, KurentoManager kurentoManager) {
25+
public FilterChannelInterceptor(JsonWebTokenUtil jsonWebTokenUtil) {
3326
this.jsonWebTokenUtil = jsonWebTokenUtil;
34-
this.kurentoManager = kurentoManager;
3527
}
3628

3729
private String extractToken(String headerValue) {
@@ -59,18 +51,8 @@ public Message<?> preSend(Message<?> message, MessageChannel channel) {
5951
if(headerAccessor.getSessionAttributes().get("userId") == null) {
6052
throw new ResponseStatusException(HttpStatus.UNAUTHORIZED, "userId is missing");
6153
}
62-
63-
// ✅ roomId 가져오기
64-
String roomId = headerAccessor.getFirstNativeHeader(ROOM_HEADER);
65-
log.info("🔑 [STOMP] Room ID: {}", roomId);
66-
if (roomId == null || roomId.isEmpty()) {
67-
log.error("🚨 [STOMP] Room ID is missing!");
68-
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Room ID is missing");
69-
}
70-
71-
log.info("✅ [STOMP] CONNECT 요청 처리 완료 - Room ID: {}", roomId);
72-
73-
kurentoManager.getUsersInChannel(roomId);
54+
55+
log.info("✅ [STOMP] CONNECT 요청 처리 완료");
7456
}
7557
return message;
7658
}

src/backend/signaling-server/src/main/java/com/asyncgate/signaling_server/signaling/KurentoManager.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ public void processSdpOffer(KurentoOfferRequest message, StompHeaderAccessor acc
154154

155155
System.out.println("sdp 처리 및 sdp answer 생성" + sdpAnswer);
156156

157+
getUsersInChannel(message.data().roomId());
158+
157159
// 클라이언트에게 SDP Answer 전송
158160
messagingTemplate.convertAndSend("/topic/answer/" + message.data().roomId() + "/" + userId,
159161
new KurentoAnswerResponse("sdpAnswer", sdpAnswer));

0 commit comments

Comments
 (0)