diff --git a/backend/pom.xml b/backend/pom.xml index 7fbff52..77c7634 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -101,7 +101,6 @@ com.mysql mysql-connector-j - test diff --git a/backend/src/main/java/com/tfg/tfg/config/OpenApiConfig.java b/backend/src/main/java/com/tfg/tfg/config/OpenApiConfig.java index 8478573..6ef6131 100644 --- a/backend/src/main/java/com/tfg/tfg/config/OpenApiConfig.java +++ b/backend/src/main/java/com/tfg/tfg/config/OpenApiConfig.java @@ -44,8 +44,6 @@ public OpenAPI customOpenAPI() { new Server() .url("https://localhost") .description("Local development server (HTTPS)"))) - .addSecurityItem(new SecurityRequirement() - .addList(securitySchemeName)) .components(new Components() .addSecuritySchemes(securitySchemeName, new SecurityScheme() .name(securitySchemeName) diff --git a/backend/src/main/java/com/tfg/tfg/controller/AdminController.java b/backend/src/main/java/com/tfg/tfg/controller/AdminController.java index e187d14..153eb26 100644 --- a/backend/src/main/java/com/tfg/tfg/controller/AdminController.java +++ b/backend/src/main/java/com/tfg/tfg/controller/AdminController.java @@ -24,8 +24,11 @@ import com.tfg.tfg.model.mapper.UserMapper; import com.tfg.tfg.service.interfaces.IUserService; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; + @RestController @RequestMapping("/api/v1/admin") +@SecurityRequirement(name = "bearerAuth") public class AdminController { private static final String ROLE_ADMIN = "ADMIN"; diff --git a/backend/src/main/java/com/tfg/tfg/controller/DashboardController.java b/backend/src/main/java/com/tfg/tfg/controller/DashboardController.java index ec10ee0..6ace55b 100644 --- a/backend/src/main/java/com/tfg/tfg/controller/DashboardController.java +++ b/backend/src/main/java/com/tfg/tfg/controller/DashboardController.java @@ -31,8 +31,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; + @RestController @RequestMapping("/api/v1/dashboard") +@SecurityRequirement(name = "bearerAuth") public class DashboardController { private static final Logger logger = LoggerFactory.getLogger(DashboardController.class); diff --git a/backend/src/main/java/com/tfg/tfg/controller/UserController.java b/backend/src/main/java/com/tfg/tfg/controller/UserController.java index 925e9fa..4408aa0 100644 --- a/backend/src/main/java/com/tfg/tfg/controller/UserController.java +++ b/backend/src/main/java/com/tfg/tfg/controller/UserController.java @@ -28,8 +28,11 @@ import org.slf4j.LoggerFactory; import jakarta.validation.Valid; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; + @RestController @RequestMapping("/api/v1/users") +@SecurityRequirement(name = "bearerAuth") public class UserController { private static final Logger logger = LoggerFactory.getLogger(UserController.class); diff --git a/docker/docker-compose-dev.yml b/docker/docker-compose-dev.yml index 12a959c..2a88c1c 100644 --- a/docker/docker-compose-dev.yml +++ b/docker/docker-compose-dev.yml @@ -8,6 +8,8 @@ services: environment: MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} MYSQL_DATABASE: ${MYSQL_DATABASE} + MYSQL_USER: ${MYSQL_USER} + MYSQL_PASSWORD: ${MYSQL_PASSWORD} ports: - "3306:3306" volumes: @@ -15,9 +17,11 @@ services: networks: - spiritblade-network healthcheck: - test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] + test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${MYSQL_ROOT_PASSWORD:-1234}"] + interval: 30s timeout: 20s retries: 10 + start_period: 300s # MinIO Object Storage (S3-compatible) minio: diff --git a/docker/docker-compose-separated.yml b/docker/docker-compose-separated.yml index d182c2f..c8a017e 100644 --- a/docker/docker-compose-separated.yml +++ b/docker/docker-compose-separated.yml @@ -21,8 +21,8 @@ services: condition: service_healthy environment: SPRING_DATASOURCE_URL: "jdbc:mysql://mysql:3306/${MYSQL_DATABASE:-spiritblade}?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true" - SPRING_DATASOURCE_USERNAME: "root" - SPRING_DATASOURCE_PASSWORD: "${MYSQL_ROOT_PASSWORD}" + SPRING_DATASOURCE_USERNAME: "${MYSQL_USER}" + SPRING_DATASOURCE_PASSWORD: "${MYSQL_PASSWORD}" SPRING_JPA_HIBERNATE_DDL_AUTO: "update" SPRING_DATA_REDIS_HOST: "redis" SPRING_DATA_REDIS_PORT: "6379" @@ -85,6 +85,8 @@ services: restart: unless-stopped environment: MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} + MYSQL_USER: ${MYSQL_USER} + MYSQL_PASSWORD: ${MYSQL_PASSWORD} MYSQL_DATABASE: ${MYSQL_DATABASE:-spiritblade} volumes: - mysql_data_separated:/var/lib/mysql @@ -94,10 +96,10 @@ services: - spiritblade-network healthcheck: test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "root", "-p${MYSQL_ROOT_PASSWORD:-1234}"] - interval: 10s - timeout: 5s - retries: 5 - start_period: 30s + interval: 30s + timeout: 20s + retries: 10 + start_period: 300s # Redis Cache redis: diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 9aca0c4..087da46 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -84,8 +84,8 @@ services: environment: # Database Configuration SPRING_DATASOURCE_URL: "jdbc:mysql://mysql:3306/${MYSQL_DATABASE:-spiritblade}?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true" - SPRING_DATASOURCE_USERNAME: "root" - SPRING_DATASOURCE_PASSWORD: "${MYSQL_ROOT_PASSWORD}" + SPRING_DATASOURCE_USERNAME: "${MYSQL_USER}" + SPRING_DATASOURCE_PASSWORD: "${MYSQL_PASSWORD}" SPRING_JPA_HIBERNATE_DDL_AUTO: "update" # Redis Configuration diff --git a/utils/images/Admin.JPG b/utils/images/Admin.JPG index 45fe31c..b6331d0 100644 Binary files a/utils/images/Admin.JPG and b/utils/images/Admin.JPG differ diff --git a/utils/images/aaa.JPG b/utils/images/ArbolRamasRepositorio.JPG similarity index 100% rename from utils/images/aaa.JPG rename to utils/images/ArbolRamasRepositorio.JPG diff --git a/utils/images/Captura.JPG b/utils/images/QualityGate.JPG similarity index 100% rename from utils/images/Captura.JPG rename to utils/images/QualityGate.JPG diff --git a/utils/images/Summoner.JPG b/utils/images/Summoner.JPG index add7325..13c7d59 100644 Binary files a/utils/images/Summoner.JPG and b/utils/images/Summoner.JPG differ diff --git a/utils/images/capturaIA.JPG b/utils/images/capturaIA.JPG new file mode 100644 index 0000000..1bb669f Binary files /dev/null and b/utils/images/capturaIA.JPG differ