Merge remote-tracking branch 'origin/dev'

merge

api/src/main/java/fr/gameovergne/api/config/SecurityConfig.java

@@ -61,16 +61,26 @@ public class SecurityConfig {
     @Bean
     public CorsConfigurationSource corsConfigurationSource() {
         CorsConfiguration config = new CorsConfiguration();
-        config.setAllowedOriginPatterns(Arrays.asList(
+
-            "http://localhost:4200", 
+        // IMPORTANT : origins explicites, sans path
-            "http://127.0.0.1:4200", 
+        config.setAllowedOrigins(Arrays.asList(
-            "https://dev.vincent-guillet.fr"
+                "http://localhost:4200",
-            ));
+                "http://127.0.0.1:4200",
-        config.setAllowedMethods(Arrays.asList("GET","POST","PUT","DELETE","OPTIONS"));
+                "https://dev.vincent-guillet.fr",
-        config.setAllowedHeaders(Arrays.asList("Authorization","Content-Type","Accept"));
+                "https://projets.vincent-guillet.fr"
-        config.setExposedHeaders(Arrays.asList("Authorization"));
+        ));
+
         config.setAllowCredentials(true);
 
+        // Autoriser tous les headers côté requête (plus robuste)
+        config.setAllowedHeaders(Arrays.asList("*"));
+
+        // Autoriser les méthodes classiques
+        config.setAllowedMethods(Arrays.asList("GET", "POST", "PUT", "DELETE", "OPTIONS"));
+
+        // Headers que le client *voit* dans la réponse
+        config.setExposedHeaders(Arrays.asList("Authorization", "Content-Type"));
+
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         source.registerCorsConfiguration("/**", config);
         return source;

api/src/main/java/fr/gameovergne/api/controller/auth/AuthController.java

@@ -17,12 +17,6 @@ import java.util.Arrays;
 
 @RestController
 @RequestMapping("/api/auth")
-@CrossOrigin(
-        origins = "https://dev.vincent-guillet.fr",
-        allowCredentials = "true",
-        allowedHeaders = "*",
-        methods = {RequestMethod.GET, RequestMethod.POST, RequestMethod.OPTIONS}
-)
 public class AuthController {
 
     private final AuthService authService;

docker-compose.prod.yml

@@ -10,6 +10,8 @@ services:
       MYSQL_PASSWORD: gameovergne
     volumes:
       - ./mysql-data-prod:/var/lib/mysql
+    ports:
+      - "3366:3306"
     networks:
       - gameovergne
     restart: unless-stopped

jenkinsfile

@@ -2,12 +2,12 @@ pipeline {
     agent none
 
     environment {
-        REGISTRY        = 'registry.vincent-guillet.fr'
+        REGISTRY           = 'registry.vincent-guillet.fr'
-        API_IMAGE_DEV   = "${REGISTRY}/gameovergne-api:dev-latest"
+        API_IMAGE_DEV      = "${REGISTRY}/gameovergne-api:dev-latest"
-        CLIENT_IMAGE_DEV= "${REGISTRY}/gameovergne-client:dev-latest"
+        CLIENT_IMAGE_DEV   = "${REGISTRY}/gameovergne-client:dev-latest"
-        API_IMAGE_PROD  = "${REGISTRY}/gameovergne-api:prod-latest"
+        API_IMAGE_PROD     = "${REGISTRY}/gameovergne-api:prod-latest"
-        CLIENT_IMAGE_PROD = "${REGISTRY}/gameovergne-client:prod-latest"
+        CLIENT_IMAGE_PROD  = "${REGISTRY}/gameovergne-client:prod-latest"
-        COMPOSE_PROJECT = 'gameovergne-app'
+        COMPOSE_PROJECT    = 'gameovergne-app'
     }
 
     stages {
@@ -48,7 +48,6 @@ pipeline {
                 }
 
                 // ----- Push vers registry -----
-                // Si tu as des credentials, tu peux les utiliser ici via withCredentials
                 sh """
                     echo "=== Push images vers ${REGISTRY} ==="
                     docker push ${API_IMAGE}
@@ -75,11 +74,14 @@ pipeline {
                         echo "=== [DEV] Nettoyage anciens conteneurs ==="
                         docker rm -f gameovergne-api gameovergne-client 2>/dev/null || true
 
-                        echo "=== [DEV] docker-compose down ==="
+                        echo "=== [DEV] docker compose down ==="
-                        docker-compose -f docker-compose.dev.yml down -v || true
+                        docker compose -f docker-compose.dev.yml down -v || true
 
-                        echo "=== [DEV] docker-compose up ==="
+                        echo "=== [DEV] docker compose pull ==="
-                        docker-compose -f docker-compose.dev.yml up -d mysql spring angular
+                        docker compose -f docker-compose.dev.yml pull
+
+                        echo "=== [DEV] docker compose up (force recreate) ==="
+                        docker compose -f docker-compose.dev.yml up -d --force-recreate mysql spring angular
                     """
                 }
             }
@@ -103,11 +105,14 @@ pipeline {
                         echo "=== [PROD] Nettoyage anciens conteneurs ==="
                         docker rm -f gameovergne-api-prod gameovergne-client-prod 2>/dev/null || true
 
-                        echo "=== [PROD] docker-compose down ==="
+                        echo "=== [PROD] docker compose down ==="
-                        docker-compose -f docker-compose.prod.yml down -v || true
+                        docker compose -f docker-compose.prod.yml down || true
 
-                        echo "=== [PROD] docker-compose up ==="
+                        echo "=== [PROD] docker compose pull ==="
-                        docker-compose -f docker-compose.prod.yml up -d mysql spring angular
+                        docker compose -f docker-compose.prod.yml pull
+
+                        echo "=== [PROD] docker compose up (force recreate) ==="
+                        docker compose -f docker-compose.prod.yml up -d --force-recreate mysql spring angular
                     """
                 }
             }