fix: change --allowed-origins to be actually optional

ldss-project · Sep 12, 2023 · 75eba89 · 75eba89
1 parent 2672b05
commit 75eba89
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/...a/io/github/jahrim/chess/game/service/components/adapters/http/ChessGameHttpAdapter.scala b/...a/io/github/jahrim/chess/game/service/components/adapters/http/ChessGameHttpAdapter.scala
@@ -36,23 +36,26 @@ class ChessGameHttpAdapter(
   override protected def init(context: AdapterContext[ChessGamePort]): Unit =
     val router = Router.router(context.vertx)
 
-    val cors: CorsHandler =
-      CorsHandler
-        .create()
-        .addOrigins(allowedOrigins.asJava)
-        .allowCredentials(true)
-        .allowedMethods(
-          Set(
-            HttpMethod.HEAD,
-            HttpMethod.GET,
-            HttpMethod.POST,
-            HttpMethod.PUT
-          ).asJava
+    if allowedOrigins.nonEmpty then
+      router
+        .route()
+        .handler(
+          CorsHandler
+            .create()
+            .addOrigins(allowedOrigins.asJava)
+            .allowCredentials(true)
+            .allowedMethods(
+              Set(
+                HttpMethod.HEAD,
+                HttpMethod.GET,
+                HttpMethod.POST,
+                HttpMethod.PUT
+              ).asJava
+            )
         )
 
     router
       .route()
-      .handler(cors)
       .handler(BodyHandler.create())
       .handler(LogHandler(context.log.info))
       .failureHandler(context => context.sendException(context.failure))

diff --git a/src/main/scala/io/github/jahrim/chess/game/service/main/Main.scala b/src/main/scala/io/github/jahrim/chess/game/service/main/Main.scala
@@ -69,5 +69,5 @@ class Args(private val arguments: Seq[String]) extends ScallopConf(arguments):
     descr = "A list of colon separated origins that are allowed to access this service.",
     default = Some(""),
     required = false
-  ).map(_.split(";").toSeq)
+  ).map(_.split(";").filter(_.nonEmpty).toSeq)
   verify()