From 47eadfc2a5f984e46ed9c0b3705b5f53697229d9 Mon Sep 17 00:00:00 2001
From: Jan-Niclas Struewer <j.n.struewer@gmail.com>
Date: Mon, 11 Dec 2023 15:05:24 +0100
Subject: [PATCH] fixed api usage for auth api
---
.../repository/service/RepositoryService.kt | 12 +++++++-----
src/main/resources/application-dev.properties | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/service/RepositoryService.kt b/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/service/RepositoryService.kt
index 6ef6dc45..12059bbe 100644
--- a/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/service/RepositoryService.kt
+++ b/src/main/kotlin/de/fraunhofer/iem/dataprovider/repository/service/RepositoryService.kt
@@ -11,6 +11,7 @@ import de.fraunhofer.iem.dataprovider.repository.repository.RepositoryRepository
import de.fraunhofer.iem.dataprovider.utilities.HttpClientWrapper
import io.ktor.client.call.*
import io.ktor.client.request.*
+import io.ktor.http.*
import org.springframework.stereotype.Service
import java.util.*
@@ -79,14 +80,15 @@ class RepositoryService(
}
suspend fun validateUser(validateUserDto: ValidateUserDto) {
- val userCookie = httpClient.get(getAuthApiPath(validateUserDto))
+ val userCookie = httpClient.get(openCodeApiProperties.auth) {
+ url {
+ appendPathSegments(validateUserDto.b)
+ parameters.append("apiKey", openCodeApiProperties.authApiKey)
+ }
+ }
println(userCookie)
println(userCookie.headers)
println(userCookie.body<Any>())
}
- private fun getAuthApiPath(validateUserDto: ValidateUserDto): String {
- return "${openCodeApiProperties.auth}${validateUserDto.b}?apiKey=${openCodeApiProperties.authApiKey}"
- }
-
}
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 4c48b1e4..f9d08a89 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -8,7 +8,7 @@ opencode.user-name=${OC_GL_USER:}
# Tool APIs
opencode.api.base-path=https://sl.dev.o4oe.de/api/v1/project/
opencode.api.ort=/cve-result
-opencode.api.auth=https://sl.dev.o4oe.de/api/receive-session/
+opencode.api.auth=https://sl.dev.o4oe.de/api/receive-session
opencode.api.auth-api-key=${AUTH_API_KEY}
# API key to access this server's API
--
GitLab