Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BE] hotfix: 웹소켓 무한로딩 해결 #474

Merged
merged 1 commit into from
Aug 19, 2024
Merged

[BE] hotfix: 웹소켓 무한로딩 해결 #474

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 36 additions & 19 deletions backend/src/main/java/com/happy/friendogly/config/WebSocketInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.happy.friendogly.chat.repository.ChatRoomMemberRepository;
import com.happy.friendogly.chat.repository.ChatRoomRepository;
import com.happy.friendogly.club.repository.ClubRepository;
import com.happy.friendogly.exception.FriendoglyException;
import com.happy.friendogly.exception.FriendoglyWebSocketException;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
Expand Down Expand Up @@ -41,28 +42,53 @@ public WebSocketInterceptor(
@Override
public Message<?> preSend(Message<?> message, MessageChannel channel) {
StompHeaderAccessor accessor = StompHeaderAccessor.wrap(message);

if (accessor.getCommand() == SUBSCRIBE) {
// TODO: token 정보를 이용하도록 수정 필요!! 현재는 Authorization에 member ID를 raw data로 넣고 있음.
String destination = accessor.getDestination();
validateDestination(destination);

if (destination == null) {
throw new FriendoglyWebSocketException("잘못된 subscribe 요청입니다.");
}
String accessToken = accessor.getFirstNativeHeader(AUTHORIZATION);
long memberId = validateAndExtractMemberIdFrom(accessToken);

if (destination.startsWith(TOPIC_INVITE_ENDPOINT)) {
validateInviteSubscription(accessor, destination);
validateInviteSubscription(memberId, destination);
}

if (destination.startsWith(TOPIC_CHAT_ENDPOINT)) {
validateChatSubscription(accessor, destination);
validateChatSubscription(memberId, destination);
}
}
return message;
}

private void validateInviteSubscription(StompHeaderAccessor accessor, String destination) {
String accessToken = accessor.getFirstNativeHeader(AUTHORIZATION);
long memberId = Long.parseLong(jwtProvider.validateAndExtract(accessToken));
private void validateDestination(String destination) {
if (destination == null) {
throw new FriendoglyWebSocketException("subscribe 경로는 null일 수 없습니다.");
}
if (destination.startsWith(TOPIC_CHAT_ENDPOINT)) {
return;
}
if (destination.startsWith(TOPIC_INVITE_ENDPOINT)) {
return;
}
throw new FriendoglyWebSocketException(String.format("%s는 올바른 sub 경로가 아닙니다.", destination));
}

private long validateAndExtractMemberIdFrom(String accessToken) {
if (accessToken == null) {
throw new FriendoglyWebSocketException("액세스 토큰은 null일 수 없습니다.");
}

try {
return Long.parseLong(jwtProvider.validateAndExtract(accessToken));
} catch (NumberFormatException e) {
throw new FriendoglyWebSocketException("올바르지 않은 토큰 형식입니다.");
} catch (FriendoglyException e) {
throw new FriendoglyWebSocketException(e.getMessage());
}
}

private void validateInviteSubscription(long memberId, String destination) {
String rawMemberIdToSubscribe = destination.substring(TOPIC_INVITE_ENDPOINT.length());
long memberIdToSubscribe = convertToLong(rawMemberIdToSubscribe);

Expand All @@ -71,10 +97,7 @@ private void validateInviteSubscription(StompHeaderAccessor accessor, String des
}
}

private void validateChatSubscription(StompHeaderAccessor accessor, String destination) {
String accessToken = accessor.getFirstNativeHeader(AUTHORIZATION);
long memberId = Long.parseLong(jwtProvider.validateAndExtract(accessToken));

private void validateChatSubscription(long memberId, String destination) {
String rawChatRoomId = destination.substring(TOPIC_CHAT_ENDPOINT.length());
long chatRoomId = convertToLong(rawChatRoomId);

Expand All @@ -89,12 +112,6 @@ private void validateChatSubscription(StompHeaderAccessor accessor, String desti
}
}

private void validateLogin(String rawMemberId) {
if (rawMemberId == null) {
throw new FriendoglyWebSocketException("로그인 후 이용하세요.");
}
}

private long convertToLong(String rawId) {
try {
return Long.parseLong(rawId);
Expand Down
Loading