From 66f8fd89c09e23cb88e26206df6afe2ceb415778 Mon Sep 17 00:00:00 2001
From: henridb <henridb@stud.ntnu.no>
Date: Fri, 3 May 2024 12:00:01 +0200
Subject: [PATCH] change to property
---
Dockerfile | 2 +-
.../no/ntnu/idi/stud/savingsapp/security/SecurityConfig.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index ec63190..44e3714 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,5 +24,5 @@ COPY --from=build /app/target/*.jar app.jar
EXPOSE 8080
# Run the application
-CMD ["java", "-jar", "app.jar", "-DAPI_URL=\"https://api.sparesti.org\""]
+CMD ["java", "-DAPI_URL=https://api.sparesti.org", "-jar", "app.jar"]
diff --git a/src/main/java/no/ntnu/idi/stud/savingsapp/security/SecurityConfig.java b/src/main/java/no/ntnu/idi/stud/savingsapp/security/SecurityConfig.java
index 4d575bb..b1ff078 100644
--- a/src/main/java/no/ntnu/idi/stud/savingsapp/security/SecurityConfig.java
+++ b/src/main/java/no/ntnu/idi/stud/savingsapp/security/SecurityConfig.java
@@ -65,9 +65,9 @@ public class SecurityConfig {
@Bean
public CorsConfigurationSource corsConfigurationSource() {
CorsConfiguration config = new CorsConfiguration();
- System.out.println("API_URL: " + System.getenv().getOrDefault("API_URL", "http://localhost"));
+ System.out.println("API_URL: " + System.getProperty("API_URL", "http://localhost"));
config.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"));
- config.setAllowedOrigins(List.of(System.getenv().getOrDefault("API_URL", "http://localhost")));
+ config.setAllowedOrigins(List.of(System.getProperty("API_URL", "http://localhost")));
config.setAllowedHeaders(Arrays.asList("Authorization", "Content-Type", "Cache-Control"));
config.setAllowCredentials(true);
--
GitLab