ci: bump version to v4.25.0

CHANGELOG.md

@@ -307,3 +307,8 @@
 ### Features
 
 * Update Gateway to use ArrayList for game IDs and bound users ([2f89951](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/2f89951c25484d6bc412536a83019ee6d0b7f780))
+##  (2026-01-07)
+
+### Features
+
+* Update joinGame endpoint to accept gameId as a path parameter ([cf18549](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/cf1854976a51eb4931d50cf93640498ed18686fc))

knockoutwhistweb/app/controllers/MainMenuController.scala

@@ -55,32 +55,21 @@ class MainMenuController @Inject()(
 
   }
 
-  def joinGame(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
+  def joinGame(gameId: String): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
-    val jsonBody = request.body.asJson
+    val game = PodManager.getGame(gameId)
-    val gameId: Option[String] = jsonBody.flatMap { jsValue =>
+    game match {
-      (jsValue \ "gameId").asOpt[String]
+      case Some(g) =>
-    }
+        g.addUser(request.user)
-    if (gameId.isDefined) {
+        Ok(Json.obj(
-      val game = PodManager.getGame(gameId.get)
+          "status" -> "success",
-      game match {
+          "redirectUrl" -> routes.IngameController.game(g.id).url,
-        case Some(g) =>
+          "content" -> IngameController.returnInnerHTML(g, g.logic.getCurrentState, request.user).toString
-          g.addUser(request.user)
+        ))
-          Ok(Json.obj(
+      case None =>
-            "status" -> "success",
+        NotFound(Json.obj(
-            "redirectUrl" -> routes.IngameController.game(g.id).url,
+          "status" -> "failure",
-            "content" -> IngameController.returnInnerHTML(g, g.logic.getCurrentState, request.user).toString
+          "errorMessage" -> "No Game found"
-          ))
+        ))
-        case None =>
-          NotFound(Json.obj(
-            "status" -> "failure",
-            "errorMessage" -> "No Game found"
-          ))
-      }
-    } else {
-      BadRequest(Json.obj(
-        "status" -> "failure",
-        "errorMessage" -> "Invalid form submission"
-      ))
     }
   }
 

knockoutwhistweb/conf/routes

@@ -15,7 +15,7 @@ GET         /rules                   controllers.MainMenuController.rules()
 GET         /navSPA/:pType           controllers.MainMenuController.navSPA(pType)
 
 POST        /createGame              controllers.MainMenuController.createGame()
-POST        /joinGame                controllers.MainMenuController.joinGame()
+POST        /joinGame/:gameId        controllers.MainMenuController.joinGame(gameId: String)
 
 # User authentication routes
 POST        /login                   controllers.UserController.login_Post()

versions.env

@@ -1,3 +1,3 @@
 MAJOR=4
-MINOR=24
+MINOR=25
 PATCH=0