From 1a0b09c4244e65a55d45072ab69bd699c6cc5aa8 Mon Sep 17 00:00:00 2001 From: Balduin Landolt <33053745+BalduinLandolt@users.noreply.github.com> Date: Thu, 29 Sep 2022 11:47:37 +0200 Subject: [PATCH] fix: API returns invalid file URLs, due to including the port (#2223) --- .../main/scala/org/knora/webapi/config/AppConfig.scala | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/webapi/src/main/scala/org/knora/webapi/config/AppConfig.scala b/webapi/src/main/scala/org/knora/webapi/config/AppConfig.scala index b05f8f24ef..be06bf5a8d 100644 --- a/webapi/src/main/scala/org/knora/webapi/config/AppConfig.scala +++ b/webapi/src/main/scala/org/knora/webapi/config/AppConfig.scala @@ -134,12 +134,10 @@ final case class Sipi( audioMimeTypes: List[String], archiveMimeTypes: List[String] ) { - val internalBaseUrl: String = "http://" + internalHost + (if (internalPort != 80) - ":" + internalPort - else "") - val externalBaseUrl: String = "http://" + externalHost + (if (externalPort != 80) - ":" + externalPort - else "") + val internalBaseUrl: String = + internalProtocol + "://" + internalHost + (if (internalPort != 80) ":" + internalPort else "") + val externalBaseUrl: String = + externalProtocol + "://" + externalHost + (if (externalPort != 80) ":" + externalPort else "") val timeoutInSeconds: duration.Duration = scala.concurrent.duration.Duration(timeout) }