From ae203abea16e2b563b3b0274dee516e42895e123 Mon Sep 17 00:00:00 2001
From: Jan-Niclas Struewer <j.n.struewer@gmail.com>
Date: Tue, 12 Dec 2023 15:30:45 +0100
Subject: [PATCH] Changed return type of get cookie function
---
.../repository/controller/RepositoryController.kt | 9 +++++++--
.../iem/dataprovider/repository/dto/OkResponseDto.kt | 5 +++++
2 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/dto/OkResponseDto.kt
diff --git a/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/controller/RepositoryController.kt b/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/controller/RepositoryController.kt
index d0ac1164..2e28ae3c 100644
--- a/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/controller/RepositoryController.kt
+++ b/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/controller/RepositoryController.kt
@@ -167,16 +167,21 @@ class RepositoryController(
suspend fun validateUserLogin(
@PathVariable id: Long,
@RequestBody validateDto: ValidateUserDto
- ): ResponseEntity<Unit> {
+ ): ResponseEntity<OkResponseDto> {
val gitlabUserId = userService.getGitlabUserId(validateUserDto = validateDto)
val jwt = jwtService.createJWT(JwtContentDto(gitlabId = gitlabUserId))
+
val gitlabCookie = ResponseCookie.from("gitlabIdToken", jwt ?: "")
.httpOnly(true)
.secure(true)
.path("/")
.maxAge(Duration.ofDays(7))
.build()
- return ResponseEntity.ok().header(HttpHeaders.SET_COOKIE, gitlabCookie.toString()).build()
+
+ return ResponseEntity
+ .ok()
+ .header(HttpHeaders.SET_COOKIE, gitlabCookie.toString())
+ .body(OkResponseDto())
}
diff --git a/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/dto/OkResponseDto.kt b/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/dto/OkResponseDto.kt
new file mode 100644
index 00000000..11c3b397
--- /dev/null
+++ b/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/dto/OkResponseDto.kt
@@ -0,0 +1,5 @@
+package de.fraunhofer.iem.dataprovider.repository.dto
+
+data class OkResponseDto(
+ val status: Int = 200
+)
--
GitLab