Skip to content

Commit 9c21d43

Browse files
committed
Merge branch 'dev'
2 parents 0d269d1 + 206eb95 commit 9c21d43

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

backend/src/main/java/com/deliveranything/global/config/WebSocketConfig.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
import com.deliveranything.global.exception.CustomException;
99
import com.deliveranything.global.exception.ErrorCode;
1010
import com.deliveranything.global.security.auth.SecurityUser;
11+
import com.deliveranything.global.security.handler.StompErrorHandler;
1112
import jakarta.annotation.Nonnull;
1213
import java.util.Collection;
1314
import java.util.Map;
1415
import java.util.Optional;
15-
import com.deliveranything.global.security.handler.StompErrorHandler;
1616
import lombok.RequiredArgsConstructor;
1717
import lombok.extern.slf4j.Slf4j;
1818
import org.springframework.context.annotation.Bean;
@@ -30,15 +30,13 @@
3030
import org.springframework.security.core.Authentication;
3131
import org.springframework.security.core.GrantedAuthority;
3232
import org.springframework.security.core.userdetails.UserDetails;
33-
import org.springframework.security.config.annotation.web.socket.EnableWebSocketSecurity;
3433
import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
3534
import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
3635
import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
3736

3837
@Slf4j
3938
@Configuration
4039
@EnableWebSocketMessageBroker
41-
@EnableWebSocketSecurity
4240
@RequiredArgsConstructor
4341
public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
4442

@@ -52,7 +50,12 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
5250
public void registerStompEndpoints(StompEndpointRegistry registry) {
5351
registry.setErrorHandler(stompErrorHandler);
5452
registry.addEndpoint("/ws")
55-
.setAllowedOriginPatterns("*")
53+
.setAllowedOriginPatterns("http://localhost:*",
54+
"https://localhost:*",
55+
"https://cdpn.io",
56+
"https://www.deliver-anything.shop",
57+
"https://api.deliver-anything.shop"
58+
)
5659
.withSockJS();
5760
}
5861

0 commit comments

Comments
 (0)