Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1542906edf | ||
| cf1854976a | |||
|
|
723a4be33f | ||
| 2f89951c25 |
10
CHANGELOG.md
10
CHANGELOG.md
@@ -302,3 +302,13 @@
|
|||||||
### Features
|
### Features
|
||||||
|
|
||||||
* Add Health and Login endpoints with updated Redis configuration ([4a5af36](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/4a5af36ae0dcb540e02b7a1cd042e54cc6342c78))
|
* Add Health and Login endpoints with updated Redis configuration ([4a5af36](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/4a5af36ae0dcb540e02b7a1cd042e54cc6342c78))
|
||||||
|
## (2026-01-07)
|
||||||
|
|
||||||
|
### 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))
|
||||||
|
|||||||
Submodule knockoutwhistfrontend updated: 352b7fd3ff...92a7bc0586
@@ -55,13 +55,8 @@ 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 =>
|
|
||||||
(jsValue \ "gameId").asOpt[String]
|
|
||||||
}
|
|
||||||
if (gameId.isDefined) {
|
|
||||||
val game = PodManager.getGame(gameId.get)
|
|
||||||
game match {
|
game match {
|
||||||
case Some(g) =>
|
case Some(g) =>
|
||||||
g.addUser(request.user)
|
g.addUser(request.user)
|
||||||
@@ -76,12 +71,6 @@ class MainMenuController @Inject()(
|
|||||||
"errorMessage" -> "No Game found"
|
"errorMessage" -> "No Game found"
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
BadRequest(Json.obj(
|
|
||||||
"status" -> "failure",
|
|
||||||
"errorMessage" -> "Invalid form submission"
|
|
||||||
))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def rules(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
|
def rules(): Action[AnyContent] = authAction { implicit request: AuthenticatedRequest[AnyContent] =>
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import org.redisson.config.Config
|
|||||||
import play.api.Logger
|
import play.api.Logger
|
||||||
import play.api.inject.ApplicationLifecycle
|
import play.api.inject.ApplicationLifecycle
|
||||||
|
|
||||||
|
import java.util
|
||||||
import java.util.UUID
|
import java.util.UUID
|
||||||
import javax.inject.*
|
import javax.inject.*
|
||||||
import scala.concurrent.ExecutionContext
|
import scala.concurrent.ExecutionContext
|
||||||
@@ -45,8 +46,8 @@ class Gateway @Inject()(
|
|||||||
PodManager.podName,
|
PodManager.podName,
|
||||||
PodManager.podIp,
|
PodManager.podIp,
|
||||||
9000,
|
9000,
|
||||||
PodManager.getAllGameIds().asJava,
|
new util.ArrayList[String](PodManager.getAllGameIds().asJava),
|
||||||
PodManager.allBoundUsers().asJava
|
new util.ArrayList[String](PodManager.allBoundUsers().asJava)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ GET /rules controllers.MainMenuController.rules()
|
|||||||
GET /navSPA/:pType controllers.MainMenuController.navSPA(pType)
|
GET /navSPA/:pType controllers.MainMenuController.navSPA(pType)
|
||||||
|
|
||||||
POST /createGame controllers.MainMenuController.createGame()
|
POST /createGame controllers.MainMenuController.createGame()
|
||||||
POST /joinGame controllers.MainMenuController.joinGame()
|
POST /joinGame/:gameId controllers.MainMenuController.joinGame(gameId: String)
|
||||||
|
|
||||||
# User authentication routes
|
# User authentication routes
|
||||||
POST /login controllers.UserController.login_Post()
|
POST /login controllers.UserController.login_Post()
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
MAJOR=4
|
MAJOR=4
|
||||||
MINOR=23
|
MINOR=25
|
||||||
PATCH=0
|
PATCH=0
|
||||||
|
|||||||
Reference in New Issue
Block a user