Fix: Add Access-Control-Allow-Credentials header for handshaking response

Author: vietlvq2609

src/main/java/com/vietle/mychatapi/config/CustomHandshakeInterceptor.java

@@ -0,0 +1,30 @@
+package com.vietle.mychatapi.config;
+
+import java.util.Map;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.server.HandshakeInterceptor;
+
+public class CustomHandshakeInterceptor implements HandshakeInterceptor {
+
+    @Override
+    public boolean beforeHandshake(
+        ServerHttpRequest request,
+        ServerHttpResponse response,
+        WebSocketHandler wsHandler,
+        Map<String, Object> attributes
+    ) throws Exception {
+        response.getHeaders().add("Access-Control-Allow-Credentials", "true");
+        return true;
+    }
+
+    @Override
+    public void afterHandshake(
+        ServerHttpRequest request,
+        ServerHttpResponse response,
+        WebSocketHandler wsHandler,
+        Exception exception) {
+        // After handshake logic, if needed
+    }
+}

src/main/java/com/vietle/mychatapi/config/WebSocketConfig.java

@@ -3,14 +3,9 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.simp.config.MessageBrokerRegistry;
-import org.springframework.web.socket.WebSocketHandler;
-import org.springframework.web.socket.WebSocketSession;
 import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
 import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
 import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
-import org.springframework.web.socket.config.annotation.WebSocketTransportRegistration;
-import org.springframework.web.socket.handler.WebSocketHandlerDecorator;
-import org.springframework.web.socket.handler.WebSocketHandlerDecoratorFactory;
 
 @Configuration
 @EnableWebSocketMessageBroker
@@ -20,42 +15,15 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
 
     @Override
     public void registerStompEndpoints(StompEndpointRegistry registry) {
-        registry.addEndpoint("/ws").setAllowedOriginPatterns(allowedOrigins).withSockJS();
+        registry.addEndpoint("/ws")
+            .setAllowedOriginPatterns(allowedOrigins)
+            .addInterceptors(new CustomHandshakeInterceptor())
+            .withSockJS();
     }
 
     @Override
     public void configureMessageBroker(MessageBrokerRegistry registry) {
         registry.setApplicationDestinationPrefixes("/app");
         registry.enableSimpleBroker("/topic");
     }
-
-//    @Override
-//    public void configureWebSocketTransport(WebSocketTransportRegistration registration) {
-//        registration.addDecoratorFactory(new WebSocketHandlerDecoratorFactory() {
-//            @Override
-//            public WebSocketHandler decorate(WebSocketHandler handler) {
-//                return new WebSocketHandlerDecorator(handler) {
-//                    @Override
-//                    public void afterConnectionEstablished(WebSocketSession session) throws Exception {
-//                        super.afterConnectionEstablished(session);
-//                        session.getHandshakeHeaders().add("Access-Control-Allow-Origin", "*");
-//                    }
-//                };
-//            }
-//        });
-//    }
-
-//    @Override
-//    public boolean configureMessageConverters(List<MessageConverter> messageConverters) {
-//        DefaultContentTypeResolver resolver = new DefaultContentTypeResolver();
-//        resolver.setDefaultMimeType(APPLICATION_JSON);
-//        MappingJackson2MessageConverter converter = new MappingJackson2MessageConverter();
-//        converter.setObjectMapper(new ObjectMapper());
-//        converter.setContentTypeResolver(resolver);
-//        messageConverters.add(new StringMessageConverter());
-//        messageConverters.add(new ByteArrayMessageConverter());
-//        messageConverters.add(converter);
-//
-//        return false;
-//    }
 }