KnockOutWhist/KnockOutWhist-Web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 32 Wiki Activity

feat/FRO-31 Small backend changes #108

Merged
Janis merged 3 commits from feat/FRO-31 into main 2025-12-11 07:10:24 +01:00
Conversation 0 Commits 3 Files Changed 2 +5 -4
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
knockoutwhistweb/app/controllers/StatusController.scala
View File

@@ -34,7 +34,7 @@ class StatusController @Inject()(
Json.obj( Json.obj(
"status" -> "authenticated", "status" -> "authenticated",
"username" -> user.name, "username" -> user.name,
"inGame" -> "false" "inGame" -> false
) )
) )
} else { } else {
@@ -43,7 +43,7 @@ class StatusController @Inject()(
Json.obj( Json.obj(
"status" -> "authenticated", "status" -> "authenticated",
"username" -> user.name, "username" -> user.name,
"inGame" -> "true", "inGame" -> true,
"gameId" -> game.id "gameId" -> game.id
) )
) )
@@ -80,7 +80,7 @@ class StatusController @Inject()(
}} }}
private def getUserFromSession(request: RequestHeader): Option[User] = { private def getUserFromSession(request: RequestHeader): Option[User] = {
val session = request.cookies.get("sessionId") val session = request.cookies.get("accessToken")
if (session.isDefined) if (session.isDefined)
return sessionManager.getUserBySession(session.get.value) return sessionManager.getUserBySession(session.get.value)
None None

3
knockoutwhistweb/app/util/WebsocketEventMapper.scala
View File

@@ -57,7 +57,8 @@ object WebsocketEventMapper {
Json.obj( Json.obj(
"id" -> ("request-" + java.util.UUID.randomUUID().toString), "id" -> ("request-" + java.util.UUID.randomUUID().toString),
"event" -> obj.id, "event" -> obj.id,
"state" -> stateToJson(session), "state" -> session.gameLobby.getLogic.getCurrentState.toString,
"stateData" -> stateToJson(session),
"data" -> data "data" -> data
) )
} }