Skip to content

Refactor/101 room detail #118

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

Merged
rjswjddn merged 15 commits into from
Jul 30, 2025
Merged

Refactor/101 room detail #118

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
da86542
feat: cors 설정
rjswjddn Jul 29, 2025
ea7a869
웹소켓
rjswjddn Jul 30, 2025
9ece1cc
웹소켓
rjswjddn Jul 30, 2025
b9b53ad
웹소켓
rjswjddn Jul 30, 2025
63cd18c
웹소켓
rjswjddn Jul 30, 2025
f4a4375
Merge branch 'dev' into refactor/101-room-detail
rjswjddn Jul 30, 2025
5cfdf94
Merge branch 'dev' of https://github.com/prgrms-web-devcourse-final-p…
rjswjddn Jul 30, 2025
9ba2544
웹소켓
rjswjddn Jul 30, 2025
d75941d
merger: 충돌해결
rjswjddn Jul 30, 2025
189c0ca
웹소켓
rjswjddn Jul 30, 2025
956deaf
Merge branch 'dev' into refactor/101-room-detail
rjswjddn Jul 30, 2025
b209c4c
인터셉터, 핸들러 재추가
rjswjddn Jul 30, 2025
8b2b0fe
인터셉터, 핸들러 재추가
rjswjddn Jul 30, 2025
008127a
충돌
rjswjddn Jul 30, 2025
8d3151c
핸들러 다시 추가
rjswjddn Jul 30, 2025
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
5 changes: 3 additions & 2 deletions src/main/java/com/oronaminc/join/websocket/config/WebSocketConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
import org.springframework.web.socket.config.annotation.WebSocketTransportRegistration;
import org.springframework.web.socket.handler.WebSocketHandlerDecoratorFactory;
import org.springframework.web.socket.server.support.HttpSessionHandshakeInterceptor;

import com.oronaminc.join.websocket.handshake.CustomHandshakeHandler;
import com.oronaminc.join.websocket.session.CustomWebSocketHandlerDecorator;
Expand Down Expand Up @@ -49,9 +50,9 @@ public void registerStompEndpoints(StompEndpointRegistry registry) {
registry.addEndpoint("/ws")
.setAllowedOriginPatterns("*")
// websocket 연결 전 쿠키 체크
// .addInterceptors(new HttpSessionHandshakeInterceptor())
.addInterceptors(new HttpSessionHandshakeInterceptor())
// websocket 연결 후 principal 생성
// .setHandshakeHandler(handshakeHandler)
.setHandshakeHandler(handshakeHandler)
.withSockJS();

registry.addEndpoint("/ws")
Expand Down