From 166c2e5190fc4add1cf9b9648ba4d0274880f378 Mon Sep 17 00:00:00 2001 From: jecos Date: Thu, 12 Oct 2023 17:44:31 -0400 Subject: [PATCH] fix: CQDG-369 Add realm into ferload client config --- .../scala/bio/ferlab/ferload/endpoints/ConfigEndpoint.scala | 2 +- src/main/scala/bio/ferlab/ferload/model/FerloadConfig.scala | 2 +- .../bio/ferlab/ferload/endpoints/ConfigEndpointsSpec.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/scala/bio/ferlab/ferload/endpoints/ConfigEndpoint.scala b/src/main/scala/bio/ferlab/ferload/endpoints/ConfigEndpoint.scala index c18a3af..06fdf1a 100644 --- a/src/main/scala/bio/ferlab/ferload/endpoints/ConfigEndpoint.scala +++ b/src/main/scala/bio/ferlab/ferload/endpoints/ConfigEndpoint.scala @@ -19,7 +19,7 @@ object ConfigEndpoint: def configServerEndpoint(config: Config): ServerEndpoint[Any, IO] = configEndpoint.serverLogicSuccess(_ => { if (config.ferloadClientConfig.method == FerloadClientConfig.TOKEN) { - val tokenConfig = TokenConfig(config.ferloadClientConfig.clientId, config.ferloadClientConfig.tokenLink.get, config.ferloadClientConfig.tokenHelper) + val tokenConfig = TokenConfig(config.auth.realm, config.ferloadClientConfig.clientId, config.ferloadClientConfig.tokenLink.get, config.ferloadClientConfig.tokenHelper) IO.pure(FerloadConfig(config.ferloadClientConfig.method, None, Some(tokenConfig))) } else if (config.ferloadClientConfig.method == FerloadClientConfig.PASSWORD) { val kc = KeycloakConfig(config.auth.authUrl, config.auth.realm, config.ferloadClientConfig.clientId, config.auth.clientId) diff --git a/src/main/scala/bio/ferlab/ferload/model/FerloadConfig.scala b/src/main/scala/bio/ferlab/ferload/model/FerloadConfig.scala index 2a25816..3c3073f 100644 --- a/src/main/scala/bio/ferlab/ferload/model/FerloadConfig.scala +++ b/src/main/scala/bio/ferlab/ferload/model/FerloadConfig.scala @@ -8,4 +8,4 @@ case class FerloadConfig(method: String, keycloak: Option[KeycloakConfig], token case class KeycloakConfig(url: String, realm: String, `client-id`: String, audience: String) -case class TokenConfig(`client-id`: String, link: String, helper: Option[String]) \ No newline at end of file +case class TokenConfig(realm:String, `client-id`: String, link: String, helper: Option[String]) \ No newline at end of file diff --git a/src/test/scala/bio/ferlab/ferload/endpoints/ConfigEndpointsSpec.scala b/src/test/scala/bio/ferlab/ferload/endpoints/ConfigEndpointsSpec.scala index c77ff64..a8f3ab0 100644 --- a/src/test/scala/bio/ferlab/ferload/endpoints/ConfigEndpointsSpec.scala +++ b/src/test/scala/bio/ferlab/ferload/endpoints/ConfigEndpointsSpec.scala @@ -56,6 +56,6 @@ class ConfigEndpointsSpec extends AnyFlatSpec with Matchers with EitherValues: .response(asJson[FerloadConfig]) .send(backendStub) - val expected = FerloadConfig(FerloadClientConfig.TOKEN, None, Some(TokenConfig("ferloadClientId","https://ferload.ferlab.bio/token", Some("Please copy / paste this url in your browser to get a new authentication token.")))) + val expected = FerloadConfig(FerloadClientConfig.TOKEN, None, Some(TokenConfig("realm", "ferloadClientId", "https://ferload.ferlab.bio/token", Some("Please copy / paste this url in your browser to get a new authentication token.")))) response.map(_.body.value shouldBe expected).unwrap } \ No newline at end of file