feat: enhance CORS configuration to allow dynamic origins and improve health check commands in Docker configurations

AbaSheger · AbaSheger · commit 7f7a8e0db1f8 · 2025-03-18T21:59:49.000+01:00
diff --git a/api-gateway/src/main/java/com/example/apigateway/ApiGatewayApplication.java b/api-gateway/src/main/java/com/example/apigateway/ApiGatewayApplication.java
@@ -22,12 +22,23 @@ public static void main(String[] args) {
     @Bean
     public CorsWebFilter corsWebFilter() {
         CorsConfiguration corsConfig = new CorsConfiguration();
-        corsConfig.addAllowedOrigin("https://musicanalytics.netlify.app");
-        corsConfig.addAllowedOrigin("https://music-analytics.abenezeranglo.uk");
-        corsConfig.addAllowedOrigin("http://localhost:3000");
+        
+        // Get allowed origins from environment or use defaults
+        String allowedOrigins = System.getenv("CORS_ALLOWED_ORIGINS");
+        if (allowedOrigins != null && !allowedOrigins.isEmpty()) {
+            Arrays.stream(allowedOrigins.split(","))
+                  .forEach(corsConfig::addAllowedOrigin);
+        } else {
+            corsConfig.addAllowedOrigin("https://musicanalytics.netlify.app");
+            corsConfig.addAllowedOrigin("https://music-analytics.abenezeranglo.uk");
+            if (!isProduction()) {
+                corsConfig.addAllowedOrigin("http://localhost:3000");
+            }
+        }
+        
         corsConfig.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS", "HEAD"));
-        corsConfig.setAllowedHeaders(Collections.singletonList("*"));
-        corsConfig.setExposedHeaders(Collections.singletonList("*"));
+        corsConfig.setAllowedHeaders(Arrays.asList("Authorization", "Content-Type", "Origin"));
+        corsConfig.setExposedHeaders(Arrays.asList("Authorization", "Content-Type"));
         corsConfig.setAllowCredentials(true);
         corsConfig.setMaxAge(3600L);
         
@@ -36,4 +47,9 @@ public CorsWebFilter corsWebFilter() {
         
         return new CorsWebFilter(source);
     }
+
+    private boolean isProduction() {
+        String profile = System.getenv("SPRING_PROFILES_ACTIVE");
+        return "production".equals(profile);
+    }
 }
diff --git a/cloud-deploy/docker-compose.direct.yml b/cloud-deploy/docker-compose.direct.yml
@@ -14,7 +14,7 @@ services:
       - SPRING_CLOUD_SERVICE-REGISTRY_AUTO-REGISTRATION_ENABLED=false
     restart: unless-stopped
     healthcheck:
-      test: ["CMD-SHELL", "wget -q --spider http://localhost:8761/actuator/health || exit 0"]
+      test: ["CMD-SHELL", "curl -f http://localhost:8761/actuator/health || exit 1"]
       interval: 30s
       timeout: 10s
       retries: 5
@@ -37,6 +37,12 @@ services:
       eureka-server:
         condition: service_healthy
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8080/actuator/health || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 60s
 
   # Microservices depend on healthy Eureka server
   recommendation-service:
@@ -56,7 +62,7 @@ services:
       - recommendation-data:/data
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "wget", "-q", "--spider", "http://localhost:8082/actuator/health || exit 0"]
+      test: ["CMD-SHELL", "curl -f http://localhost:8082/actuator/health || exit 1"]
       interval: 30s
       timeout: 10s
       retries: 3
@@ -79,7 +85,7 @@ services:
       - statistics-data:/data
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "wget", "-q", "--spider", "http://localhost:8083/actuator/health || exit 0"]
+      test: ["CMD-SHELL", "curl -f http://localhost:8083/actuator/health || exit 1"]
       interval: 30s
       timeout: 10s
       retries: 3
@@ -102,7 +108,7 @@ services:
       - user-tracking-data:/data
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "wget", "-q", "--spider", "http://localhost:8084/actuator/health || exit 0"]
+      test: ["CMD-SHELL", "curl -f http://localhost:8084/actuator/health || exit 1"]
       interval: 30s
       timeout: 10s
       retries: 3
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
       - SPRING_PROFILES_ACTIVE=docker
       - SERVER_PORT=8761
     healthcheck:
-      test: "wget -q --spider http://localhost:8761/actuator/health || exit 1"
+      test: ["CMD-SHELL", "curl -f http://localhost:8761/actuator/health || exit 1"]
       interval: 10s
       timeout: 5s
       retries: 10
@@ -31,6 +31,12 @@ services:
     depends_on:
       eureka-server:
         condition: service_healthy
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8080/actuator/health || exit 1"]
+      interval: 15s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
 
   # Microservices depend on healthy Eureka server
   recommendation-service:
@@ -47,6 +53,12 @@ services:
         condition: service_healthy
     volumes:
       - recommendation-data:/data
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8082/actuator/health || exit 1"]
+      interval: 15s
+      timeout: 5s
+      retries: 5
+      start_period: 40s
 
   statistics-service:
     image: statistics-service:latest
@@ -62,6 +74,12 @@ services:
         condition: service_healthy
     volumes:
       - statistics-data:/data
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8083/actuator/health || exit 1"]
+      interval: 15s
+      timeout: 5s
+      retries: 5
+      start_period: 40s
 
   user-tracking-service:
     image: user-tracking-service:latest
@@ -77,6 +95,12 @@ services:
         condition: service_healthy
     volumes:
       - user-tracking-data:/data
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8084/actuator/health || exit 1"]
+      interval: 15s
+      timeout: 5s
+      retries: 5
+      start_period: 40s
 
 volumes:
   recommendation-data:
diff --git a/recommendation-service/src/main/java/com/example/recommendation/RecommendationServiceApplication.java b/recommendation-service/src/main/java/com/example/recommendation/RecommendationServiceApplication.java
@@ -2,10 +2,11 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 @SpringBootApplication
-@EnableScheduling
+@EnableDiscoveryClient
+
 public class RecommendationServiceApplication {
 
     public static void main(String[] args) {
diff --git a/user-tracking-service/pom.xml b/user-tracking-service/pom.xml
@@ -5,37 +5,41 @@
 
     <groupId>com.example</groupId>
     <artifactId>user-tracking-service</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.0</version>
+        <version>2.5.4</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <java.version>17</java.version>
-        <spring-cloud.version>2022.0.0</spring-cloud.version>
+        <java.version>8</java.version>
+        <spring-cloud.version>2020.0.3</spring-cloud.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <version>2.5.4</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
+            <version>2.5.4</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
+            <version>2.5.4</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+            <version>3.0.3</version>
         </dependency>
 
         <!-- H2 Database -->
@@ -71,6 +75,14 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.5.4</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
 
             <!-- Maven JAR Plugin to ensure the JAR is created -->
@@ -86,6 +98,17 @@
                     </archive>
                 </configuration>
             </plugin>
+
+            <!-- Maven Compiler Plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
