use request.absoluteURI() as fallback

campudus · Mar 13, 2024 · 9054c69 · 9054c69
1 parent 3a8727d
commit 9054c69
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/main/scala/com/campudus/tableaux/Starter.scala b/src/main/scala/com/campudus/tableaux/Starter.scala
@@ -53,7 +53,7 @@ class Starter extends ScalaVerticle with LazyLogging {
       val uploadsDirectory = getStringDefault(config, "uploadsDirectory", Starter.DEFAULT_UPLOADS_DIRECTORY)
       val authConfig = config.getJsonObject("auth", Json.obj())
       val rolePermissionsPath = getStringDefault(config, "rolePermissionsPath", Starter.DEFAULT_ROLE_PERMISSIONS_PATH)
-      val openApiUrl = getStringDefault(config, "openApiUrl", "")
+      val openApiUrl = Option(getStringDefault(config, "openApiUrl", null))
 
       val rolePermissions = FileUtils(vertxAccessContainer()).readJsonFile(rolePermissionsPath, Json.emptyObj())
 

diff --git a/src/main/scala/com/campudus/tableaux/TableauxConfig.scala b/src/main/scala/com/campudus/tableaux/TableauxConfig.scala
@@ -14,7 +14,7 @@ class TableauxConfig(
     workingDirectory: String,
     uploadsDirectory: String,
     val rolePermissions: JsonObject,
-    val openApiUrl: String = ""
+    val openApiUrl: Option[String] = None
 ) extends VertxAccess {
 
   def uploadsDirectoryPath(): Path = {

diff --git a/src/main/scala/com/campudus/tableaux/router/DocumentationRouter.scala b/src/main/scala/com/campudus/tableaux/router/DocumentationRouter.scala
@@ -130,10 +130,12 @@ class DocumentationRouter(override val config: TableauxConfig) extends BaseRoute
       })
 
     val forwardedUrl = request.getHeader("x-forwarded-url")
+    val openApiUrl = config.openApiUrl
 
-    val uri = (forwardedScheme, forwardedHost, forwardedUrl) match {
-      case (Some(scheme), Some(host), Some(query)) => s"$scheme://$host$query"
-      case _ => config.openApiUrl
+    val uri = (forwardedScheme, forwardedHost, forwardedUrl, openApiUrl) match {
+      case (Some(scheme), Some(host), Some(query), _) => s"$scheme://$host$query"
+      case (_, _, _, Some(openApiUrl)) => openApiUrl
+      case _ => request.absoluteURI()
     }
 
     DocUriParser.parse(uri)