From a8e39d8f09c5b38ca8dcdb05cf2dc8c35cbad725 Mon Sep 17 00:00:00 2001 From: kasun Date: Sun, 10 May 2026 03:49:41 +0200 Subject: [PATCH] changed cors config to use env variables --- .../src/main/java/com/vaessl/app/config/CorsConfig.java | 9 ++++++--- .../additional-spring-configuration-metadata.json | 9 +++++++-- backend/src/main/resources/application.yaml | 5 +++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/com/vaessl/app/config/CorsConfig.java b/backend/src/main/java/com/vaessl/app/config/CorsConfig.java index 3144cbe..945686a 100644 --- a/backend/src/main/java/com/vaessl/app/config/CorsConfig.java +++ b/backend/src/main/java/com/vaessl/app/config/CorsConfig.java @@ -8,13 +8,16 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration public class CorsConfig implements WebMvcConfigurer { - @Value("${vaessl.frontend-url}") - private String frontendUrl; + @Value("${vaessl.frontend-local-url}") + private String frontendLocalUrl; + + @Value("${vaessl.frontend-public-url}") + private String frontendPublicUrl; @Override public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") - .allowedOrigins(frontendUrl, "http://192.168.1.208:5173", "https://5173.code-server.kasuns.website") + .allowedOrigins(frontendLocalUrl, frontendPublicUrl) .allowedMethods("GET", "POST", "DELETE", "OPTIONS") .allowedHeaders("Content-Type", "Accept") .allowCredentials(true); diff --git a/backend/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/backend/src/main/resources/META-INF/additional-spring-configuration-metadata.json index b3bc323..57fd745 100644 --- a/backend/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/backend/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -5,8 +5,13 @@ "description": "A description for 'spring.session.store-type'" }, { - "name": "vaessl.frontend-url", + "name": "vaessl.frontend-local-url", "type": "java.lang.String", - "description": "A description for 'vaessl.frontend-url'" + "description": "A description for 'vaessl.frontend-local-url'" + }, + { + "name": "vaessl.frontend-public-url", + "type": "java.lang.String", + "description": "A description for 'vaessl.frontend-public-url'" } ]} \ No newline at end of file diff --git a/backend/src/main/resources/application.yaml b/backend/src/main/resources/application.yaml index eba2fc2..f9c6a95 100644 --- a/backend/src/main/resources/application.yaml +++ b/backend/src/main/resources/application.yaml @@ -7,7 +7,7 @@ spring: - "optional:file:backend/.env.local[.properties]" - "optional:file:vaessl/backend/.env.local[.properties]" datasource: - url : ${DB_URL} + url: ${DB_URL} username: ${DB_USERNAME} password: ${DB_PASSWORD} driver-class-name: ${PG_DRIVER_CLASS_NAME} @@ -30,4 +30,5 @@ server: servlet: context-path: /api vaessl: - frontend-url: ${FRONTEND_URL:http://192.168.1.208:5173/} + frontend-local-url: ${FRONTEND_LOCAL_URL} + frontend-public-url: ${FRONTEND_PUBLIC_URL}