Merge branch 'main' into dependabot/github_actions/github/codeql-acti…

…on-3
dallay · Sep 30, 2024 · c5ec2a7 · c5ec2a7
2 parents 002600e + e789d5d
commit c5ec2a7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/apps/backend/src/main/kotlin/com/lyra/app/users/application/UserRegistrator.kt b/apps/backend/src/main/kotlin/com/lyra/app/users/application/UserRegistrator.kt
@@ -10,6 +10,7 @@ import com.lyra.common.domain.Service
 import com.lyra.common.domain.bus.event.EventBroadcaster
 import com.lyra.common.domain.bus.event.EventPublisher
 import com.lyra.common.domain.error.BusinessRuleValidationException
+import org.apache.commons.text.StringEscapeUtils
 import org.slf4j.LoggerFactory
 
 @Service
@@ -24,7 +25,10 @@ class UserRegistrator(
  }
 
  suspend fun registerNewUser(registerUserCommand: RegisterUserCommand): ApiDataResponse<UserResponse> {
- log.info("Registering new user with email: {}", registerUserCommand.email)
+ log.info(
+ "Registering new user with email: {}",
+ StringEscapeUtils.escapeJava(registerUserCommand.email),
+ )
  return try {
  val user = registerUserCommand.toUser()
  val createdUser = userCreator.create(user)

diff --git a/.../backend/src/main/kotlin/com/lyra/app/users/infrastructure/http/UserRegisterController.kt b/.../backend/src/main/kotlin/com/lyra/app/users/infrastructure/http/UserRegisterController.kt
@@ -8,6 +8,7 @@ import com.lyra.app.users.infrastructure.http.request.RegisterUserRequest
 import io.swagger.v3.oas.annotations.Operation
 import io.swagger.v3.oas.annotations.responses.ApiResponse
 import io.swagger.v3.oas.annotations.responses.ApiResponses
+import org.apache.commons.text.StringEscapeUtils
 import org.slf4j.LoggerFactory
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
@@ -30,7 +31,7 @@ class UserRegisterController(private val userRegistrator: UserRegistrator) {
  @PostMapping("/register")
  suspend fun registerUser(@Validated @RequestBody registerUserRequest: RegisterUserRequest):
  ResponseEntity<ApiDataResponse<UserResponse>> {
- log.info("Registering new user with email: {}", registerUserRequest.email)
+ log.info("Registering new user with email: {}", StringEscapeUtils.escapeJava(registerUserRequest.email))
  return try {
  val response = userRegistrator.registerNewUser(registerUserRequest.toRegisterUserCommand())
  mapRegistrationResult(response)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -39,7 +39,7 @@ gradle-frontend = { module = "org.siouan:frontend-jdk17", version.ref = "fronten
 
 # Detekt
 gradle-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
-detekt-compose = { module = "io.nlopez.compose.rules:detekt", version = "0.4.3" }
+detekt-compose = { module = "io.nlopez.compose.rules:detekt", version = "0.4.12" }
 detekt-compose2 = { module = "ru.kode:detekt-rules-compose", version = "1.3.0" }
 detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }