Merge pull request #115 from Me1tingPot/feature/#111

refactor : 소켓 jwt 인증 로직
Me1tingPot · Jun 30, 2024 · c3ce070 · c3ce070
2 parents 4b5672a + 9437f41
commit c3ce070
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 22 deletions.
diff --git a/src/main/java/meltingpot/server/config/JwtChannelInterceptor.java b/src/main/java/meltingpot/server/config/JwtChannelInterceptor.java
@@ -18,6 +18,10 @@
 import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
 import org.springframework.messaging.support.ChannelInterceptor;
 
+import org.springframework.messaging.support.MessageHeaderAccessor;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -35,38 +39,24 @@ public class JwtChannelInterceptor implements ChannelInterceptor {
     private final String SUB_MESSAGE_PREFIX = "/sub/";
 
     private final TokenProvider tokenProvider;
-    private final AccountRepository accountRepository;
-    private final ChatRoomUserRepository chatRoomUSerRepository;
 
     @Override
     public Message<?> preSend(Message<?> message, MessageChannel channel) {
-        StompHeaderAccessor headerAccessor = StompHeaderAccessor.wrap(message);
-        Map<String, Object> sessionAttributes = headerAccessor.getSessionAttributes();
+        StompHeaderAccessor headerAccessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class);
 
         if (StompCommand.CONNECT.equals(headerAccessor.getCommand())) {
 
             List<String> authorization = headerAccessor.getNativeHeader("Authorization");
             if (authorization == null || authorization.size() != 1) {
                 throw new BadRequestException(AUTHORIZATION_CHECK_FAIL);
             }
-            String accessToken = authorization.get(0);
+            String accessToken = authorization.get(0).substring(7);
 
             if (tokenProvider.validateToken(accessToken)) {
-                Claims claims = tokenProvider.getSocketTokenClaims(accessToken);
-                String username = claims.getSubject();
+                Authentication authentication = tokenProvider.getAuthentication(accessToken);
 
-                Account account = accountRepository.findByUsername(username)
-                        .orElseThrow(() -> new ResourceNotFoundException(ACCOUNT_NOT_FOUND));
-
-                List<ChatRoomUser> chatRoomUsers = chatRoomUSerRepository.findAllByUserId(account.getId());
-                List<Long> chatRooms = chatRoomUsers.stream()
-                        .map(ChatRoomUser::getChatRoom)
-                        .map(ChatRoom::getId)
-                        .toList();
-
-                sessionAttributes.put("username", account.getUsername());
-                sessionAttributes.put("chatRooms", chatRooms);
-                headerAccessor.setSessionAttributes(sessionAttributes);
+                SecurityContextHolder.getContext().setAuthentication(authentication);
+                headerAccessor.setUser(authentication);
             } else {
                 throw new InvalidTokenException(ResponseCode.INVALID_AUTH_TOKEN);
             }

diff --git a/src/main/java/meltingpot/server/config/WebSocketConfig.java b/src/main/java/meltingpot/server/config/WebSocketConfig.java
@@ -27,7 +27,6 @@ public void configureMessageBroker(MessageBrokerRegistry registry) {
     @Override
     public void registerStompEndpoints(StompEndpointRegistry registry) {
         // 주소 : ws://localhost:8080/chat
-        registry.addEndpoint("/chat").setAllowedOriginPatterns("*").withSockJS();
         registry.addEndpoint("/chat").setAllowedOriginPatterns("*");
         registry.setErrorHandler(chatErrorHandler);
     }

diff --git a/src/main/java/meltingpot/server/config/WebSocketSecurityConfig.java b/src/main/java/meltingpot/server/config/WebSocketSecurityConfig.java
@@ -10,8 +10,8 @@ public class WebSocketSecurityConfig extends AbstractSecurityWebSocketMessageBro
     protected void configureInbound(MessageSecurityMetadataSourceRegistry messages) {
         messages
                 .nullDestMatcher().permitAll()
-                .simpDestMatchers("/app/**").authenticated()
-                .simpSubscribeDestMatchers("/topic/**").authenticated()
+                .simpDestMatchers("/pub/**").authenticated()
+                .simpSubscribeDestMatchers("/sub/**").authenticated()
                 .anyMessage().denyAll();
     }