digiops/api-gateway
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
root
2025-09-14 16:31:52 +05:00
parent 203c4c55a2
commit 1a24b6048e
1 changed files with 18 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/konturai/kz/api_gateway/filter/CorsHeaderFilter.java
+6 -37
View File
@@ -16,20 +16,10 @@ public class CorsHeaderFilter implements GlobalFilter, Ordered {
@Override @Override
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) { public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
ServerHttpRequest request = exchange.getRequest(); ServerHttpRequest request = exchange.getRequest();
// Handle preflight requests immediately
if (request.getMethod().name().equals("OPTIONS")) {
ServerHttpResponse response = exchange.getResponse(); ServerHttpResponse response = exchange.getResponse();
HttpHeaders headers = response.getHeaders(); HttpHeaders headers = response.getHeaders();
// Clear any existing CORS headers // Always set CORS headers first
headers.remove(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN);
headers.remove(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS);
headers.remove(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS);
headers.remove(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS);
headers.remove(HttpHeaders.ACCESS_CONTROL_MAX_AGE);
// Set CORS headers for preflight
String origin = request.getHeaders().getFirst(HttpHeaders.ORIGIN); String origin = request.getHeaders().getFirst(HttpHeaders.ORIGIN);
if (origin != null && isAllowedOrigin(origin)) { if (origin != null && isAllowedOrigin(origin)) {
headers.set(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, origin); headers.set(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, origin);
@@ -42,35 +32,14 @@ public class CorsHeaderFilter implements GlobalFilter, Ordered {
headers.set(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS, "true"); headers.set(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS, "true");
headers.set(HttpHeaders.ACCESS_CONTROL_MAX_AGE, "3600"); headers.set(HttpHeaders.ACCESS_CONTROL_MAX_AGE, "3600");
// Handle preflight requests immediately
if (request.getMethod().name().equals("OPTIONS")) {
response.setStatusCode(org.springframework.http.HttpStatus.OK); response.setStatusCode(org.springframework.http.HttpStatus.OK);
return Mono.empty(); return Mono.empty();
} }
// For non-preflight requests, process after the downstream service responds // For non-preflight requests, continue to downstream service
return chain.filter(exchange).then(Mono.fromRunnable(() -> { return chain.filter(exchange);
ServerHttpResponse response = exchange.getResponse();
HttpHeaders headers = response.getHeaders();
// Clear any existing CORS headers from downstream service
headers.remove(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN);
headers.remove(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS);
headers.remove(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS);
headers.remove(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS);
headers.remove(HttpHeaders.ACCESS_CONTROL_MAX_AGE);
// Set our CORS headers
String origin = request.getHeaders().getFirst(HttpHeaders.ORIGIN);
if (origin != null && isAllowedOrigin(origin)) {
headers.set(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, origin);
} else {
headers.set(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, "https://konturai.kz");
}
headers.set(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, "GET, POST, PUT, DELETE, OPTIONS");
headers.set(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS, "*");
headers.set(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS, "true");
headers.set(HttpHeaders.ACCESS_CONTROL_MAX_AGE, "3600");
}));
} }
private boolean isAllowedOrigin(String origin) { private boolean isAllowedOrigin(String origin) {
@@ -83,6 +52,6 @@ public class CorsHeaderFilter implements GlobalFilter, Ordered {
@Override @Override
public int getOrder() { public int getOrder() {
return 1000; // Low priority to run after other filters and downstream services return -1; // High priority to run before other filters
} }
} }