From bc09bdedf90288c22d67111f9133eb1b9fb8fc8e Mon Sep 17 00:00:00 2001 From: Connor Yoh Date: Tue, 22 Jul 2025 18:18:41 +0100 Subject: [PATCH] use bool for checking tauri mode in webmvc --- .../software/SPDF/config/WebMvcConfig.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/core/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java b/app/core/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java index 458441522..96212c6bf 100644 --- a/app/core/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java +++ b/app/core/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java @@ -1,6 +1,5 @@ package stirling.software.SPDF.config; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; @@ -32,11 +31,15 @@ public class WebMvcConfig implements WebMvcConfigurer { } @Override - @ConditionalOnProperty(name = "STIRLING_PDF_TAURI_MODE", havingValue = "true") public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**") - .allowedOrigins("http://localhost:5173", "http://tauri.localhost", "tauri://localhost") - .allowedMethods("*") - .allowedHeaders("*"); + if (Boolean.parseBoolean(System.getProperty("STIRLING_PDF_TAURI_MODE", "false"))) { + // Tauri mode CORS configuration + registry.addMapping("/**") + .allowedOrigins( + "http://localhost:5173", "http://tauri.localhost", "tauri://localhost") + .allowedMethods("*") + .allowedHeaders("*"); + return; + } } }