DrunkenPinguin/LernApp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat/gitignore #9

Merged
mt merged 5 commits from feat/gitignore into main 2026-09-14 10:13:13 +00:00
Conversation 0 Commits 5 Files changed 266 +169 -166
1 changed files with 169 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit aabf94941a - Show all commits

15
src/main/kotlin/com/oliver/kidio/backend/plugins/Routing.kt
View file

@ -33,10 +33,10 @@ fun isValidPassword(password: String): Boolean {
} }
fun Application.configureRouting(repository: KidioRepository, jwtService : JwtService) { fun Application.configureRouting(repository: KidioRepository, jwtService : JwtService) {
fun Application.configureRouting( fun Application.configureRouting(
repository: KidioRepository, repository: KidioRepository,
jwtService: JwtService, jwtService: JwtService,
) { ) {
routing { routing {
post("/api/v1/auth/register") { post("/api/v1/auth/register") {
val registerRequest = call.receive<RegisterRequest>() val registerRequest = call.receive<RegisterRequest>()
@ -117,8 +117,6 @@ fun Application.configureRouting(
return@post return@post
} }
authenticate("auth-jwt") { authenticate("auth-jwt") {
@ -135,7 +133,10 @@ fun Application.configureRouting(
val principal = call.principal<UserPrincipal>() val principal = call.principal<UserPrincipal>()
val userId = principal?.userId val userId = principal?.userId
if (userId == null) { if (userId == null) {
call.respond(HttpStatusCode.Unauthorized, mapOf("error" to "Ungültiges oder abgelaufenes Token")) call.respond(
HttpStatusCode.Unauthorized,
mapOf("error" to "Ungültiges oder abgelaufenes Token")
)
return@post return@post
} }
val taskInfo = repository.getTaskAnswerAndReward(request.taskId) val taskInfo = repository.getTaskAnswerAndReward(request.taskId)
@ -199,7 +200,8 @@ fun Application.configureRouting(
// Wir holen die echte, fälschungssichere userId aus dem Login-Token: // Wir holen die echte, fälschungssichere userId aus dem Login-Token:
val principal = call.principal<UserPrincipal>() val principal = call.principal<UserPrincipal>()
val userId = principal?.userId ?: request.userId // Fallback auf request.userId, falls token noch fehlt val userId =
principal?.userId ?: request.userId // Fallback auf request.userId, falls token noch fehlt
val currentSeconds = repository.getScreentime(userId) val currentSeconds = repository.getScreentime(userId)
var newSeconds = currentSeconds - request.usedSecondsSinceLastSync var newSeconds = currentSeconds - request.usedSecondsSinceLastSync
@ -216,5 +218,6 @@ fun Application.configureRouting(
} }
} }
} }
}
} }