Browse Source

fix for deploy

rajah 5 months ago
parent
commit
9c21f66d5b

BIN
.gradle/8.11.1/checksums/checksums.lock


BIN
.gradle/8.11.1/executionHistory/executionHistory.bin


BIN
.gradle/8.11.1/executionHistory/executionHistory.lock


BIN
.gradle/8.11.1/fileHashes/fileHashes.bin


BIN
.gradle/8.11.1/fileHashes/fileHashes.lock


BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock


BIN
.gradle/file-system.probe


+ 2 - 0
bin/main/application.properties

@@ -26,6 +26,8 @@ server.ssl.key-alias=springboot
 server.ssl.key-password: password
 server.servlet.context-path=/demovote-api/v1
 
+cors.allow.origin=https://localhost:4200
+
 #logging.file.name=logs/demovote.log
 
 #logging.logback.rollingpolicy.file-name-pattern=logs/%d{yyyy-MM, aux}/demovote.%d{yyyy-MM-dd}.%i.log

+ 1 - 1
build.gradle

@@ -1,7 +1,7 @@
 plugins {
 	id 'java'
 	id 'war'
-	id 'org.springframework.boot' version '3.5.0'
+	id 'org.springframework.boot' version '3.5.2'
 	id 'io.spring.dependency-management' version '1.1.7'
 }
 

+ 5 - 1
src/main/java/fr/triplea/demovote/security/cors/CorsFilter.java

@@ -4,6 +4,7 @@ import java.io.IOException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import jakarta.servlet.FilterChain;
@@ -17,12 +18,15 @@ public class CorsFilter extends OncePerRequestFilter
   
   private final Logger LOG = LoggerFactory.getLogger(CorsFilter.class);
 
+  @Value("${cors.allow.origin}")
+  private String AccessControlAllowOriginUrl;
+
   public CorsFilter() { LOG.info("CorsFilter init"); }
 
   @Override
   public void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws IOException, ServletException
   {
-    response.setHeader("Access-Control-Allow-Origin", "https://localhost:4200");
+    response.setHeader("Access-Control-Allow-Origin", AccessControlAllowOriginUrl);
     response.setHeader("Access-Control-Allow-Credentials", "true");
     response.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, OPTIONS, DELETE");
     response.setHeader("Access-Control-Max-Age", "3600");

+ 2 - 0
src/main/resources/application.properties

@@ -26,6 +26,8 @@ server.ssl.key-alias=springboot
 server.ssl.key-password: password
 server.servlet.context-path=/demovote-api/v1
 
+cors.allow.origin=https://localhost:4200
+
 #logging.file.name=logs/demovote.log
 
 #logging.logback.rollingpolicy.file-name-pattern=logs/%d{yyyy-MM, aux}/demovote.%d{yyyy-MM-dd}.%i.log