From 17f04d71a432f4511fd27d971103c773f1687878 Mon Sep 17 00:00:00 2001
From: Oliver Wallisch <oliver.wallisch@stackit.cloud>
Date: Wed, 9 Sep 2026 23:23:23 +0200
Subject: [PATCH] fixes for jwt token (now 30 days) screentime sync and redis

---
 .../domain/repository/KidioRepository.kt      | 29 +++++++++++++------
 .../oliver/kidio/backend/plugins/Routing.kt   | 14 +++++----
 .../kidio/backend/security/JwtService.kt      |  2 +-
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/main/kotlin/com/oliver/kidio/backend/domain/repository/KidioRepository.kt b/src/main/kotlin/com/oliver/kidio/backend/domain/repository/KidioRepository.kt
index e989fb1..a15c87e 100644
--- a/src/main/kotlin/com/oliver/kidio/backend/domain/repository/KidioRepository.kt
+++ b/src/main/kotlin/com/oliver/kidio/backend/domain/repository/KidioRepository.kt
@@ -78,7 +78,7 @@ class ExposedKidioRepository : KidioRepository {
         val dbSeconds = DatabaseFactory.dbQuery {
             ScreentimeTable.selectAll()
                 .where { ScreentimeTable.userId eq userId }
-                .map { it[ScreentimeTable.remainingSeconds] } // Korrigiert: Abfrage der Sekunden!
+                .map { it[ScreentimeTable.remainingSeconds] }
                 .singleOrNull() ?: 1800
         }
 
@@ -93,15 +93,26 @@ class ExposedKidioRepository : KidioRepository {
         return dbSeconds
     }
 
-    override suspend fun updateScreentime(userId: String, seconds: Int) = DatabaseFactory.dbQuery {
-        val rowsUpdated = ScreentimeTable.update({ ScreentimeTable.userId eq userId }) {
-            it[remainingSeconds] = seconds
-        }
-        if (rowsUpdated == 0) {
-            ScreentimeTable.insert {
-                it[ScreentimeTable.userId] = userId
-                it[ScreentimeTable.remainingSeconds] = seconds // Korrigiert: Wert wird wieder mitgegeben!
+    override suspend fun updateScreentime(userId: String, seconds: Int) {
+        DatabaseFactory.dbQuery {
+            val rowsUpdated = ScreentimeTable.update({ ScreentimeTable.userId eq userId }) {
+                it[remainingSeconds] = seconds
             }
+            if (rowsUpdated == 0) {
+                ScreentimeTable.insert {
+                    it[ScreentimeTable.userId] = userId
+                    it[ScreentimeTable.remainingSeconds] = seconds
+                }
+            }
+        }
+        val redisKey = "screentime:$userId"
+        try {
+            RedisFactory.getResource().use { jedis ->
+                jedis.setex(redisKey, 3600, seconds.toString())
+                println("DEBUG: Bildschirmzeit für $userId in REDIS aktualisiert auf $seconds Sek")
+            }
+        } catch (e: Exception) {
+            println("WARNUNG: Konnte Redis nicht aktualisieren: ${e.message}")
         }
     }
 
diff --git a/src/main/kotlin/com/oliver/kidio/backend/plugins/Routing.kt b/src/main/kotlin/com/oliver/kidio/backend/plugins/Routing.kt
index 0ac4953..0654cc5 100644
--- a/src/main/kotlin/com/oliver/kidio/backend/plugins/Routing.kt
+++ b/src/main/kotlin/com/oliver/kidio/backend/plugins/Routing.kt
@@ -6,7 +6,6 @@ import com.oliver.kidio.backend.security.JwtService
 import io.ktor.http.HttpStatusCode
 import io.ktor.server.application.*
 import io.ktor.server.auth.authenticate
-import io.ktor.server.auth.jwt.JWTPrincipal
 import io.ktor.server.auth.principal
 import io.ktor.server.request.*
 import io.ktor.server.response.*
@@ -91,9 +90,8 @@ fun Application.configureRouting(repository: KidioRepository, jwtService : JwtSe
             // 2. Antwort auf eine Aufgabe überprüfen
                 post("/api/v1/tasks/verify") {
                     val request = call.receive<TaskVerifyRequest>()
-                    val principal = call.principal<JWTPrincipal>()
-                    val userId = principal?.payload?.getClaim("userId")?.asString()
-
+                    val principal = call.principal<UserPrincipal>()
+                    val userId = principal?.userId
                     if (userId == null){
                         call.respond(HttpStatusCode.Unauthorized, mapOf("error" to "Ungültiges oder abgelaufenes Token"))
                     return@post
@@ -140,11 +138,15 @@ fun Application.configureRouting(repository: KidioRepository, jwtService : JwtSe
             post("/api/v1/screentime/sync") {
                 val request = call.receive<SyncRequest>()
 
-                val currentSeconds = repository.getScreentime(request.userId)
+                // Wir holen die echte, fälschungssichere userId aus dem Login-Token:
+                val principal = call.principal<UserPrincipal>()
+                val userId = principal?.userId ?: request.userId // Fallback auf request.userId, falls token noch fehlt
+
+                val currentSeconds = repository.getScreentime(userId)
                 var newSeconds = currentSeconds - request.usedSecondsSinceLastSync
                 if (newSeconds < 0) newSeconds = 0
 
-                repository.updateScreentime(request.userId, newSeconds)
+                repository.updateScreentime(userId, newSeconds)
 
                 call.respond(
                     SyncResponse(
diff --git a/src/main/kotlin/com/oliver/kidio/backend/security/JwtService.kt b/src/main/kotlin/com/oliver/kidio/backend/security/JwtService.kt
index f6c780c..e5faf17 100644
--- a/src/main/kotlin/com/oliver/kidio/backend/security/JwtService.kt
+++ b/src/main/kotlin/com/oliver/kidio/backend/security/JwtService.kt
@@ -9,7 +9,7 @@ class JwtService(
     private val secret: String = System.getenv("JWT_SECRET") ?: "super-geheimes-secret-fuer-dev",
     private val issuer: String = "https://kidio.oliver.com/",
     private val audience: String = "kidio-users",
-    private val expirationInMs: Long = 36_000_000 // 10 Stunden
+    private val expirationInMs: Long =  java.util.concurrent.TimeUnit.DAYS.toMillis(30) // 30 Tage
 ) {
 
     val verifier: JWTVerifier = JWT