diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/ClassroomApiMappings.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/ClassroomApiMappings.kt index bac2973c..040363c6 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/ClassroomApiMappings.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/ClassroomApiMappings.kt @@ -2,6 +2,7 @@ package edu.ntnu.idi.idatt.backend.classroom.api import edu.ntnu.idi.idatt.backend.classroom.application.JoinClassroomCommand import edu.ntnu.idi.idatt.backend.classroom.application.JoinClassroomResult +import edu.ntnu.idi.idatt.backend.classroom.application.OwnedClassroomSummary fun JoinClassroomRequest.toCommand(authenticatedSubject: String): JoinClassroomCommand = JoinClassroomCommand( @@ -16,3 +17,14 @@ fun JoinClassroomResult.toJoinClassroomResponse(): JoinClassroomResponse = membershipStatus = membershipStatus, message = message, ) + +fun OwnedClassroomSummary.toOwnedClassroomResponse(): OwnedClassroomResponse = + OwnedClassroomResponse( + id = id, + title = title, + description = description, + pupilCount = pupilCount, + pendingPupilCount = pendingPupilCount, + teacherCount = teacherCount, + taskCount = taskCount, + ) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/ClassroomController.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/ClassroomController.kt index f31924e4..7a07d514 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/ClassroomController.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/ClassroomController.kt @@ -4,6 +4,8 @@ import edu.ntnu.idi.idatt.backend.classroom.application.ClassroomService import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser import jakarta.validation.Valid import org.springframework.security.core.annotation.AuthenticationPrincipal +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestBody import org.springframework.web.bind.annotation.RequestMapping @@ -17,6 +19,22 @@ import org.springframework.web.bind.annotation.RestController class ClassroomController( private val classroomService: ClassroomService, ) { + @GetMapping("/owned") + fun listOwnedClassrooms( + @AuthenticationPrincipal currentUser: CurrentUser, + ): List = + classroomService + .listOwnedClassrooms(currentUser.subject) + .map { it.toOwnedClassroomResponse() } + + @GetMapping("/{classroomId}") + fun getOwnedClassroom( + @AuthenticationPrincipal currentUser: CurrentUser, + @PathVariable classroomId: Long, + ): OwnedClassroomResponse = + classroomService + .getOwnedClassroom(currentUser.subject, classroomId) + .toOwnedClassroomResponse() /** * Endpoint for joining a classroom. diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/OwnedClassroomResponse.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/OwnedClassroomResponse.kt new file mode 100644 index 00000000..7b459109 --- /dev/null +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/OwnedClassroomResponse.kt @@ -0,0 +1,14 @@ +package edu.ntnu.idi.idatt.backend.classroom.api + +/** + * Minimal teacher-facing classroom summary used by classroom overview and playtest flows. + */ +data class OwnedClassroomResponse( + val id: Long, + val title: String, + val description: String?, + val pupilCount: Int, + val pendingPupilCount: Int, + val teacherCount: Int, + val taskCount: Int, +) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/application/ClassroomService.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/application/ClassroomService.kt index 91f85b6c..680fc86e 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/application/ClassroomService.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/application/ClassroomService.kt @@ -1,11 +1,15 @@ package edu.ntnu.idi.idatt.backend.classroom.application +import edu.ntnu.idi.idatt.backend.classroom.domain.Classroom +import edu.ntnu.idi.idatt.backend.classroom.domain.ClassroomPupilStatus import edu.ntnu.idi.idatt.backend.classroom.domain.ClassroomStatus import edu.ntnu.idi.idatt.backend.classroom.infrastructure.ClassroomRepository import edu.ntnu.idi.idatt.backend.game.gameProgress.domain.PupilGameProgress import edu.ntnu.idi.idatt.backend.game.gameProgress.domain.PupilGameProgressId import edu.ntnu.idi.idatt.backend.game.gameProgress.infrastructure.PupilGameProgressRepository +import edu.ntnu.idi.idatt.backend.game.tasks.infrastructure.TaskRepository import edu.ntnu.idi.idatt.backend.iam.application.CurrentUserResolver +import edu.ntnu.idi.idatt.backend.iam.domain.UserRole import org.springframework.context.ApplicationEventPublisher import org.springframework.http.HttpStatus import org.springframework.stereotype.Service @@ -24,8 +28,42 @@ class ClassroomService( private val classroomRepository: ClassroomRepository, private val currentUserResolver: CurrentUserResolver, private val pupilGameProgressRepository: PupilGameProgressRepository, + private val taskRepository: TaskRepository, private val eventPublisher: ApplicationEventPublisher, ) { + @Transactional(readOnly = true) + fun listOwnedClassrooms(authenticatedSubject: String): List { + val user = currentUserResolver.requireTeacherOrAdmin(authenticatedSubject) + val userId = requireNotNull(user.id) { "Authenticated user is missing an id" } + + val classrooms = if (user.role == UserRole.ADMIN) { + classroomRepository.findAll().sortedWith(compareBy({ it.title }, { it.id })) + } else { + classroomRepository.findAllByOwnerTeacherIdOrderByTitleAscIdAsc(userId) + } + + return classrooms.map(::toOwnedClassroomSummary) + } + + @Transactional(readOnly = true) + fun getOwnedClassroom( + authenticatedSubject: String, + classroomId: Long, + ): OwnedClassroomSummary { + val user = currentUserResolver.requireTeacherOrAdmin(authenticatedSubject) + val classroom = classroomRepository.findById(classroomId) + .orElseThrow { + ResponseStatusException(HttpStatus.NOT_FOUND, "Classroom not found") + } + val userId = requireNotNull(user.id) { "Authenticated user is missing an id" } + + if (user.role != UserRole.ADMIN && classroom.ownerTeacherId != userId) { + throw ResponseStatusException(HttpStatus.FORBIDDEN, "Only the classroom owner may access this classroom") + } + + return toOwnedClassroomSummary(classroom) + } + /** * Adds an authenticated pupil to a classroom as a pending member. * @@ -78,4 +116,15 @@ class ClassroomService( } return normalizedCode } + + private fun toOwnedClassroomSummary(classroom: Classroom): OwnedClassroomSummary = + OwnedClassroomSummary( + id = classroom.id, + title = classroom.title, + description = classroom.description, + pupilCount = classroom.pupilMemberships.count { it.status == ClassroomPupilStatus.ACTIVE }, + pendingPupilCount = classroom.pupilMemberships.count { it.status == ClassroomPupilStatus.PENDING }, + teacherCount = 1, + taskCount = taskRepository.countByClassroomId(classroom.id).toInt(), + ) } diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/application/OwnedClassroomSummary.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/application/OwnedClassroomSummary.kt new file mode 100644 index 00000000..48f283a4 --- /dev/null +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/application/OwnedClassroomSummary.kt @@ -0,0 +1,14 @@ +package edu.ntnu.idi.idatt.backend.classroom.application + +/** + * Lightweight teacher-facing classroom summary used by classroom overview and playtest flows. + */ +data class OwnedClassroomSummary( + val id: Long, + val title: String, + val description: String?, + val pupilCount: Int, + val pendingPupilCount: Int, + val teacherCount: Int, + val taskCount: Int, +) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/infrastructure/ClassroomRepository.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/infrastructure/ClassroomRepository.kt index f730ca95..a1d01615 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/infrastructure/ClassroomRepository.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/infrastructure/ClassroomRepository.kt @@ -23,6 +23,8 @@ interface ClassroomRepository : JpaRepository { */ fun findFirstByOwnerTeacherIdOrderByIdAsc(ownerTeacherId: Long): Classroom? + fun findAllByOwnerTeacherIdOrderByTitleAscIdAsc(ownerTeacherId: Long): List + /** * Returns all classrooms with the average total score across their pupils. * diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/application/GameAccessContextResolver.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/application/GameAccessContextResolver.kt index 6c565e44..df8d6c91 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/application/GameAccessContextResolver.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/application/GameAccessContextResolver.kt @@ -10,11 +10,16 @@ import org.springframework.http.HttpStatus import org.springframework.stereotype.Service import org.springframework.web.server.ResponseStatusException +enum class GameReadMode { + DEFAULT, + TEACHER_PLAYTEST, +} + /** * Resolves classroom-scoped game read capabilities from the authenticated session. * - * This centralizes the differences between normal pupil access, normal teacher/admin access, and - * read-only teacher preview sessions so map-stop and task endpoints apply consistent rules. + * This centralizes the differences between normal pupil access, teacher authoring reads, and + * classroom-scoped teacher playtest reads so map-stop and task endpoints apply consistent rules. */ @Service class GameAccessContextResolver( @@ -31,6 +36,7 @@ class GameAccessContextResolver( fun resolveReadContext( currentUser: CurrentUser, classroomId: Long, + readMode: GameReadMode = GameReadMode.DEFAULT, ): GameAccessContext { val user = currentUserResolver.requireUser(currentUser.subject) val classroom = classroomRepository.findById(classroomId) @@ -39,15 +45,12 @@ class GameAccessContextResolver( } val userId = requireNotNull(user.id) { "Authenticated user is missing an id" } - if (currentUser.isPreviewSession()) { + if (readMode == GameReadMode.TEACHER_PLAYTEST) { if (user.role !in setOf(UserRole.TEACHER, UserRole.ADMIN)) { - throw ResponseStatusException(HttpStatus.FORBIDDEN, "Only teachers and admins may use preview") - } - if (currentUser.previewClassroomId != classroomId) { - throw ResponseStatusException(HttpStatus.FORBIDDEN, "Preview session is limited to one classroom") + throw ResponseStatusException(HttpStatus.FORBIDDEN, "Only teachers and admins may use teacher playtest") } if (user.role == UserRole.TEACHER && classroom.ownerTeacherId != userId) { - throw ResponseStatusException(HttpStatus.FORBIDDEN, "Only the classroom owner may preview this classroom") + throw ResponseStatusException(HttpStatus.FORBIDDEN, "Only the classroom owner may playtest this classroom") } return GameAccessContext( classroom = classroom, diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/api/TeacherPlaytestMapStopsController.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/api/TeacherPlaytestMapStopsController.kt new file mode 100644 index 00000000..073d387f --- /dev/null +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/api/TeacherPlaytestMapStopsController.kt @@ -0,0 +1,38 @@ +package edu.ntnu.idi.idatt.backend.game.mapstops.api + +import edu.ntnu.idi.idatt.backend.game.application.GameReadMode +import edu.ntnu.idi.idatt.backend.game.mapstops.application.MapStopService +import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser +import org.springframework.security.core.annotation.AuthenticationPrincipal +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +/** + * Teacher-only read endpoints for classroom playtesting of the published game map. + */ +@RestController +@RequestMapping("/api/v1/teacher/classrooms/{classroomId}/playtest/map-stops") +class TeacherPlaytestMapStopsController( + private val mapStopService: MapStopService, +) { + @GetMapping + fun getMapOverview( + @AuthenticationPrincipal currentUser: CurrentUser, + @PathVariable classroomId: Long, + ): List = + mapStopService + .getMapOverview(currentUser, classroomId, GameReadMode.TEACHER_PLAYTEST) + .map { it.toResponse() } + + @GetMapping("/{slug}") + fun getMapStopBySlug( + @AuthenticationPrincipal currentUser: CurrentUser, + @PathVariable classroomId: Long, + @PathVariable slug: String, + ): MapStopOverviewResponse = + mapStopService + .getMapStopOverviewBySlug(currentUser, classroomId, slug, GameReadMode.TEACHER_PLAYTEST) + .toResponse() +} diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/application/MapStopService.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/application/MapStopService.kt index 2b4c5cb7..bf78a2fa 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/application/MapStopService.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/application/MapStopService.kt @@ -2,6 +2,7 @@ package edu.ntnu.idi.idatt.backend.game.mapstops.application import edu.ntnu.idi.idatt.backend.game.application.GameAccessContext import edu.ntnu.idi.idatt.backend.game.application.GameAccessContextResolver +import edu.ntnu.idi.idatt.backend.game.application.GameReadMode import edu.ntnu.idi.idatt.backend.game.mapstops.domain.MapStop import edu.ntnu.idi.idatt.backend.game.mapstops.domain.StopProgressStatus import edu.ntnu.idi.idatt.backend.game.mapstops.infrastructure.MapStopsRepository @@ -52,8 +53,12 @@ class MapStopService( * @param classroomId classroom to scope the progress lookup to * @return sorted list of stops with progress state for the pupil */ - fun getMapOverview(currentUser: CurrentUser, classroomId: Long): List { - val accessContext = gameAccessContextResolver.resolveReadContext(currentUser, classroomId) + fun getMapOverview( + currentUser: CurrentUser, + classroomId: Long, + readMode: GameReadMode = GameReadMode.DEFAULT, + ): List { + val accessContext = gameAccessContextResolver.resolveReadContext(currentUser, classroomId, readMode) val stops = mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc() if (accessContext.allStopsOpen || accessContext.pupilUserId == null) { return stops.mapNotNull { stop -> stop.toOpenOverviewEntry() } @@ -92,8 +97,9 @@ class MapStopService( currentUser: CurrentUser, classroomId: Long, slug: String, + readMode: GameReadMode = GameReadMode.DEFAULT, ): MapStopOverviewEntry { - val accessContext = gameAccessContextResolver.resolveReadContext(currentUser, classroomId) + val accessContext = gameAccessContextResolver.resolveReadContext(currentUser, classroomId, readMode) val stop = getMapStopBySlug(slug) if (accessContext.allStopsOpen || accessContext.pupilUserId == null) { return stop.toOpenOverviewEntry() diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskRequests.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskRequests.kt index 0d3529a0..d1edf577 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskRequests.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskRequests.kt @@ -127,7 +127,6 @@ fun CreateTaskRequest.toCommand( ): CreateTaskCommand = CreateTaskCommand( authenticatedSubject = currentUser.subject, - sessionMode = currentUser.sessionMode, classroomId = classroomId, stopId = stopId, title = title.toLocalizedText(), @@ -150,7 +149,6 @@ fun UpdateTaskRequest.toCommand( ): UpdateTaskCommand = UpdateTaskCommand( authenticatedSubject = currentUser.subject, - sessionMode = currentUser.sessionMode, classroomId = classroomId, taskId = taskId, stopId = stopId, diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TeacherPlaytestTaskController.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TeacherPlaytestTaskController.kt new file mode 100644 index 00000000..e08cb2bf --- /dev/null +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TeacherPlaytestTaskController.kt @@ -0,0 +1,40 @@ +package edu.ntnu.idi.idatt.backend.game.tasks.api + +import edu.ntnu.idi.idatt.backend.game.application.GameReadMode +import edu.ntnu.idi.idatt.backend.game.tasks.application.TaskService +import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser +import org.springframework.security.core.annotation.AuthenticationPrincipal +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RequestParam +import org.springframework.web.bind.annotation.RestController + +/** + * Teacher-only read endpoints for classroom playtesting of published classroom tasks. + */ +@RestController +@RequestMapping("/api/v1/teacher/classrooms/{classroomId}/playtest/tasks") +class TeacherPlaytestTaskController( + private val taskService: TaskService, +) { + @GetMapping + fun listTasks( + @PathVariable classroomId: Long, + @RequestParam(required = false) stopId: Long?, + @AuthenticationPrincipal currentUser: CurrentUser, + ): List = + taskService + .listTasks(currentUser, classroomId, stopId, GameReadMode.TEACHER_PLAYTEST) + .map { it.toResponse() } + + @GetMapping("/{taskId}") + fun getTask( + @PathVariable classroomId: Long, + @PathVariable taskId: Long, + @AuthenticationPrincipal currentUser: CurrentUser, + ): TaskResponse = + taskService + .getTask(currentUser, classroomId, taskId, GameReadMode.TEACHER_PLAYTEST) + .let { it.task.toResponse(includeAnswers = it.includeAnswers) } +} diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/application/TaskModels.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/application/TaskModels.kt index 5078f9b7..37d0bd58 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/application/TaskModels.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/application/TaskModels.kt @@ -1,6 +1,5 @@ package edu.ntnu.idi.idatt.backend.game.tasks.application -import edu.ntnu.idi.idatt.backend.iam.application.SessionMode import edu.ntnu.idi.idatt.backend.game.tasks.domain.TaskPassingRule import edu.ntnu.idi.idatt.backend.game.tasks.domain.TaskType import java.time.Instant @@ -47,7 +46,6 @@ data class ReplaceTaskItemCommand( */ data class CreateTaskCommand( val authenticatedSubject: String, - val sessionMode: SessionMode, val classroomId: Long, val stopId: Long, val title: LocalizedText, @@ -65,7 +63,6 @@ data class CreateTaskCommand( */ data class UpdateTaskCommand( val authenticatedSubject: String, - val sessionMode: SessionMode, val classroomId: Long, val taskId: Long, val stopId: Long, diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/application/TaskService.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/application/TaskService.kt index 5d4ff0b3..ea8fd76a 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/application/TaskService.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/application/TaskService.kt @@ -3,7 +3,7 @@ package edu.ntnu.idi.idatt.backend.game.tasks.application import edu.ntnu.idi.idatt.backend.classroom.domain.Classroom import edu.ntnu.idi.idatt.backend.classroom.infrastructure.ClassroomRepository import edu.ntnu.idi.idatt.backend.game.application.GameAccessContextResolver -import edu.ntnu.idi.idatt.backend.iam.application.SessionMode +import edu.ntnu.idi.idatt.backend.game.application.GameReadMode import edu.ntnu.idi.idatt.backend.iam.application.CurrentUserResolver import edu.ntnu.idi.idatt.backend.iam.domain.UserRole import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser @@ -40,8 +40,9 @@ class TaskService( currentUser: CurrentUser, classroomId: Long, stopId: Long?, + readMode: GameReadMode = GameReadMode.DEFAULT, ): List { - val accessContext = gameAccessContextResolver.resolveReadContext(currentUser, classroomId) + val accessContext = gameAccessContextResolver.resolveReadContext(currentUser, classroomId, readMode) val tasks = if (stopId != null) { taskRepository.findAllByClassroomIdAndStopIdOrderByDifficultyLevelAsc(accessContext.classroom.id, stopId) } else { @@ -57,8 +58,9 @@ class TaskService( currentUser: CurrentUser, classroomId: Long, taskId: Long, + readMode: GameReadMode = GameReadMode.DEFAULT, ): TaskReadResult { - val accessContext = gameAccessContextResolver.resolveReadContext(currentUser, classroomId) + val accessContext = gameAccessContextResolver.resolveReadContext(currentUser, classroomId, readMode) val task = requireTask(classroomId, taskId) if (accessContext.publishedOnly && !task.isPublished) { throw ResponseStatusException(HttpStatus.FORBIDDEN, "Pupils cannot view unpublished tasks") @@ -71,7 +73,6 @@ class TaskService( @Transactional fun createTask(command: CreateTaskCommand): TaskDetails { - requireWritableTeacherSession(command.sessionMode) val teacher = currentUserResolver.requireTeacherOrAdmin(command.authenticatedSubject) val classroom = requireOwnedClassroom(command.authenticatedSubject, command.classroomId) @@ -105,7 +106,6 @@ class TaskService( @Transactional fun updateTask(command: UpdateTaskCommand): TaskDetails { - requireWritableTeacherSession(command.sessionMode) requireOwnedClassroom(command.authenticatedSubject, command.classroomId) val task = requireTask(command.classroomId, command.taskId) @@ -151,7 +151,6 @@ class TaskService( taskId: Long, published: Boolean, ): TaskDetails { - requireWritableTeacherSession(currentUser.sessionMode) requireOwnedClassroom(currentUser.subject, classroomId) val task = requireTask(classroomId, taskId) if (published) { @@ -167,18 +166,11 @@ class TaskService( classroomId: Long, taskId: Long, ) { - requireWritableTeacherSession(currentUser.sessionMode) requireOwnedClassroom(currentUser.subject, classroomId) val task = requireTask(classroomId, taskId) taskRepository.delete(task) } - private fun requireWritableTeacherSession(sessionMode: SessionMode) { - if (sessionMode == SessionMode.GAME_PREVIEW) { - throw ResponseStatusException(HttpStatus.FORBIDDEN, "Preview sessions are read-only") - } - } - private fun requireOwnedClassroom(authenticatedSubject: String, classroomId: Long): Classroom { val user = currentUserResolver.requireTeacherOrAdmin(authenticatedSubject) val userId = requireNotNull(user.id) { "Authenticated user is missing an id" } diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/infrastructure/TaskRepository.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/infrastructure/TaskRepository.kt index 7141fdd0..80a67365 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/infrastructure/TaskRepository.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/infrastructure/TaskRepository.kt @@ -6,6 +6,8 @@ import org.springframework.stereotype.Repository @Repository interface TaskRepository : JpaRepository { + fun countByClassroomId(classroomId: Long): Long + fun findAllByClassroomIdOrderByStopIdAscDifficultyLevelAsc(classroomId: Long): List fun findAllByClassroomIdAndStopIdOrderByDifficultyLevelAsc( diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/AuthApiMappings.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/AuthApiMappings.kt index 40f6f18a..b0997286 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/AuthApiMappings.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/AuthApiMappings.kt @@ -55,9 +55,6 @@ fun AuthSession.toLoginResponse(): LoginResponse = expiresInSeconds = expiresInSeconds, refreshHandledViaCookie = true, portalType = portalType, - sessionMode = sessionMode.name, - viewAs = viewAs.name, - previewClassroomId = previewClassroomId, user = user?.toAuthenticatedUserResponse(), ) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/AuthController.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/AuthController.kt index f38bc34c..674d4382 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/AuthController.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/AuthController.kt @@ -14,9 +14,8 @@ import org.springframework.http.ResponseCookie import org.springframework.http.ResponseEntity import org.springframework.security.core.annotation.AuthenticationPrincipal import org.springframework.security.web.csrf.CsrfTokenRepository -import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.DeleteMapping -import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.PutMapping import org.springframework.web.bind.annotation.RequestBody @@ -86,50 +85,6 @@ class AuthController( .body(session.toLoginResponse()) } - /** - * Starts a classroom-scoped teacher preview session from the auth cookie path so the current - * refresh token can be rotated in the same browser request. - * - * @param currentUser authenticated teacher/admin principal - * @param classroomId classroom to preview with pupil-facing game semantics - * @param request servlet request used to extract the current refresh-token cookie - * @return login response for the new preview session - */ - @PostMapping("/teacher/game-preview/session/{classroomId}") - fun startTeacherGamePreviewSession( - @AuthenticationPrincipal currentUser: CurrentUser, - @PathVariable classroomId: Long, - request: HttpServletRequest, - ): ResponseEntity { - val session = authService.startTeacherGamePreview( - authenticatedSubject = currentUser.subject, - classroomId = classroomId, - refreshToken = extractRefreshCookie(request), - ) - return ResponseEntity.ok() - .header(HttpHeaders.SET_COOKIE, refreshCookie(session.refreshToken).toString()) - .body(session.toLoginResponse()) - } - - /** - * Leaves teacher game preview mode, revokes the preview refresh token, and restores a normal - * teacher/admin session. - * - * @param currentUser authenticated teacher/admin principal - * @param request servlet request used to extract the current refresh-token cookie - * @return login response for the restored normal session - */ - @DeleteMapping("/teacher/game-preview/session") - fun exitTeacherGamePreviewSession( - @AuthenticationPrincipal currentUser: CurrentUser, - request: HttpServletRequest, - ): ResponseEntity { - val session = authService.exitTeacherGamePreview(currentUser.subject, extractRefreshCookie(request)) - return ResponseEntity.ok() - .header(HttpHeaders.SET_COOKIE, refreshCookie(session.refreshToken).toString()) - .body(session.toLoginResponse()) - } - /** * Revokes the current teacher refresh token, if present, and clears the auth cookie. * @@ -226,9 +181,6 @@ class AuthController( portalType = currentUser.portalType, email = currentUser.email, authorities = currentUser.authorities, - sessionMode = currentUser.sessionMode.name, - viewAs = currentUser.viewAs.name, - previewClassroomId = currentUser.previewClassroomId, ) /** diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/CurrentUserResponse.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/CurrentUserResponse.kt index 1b5a6afb..a8fcd9ff 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/CurrentUserResponse.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/CurrentUserResponse.kt @@ -13,7 +13,4 @@ data class CurrentUserResponse( val portalType: String, val email: String?, val authorities: Set, - val sessionMode: String, - val viewAs: String, - val previewClassroomId: Long?, ) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/LoginResponse.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/LoginResponse.kt index e8282173..b88db6d3 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/LoginResponse.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/api/LoginResponse.kt @@ -16,8 +16,5 @@ data class LoginResponse( val expiresInSeconds: Long, val refreshHandledViaCookie: Boolean, val portalType: String, - val sessionMode: String, - val viewAs: String, - val previewClassroomId: Long?, val user: AuthenticatedUserResponse?, ) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/AuthService.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/AuthService.kt index 4df2a7b1..209042a0 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/AuthService.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/AuthService.kt @@ -1,11 +1,10 @@ package edu.ntnu.idi.idatt.backend.iam.application -import edu.ntnu.idi.idatt.backend.classroom.infrastructure.ClassroomRepository import edu.ntnu.idi.idatt.backend.iam.domain.RefreshToken import edu.ntnu.idi.idatt.backend.iam.domain.User import edu.ntnu.idi.idatt.backend.iam.domain.UserRole -import edu.ntnu.idi.idatt.backend.iam.infrastructure.RefreshTokenRepository import edu.ntnu.idi.idatt.backend.iam.infrastructure.UserRepository +import edu.ntnu.idi.idatt.backend.iam.infrastructure.RefreshTokenRepository import edu.ntnu.idi.idatt.backend.iam.security.AppSecurityProperties import edu.ntnu.idi.idatt.backend.iam.security.JwtService import edu.ntnu.idi.idatt.backend.iam.security.JwtSubject @@ -39,8 +38,6 @@ class AuthService( private val jwtService: JwtService, private val securityProperties: AppSecurityProperties, private val pupilProvisioningService: PupilProvisioningService, - private val currentUserResolver: CurrentUserResolver, - private val classroomRepository: ClassroomRepository, ) { private val secureRandom = SecureRandom() @@ -90,51 +87,6 @@ class AuthService( refreshToken: String?, ): AuthSession = refreshPupilSession(refreshToken) - /** - * Creates a classroom-scoped teacher preview session and revokes the prior refresh token. - * - * @param authenticatedSubject JWT subject for the current teacher/admin actor - * @param classroomId classroom to preview with pupil-facing game semantics - * @param refreshToken current raw refresh token from the auth cookie - * @return authenticated preview session with rotated refresh token - */ - @Transactional - fun startTeacherGamePreview( - authenticatedSubject: String, - classroomId: Long, - refreshToken: String?, - ): AuthSession { - val user = currentTeacherOrAdmin(authenticatedSubject) - requirePreviewClassroom(user, classroomId) - revokeRefreshTokenOwnedByUser(refreshToken, requireNotNull(user.id)) - return issueSession( - user = user, - portalType = "TEACHER", - sessionContext = SessionContext( - sessionMode = SessionMode.GAME_PREVIEW, - viewAs = ViewAs.PUPIL, - previewClassroomId = classroomId, - ), - ) - } - - /** - * Leaves preview mode and returns to a normal teacher/admin session. - * - * @param authenticatedSubject JWT subject for the current teacher/admin actor - * @param refreshToken current raw refresh token from the auth cookie - * @return authenticated normal session with rotated refresh token - */ - @Transactional - fun exitTeacherGamePreview( - authenticatedSubject: String, - refreshToken: String?, - ): AuthSession { - val user = currentTeacherOrAdmin(authenticatedSubject) - revokeRefreshTokenOwnedByUser(refreshToken, requireNotNull(user.id)) - return issueSession(user = user, portalType = "TEACHER", sessionContext = normalTeacherSession()) - } - /** * Revokes the refresh token represented by the cookie value when a matching token exists. * @@ -166,7 +118,7 @@ class AuthService( ?.takeIf { passwordEncoder.matches(command.password, it.passwordHash) } ?: throw ResponseStatusException(HttpStatus.UNAUTHORIZED, "Invalid email or password") - return issueSession(user, "TEACHER", normalTeacherSession()) + return issueSession(user, "TEACHER") } /** @@ -182,7 +134,7 @@ class AuthService( ?.takeIf { passwordEncoder.matches(command.password, it.passwordHash) } ?: throw ResponseStatusException(HttpStatus.UNAUTHORIZED, "Invalid username or password") - return issueSession(user, "PUPIL", normalPupilSession()) + return issueSession(user, "PUPIL") } private fun refreshTeacherSession( @@ -193,7 +145,6 @@ class AuthService( return issueSession( user = persistedToken.user, portalType = "TEACHER", - sessionContext = persistedToken.toSessionContext(), ) } @@ -205,7 +156,6 @@ class AuthService( return issueSession( user = persistedToken.user, portalType = "PUPIL", - sessionContext = normalPupilSession(), ) } @@ -219,7 +169,6 @@ class AuthService( private fun issueSession( user: User, portalType: String, - sessionContext: SessionContext, ): AuthSession { val now = Instant.now() val subject = user.id?.toString() @@ -230,9 +179,6 @@ class AuthService( portalType = portalType, email = user.email, authorities = authoritiesFor(user, portalType), - sessionMode = sessionContext.sessionMode, - viewAs = sessionContext.viewAs, - previewClassroomId = sessionContext.previewClassroomId, ), ) val rawRefreshToken = generateRawRefreshToken() @@ -242,9 +188,6 @@ class AuthService( user = user, tokenHash = hashToken(rawRefreshToken), expiresAt = now.plus(securityProperties.refresh.ttl), - sessionMode = sessionContext.sessionMode, - viewAs = sessionContext.viewAs, - previewClassroomId = sessionContext.previewClassroomId, ), ) @@ -253,9 +196,6 @@ class AuthService( refreshToken = rawRefreshToken, expiresInSeconds = accessToken.expiresInSeconds, portalType = portalType, - sessionMode = sessionContext.sessionMode, - viewAs = sessionContext.viewAs, - previewClassroomId = sessionContext.previewClassroomId, user = AuthenticatedUser( subject = subject, email = user.email, @@ -325,41 +265,4 @@ class AuthService( ?: throw ResponseStatusException(HttpStatus.UNAUTHORIZED, "Invalid refresh token") } - private fun revokeRefreshTokenOwnedByUser(rawRefreshToken: String?, userId: Long) { - if (rawRefreshToken.isNullOrBlank()) { - return - } - val persistedToken = refreshTokenRepository.findByTokenHash(hashToken(rawRefreshToken)) - ?.takeIf { requireNotNull(it.user.id) == userId } - ?: return - if (persistedToken.revokedAt == null) { - persistedToken.revoke(Instant.now()) - } - } - - private fun currentTeacherOrAdmin(authenticatedSubject: String): User = - currentUserResolver.requireTeacherOrAdmin(authenticatedSubject) - - private fun requirePreviewClassroom(user: User, classroomId: Long) { - val classroom = classroomRepository.findById(classroomId) - .orElseThrow { - ResponseStatusException(HttpStatus.NOT_FOUND, "Classroom not found") - } - val userId = requireNotNull(user.id) { "Authenticated user is missing an id" } - if (user.role == UserRole.TEACHER && classroom.ownerTeacherId != userId) { - throw ResponseStatusException(HttpStatus.FORBIDDEN, "Only the classroom owner may start preview") - } - } - - private fun normalTeacherSession(): SessionContext = - SessionContext( - sessionMode = SessionMode.NORMAL, - viewAs = ViewAs.TEACHER, - ) - - private fun normalPupilSession(): SessionContext = - SessionContext( - sessionMode = SessionMode.NORMAL, - viewAs = ViewAs.PUPIL, - ) } diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/AuthSession.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/AuthSession.kt index b8d0be71..a57b0e94 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/AuthSession.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/AuthSession.kt @@ -14,8 +14,5 @@ data class AuthSession( val refreshToken: String, val expiresInSeconds: Long, val portalType: String, - val sessionMode: SessionMode, - val viewAs: ViewAs, - val previewClassroomId: Long?, val user: AuthenticatedUser?, ) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/CurrentUserResolver.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/CurrentUserResolver.kt index 73737557..96800371 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/CurrentUserResolver.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/CurrentUserResolver.kt @@ -66,19 +66,14 @@ class CurrentUserResolver( } /** - * Resolves a classroom for the authenticated principal, honoring preview-session scoping when - * present on teacher/admin sessions and otherwise falling back to the user's default classroom. + * Resolves a classroom for the authenticated principal by falling back to the user's default + * classroom context. * * @param currentUser authenticated principal from the access token * @return resolved classroom for the effective session context */ - fun getClassroomByUser(currentUser: CurrentUser): Classroom { - if (currentUser.isPreviewSession()) { - return resolvePreviewClassroom(currentUser) - } - - return resolveDefaultClassroom(requireUser(currentUser.subject)) - } + fun getClassroomByUser(currentUser: CurrentUser): Classroom = + resolveDefaultClassroom(requireUser(currentUser.subject)) private fun resolveDefaultClassroom(user: User): Classroom { val userId = requireNotNull(user.id) { "Authenticated user is missing an id" } @@ -106,19 +101,4 @@ class CurrentUserResolver( ) } } - - private fun resolvePreviewClassroom(currentUser: CurrentUser): Classroom { - val user = requireTeacherOrAdmin(currentUser.subject) - val classroomId = currentUser.previewClassroomId - ?: throw ResponseStatusException(HttpStatus.FORBIDDEN, "Preview session is missing classroom context") - val classroom = classroomRepository.findById(classroomId) - .orElseThrow { - ResponseStatusException(HttpStatus.NOT_FOUND, "Classroom was not found") - } - val userId = requireNotNull(user.id) { "Authenticated user is missing an id" } - if (user.role == UserRole.TEACHER && classroom.ownerTeacherId != userId) { - throw ResponseStatusException(HttpStatus.FORBIDDEN, "Only the classroom owner may preview this classroom") - } - return classroom - } } diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/SessionContext.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/SessionContext.kt deleted file mode 100644 index f7d0416b..00000000 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/SessionContext.kt +++ /dev/null @@ -1,30 +0,0 @@ -package edu.ntnu.idi.idatt.backend.iam.application - -/** - * High-level mode of an authenticated session. - */ -enum class SessionMode { - NORMAL, - GAME_PREVIEW, -} - -/** - * Product role that the frontend should render the session as. - */ -enum class ViewAs { - TEACHER, - PUPIL, -} - -/** - * Session metadata that augments the actor identity embedded in auth tokens and refresh tokens. - * - * @property sessionMode whether the session is normal or running in preview mode - * @property viewAs frontend-facing role to render the session as - * @property previewClassroomId classroom constrained to the session when preview is active - */ -data class SessionContext( - val sessionMode: SessionMode, - val viewAs: ViewAs, - val previewClassroomId: Long? = null, -) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/domain/RefreshToken.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/domain/RefreshToken.kt index eb3a8df1..9d011c0b 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/domain/RefreshToken.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/domain/RefreshToken.kt @@ -1,8 +1,4 @@ package edu.ntnu.idi.idatt.backend.iam.domain - -import edu.ntnu.idi.idatt.backend.iam.application.SessionContext -import edu.ntnu.idi.idatt.backend.iam.application.SessionMode -import edu.ntnu.idi.idatt.backend.iam.application.ViewAs import jakarta.persistence.Column import jakarta.persistence.Entity import jakarta.persistence.EnumType @@ -42,14 +38,6 @@ class RefreshToken( var tokenHash: String, @Column(name = "expires_at", nullable = false) var expiresAt: Instant, - @Enumerated(EnumType.STRING) - @Column(name = "session_mode", nullable = false, length = 32) - var sessionMode: SessionMode = SessionMode.NORMAL, - @Enumerated(EnumType.STRING) - @Column(name = "view_as", nullable = false, length = 32) - var viewAs: ViewAs = ViewAs.TEACHER, - @Column(name = "preview_classroom_id") - var previewClassroomId: Long? = null, @Column(name = "revoked_at") var revokedAt: Instant? = null, @CreationTimestamp @@ -75,11 +63,4 @@ class RefreshToken( fun revoke(instant: Instant) { revokedAt = instant } - - fun toSessionContext(): SessionContext = - SessionContext( - sessionMode = sessionMode, - viewAs = viewAs, - previewClassroomId = previewClassroomId, - ) } diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/security/CurrentUser.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/security/CurrentUser.kt index 03063889..1710db74 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/security/CurrentUser.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/security/CurrentUser.kt @@ -1,7 +1,5 @@ package edu.ntnu.idi.idatt.backend.iam.security -import edu.ntnu.idi.idatt.backend.iam.application.SessionMode -import edu.ntnu.idi.idatt.backend.iam.application.ViewAs import edu.ntnu.idi.idatt.backend.iam.domain.UserRole /** @@ -17,9 +15,6 @@ data class CurrentUser( val portalType: String, val email: String?, val authorities: Set, - val sessionMode: SessionMode, - val viewAs: ViewAs, - val previewClassroomId: Long?, ) { /** * Checks if the user has a certain role. @@ -28,6 +23,4 @@ data class CurrentUser( */ fun hasRole(role: UserRole): Boolean = "ROLE_${role.name}" in authorities - - fun isPreviewSession(): Boolean = sessionMode == SessionMode.GAME_PREVIEW } diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/security/JwtService.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/security/JwtService.kt index 704f5731..04969b09 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/security/JwtService.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/security/JwtService.kt @@ -35,15 +35,10 @@ class JwtService( .expiresAt(expiresAt) .subject(principal.subject) .claim("portal_type", principal.portalType) - .claim("session_mode", principal.sessionMode.name) - .claim("view_as", principal.viewAs.name) .claim("authorities", principal.authorities.toList()) if (principal.email != null) { claimsBuilder.claim("email", principal.email) } - if (principal.previewClassroomId != null) { - claimsBuilder.claim("preview_classroom_id", principal.previewClassroomId) - } val claims = claimsBuilder.build() val token = jwtEncoder.encode( diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/security/JwtSubject.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/security/JwtSubject.kt index 909b4d5c..4958f102 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/security/JwtSubject.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/security/JwtSubject.kt @@ -1,8 +1,5 @@ package edu.ntnu.idi.idatt.backend.iam.security -import edu.ntnu.idi.idatt.backend.iam.application.SessionMode -import edu.ntnu.idi.idatt.backend.iam.application.ViewAs - /** * Principal data encoded into a JWT access token. * @@ -16,7 +13,4 @@ data class JwtSubject( val portalType: String, val email: String?, val authorities: Set = emptySet(), - val sessionMode: SessionMode, - val viewAs: ViewAs, - val previewClassroomId: Long? = null, ) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/security/SecurityConfig.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/security/SecurityConfig.kt index 728b24ad..9b855b3e 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/security/SecurityConfig.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/security/SecurityConfig.kt @@ -1,8 +1,6 @@ package edu.ntnu.idi.idatt.backend.iam.security import com.nimbusds.jose.jwk.source.ImmutableSecret -import edu.ntnu.idi.idatt.backend.iam.application.SessionMode -import edu.ntnu.idi.idatt.backend.iam.application.ViewAs import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration import org.springframework.boot.context.properties.EnableConfigurationProperties @@ -166,16 +164,10 @@ class SecurityConfig( portalType = portalType, email = jwt.getClaimAsString("email"), authorities = authorities, - sessionMode = jwt.getClaimAsString("session_mode")?.let(SessionMode::valueOf) ?: SessionMode.NORMAL, - viewAs = jwt.getClaimAsString("view_as")?.let(ViewAs::valueOf) ?: defaultViewAs(portalType), - previewClassroomId = (jwt.claims["preview_classroom_id"] as? Number)?.toLong(), ) return UsernamePasswordAuthenticationToken(principal, jwt, authorities.map { org.springframework.security.core.authority.SimpleGrantedAuthority(it) }) } - private fun defaultViewAs(portalType: String): ViewAs = - if (portalType == "PUPIL") ViewAs.PUPIL else ViewAs.TEACHER - private fun audienceValidator(): OAuth2TokenValidator = OAuth2TokenValidator { jwt -> if (jwt.audience.contains(securityProperties.jwt.audience)) { diff --git a/src/main/resources/db/migration/V13__add_preview_session_state_to_refresh_tokens.sql b/src/main/resources/db/migration/V13__add_preview_session_state_to_refresh_tokens.sql deleted file mode 100644 index 2efbf46a..00000000 --- a/src/main/resources/db/migration/V13__add_preview_session_state_to_refresh_tokens.sql +++ /dev/null @@ -1,8 +0,0 @@ -ALTER TABLE refresh_tokens - ADD COLUMN session_mode VARCHAR(32) NOT NULL DEFAULT 'NORMAL'; - -ALTER TABLE refresh_tokens - ADD COLUMN view_as VARCHAR(32) NOT NULL DEFAULT 'TEACHER'; - -ALTER TABLE refresh_tokens - ADD COLUMN preview_classroom_id BIGINT NULL; diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomIntegrationTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomIntegrationTests.kt index ee96895f..0ec131d4 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomIntegrationTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomIntegrationTests.kt @@ -27,6 +27,7 @@ import org.springframework.jdbc.core.JdbcTemplate import org.springframework.security.crypto.password.PasswordEncoder import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf import org.springframework.test.web.servlet.MockMvc +import org.springframework.test.web.servlet.get import org.springframework.test.web.servlet.post import java.time.Instant @@ -157,6 +158,44 @@ class ClassroomIntegrationTests { assertEquals(1, progressCount) } + @Test + fun `teacher can list owned classrooms`() { + val owner = userRepository.save(activeTeacher(email = "teacher-owned@example.com")) + classroomRepository.save( + Classroom( + ownerTeacherId = requireNotNull(owner.id), + title = "Alpha classroom", + description = "Owned by teacher", + joinCode = "OWN01", + status = ClassroomStatus.ACTIVE, + createdAt = Instant.now(), + updatedAt = Instant.now(), + ), + ) + classroomRepository.save( + Classroom( + ownerTeacherId = requireNotNull(owner.id), + title = "Beta classroom", + description = "Owned by teacher", + joinCode = "OWN02", + status = ClassroomStatus.ACTIVE, + createdAt = Instant.now(), + updatedAt = Instant.now(), + ), + ) + createClassroom("OTHER1") + val accessToken = teacherPortalAccessToken(email = "teacher-owned@example.com", password = "secret123") + + mockMvc.get("/api/v1/classrooms/owned") { + header(HttpHeaders.AUTHORIZATION, "Bearer $accessToken") + }.andExpect { + status { isOk() } + jsonPath("$.length()") { value(2) } + jsonPath("$[0].title") { value("Alpha classroom") } + jsonPath("$[1].title") { value("Beta classroom") } + } + } + @Test fun `authenticated teacher cannot join classroom`() { createClassroom("AB12") diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt index 9b44f0ac..0059d4c9 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/classroom/ClassroomServiceTest.kt @@ -10,6 +10,7 @@ import edu.ntnu.idi.idatt.backend.classroom.domain.ClassroomStatus import edu.ntnu.idi.idatt.backend.classroom.infrastructure.ClassroomRepository import edu.ntnu.idi.idatt.backend.game.gameProgress.domain.PupilGameProgress import edu.ntnu.idi.idatt.backend.game.gameProgress.infrastructure.PupilGameProgressRepository +import edu.ntnu.idi.idatt.backend.game.tasks.infrastructure.TaskRepository import edu.ntnu.idi.idatt.backend.iam.application.CurrentUserResolver import edu.ntnu.idi.idatt.backend.iam.domain.User import edu.ntnu.idi.idatt.backend.iam.domain.UserRole @@ -31,6 +32,7 @@ class ClassroomServiceTest { private lateinit var classroomRepository: ClassroomRepository private lateinit var currentUserResolver: CurrentUserResolver private lateinit var pupilGameProgressRepository: PupilGameProgressRepository + private lateinit var taskRepository: TaskRepository private lateinit var classroomService: ClassroomService private lateinit var eventPublisher: ApplicationEventPublisher @@ -39,11 +41,13 @@ class ClassroomServiceTest { classroomRepository = mock(ClassroomRepository::class.java) currentUserResolver = mock(CurrentUserResolver::class.java) pupilGameProgressRepository = mock(PupilGameProgressRepository::class.java) + taskRepository = mock(TaskRepository::class.java) eventPublisher = mock(ApplicationEventPublisher::class.java) classroomService = ClassroomService( classroomRepository, currentUserResolver, pupilGameProgressRepository, + taskRepository, eventPublisher, ) } diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/TeacherGamePreviewIntegrationTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/TeacherGamePreviewIntegrationTests.kt deleted file mode 100644 index 6c14f20c..00000000 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/TeacherGamePreviewIntegrationTests.kt +++ /dev/null @@ -1,632 +0,0 @@ -package edu.ntnu.idi.idatt.backend.game - -import com.fasterxml.jackson.databind.JsonNode -import com.fasterxml.jackson.databind.json.JsonMapper -import edu.ntnu.idi.idatt.backend.classroom.domain.Classroom -import edu.ntnu.idi.idatt.backend.classroom.domain.ClassroomStatus -import edu.ntnu.idi.idatt.backend.classroom.infrastructure.ClassroomRepository -import edu.ntnu.idi.idatt.backend.game.mapstops.domain.MapStop -import edu.ntnu.idi.idatt.backend.game.mapstops.domain.PupilStopProgress -import edu.ntnu.idi.idatt.backend.game.mapstops.domain.PupilStopProgressId -import edu.ntnu.idi.idatt.backend.game.mapstops.domain.StopProgressStatus -import edu.ntnu.idi.idatt.backend.game.mapstops.infrastructure.MapStopsRepository -import edu.ntnu.idi.idatt.backend.game.mapstops.infrastructure.PupilStopProgressRepository -import edu.ntnu.idi.idatt.backend.game.gameProgress.domain.PupilGameProgress -import edu.ntnu.idi.idatt.backend.game.gameProgress.domain.PupilGameProgressId -import edu.ntnu.idi.idatt.backend.game.gameProgress.infrastructure.PupilGameProgressRepository -import edu.ntnu.idi.idatt.backend.game.tasks.infrastructure.TaskRepository -import edu.ntnu.idi.idatt.backend.iam.domain.User -import edu.ntnu.idi.idatt.backend.iam.domain.UserRole -import edu.ntnu.idi.idatt.backend.iam.domain.UserStatus -import edu.ntnu.idi.idatt.backend.iam.infrastructure.RefreshTokenRepository -import edu.ntnu.idi.idatt.backend.iam.infrastructure.UserRepository -import edu.ntnu.idi.idatt.backend.users.avatar.infrastructure.UserAvatarRepository -import edu.ntnu.idi.idatt.backend.users.profile.infrastructure.PupilProfileRepository -import edu.ntnu.idi.idatt.backend.users.profile.infrastructure.TeacherProfileRepository -import jakarta.servlet.http.Cookie -import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Assertions.assertNotEquals -import org.junit.jupiter.api.Assertions.assertNotNull -import java.time.Instant -import org.junit.jupiter.api.BeforeEach -import org.junit.jupiter.api.Test -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc -import org.springframework.http.HttpHeaders -import org.springframework.http.MediaType -import org.springframework.security.crypto.password.PasswordEncoder -import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf -import org.springframework.test.web.servlet.MockMvc -import org.springframework.test.web.servlet.delete -import org.springframework.test.web.servlet.get -import org.springframework.test.web.servlet.patch -import org.springframework.test.web.servlet.post -import org.springframework.test.web.servlet.put - -@SpringBootTest -@AutoConfigureMockMvc -class TeacherGamePreviewIntegrationTests { - @Autowired - private lateinit var mockMvc: MockMvc - - @Autowired - private lateinit var userRepository: UserRepository - - @Autowired - private lateinit var classroomRepository: ClassroomRepository - - @Autowired - private lateinit var mapStopsRepository: MapStopsRepository - - @Autowired - private lateinit var progressRepository: PupilStopProgressRepository - - @Autowired - private lateinit var pupilGameProgressRepository: PupilGameProgressRepository - - @Autowired - private lateinit var taskRepository: TaskRepository - - @Autowired - private lateinit var refreshTokenRepository: RefreshTokenRepository - - @Autowired - private lateinit var userAvatarRepository: UserAvatarRepository - - @Autowired - private lateinit var pupilProfileRepository: PupilProfileRepository - - @Autowired - private lateinit var teacherProfileRepository: TeacherProfileRepository - - @Autowired - private lateinit var passwordEncoder: PasswordEncoder - - private val jsonMapper = JsonMapper.builder().build() - - @BeforeEach - fun setUp() { - refreshTokenRepository.deleteAll() - progressRepository.deleteAll() - pupilGameProgressRepository.deleteAll() - taskRepository.deleteAll() - mapStopsRepository.deleteAll() - classroomRepository.deleteAll() - userAvatarRepository.deleteAll() - pupilProfileRepository.deleteAll() - teacherProfileRepository.deleteAll() - userRepository.deleteAll() - } - - @Test - fun `teacher can start preview for own classroom and refresh preserves metadata`() { - val teacher = userRepository.save(activeTeacher("owner@example.com")) - val classroom = createClassroom(teacher, "PREVIEW1") - val normalSession = teacherSession("owner@example.com", "secret123") - - val previewSession = startPreviewSession(normalSession, classroom.id) - - assertEquals("TEACHER", previewSession.body["portalType"].asText()) - assertEquals("GAME_PREVIEW", previewSession.body["sessionMode"].asText()) - assertEquals("PUPIL", previewSession.body["viewAs"].asText()) - assertEquals(classroom.id, previewSession.body["previewClassroomId"].asLong()) - assertNotEquals(normalSession.refreshToken, previewSession.refreshToken) - assertEquals(2, refreshTokenRepository.count()) - assertNotNull(refreshTokenRepository.findAll().single { it.tokenHash != activeRefreshTokenHash() }.revokedAt) - - val refreshed = refreshTeacherSession(previewSession.refreshToken) - - assertEquals("GAME_PREVIEW", refreshed.body["sessionMode"].asText()) - assertEquals("PUPIL", refreshed.body["viewAs"].asText()) - assertEquals(classroom.id, refreshed.body["previewClassroomId"].asLong()) - } - - @Test - fun `preview exit returns a normal teacher session`() { - val teacher = userRepository.save(activeTeacher("owner@example.com")) - val classroom = createClassroom(teacher, "PREVIEW2") - val previewSession = startPreviewSession(teacherSession("owner@example.com", "secret123"), classroom.id) - - mockMvc.delete("/api/v1/auth/teacher/game-preview/session") { - with(csrf()) - header(HttpHeaders.AUTHORIZATION, "Bearer ${previewSession.accessToken}") - cookie(Cookie("nettdetektivene_refresh_token", previewSession.refreshToken)) - }.andExpect { - status { isOk() } - jsonPath("$.sessionMode") { value("NORMAL") } - jsonPath("$.viewAs") { value("TEACHER") } - jsonPath("$.previewClassroomId") { value(org.hamcrest.Matchers.nullValue()) } - jsonPath("$.portalType") { value("TEACHER") } - cookie { exists("nettdetektivene_refresh_token") } - } - } - - @Test - fun `pupil cannot start preview`() { - val teacher = userRepository.save(activeTeacher("owner@example.com")) - val classroom = createClassroom(teacher, "PREVIEW3") - val pupil = userRepository.save(activePupil("preview_pupil")) - classroom.addPupilMembership(pupil) - classroomRepository.saveAndFlush(classroom) - val pupilSession = pupilSession("preview_pupil", "secret123") - - mockMvc.post("/api/v1/auth/teacher/game-preview/session/${classroom.id}") { - with(csrf()) - header(HttpHeaders.AUTHORIZATION, "Bearer ${pupilSession.accessToken}") - cookie(Cookie("nettdetektivene_refresh_token", pupilSession.refreshToken)) - }.andExpect { - status { isForbidden() } - } - } - - @Test - fun `teacher cannot start preview for another teachers classroom`() { - val owner = userRepository.save(activeTeacher("owner@example.com")) - userRepository.save(activeTeacher("intruder@example.com")) - val classroom = createClassroom(owner, "PREVIEW4") - val intruderSession = teacherSession("intruder@example.com", "secret123") - - mockMvc.post("/api/v1/auth/teacher/game-preview/session/${classroom.id}") { - with(csrf()) - header(HttpHeaders.AUTHORIZATION, "Bearer ${intruderSession.accessToken}") - cookie(Cookie("nettdetektivene_refresh_token", intruderSession.refreshToken)) - }.andExpect { - status { isForbidden() } - } - } - - @Test - fun `preview returns all active stops as open and blocks other classrooms`() { - val teacher = userRepository.save(activeTeacher("owner@example.com")) - val classroom = createClassroom(teacher, "PREVIEW5") - val otherClassroom = createClassroom(teacher, "PREVIEW6") - createStop("start-stop", "Start stop", 1) - createStop("boss-stop", "Boss stop", 2, isFinalBoss = true) - val previewSession = startPreviewSession(teacherSession("owner@example.com", "secret123"), classroom.id) - - mockMvc.get("/api/v1/classrooms/${classroom.id}/map-stops") { - header(HttpHeaders.AUTHORIZATION, "Bearer ${previewSession.accessToken}") - }.andExpect { - status { isOk() } - jsonPath("$[0].status") { value("NOT_STARTED") } - jsonPath("$[0].stars") { value(0) } - jsonPath("$[0].medalAwarded") { value(false) } - jsonPath("$[1].status") { value("NOT_STARTED") } - } - - mockMvc.get("/api/v1/classrooms/${otherClassroom.id}/map-stops") { - header(HttpHeaders.AUTHORIZATION, "Bearer ${previewSession.accessToken}") - }.andExpect { - status { isForbidden() } - } - } - - @Test - fun `normal pupil still gets progress based lock state`() { - val teacher = userRepository.save(activeTeacher("owner@example.com")) - val classroom = createClassroom(teacher, "PREVIEW7") - val firstStop = createStop("first-stop", "First stop", 1) - val secondStop = createStop("second-stop", "Second stop", 2) - val pupil = userRepository.save(activePupil("map_pupil")) - classroom.addPupilMembership(pupil) - classroomRepository.saveAndFlush(classroom) - progressRepository.save( - PupilStopProgress( - id = PupilStopProgressId(requireNotNull(pupil.id), classroom.id, requireNotNull(firstStop.id)), - pupil = pupil, - classroom = classroom, - stop = firstStop, - ).apply { - status = StopProgressStatus.COMPLETED - bestScore = 80 - medalAwarded = true - }, - ) - progressRepository.save( - PupilStopProgress( - id = PupilStopProgressId(requireNotNull(pupil.id), classroom.id, requireNotNull(secondStop.id)), - pupil = pupil, - classroom = classroom, - stop = secondStop, - ).apply { - status = StopProgressStatus.LOCKED - }, - ) - val pupilSession = pupilSession("map_pupil", "secret123") - - mockMvc.get("/api/v1/classrooms/${classroom.id}/map-stops") { - header(HttpHeaders.AUTHORIZATION, "Bearer ${pupilSession.accessToken}") - }.andExpect { - status { isOk() } - jsonPath("$[0].status") { value("COMPLETED") } - jsonPath("$[0].stars") { value(3) } - jsonPath("$[0].medalAwarded") { value(true) } - jsonPath("$[1].status") { value("LOCKED") } - } - } - - @Test - fun `preview task reads show answers but only published tasks`() { - val teacher = userRepository.save(activeTeacher("owner@example.com")) - val classroom = createClassroom(teacher, "PREVIEW8") - val stop = createStop("task-stop", "Task stop", 1) - val teacherSession = teacherSession("owner@example.com", "secret123") - val publishedTaskId = createTask(classroom.id, stop.id!!, teacherSession.accessToken, titleEn = "Published task", difficultyLevel = 1, publish = true) - val draftTaskId = createTask(classroom.id, stop.id!!, teacherSession.accessToken, titleEn = "Draft task", difficultyLevel = 2, publish = false) - val previewSession = startPreviewSession(teacherSession, classroom.id) - - mockMvc.get("/api/v1/classrooms/${classroom.id}/tasks") { - header(HttpHeaders.AUTHORIZATION, "Bearer ${previewSession.accessToken}") - }.andExpect { - status { isOk() } - jsonPath("$.length()") { value(1) } - jsonPath("$[0].id") { value(publishedTaskId.toInt()) } - } - - mockMvc.get("/api/v1/classrooms/${classroom.id}/tasks/$publishedTaskId") { - header(HttpHeaders.AUTHORIZATION, "Bearer ${previewSession.accessToken}") - }.andExpect { - status { isOk() } - jsonPath("$.items[0].options[0].isCorrect") { value(true) } - jsonPath("$.items[0].options[0].explanationText.en") { value("This source is verified.") } - } - - mockMvc.get("/api/v1/classrooms/${classroom.id}/tasks/$draftTaskId") { - header(HttpHeaders.AUTHORIZATION, "Bearer ${previewSession.accessToken}") - }.andExpect { - status { isForbidden() } - } - } - - @Test - fun `preview session cannot mutate tasks`() { - val teacher = userRepository.save(activeTeacher("owner@example.com")) - val classroom = createClassroom(teacher, "PREVIEW10") - val stop = createStop("write-stop", "Write stop", 1) - val teacherSession = teacherSession("owner@example.com", "secret123") - val taskId = createTask( - classroomId = classroom.id, - stopId = stop.id!!, - accessToken = teacherSession.accessToken, - titleEn = "Existing task", - difficultyLevel = 1, - publish = false, - ) - val previewSession = startPreviewSession(teacherSession, classroom.id) - - mockMvc.post("/api/v1/classrooms/${classroom.id}/tasks") { - with(csrf()) - contentType = MediaType.APPLICATION_JSON - header(HttpHeaders.AUTHORIZATION, "Bearer ${previewSession.accessToken}") - content = validTaskPayload(stopId = stop.id!!, titleEn = "Preview create", difficultyLevel = 2) - }.andExpect { - status { isForbidden() } - } - - mockMvc.put("/api/v1/classrooms/${classroom.id}/tasks/$taskId") { - with(csrf()) - contentType = MediaType.APPLICATION_JSON - header(HttpHeaders.AUTHORIZATION, "Bearer ${previewSession.accessToken}") - content = validTaskPayload(stopId = stop.id!!, titleEn = "Preview update", difficultyLevel = 1) - }.andExpect { - status { isForbidden() } - } - - mockMvc.patch("/api/v1/classrooms/${classroom.id}/tasks/$taskId/publish") { - with(csrf()) - contentType = MediaType.APPLICATION_JSON - header(HttpHeaders.AUTHORIZATION, "Bearer ${previewSession.accessToken}") - content = """{"published":true}""" - }.andExpect { - status { isForbidden() } - } - - mockMvc.delete("/api/v1/classrooms/${classroom.id}/tasks/$taskId") { - with(csrf()) - header(HttpHeaders.AUTHORIZATION, "Bearer ${previewSession.accessToken}") - }.andExpect { - status { isForbidden() } - } - } - - @Test - fun `leaderboard returns ranked classrooms with average total scores`() { - val teacher = userRepository.save(activeTeacher("owner@example.com")) - val firstClassroom = createClassroom(teacher, "PREVIEW11") - val previewClassroom = createClassroom(teacher, "PREVIEW12") - val firstPupil = userRepository.save(activePupil("leaderboard_first")) - val previewPupil = userRepository.save(activePupil("leaderboard_preview")) - firstClassroom.addPupilMembership(firstPupil) - previewClassroom.addPupilMembership(previewPupil) - classroomRepository.saveAll(listOf(firstClassroom, previewClassroom)) - pupilGameProgressRepository.save( - PupilGameProgress( - id = PupilGameProgressId(requireNotNull(firstPupil.id), firstClassroom.id), - pupil = firstPupil, - classroom = firstClassroom, - totalScore = 10, - totalXp = 10, - currentLevel = 1, - completedStopsCount = 1, - completedTasksCount = 1, - finalBossCompleted = false, - lastActivityAt = Instant.now().minusSeconds(120), - ), - ) - pupilGameProgressRepository.save( - PupilGameProgress( - id = PupilGameProgressId(requireNotNull(previewPupil.id), previewClassroom.id), - pupil = previewPupil, - classroom = previewClassroom, - totalScore = 90, - totalXp = 90, - currentLevel = 3, - completedStopsCount = 4, - completedTasksCount = 7, - finalBossCompleted = true, - lastActivityAt = Instant.now(), - ), - ) - val previewSession = startPreviewSession(teacherSession("owner@example.com", "secret123"), previewClassroom.id) - - mockMvc.get("/api/v1/leaderboard") { - header(HttpHeaders.AUTHORIZATION, "Bearer ${previewSession.accessToken}") - }.andExpect { - status { isOk() } - jsonPath("$.entries.length()") { value(2) } - jsonPath("$.entries[0].rank") { value(1) } - jsonPath("$.entries[0].classroomId") { value(firstClassroom.id.toInt()) } - jsonPath("$.entries[0].classroomTitle") { value(firstClassroom.title) } - jsonPath("$.entries[0].averageTotalScore") { value(10.0) } - jsonPath("$.entries[1].rank") { value(2) } - jsonPath("$.entries[1].classroomId") { value(previewClassroom.id.toInt()) } - jsonPath("$.entries[1].classroomTitle") { value(previewClassroom.title) } - jsonPath("$.entries[1].averageTotalScore") { value(90.0) } - } - } - - @Test - fun `preview and non pupil teacher sessions cannot patch stop progress while a real pupil still can`() { - val teacher = userRepository.save(activeTeacher("owner@example.com")) - val classroom = createClassroom(teacher, "PREVIEW9") - val stop = createStop("progress-stop", "Progress stop", 1) - val pupil = userRepository.save(activePupil("progress_pupil")) - classroom.addPupilMembership(pupil) - classroomRepository.saveAndFlush(classroom) - progressRepository.save( - PupilStopProgress( - id = PupilStopProgressId(requireNotNull(pupil.id), classroom.id, requireNotNull(stop.id)), - pupil = pupil, - classroom = classroom, - stop = stop, - ).apply { - status = StopProgressStatus.NOT_STARTED - }, - ) - val teacherSession = teacherSession("owner@example.com", "secret123") - val previewSession = startPreviewSession(teacherSession, classroom.id) - val pupilSession = pupilSession("progress_pupil", "secret123") - - mockMvc.patch("/api/v1/classrooms/${classroom.id}/pupils/${pupil.id}/stop-progress/${stop.id}") { - with(csrf()) - contentType = MediaType.APPLICATION_JSON - header(HttpHeaders.AUTHORIZATION, "Bearer ${teacherSession.accessToken}") - content = """{"status":"IN_PROGRESS"}""" - }.andExpect { - status { isForbidden() } - } - - mockMvc.patch("/api/v1/classrooms/${classroom.id}/pupils/${pupil.id}/stop-progress/${stop.id}") { - with(csrf()) - contentType = MediaType.APPLICATION_JSON - header(HttpHeaders.AUTHORIZATION, "Bearer ${previewSession.accessToken}") - content = """{"status":"IN_PROGRESS"}""" - }.andExpect { - status { isForbidden() } - } - - mockMvc.patch("/api/v1/classrooms/${classroom.id}/pupils/${pupil.id}/stop-progress/${stop.id}") { - with(csrf()) - contentType = MediaType.APPLICATION_JSON - header(HttpHeaders.AUTHORIZATION, "Bearer ${pupilSession.accessToken}") - content = """{"status":"IN_PROGRESS"}""" - }.andExpect { - status { isOk() } - jsonPath("$.status") { value("IN_PROGRESS") } - } - } - - private fun createClassroom(owner: User, joinCode: String): Classroom = - classroomRepository.save( - Classroom( - ownerTeacherId = requireNotNull(owner.id), - title = "Class $joinCode", - description = "Preview classroom", - joinCode = joinCode, - status = ClassroomStatus.ACTIVE, - ), - ) - - private fun createStop( - slug: String, - title: String, - displayOrder: Int, - isFinalBoss: Boolean = false, - ): MapStop = - mapStopsRepository.save( - MapStop( - slug = slug, - title = title, - category = "preview", - displayOrder = displayOrder, - maxScore = 100, - isFinalBoss = isFinalBoss, - isActive = true, - ), - ) - - private fun createTask( - classroomId: Long, - stopId: Long, - accessToken: String, - titleEn: String, - difficultyLevel: Int, - publish: Boolean, - ): Long { - val createResponse = mockMvc.post("/api/v1/classrooms/$classroomId/tasks") { - with(csrf()) - contentType = MediaType.APPLICATION_JSON - header(HttpHeaders.AUTHORIZATION, "Bearer $accessToken") - content = validTaskPayload(stopId = stopId, titleEn = titleEn, difficultyLevel = difficultyLevel) - }.andExpect { - status { isCreated() } - }.andReturn().response - - val taskId = readJson(createResponse.contentAsString)["id"].asLong() - if (publish) { - mockMvc.patch("/api/v1/classrooms/$classroomId/tasks/$taskId/publish") { - with(csrf()) - contentType = MediaType.APPLICATION_JSON - header(HttpHeaders.AUTHORIZATION, "Bearer $accessToken") - content = """{"published":true}""" - }.andExpect { - status { isOk() } - } - } - return taskId - } - - private fun teacherSession( - email: String, - password: String, - ): SessionResponse { - val response = mockMvc.post("/api/v1/auth/teacher/login") { - with(csrf()) - contentType = MediaType.APPLICATION_JSON - content = """{"email":"$email","password":"$password"}""" - }.andExpect { - status { isOk() } - }.andReturn().response - return response.toSessionResponse() - } - - private fun pupilSession( - username: String, - password: String, - ): SessionResponse { - val response = mockMvc.post("/api/v1/auth/pupil/login") { - with(csrf()) - contentType = MediaType.APPLICATION_JSON - content = """{"username":"$username","password":"$password"}""" - }.andExpect { - status { isOk() } - }.andReturn().response - return response.toSessionResponse() - } - - private fun startPreviewSession( - session: SessionResponse, - classroomId: Long, - ): SessionResponse { - val response = mockMvc.post("/api/v1/auth/teacher/game-preview/session/$classroomId") { - with(csrf()) - header(HttpHeaders.AUTHORIZATION, "Bearer ${session.accessToken}") - cookie(Cookie("nettdetektivene_refresh_token", session.refreshToken)) - }.andExpect { - status { isOk() } - }.andReturn().response - return response.toSessionResponse() - } - - private fun refreshTeacherSession(refreshToken: String): SessionResponse { - val response = mockMvc.post("/api/v1/auth/teacher/refresh") { - with(csrf()) - cookie(Cookie("nettdetektivene_refresh_token", refreshToken)) - }.andExpect { - status { isOk() } - }.andReturn().response - return response.toSessionResponse() - } - - private fun activeRefreshTokenHash(): String = - refreshTokenRepository.findAll().single { it.revokedAt == null }.tokenHash - - private fun readJson(content: String): JsonNode = jsonMapper.readTree(content) - - private fun org.springframework.mock.web.MockHttpServletResponse.toSessionResponse(): SessionResponse { - val body = readJson(contentAsString) - return SessionResponse( - accessToken = body["accessToken"].asText(), - refreshToken = extractRefreshToken(getHeaders("Set-Cookie")), - body = body, - ) - } - - private fun extractRefreshToken(setCookieHeaders: List): String = - setCookieHeaders - .first { it.startsWith("nettdetektivene_refresh_token=") } - .substringAfter("nettdetektivene_refresh_token=") - .substringBefore(";") - - private fun activeTeacher(email: String): User = - User( - email = email, - passwordHash = requireNotNull(passwordEncoder.encode("secret123")), - role = UserRole.TEACHER, - status = UserStatus.ACTIVE, - ) - - private fun activePupil(username: String): User = - User( - username = username, - passwordHash = requireNotNull(passwordEncoder.encode("secret123")), - role = UserRole.PUPIL, - status = UserStatus.ACTIVE, - ) - - private fun validTaskPayload( - stopId: Long, - titleEn: String, - difficultyLevel: Int, - ): String = - """ - { - "stopId": $stopId, - "title": {"nb":"Finn den ekte artikkelen","en":"$titleEn"}, - "introText": {"nb":"Velg den troverdige artikkelen.","en":"Choose the trustworthy article."}, - "difficultyLevel": $difficultyLevel, - "taskType": "NEWS_COMPARISON", - "passingRule": "ALL_CORRECT", - "passingScore": 100, - "maxScore": 100, - "items": [ - { - "itemOrder": 1, - "promptText": {"nb":"Hvilken artikkel er troverdig?","en":"Which article is reliable?"}, - "metadataJson": "{\"articleCount\":2}", - "options": [ - { - "optionOrder": 1, - "optionText": {"nb":"Artikkel A","en":"Article A"}, - "isCorrect": true, - "explanationText": {"nb":"Denne kilden er verifisert.","en":"This source is verified."} - }, - { - "optionOrder": 2, - "optionText": {"nb":"Artikkel B","en":"Article B"}, - "isCorrect": false, - "explanationText": {"nb":"Denne kilden bruker klikkagn.","en":"This source uses clickbait."} - } - ] - } - ] - } - """.trimIndent() - - private data class SessionResponse( - val accessToken: String, - val refreshToken: String, - val body: JsonNode, - ) -} diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/TeacherPlaytestIntegrationTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/TeacherPlaytestIntegrationTests.kt new file mode 100644 index 00000000..d3a7aea1 --- /dev/null +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/TeacherPlaytestIntegrationTests.kt @@ -0,0 +1,404 @@ +package edu.ntnu.idi.idatt.backend.game + +import edu.ntnu.idi.idatt.backend.classroom.domain.Classroom +import edu.ntnu.idi.idatt.backend.classroom.domain.ClassroomStatus +import edu.ntnu.idi.idatt.backend.classroom.infrastructure.ClassroomRepository +import edu.ntnu.idi.idatt.backend.game.gameProgress.infrastructure.PupilGameProgressRepository +import edu.ntnu.idi.idatt.backend.game.mapstops.domain.MapStop +import edu.ntnu.idi.idatt.backend.game.mapstops.domain.PupilStopProgress +import edu.ntnu.idi.idatt.backend.game.mapstops.domain.PupilStopProgressId +import edu.ntnu.idi.idatt.backend.game.mapstops.domain.StopProgressStatus +import edu.ntnu.idi.idatt.backend.game.mapstops.infrastructure.MapStopsRepository +import edu.ntnu.idi.idatt.backend.game.mapstops.infrastructure.PupilStopProgressRepository +import edu.ntnu.idi.idatt.backend.game.tasks.infrastructure.TaskRepository +import edu.ntnu.idi.idatt.backend.iam.domain.User +import edu.ntnu.idi.idatt.backend.iam.domain.UserRole +import edu.ntnu.idi.idatt.backend.iam.domain.UserStatus +import edu.ntnu.idi.idatt.backend.iam.infrastructure.RefreshTokenRepository +import edu.ntnu.idi.idatt.backend.iam.infrastructure.UserRepository +import edu.ntnu.idi.idatt.backend.users.avatar.infrastructure.UserAvatarRepository +import edu.ntnu.idi.idatt.backend.users.profile.infrastructure.PupilProfileRepository +import edu.ntnu.idi.idatt.backend.users.profile.infrastructure.TeacherProfileRepository +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.Test +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc +import org.springframework.http.HttpHeaders +import org.springframework.http.MediaType +import org.springframework.security.crypto.password.PasswordEncoder +import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf +import org.springframework.test.web.servlet.MockMvc +import org.springframework.test.web.servlet.get +import org.springframework.test.web.servlet.patch +import org.springframework.test.web.servlet.post + +@SpringBootTest +@AutoConfigureMockMvc +class TeacherPlaytestIntegrationTests { + @Autowired + private lateinit var mockMvc: MockMvc + + @Autowired + private lateinit var userRepository: UserRepository + + @Autowired + private lateinit var classroomRepository: ClassroomRepository + + @Autowired + private lateinit var mapStopsRepository: MapStopsRepository + + @Autowired + private lateinit var progressRepository: PupilStopProgressRepository + + @Autowired + private lateinit var pupilGameProgressRepository: PupilGameProgressRepository + + @Autowired + private lateinit var taskRepository: TaskRepository + + @Autowired + private lateinit var refreshTokenRepository: RefreshTokenRepository + + @Autowired + private lateinit var userAvatarRepository: UserAvatarRepository + + @Autowired + private lateinit var pupilProfileRepository: PupilProfileRepository + + @Autowired + private lateinit var teacherProfileRepository: TeacherProfileRepository + + @Autowired + private lateinit var passwordEncoder: PasswordEncoder + + @BeforeEach + fun setUp() { + refreshTokenRepository.deleteAll() + progressRepository.deleteAll() + pupilGameProgressRepository.deleteAll() + taskRepository.deleteAll() + mapStopsRepository.deleteAll() + classroomRepository.deleteAll() + userAvatarRepository.deleteAll() + pupilProfileRepository.deleteAll() + teacherProfileRepository.deleteAll() + userRepository.deleteAll() + } + + @Test + fun `teacher playtest map returns all active stops as open for classroom owner`() { + val teacher = userRepository.save(activeTeacher("owner@example.com")) + val classroom = createClassroom(teacher, "PLAYTEST1") + createStop("start-stop", "Start stop", 1) + createStop("boss-stop", "Boss stop", 2, isFinalBoss = true) + val accessToken = teacherAccessToken("owner@example.com", "secret123") + + mockMvc.get("/api/v1/teacher/classrooms/${classroom.id}/playtest/map-stops") { + header(HttpHeaders.AUTHORIZATION, "Bearer $accessToken") + }.andExpect { + status { isOk() } + jsonPath("$.length()") { value(2) } + jsonPath("$[0].status") { value("NOT_STARTED") } + jsonPath("$[0].stars") { value(0) } + jsonPath("$[1].status") { value("NOT_STARTED") } + } + } + + @Test + fun `teacher playtest rejects non-owner teacher`() { + val owner = userRepository.save(activeTeacher("owner@example.com")) + userRepository.save(activeTeacher("intruder@example.com")) + val classroom = createClassroom(owner, "PLAYTEST2") + val accessToken = teacherAccessToken("intruder@example.com", "secret123") + + mockMvc.get("/api/v1/teacher/classrooms/${classroom.id}/playtest/map-stops") { + header(HttpHeaders.AUTHORIZATION, "Bearer $accessToken") + }.andExpect { + status { isForbidden() } + } + } + + @Test + fun `teacher playtest task reads show answers but only published tasks`() { + val teacher = userRepository.save(activeTeacher("owner@example.com")) + val classroom = createClassroom(teacher, "PLAYTEST3") + val stop = createStop("task-stop", "Task stop", 1) + val teacherAccessToken = teacherAccessToken("owner@example.com", "secret123") + val publishedTaskId = createTask( + classroomId = classroom.id, + stopId = requireNotNull(stop.id), + accessToken = teacherAccessToken, + titleEn = "Published task", + difficultyLevel = 1, + publish = true, + ) + val draftTaskId = createTask( + classroomId = classroom.id, + stopId = requireNotNull(stop.id), + accessToken = teacherAccessToken, + titleEn = "Draft task", + difficultyLevel = 2, + publish = false, + ) + + mockMvc.get("/api/v1/teacher/classrooms/${classroom.id}/playtest/tasks") { + header(HttpHeaders.AUTHORIZATION, "Bearer $teacherAccessToken") + param("stopId", stop.id!!.toString()) + }.andExpect { + status { isOk() } + jsonPath("$.length()") { value(1) } + jsonPath("$[0].id") { value(publishedTaskId.toInt()) } + } + + mockMvc.get("/api/v1/teacher/classrooms/${classroom.id}/playtest/tasks/$publishedTaskId") { + header(HttpHeaders.AUTHORIZATION, "Bearer $teacherAccessToken") + }.andExpect { + status { isOk() } + jsonPath("$.items[0].options[0].isCorrect") { value(true) } + jsonPath("$.items[0].options[0].explanationText.en") { value("This source is verified.") } + } + + mockMvc.get("/api/v1/teacher/classrooms/${classroom.id}/playtest/tasks/$draftTaskId") { + header(HttpHeaders.AUTHORIZATION, "Bearer $teacherAccessToken") + }.andExpect { + status { isForbidden() } + } + } + + @Test + fun `pupil cannot access teacher playtest endpoints`() { + val teacher = userRepository.save(activeTeacher("owner@example.com")) + val classroom = createClassroom(teacher, "PLAYTEST4") + val pupil = userRepository.save(activePupil("playtest_pupil")) + classroom.addPupilMembership(pupil) + classroomRepository.saveAndFlush(classroom) + val pupilAccessToken = pupilAccessToken("playtest_pupil", "secret123") + + mockMvc.get("/api/v1/teacher/classrooms/${classroom.id}/playtest/map-stops") { + header(HttpHeaders.AUTHORIZATION, "Bearer $pupilAccessToken") + }.andExpect { + status { isForbidden() } + } + } + + @Test + fun `teacher login response no longer exposes preview metadata and old preview endpoint is gone`() { + userRepository.save(activeTeacher("owner@example.com")) + val loginResponse = mockMvc.post("/api/v1/auth/teacher/login") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + content = """{"email":"owner@example.com","password":"secret123"}""" + }.andExpect { + status { isOk() } + jsonPath("$.portalType") { value("TEACHER") } + }.andReturn().response + + val body = loginResponse.contentAsString + assert(!body.contains("sessionMode")) + assert(!body.contains("viewAs")) + assert(!body.contains("previewClassroomId")) + + mockMvc.post("/api/v1/auth/teacher/game-preview/session/1") { + with(csrf()) + header(HttpHeaders.AUTHORIZATION, "Bearer ${extractAccessToken(body)}") + }.andExpect { + status { isNotFound() } + } + } + + @Test + fun `teacher playtest stays read only while pupil progress updates remain available to pupils`() { + val teacher = userRepository.save(activeTeacher("owner@example.com")) + val classroom = createClassroom(teacher, "PLAYTEST5") + val stop = createStop("progress-stop", "Progress stop", 1) + val pupil = userRepository.save(activePupil("progress_pupil")) + classroom.addPupilMembership(pupil) + classroomRepository.saveAndFlush(classroom) + progressRepository.save( + PupilStopProgress( + id = PupilStopProgressId(requireNotNull(pupil.id), classroom.id, requireNotNull(stop.id)), + pupil = pupil, + classroom = classroom, + stop = stop, + ).apply { + status = StopProgressStatus.NOT_STARTED + }, + ) + val teacherAccessToken = teacherAccessToken("owner@example.com", "secret123") + val pupilAccessToken = pupilAccessToken("progress_pupil", "secret123") + + mockMvc.post("/api/v1/teacher/classrooms/${classroom.id}/playtest/tasks") { + header(HttpHeaders.AUTHORIZATION, "Bearer $teacherAccessToken") + }.andExpect { + status { isMethodNotAllowed() } + } + + mockMvc.patch("/api/v1/classrooms/${classroom.id}/pupils/${pupil.id}/stop-progress/${stop.id}") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $teacherAccessToken") + content = """{"status":"IN_PROGRESS"}""" + }.andExpect { + status { isForbidden() } + } + + mockMvc.patch("/api/v1/classrooms/${classroom.id}/pupils/${pupil.id}/stop-progress/${stop.id}") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $pupilAccessToken") + content = """{"status":"IN_PROGRESS"}""" + }.andExpect { + status { isOk() } + jsonPath("$.status") { value("IN_PROGRESS") } + } + } + + private fun createClassroom(owner: User, joinCode: String): Classroom = + classroomRepository.save( + Classroom( + ownerTeacherId = requireNotNull(owner.id), + title = "Class $joinCode", + description = "Teacher playtest classroom", + joinCode = joinCode, + status = ClassroomStatus.ACTIVE, + ), + ) + + private fun createStop( + slug: String, + title: String, + displayOrder: Int, + isFinalBoss: Boolean = false, + ): MapStop = + mapStopsRepository.save( + MapStop( + slug = slug, + title = title, + category = "playtest", + displayOrder = displayOrder, + maxScore = 100, + isFinalBoss = isFinalBoss, + isActive = true, + ), + ) + + private fun createTask( + classroomId: Long, + stopId: Long, + accessToken: String, + titleEn: String, + difficultyLevel: Int, + publish: Boolean, + ): Long { + val createResponse = mockMvc.post("/api/v1/classrooms/$classroomId/tasks") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $accessToken") + content = validTaskPayload(stopId = stopId, titleEn = titleEn, difficultyLevel = difficultyLevel) + }.andExpect { + status { isCreated() } + }.andReturn().response + + val taskId = Regex(""""id":(\d+)""").find(createResponse.contentAsString)?.groupValues?.get(1)?.toLong() + ?: error("Task id missing from create response") + if (publish) { + mockMvc.patch("/api/v1/classrooms/$classroomId/tasks/$taskId/publish") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + header(HttpHeaders.AUTHORIZATION, "Bearer $accessToken") + content = """{"published":true}""" + }.andExpect { + status { isOk() } + } + } + return taskId + } + + private fun teacherAccessToken( + email: String, + password: String, + ): String = + extractAccessToken( + mockMvc.post("/api/v1/auth/teacher/login") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + content = """{"email":"$email","password":"$password"}""" + }.andExpect { + status { isOk() } + }.andReturn().response.contentAsString, + ) + + private fun pupilAccessToken( + username: String, + password: String, + ): String = + extractAccessToken( + mockMvc.post("/api/v1/auth/pupil/login") { + with(csrf()) + contentType = MediaType.APPLICATION_JSON + content = """{"username":"$username","password":"$password"}""" + }.andExpect { + status { isOk() } + }.andReturn().response.contentAsString, + ) + + private fun extractAccessToken(body: String): String = + Regex(""""accessToken":"([^"]+)"""").find(body)?.groupValues?.get(1) + ?: error("Access token missing from response body: $body") + + private fun activeTeacher(email: String): User = + User( + email = email, + passwordHash = requireNotNull(passwordEncoder.encode("secret123")), + role = UserRole.TEACHER, + status = UserStatus.ACTIVE, + ) + + private fun activePupil(username: String): User = + User( + username = username, + passwordHash = requireNotNull(passwordEncoder.encode("secret123")), + role = UserRole.PUPIL, + status = UserStatus.ACTIVE, + ) + + private fun validTaskPayload( + stopId: Long, + titleEn: String, + difficultyLevel: Int, + ): String = + """ + { + "stopId": $stopId, + "title": {"nb":"Finn den ekte artikkelen","en":"$titleEn"}, + "introText": {"nb":"Velg den troverdige artikkelen.","en":"Choose the trustworthy article."}, + "difficultyLevel": $difficultyLevel, + "taskType": "NEWS_COMPARISON", + "passingRule": "ALL_CORRECT", + "passingScore": 100, + "maxScore": 100, + "items": [ + { + "itemOrder": 1, + "promptText": {"nb":"Hvilken artikkel er troverdig?","en":"Which article is reliable?"}, + "metadataJson": "{\"articleCount\":2}", + "options": [ + { + "optionOrder": 1, + "optionText": {"nb":"Artikkel A","en":"Article A"}, + "isCorrect": true, + "explanationText": {"nb":"Denne kilden er verifisert.","en":"This source is verified."} + }, + { + "optionOrder": 2, + "optionText": {"nb":"Artikkel B","en":"Article B"}, + "isCorrect": false, + "explanationText": {"nb":"Denne kilden bruker klikkagn.","en":"This source uses clickbait."} + } + ] + } + ] + } + """.trimIndent() +} diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/MapStopServiceTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/MapStopServiceTests.kt index 691cf1ca..2986aec2 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/MapStopServiceTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/MapStopServiceTests.kt @@ -10,12 +10,10 @@ import edu.ntnu.idi.idatt.backend.game.mapstops.domain.PupilStopProgressId import edu.ntnu.idi.idatt.backend.game.mapstops.domain.StopProgressStatus import edu.ntnu.idi.idatt.backend.game.mapstops.infrastructure.MapStopsRepository import edu.ntnu.idi.idatt.backend.game.mapstops.infrastructure.PupilStopProgressRepository +import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser import edu.ntnu.idi.idatt.backend.iam.domain.User import edu.ntnu.idi.idatt.backend.iam.domain.UserRole import edu.ntnu.idi.idatt.backend.iam.domain.UserStatus -import edu.ntnu.idi.idatt.backend.iam.application.SessionMode -import edu.ntnu.idi.idatt.backend.iam.application.ViewAs -import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows @@ -251,9 +249,6 @@ class MapStopServiceTests { portalType = "PUPIL", email = null, authorities = setOf("ROLE_PUPIL", "PORTAL_PUPIL"), - sessionMode = SessionMode.NORMAL, - viewAs = ViewAs.PUPIL, - previewClassroomId = null, ) private fun pupilAccessContext(): GameAccessContext = diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/AuthControllerIntegrationTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/AuthControllerIntegrationTests.kt index c0e23f92..92dea24c 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/AuthControllerIntegrationTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/AuthControllerIntegrationTests.kt @@ -524,7 +524,7 @@ class AuthControllerIntegrationTests { } @Test - fun `auth me derives pupil viewAs from legacy tokens without view_as claim`() { + fun `auth me accepts legacy tokens without preview metadata claims`() { val pupil = userRepository.save(activePupil()) val token = legacyAccessToken( subject = requireNotNull(pupil.id).toString(), @@ -537,11 +537,12 @@ class AuthControllerIntegrationTests { }.andExpect { status { isOk() } jsonPath("$.portalType") { value("PUPIL") } - jsonPath("$.sessionMode") { value("NORMAL") } - jsonPath("$.viewAs") { value("PUPIL") } + jsonPath("$.authorities[0]") { value("PORTAL_PUPIL") } }.andReturn().response assertFalse(response.contentAsString.contains("TEACHER")) + assertFalse(response.contentAsString.contains("sessionMode")) + assertFalse(response.contentAsString.contains("viewAs")) } private fun teacherLogin() = diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/AuthServiceTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/AuthServiceTests.kt index d92c19c1..bb13228c 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/AuthServiceTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/AuthServiceTests.kt @@ -1,13 +1,11 @@ package edu.ntnu.idi.idatt.backend.iam import edu.ntnu.idi.idatt.backend.iam.application.AuthService -import edu.ntnu.idi.idatt.backend.iam.application.PupilLoginCommand import edu.ntnu.idi.idatt.backend.iam.application.PupilProvisioningService -import edu.ntnu.idi.idatt.backend.iam.application.CurrentUserResolver +import edu.ntnu.idi.idatt.backend.iam.application.PupilLoginCommand import edu.ntnu.idi.idatt.backend.iam.domain.User import edu.ntnu.idi.idatt.backend.iam.domain.UserRole import edu.ntnu.idi.idatt.backend.iam.domain.UserStatus -import edu.ntnu.idi.idatt.backend.classroom.infrastructure.ClassroomRepository import edu.ntnu.idi.idatt.backend.iam.infrastructure.RefreshTokenRepository import edu.ntnu.idi.idatt.backend.iam.infrastructure.UserRepository import edu.ntnu.idi.idatt.backend.iam.security.AppSecurityProperties @@ -33,7 +31,6 @@ class AuthServiceTests { val userRepository = Mockito.mock(UserRepository::class.java) val refreshTokenRepository = Mockito.mock(RefreshTokenRepository::class.java) val pupilProfileRepository = Mockito.mock(PupilProfileRepository::class.java) - val classroomRepository = Mockito.mock(ClassroomRepository::class.java) val userAvatarRepository = Mockito.mock(UserAvatarRepository::class.java) val passwordEncoder = Mockito.mock(PasswordEncoder::class.java) val pupilProvisioningService = PupilProvisioningService( @@ -50,8 +47,6 @@ class AuthServiceTests { jwtService = jwtService(), securityProperties = securityProperties(), pupilProvisioningService = pupilProvisioningService, - currentUserResolver = Mockito.mock(CurrentUserResolver::class.java), - classroomRepository = classroomRepository, ) val conflictingUser = User( id = 7L, diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/CurrentUserResolverTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/CurrentUserResolverTests.kt index 5e5cefc2..df452eb6 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/CurrentUserResolverTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/CurrentUserResolverTests.kt @@ -3,8 +3,6 @@ package edu.ntnu.idi.idatt.backend.iam import edu.ntnu.idi.idatt.backend.classroom.domain.Classroom import edu.ntnu.idi.idatt.backend.classroom.infrastructure.ClassroomRepository import edu.ntnu.idi.idatt.backend.iam.application.CurrentUserResolver -import edu.ntnu.idi.idatt.backend.iam.application.SessionMode -import edu.ntnu.idi.idatt.backend.iam.application.ViewAs import edu.ntnu.idi.idatt.backend.iam.domain.User import edu.ntnu.idi.idatt.backend.iam.domain.UserRole import edu.ntnu.idi.idatt.backend.iam.domain.UserStatus @@ -141,31 +139,6 @@ class CurrentUserResolverTests { assertSame(classroom, resolvedClassroom) } - @Test - fun `resolve classroom by user honors preview classroom for teacher sessions`() { - val userRepository = Mockito.mock(UserRepository::class.java) - val pupilProfileRepository = Mockito.mock(PupilProfileRepository::class.java) - val classroomRepository = Mockito.mock(ClassroomRepository::class.java) - val resolver = CurrentUserResolver(userRepository, pupilProfileRepository, classroomRepository) - val user = user(id = 12L, role = UserRole.TEACHER) - val classroom = Classroom(id = 303L, ownerTeacherId = 12L, title = "Preview class") - - Mockito.`when`(userRepository.findById(12L)).thenReturn(Optional.of(user)) - Mockito.`when`(classroomRepository.findById(303L)).thenReturn(Optional.of(classroom)) - - val resolvedClassroom = resolver.getClassroomByUser( - currentUser( - subject = "12", - portalType = "TEACHER", - sessionMode = SessionMode.GAME_PREVIEW, - viewAs = ViewAs.PUPIL, - previewClassroomId = 303L, - ), - ) - - assertSame(classroom, resolvedClassroom) - } - private fun user( id: Long, role: UserRole, @@ -181,16 +154,10 @@ class CurrentUserResolverTests { private fun currentUser( subject: String, portalType: String, - sessionMode: SessionMode = SessionMode.NORMAL, - viewAs: ViewAs = if (portalType == "PUPIL") ViewAs.PUPIL else ViewAs.TEACHER, - previewClassroomId: Long? = null, ) = CurrentUser( subject = subject, portalType = portalType, email = if (portalType == "PUPIL") null else "user@example.com", authorities = setOf("ROLE_$portalType"), - sessionMode = sessionMode, - viewAs = viewAs, - previewClassroomId = previewClassroomId, ) } diff --git a/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/JwtServiceTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/JwtServiceTests.kt index 0d75eefc..cc7bcbba 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/JwtServiceTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/JwtServiceTests.kt @@ -4,8 +4,6 @@ import edu.ntnu.idi.idatt.backend.iam.security.AppSecurityProperties import edu.ntnu.idi.idatt.backend.iam.security.JwtService import edu.ntnu.idi.idatt.backend.iam.security.JwtSubject import edu.ntnu.idi.idatt.backend.iam.security.SecurityConfig -import edu.ntnu.idi.idatt.backend.iam.application.SessionMode -import edu.ntnu.idi.idatt.backend.iam.application.ViewAs import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertNotNull import org.junit.jupiter.api.Test @@ -41,8 +39,6 @@ class JwtServiceTests { portalType = "TEACHER", email = "teacher@example.com", authorities = setOf("PORTAL_TEACHER"), - sessionMode = SessionMode.NORMAL, - viewAs = ViewAs.TEACHER, ), ) val decoded = securityConfig.jwtDecoder().decode(issuedToken.token)