Compare commits

...

7 Commits

4 changed files with 40 additions and 29 deletions

View File

@@ -61,16 +61,26 @@ public class SecurityConfig {
@Bean @Bean
public CorsConfigurationSource corsConfigurationSource() { public CorsConfigurationSource corsConfigurationSource() {
CorsConfiguration config = new CorsConfiguration(); CorsConfiguration config = new CorsConfiguration();
config.setAllowedOriginPatterns(Arrays.asList(
// IMPORTANT : origins explicites, sans path
config.setAllowedOrigins(Arrays.asList(
"http://localhost:4200", "http://localhost:4200",
"http://127.0.0.1:4200", "http://127.0.0.1:4200",
"https://dev.vincent-guillet.fr" "https://dev.vincent-guillet.fr",
"https://projets.vincent-guillet.fr"
)); ));
config.setAllowedMethods(Arrays.asList("GET","POST","PUT","DELETE","OPTIONS"));
config.setAllowedHeaders(Arrays.asList("Authorization","Content-Type","Accept"));
config.setExposedHeaders(Arrays.asList("Authorization"));
config.setAllowCredentials(true); 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(); UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/**", config); source.registerCorsConfiguration("/**", config);
return source; return source;

View File

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

View File

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

View File

@@ -4,7 +4,7 @@ pipeline {
environment { 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'
@@ -48,7 +48,6 @@ pipeline {
} }
// ----- Push vers registry ----- // ----- Push vers registry -----
// Si tu as des credentials, tu peux les utiliser ici via withCredentials
sh """ sh """
echo "=== Push images vers ${REGISTRY} ===" echo "=== Push images vers ${REGISTRY} ==="
docker push ${API_IMAGE} docker push ${API_IMAGE}
@@ -75,11 +74,14 @@ pipeline {
echo "=== [DEV] Nettoyage anciens conteneurs ===" echo "=== [DEV] Nettoyage anciens conteneurs ==="
docker rm -f gameovergne-api gameovergne-client 2>/dev/null || true 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 ===" echo "=== [PROD] Nettoyage anciens conteneurs ==="
docker rm -f gameovergne-api-prod gameovergne-client-prod 2>/dev/null || true 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
""" """
} }
} }