From 28fe513eaf2a9f6aaff3ad1a4e2df6335808ea32 Mon Sep 17 00:00:00 2001 From: Johannes Aamot-Skeidsvoll Date: Mon, 20 Apr 2026 14:25:39 +0200 Subject: [PATCH 01/11] Add preview session metadata to auth tokens --- .../idatt/backend/iam/api/AuthApiMappings.kt | 3 + .../idatt/backend/iam/api/AuthController.kt | 15 ++ .../backend/iam/api/CurrentUserResponse.kt | 3 + .../idatt/backend/iam/api/LoginResponse.kt | 3 + .../backend/iam/application/AuthService.kt | 140 +++++++++++++++--- .../backend/iam/application/AuthSession.kt | 3 + .../backend/iam/application/SessionContext.kt | 17 +++ .../idatt/backend/iam/security/CurrentUser.kt | 7 + .../idatt/backend/iam/security/JwtService.kt | 5 + .../idatt/backend/iam/security/JwtSubject.kt | 6 + .../backend/iam/security/SecurityConfig.kt | 5 + .../idi/idatt/backend/iam/AuthServiceTests.kt | 5 + .../idi/idatt/backend/iam/JwtServiceTests.kt | 4 + 13 files changed, 192 insertions(+), 24 deletions(-) create mode 100644 src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/SessionContext.kt 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 b0997286..40f6f18a 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,6 +55,9 @@ 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 06f04ce1..ea4e6f6c 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 @@ -15,6 +15,7 @@ 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.PostMapping import org.springframework.web.bind.annotation.PutMapping import org.springframework.web.bind.annotation.RequestBody @@ -84,6 +85,17 @@ class AuthController( .body(session.toLoginResponse()) } + @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. * @@ -180,6 +192,9 @@ 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 a8fcd9ff..1b5a6afb 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,4 +13,7 @@ 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 b88db6d3..e8282173 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,5 +16,8 @@ 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 3eebfecd..afeaf2c9 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,5 +1,6 @@ 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 @@ -38,6 +39,8 @@ 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() @@ -61,7 +64,7 @@ class AuthService( @Transactional fun teacherRefresh( refreshToken: String?, - ): AuthSession = refreshSession(refreshToken, setOf(UserRole.TEACHER, UserRole.ADMIN), "TEACHER") + ): AuthSession = refreshTeacherSession(refreshToken) /** * Ensures a pupil user exists for the submitted username and then performs normal pupil login. @@ -85,7 +88,37 @@ class AuthService( @Transactional fun pupilRefresh( refreshToken: String?, - ): AuthSession = refreshSession(refreshToken, setOf(UserRole.PUPIL), "PUPIL") + ): AuthSession = refreshPupilSession(refreshToken) + + @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, + ), + ) + } + + @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. @@ -118,7 +151,7 @@ class AuthService( ?.takeIf { passwordEncoder.matches(command.password, it.passwordHash) } ?: throw ResponseStatusException(HttpStatus.UNAUTHORIZED, "Invalid email or password") - return issueSession(user, "TEACHER") + return issueSession(user, "TEACHER", normalTeacherSession()) } /** @@ -134,32 +167,31 @@ class AuthService( ?.takeIf { passwordEncoder.matches(command.password, it.passwordHash) } ?: throw ResponseStatusException(HttpStatus.UNAUTHORIZED, "Invalid username or password") - return issueSession(user, "PUPIL") + return issueSession(user, "PUPIL", normalPupilSession()) } - /** - * Validates a refresh token for the expected roles, revokes it, and issues a replacement session. - * - * @param rawRefreshToken raw refresh token from the cookie - * @param allowedRoles roles allowed to use the refresh endpoint - * @param portalType portal type to embed in the rotated access token - * @return authenticated session with a rotated refresh token - * @throws ResponseStatusException when the refresh token is missing, invalid, expired, or revoked - */ - private fun refreshSession( + private fun refreshTeacherSession( rawRefreshToken: String?, - allowedRoles: Set, - portalType: String, ): AuthSession { - val now = Instant.now() - val persistedToken = rawRefreshToken - ?.takeIf { it.isNotBlank() } - ?.let { refreshTokenRepository.findByTokenHash(hashToken(it)) } - ?.takeIf { it.isActiveAt(now) && it.user.isActive() && it.user.role in allowedRoles } - ?: throw ResponseStatusException(HttpStatus.UNAUTHORIZED, "Invalid refresh token") + val persistedToken = requireActiveRefreshToken(rawRefreshToken, setOf(UserRole.TEACHER, UserRole.ADMIN)) + persistedToken.revoke(Instant.now()) + return issueSession( + user = persistedToken.user, + portalType = "TEACHER", + sessionContext = persistedToken.toSessionContext(), + ) + } - persistedToken.revoke(now) - return issueSession(persistedToken.user, portalType) + private fun refreshPupilSession( + rawRefreshToken: String?, + ): AuthSession { + val persistedToken = requireActiveRefreshToken(rawRefreshToken, setOf(UserRole.PUPIL)) + persistedToken.revoke(Instant.now()) + return issueSession( + user = persistedToken.user, + portalType = "PUPIL", + sessionContext = normalPupilSession(), + ) } /** @@ -172,6 +204,7 @@ class AuthService( private fun issueSession( user: User, portalType: String, + sessionContext: SessionContext, ): AuthSession { val now = Instant.now() val subject = user.id?.toString() @@ -182,6 +215,9 @@ class AuthService( portalType = portalType, email = user.email, authorities = authoritiesFor(user, portalType), + sessionMode = sessionContext.sessionMode, + viewAs = sessionContext.viewAs, + previewClassroomId = sessionContext.previewClassroomId, ), ) val rawRefreshToken = generateRawRefreshToken() @@ -191,6 +227,9 @@ class AuthService( user = user, tokenHash = hashToken(rawRefreshToken), expiresAt = now.plus(securityProperties.refresh.ttl), + sessionMode = sessionContext.sessionMode, + viewAs = sessionContext.viewAs, + previewClassroomId = sessionContext.previewClassroomId, ), ) @@ -199,6 +238,9 @@ 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, @@ -255,4 +297,54 @@ class AuthService( * @return trimmed username value */ private fun normalizeUsername(username: String): String = username.trim() + + private fun requireActiveRefreshToken( + rawRefreshToken: String?, + allowedRoles: Set, + ): RefreshToken { + val now = Instant.now() + return rawRefreshToken + ?.takeIf { it.isNotBlank() } + ?.let { refreshTokenRepository.findByTokenHash(hashToken(it)) } + ?.takeIf { it.isActiveAt(now) && it.user.isActive() && it.user.role in allowedRoles } + ?: 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 a57b0e94..b8d0be71 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,5 +14,8 @@ 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/SessionContext.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/SessionContext.kt new file mode 100644 index 00000000..98787940 --- /dev/null +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/SessionContext.kt @@ -0,0 +1,17 @@ +package edu.ntnu.idi.idatt.backend.iam.application + +enum class SessionMode { + NORMAL, + GAME_PREVIEW, +} + +enum class ViewAs { + TEACHER, + PUPIL, +} + +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/security/CurrentUser.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/security/CurrentUser.kt index 1710db74..03063889 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,5 +1,7 @@ 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 /** @@ -15,6 +17,9 @@ 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. @@ -23,4 +28,6 @@ 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 04969b09..704f5731 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,10 +35,15 @@ 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 4958f102..909b4d5c 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,5 +1,8 @@ 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. * @@ -13,4 +16,7 @@ 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 258ad07f..e51b865c 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,6 +1,8 @@ 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 @@ -163,6 +165,9 @@ class SecurityConfig( portalType = jwt.getClaimAsString("portal_type") ?: "UNKNOWN", email = jwt.getClaimAsString("email"), authorities = authorities, + sessionMode = jwt.getClaimAsString("session_mode")?.let(SessionMode::valueOf) ?: SessionMode.NORMAL, + viewAs = jwt.getClaimAsString("view_as")?.let(ViewAs::valueOf) ?: ViewAs.TEACHER, + previewClassroomId = (jwt.claims["preview_classroom_id"] as? Number)?.toLong(), ) return UsernamePasswordAuthenticationToken(principal, jwt, authorities.map { org.springframework.security.core.authority.SimpleGrantedAuthority(it) }) } 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 6f986818..d92c19c1 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 @@ -3,9 +3,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.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 @@ -31,6 +33,7 @@ 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( @@ -47,6 +50,8 @@ 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/JwtServiceTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/iam/JwtServiceTests.kt index cc7bcbba..0d75eefc 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,6 +4,8 @@ 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 @@ -39,6 +41,8 @@ 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) From 47a3f51fc9816ea6e9a407f26acb22ec31abd29b Mon Sep 17 00:00:00 2001 From: Johannes Aamot-Skeidsvoll Date: Mon, 20 Apr 2026 14:26:32 +0200 Subject: [PATCH 02/11] Persist preview session state in refresh tokens --- .../idatt/backend/iam/domain/RefreshToken.kt | 20 +++++++++++++++++++ ...review_session_state_to_refresh_tokens.sql | 8 ++++++++ 2 files changed, 28 insertions(+) create mode 100644 src/main/resources/db/migration/V13__add_preview_session_state_to_refresh_tokens.sql 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 1e5714d7..eb3a8df1 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,7 +1,12 @@ 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 +import jakarta.persistence.Enumerated import jakarta.persistence.FetchType import jakarta.persistence.GeneratedValue import jakarta.persistence.GenerationType @@ -37,6 +42,14 @@ 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 @@ -62,4 +75,11 @@ class RefreshToken( fun revoke(instant: Instant) { revokedAt = instant } + + fun toSessionContext(): SessionContext = + SessionContext( + sessionMode = sessionMode, + viewAs = viewAs, + previewClassroomId = previewClassroomId, + ) } 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 new file mode 100644 index 00000000..2efbf46a --- /dev/null +++ b/src/main/resources/db/migration/V13__add_preview_session_state_to_refresh_tokens.sql @@ -0,0 +1,8 @@ +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; From 94d702d47b5468dd8e36e4c4daa88b2a267b2072 Mon Sep 17 00:00:00 2001 From: Johannes Aamot-Skeidsvoll Date: Mon, 20 Apr 2026 14:26:48 +0200 Subject: [PATCH 03/11] Add teacher game preview session endpoints --- .../api/GamePreviewSessionController.kt | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/GamePreviewSessionController.kt diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/GamePreviewSessionController.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/GamePreviewSessionController.kt new file mode 100644 index 00000000..4b9d6bc9 --- /dev/null +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/GamePreviewSessionController.kt @@ -0,0 +1,53 @@ +package edu.ntnu.idi.idatt.backend.classroom.api + +import edu.ntnu.idi.idatt.backend.iam.api.LoginResponse +import edu.ntnu.idi.idatt.backend.iam.api.toLoginResponse +import edu.ntnu.idi.idatt.backend.iam.application.AuthService +import edu.ntnu.idi.idatt.backend.iam.security.AppSecurityProperties +import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser +import jakarta.servlet.http.HttpServletRequest +import org.springframework.http.HttpHeaders +import org.springframework.http.ResponseCookie +import org.springframework.http.ResponseEntity +import org.springframework.security.core.annotation.AuthenticationPrincipal +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController + +@RestController +@RequestMapping("/api/v1/classrooms/{classroomId}/game-preview") +class GamePreviewSessionController( + private val authService: AuthService, + private val securityProperties: AppSecurityProperties, +) { + @PostMapping("/session") + fun startPreviewSession( + @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()) + } + + private fun refreshCookie(rawToken: String): ResponseCookie = + ResponseCookie.from(securityProperties.refresh.cookieName, rawToken) + .httpOnly(true) + .secure(securityProperties.refresh.secureCookie) + .path(securityProperties.refresh.cookiePath) + .sameSite(securityProperties.refresh.sameSite) + .maxAge(securityProperties.refresh.ttl) + .build() + + private fun extractRefreshCookie(request: HttpServletRequest): String? = + request.cookies + ?.firstOrNull { it.name == securityProperties.refresh.cookieName } + ?.value +} From 48f022f9fe4bf7aef381e1a8e10dddbd99928f80 Mon Sep 17 00:00:00 2001 From: Johannes Aamot-Skeidsvoll Date: Mon, 20 Apr 2026 14:27:42 +0200 Subject: [PATCH 04/11] Add classroom game access resolver --- .../application/GameAccessContextResolver.kt | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 src/main/kotlin/edu/ntnu/idi/idatt/backend/game/application/GameAccessContextResolver.kt 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 new file mode 100644 index 00000000..e427f136 --- /dev/null +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/application/GameAccessContextResolver.kt @@ -0,0 +1,102 @@ +package edu.ntnu.idi.idatt.backend.game.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.iam.application.CurrentUserResolver +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.security.CurrentUser +import org.springframework.http.HttpStatus +import org.springframework.stereotype.Service +import org.springframework.web.server.ResponseStatusException + +@Service +class GameAccessContextResolver( + private val currentUserResolver: CurrentUserResolver, + private val classroomRepository: ClassroomRepository, +) { + fun resolveReadContext( + currentUser: CurrentUser, + classroomId: Long, + ): GameAccessContext { + val user = currentUserResolver.requireUser(currentUser.subject) + 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 (currentUser.isPreviewSession()) { + 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") + } + if (user.role == UserRole.TEACHER && classroom.ownerTeacherId != userId) { + throw ResponseStatusException(HttpStatus.FORBIDDEN, "Only the classroom owner may preview this classroom") + } + return GameAccessContext( + classroom = classroom, + user = user, + pupilUserId = null, + publishedOnly = true, + includeAnswers = true, + allStopsOpen = true, + readOnly = true, + ) + } + + return when (user.role) { + UserRole.PUPIL -> { + if (!classroom.hasPupilMembership(userId)) { + throw ResponseStatusException(HttpStatus.FORBIDDEN, "User does not have access to this classroom") + } + GameAccessContext( + classroom = classroom, + user = user, + pupilUserId = userId, + publishedOnly = true, + includeAnswers = false, + allStopsOpen = false, + readOnly = false, + ) + } + + UserRole.TEACHER -> { + if (classroom.ownerTeacherId != userId) { + throw ResponseStatusException(HttpStatus.FORBIDDEN, "User does not have access to this classroom") + } + GameAccessContext( + classroom = classroom, + user = user, + pupilUserId = null, + publishedOnly = false, + includeAnswers = true, + allStopsOpen = true, + readOnly = false, + ) + } + + UserRole.ADMIN -> GameAccessContext( + classroom = classroom, + user = user, + pupilUserId = null, + publishedOnly = false, + includeAnswers = true, + allStopsOpen = true, + readOnly = false, + ) + } + } +} + +data class GameAccessContext( + val classroom: Classroom, + val user: User, + val pupilUserId: Long?, + val publishedOnly: Boolean, + val includeAnswers: Boolean, + val allStopsOpen: Boolean, + val readOnly: Boolean, +) From fb4d7e972c5dc863c51374aa4160dba75c69891c Mon Sep 17 00:00:00 2001 From: Johannes Aamot-Skeidsvoll Date: Mon, 20 Apr 2026 14:28:03 +0200 Subject: [PATCH 05/11] Allow teacher preview access to map stops --- .../game/mapstops/api/MapStopsController.kt | 6 +- .../mapstops/application/MapStopService.kt | 52 ++++++++- .../game/mapstops/MapStopServiceTests.kt | 101 +++++++++++++----- 3 files changed, 127 insertions(+), 32 deletions(-) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/api/MapStopsController.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/api/MapStopsController.kt index 22f1d2b1..edf34194 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/api/MapStopsController.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/api/MapStopsController.kt @@ -32,7 +32,7 @@ class MapStopsController( @PathVariable classroomId: Long, ): List = mapStopService - .getMapOverview(currentUser.subject.toLong(), classroomId) + .getMapOverview(currentUser, classroomId) .map { it.toResponse() } /** @@ -50,6 +50,6 @@ class MapStopsController( @PathVariable slug: String, ): MapStopOverviewResponse = mapStopService - .getMapStopOverviewBySlug(currentUser.subject.toLong(), classroomId, slug) + .getMapStopOverviewBySlug(currentUser, classroomId, slug) .toResponse() -} \ No newline at end of file +} 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 bb1907b5..2b4c5cb7 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 @@ -1,9 +1,12 @@ 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.mapstops.domain.MapStop 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 org.springframework.http.HttpStatus import org.springframework.stereotype.Service import org.springframework.web.server.ResponseStatusException @@ -18,6 +21,7 @@ import org.springframework.web.server.ResponseStatusException class MapStopService( private val mapStopsRepository: MapStopsRepository, private val pupilStopProgressRepository: PupilStopProgressRepository, + private val gameAccessContextResolver: GameAccessContextResolver, ) { /** * Returns all active map stops sorted by display order. @@ -36,6 +40,7 @@ class MapStopService( */ fun getMapStopBySlug(slug: String): MapStop { return mapStopsRepository.findBySlugIgnoreCase(slug) + ?.takeIf { it.isActive == true } ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "No map stop found for slug: $slug") } @@ -47,10 +52,14 @@ class MapStopService( * @param classroomId classroom to scope the progress lookup to * @return sorted list of stops with progress state for the pupil */ - fun getMapOverview(pupilUserId: Long, classroomId: Long): List { + fun getMapOverview(currentUser: CurrentUser, classroomId: Long): List { + val accessContext = gameAccessContextResolver.resolveReadContext(currentUser, classroomId) val stops = mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc() + if (accessContext.allStopsOpen || accessContext.pupilUserId == null) { + return stops.mapNotNull { stop -> stop.toOpenOverviewEntry() } + } val progressByStopId = pupilStopProgressRepository - .findAllByIdPupilUserIdAndIdClassroomId(pupilUserId, classroomId) + .findAllByIdPupilUserIdAndIdClassroomId(accessContext.pupilUserId, classroomId) .associateBy { it.id.stopId } return stops.mapNotNull { stop -> @@ -79,13 +88,21 @@ class MapStopService( * @return map stop matching the given slug with progress state for the pupil * @throws ResponseStatusException 404 if no stop matches the slug */ - fun getMapStopOverviewBySlug(pupilUserId: Long, classroomId: Long, slug: String): MapStopOverviewEntry { + fun getMapStopOverviewBySlug( + currentUser: CurrentUser, + classroomId: Long, + slug: String, + ): MapStopOverviewEntry { + val accessContext = gameAccessContextResolver.resolveReadContext(currentUser, classroomId) val stop = getMapStopBySlug(slug) + if (accessContext.allStopsOpen || accessContext.pupilUserId == null) { + return stop.toOpenOverviewEntry() + } val stopId = stop.id ?: throw ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, "Map stop has no id") val progress = pupilStopProgressRepository - .findByIdPupilUserIdAndIdClassroomIdAndIdStopId(pupilUserId, classroomId, stopId) + .findByIdPupilUserIdAndIdClassroomIdAndIdStopId(accessContext.pupilUserId, classroomId, stopId) return MapStopOverviewEntry( stopId = stopId, @@ -112,6 +129,31 @@ class MapStopService( } } +private fun MapStop.toOpenOverviewEntry(): MapStopOverviewEntry { + val stopId = id ?: return MapStopOverviewEntry( + stopId = 0, + slug = slug, + title = title, + category = category, + displayOrder = displayOrder ?: 0, + isFinalBoss = isFinalBoss ?: false, + status = StopProgressStatus.NOT_STARTED, + stars = 0, + medalAwarded = false, + ) + return MapStopOverviewEntry( + stopId = stopId, + slug = slug, + title = title, + category = category, + displayOrder = displayOrder ?: 0, + isFinalBoss = isFinalBoss ?: false, + status = StopProgressStatus.NOT_STARTED, + stars = 0, + medalAwarded = false, + ) +} + /** * Aggregated view of a map stop enriched with a pupil's current progress state. * @@ -135,4 +177,4 @@ data class MapStopOverviewEntry( val status: StopProgressStatus, val stars: Int, val medalAwarded: Boolean, -) \ No newline at end of file +) 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 1bf2061f..691cf1ca 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 @@ -1,6 +1,8 @@ package edu.ntnu.idi.idatt.backend.game.mapstops import edu.ntnu.idi.idatt.backend.classroom.domain.Classroom +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.mapstops.application.MapStopService import edu.ntnu.idi.idatt.backend.game.mapstops.domain.MapStop import edu.ntnu.idi.idatt.backend.game.mapstops.domain.PupilStopProgress @@ -11,6 +13,9 @@ import edu.ntnu.idi.idatt.backend.game.mapstops.infrastructure.PupilStopProgress 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 @@ -24,7 +29,7 @@ class MapStopServiceTests { fun `get all map stops returns active stops in display order`() { val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val service = MapStopService(mapStopsRepository, progressRepository) + val service = MapStopService(mapStopsRepository, progressRepository, Mockito.mock(GameAccessContextResolver::class.java)) val stops = listOf(mapStop(id = 1L, displayOrder = 1), mapStop(id = 2L, displayOrder = 2)) Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(stops) @@ -40,7 +45,7 @@ class MapStopServiceTests { fun `get all map stops returns empty list when no active stops exist`() { val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val service = MapStopService(mapStopsRepository, progressRepository) + val service = MapStopService(mapStopsRepository, progressRepository, Mockito.mock(GameAccessContextResolver::class.java)) Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(emptyList()) @@ -53,7 +58,7 @@ class MapStopServiceTests { fun `get map stop by slug throws 404 when no stop matches`() { val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val service = MapStopService(mapStopsRepository, progressRepository) + val service = MapStopService(mapStopsRepository, progressRepository, Mockito.mock(GameAccessContextResolver::class.java)) Mockito.`when`(mapStopsRepository.findBySlugIgnoreCase("not a stop")).thenReturn(null) @@ -68,13 +73,15 @@ class MapStopServiceTests { fun `get map overview falls back to LOCKED when pupil has no progress record for a stop`() { val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val service = MapStopService(mapStopsRepository, progressRepository) + val resolver = Mockito.mock(GameAccessContextResolver::class.java) + val service = MapStopService(mapStopsRepository, progressRepository, resolver) val stop = mapStop(id = 10L, displayOrder = 1) + Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) Mockito.`when`(progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(emptyList()) - val result = service.getMapOverview(pupilUserId = 1L, classroomId = 2L) + val result = service.getMapOverview(currentUser = pupilCurrentUser(), classroomId = 2L) assertEquals(1, result.size) assertEquals(StopProgressStatus.LOCKED, result[0].status) @@ -86,14 +93,16 @@ class MapStopServiceTests { fun `get map overview reflects pupil progress status and stars when record exists`() { val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val service = MapStopService(mapStopsRepository, progressRepository) + val resolver = Mockito.mock(GameAccessContextResolver::class.java) + val service = MapStopService(mapStopsRepository, progressRepository, resolver) val stop = mapStop(id = 10L, displayOrder = 1, maxScore = 100) val progress = progress(stopId = 10L, status = StopProgressStatus.COMPLETED, bestScore = 80) + Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) Mockito.`when`(progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(listOf(progress)) - val result = service.getMapOverview(pupilUserId = 1L, classroomId = 2L) + val result = service.getMapOverview(currentUser = pupilCurrentUser(), classroomId = 2L) assertEquals(StopProgressStatus.COMPLETED, result[0].status) assertEquals(3, result[0].stars) // 80/100 = 0.80 ≥ 0.75 → 3 stars @@ -103,12 +112,14 @@ class MapStopServiceTests { fun `get map overview returns empty list when there are no active stops`() { val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val service = MapStopService(mapStopsRepository, progressRepository) + val resolver = Mockito.mock(GameAccessContextResolver::class.java) + val service = MapStopService(mapStopsRepository, progressRepository, resolver) + Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(emptyList()) Mockito.`when`(progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(emptyList()) - val result = service.getMapOverview(pupilUserId = 1L, classroomId = 2L) + val result = service.getMapOverview(currentUser = pupilCurrentUser(), classroomId = 2L) assertEquals(0, result.size) } @@ -117,15 +128,17 @@ class MapStopServiceTests { fun `get map stop overview by slug returns enriched entry for pupil with progress`() { val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val service = MapStopService(mapStopsRepository, progressRepository) + val resolver = Mockito.mock(GameAccessContextResolver::class.java) + val service = MapStopService(mapStopsRepository, progressRepository, resolver) val stop = mapStop(id = 5L, slug = "data-center", maxScore = 100) val progress = progress(stopId = 5L, status = StopProgressStatus.IN_PROGRESS, bestScore = 50) + Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) Mockito.`when`(mapStopsRepository.findBySlugIgnoreCase("data-center")).thenReturn(stop) Mockito.`when`(progressRepository.findByIdPupilUserIdAndIdClassroomIdAndIdStopId(1L, 2L, 5L)) .thenReturn(progress) - val result = service.getMapStopOverviewBySlug(pupilUserId = 1L, classroomId = 2L, slug = "data-center") + val result = service.getMapStopOverviewBySlug(currentUser = pupilCurrentUser(), classroomId = 2L, slug = "data-center") assertEquals(5L, result.stopId) assertEquals(StopProgressStatus.IN_PROGRESS, result.status) @@ -136,14 +149,16 @@ class MapStopServiceTests { fun `get map stop overview by slug falls back to LOCKED when pupil has no progress`() { val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val service = MapStopService(mapStopsRepository, progressRepository) + val resolver = Mockito.mock(GameAccessContextResolver::class.java) + val service = MapStopService(mapStopsRepository, progressRepository, resolver) val stop = mapStop(id = 5L, slug = "data-center") + Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) Mockito.`when`(mapStopsRepository.findBySlugIgnoreCase("data-center")).thenReturn(stop) Mockito.`when`(progressRepository.findByIdPupilUserIdAndIdClassroomIdAndIdStopId(1L, 2L, 5L)) .thenReturn(null) - val result = service.getMapStopOverviewBySlug(pupilUserId = 1L, classroomId = 2L, slug = "data-center") + val result = service.getMapStopOverviewBySlug(currentUser = pupilCurrentUser(), classroomId = 2L, slug = "data-center") assertEquals(StopProgressStatus.LOCKED, result.status) assertEquals(0, result.stars) @@ -153,12 +168,14 @@ class MapStopServiceTests { fun `get map stop overview by slug throws 404 for unknown slug`() { val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val service = MapStopService(mapStopsRepository, progressRepository) + val resolver = Mockito.mock(GameAccessContextResolver::class.java) + val service = MapStopService(mapStopsRepository, progressRepository, resolver) + Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) Mockito.`when`(mapStopsRepository.findBySlugIgnoreCase("data center")).thenReturn(null) val exception = assertThrows { - service.getMapStopOverviewBySlug(pupilUserId = 1L, classroomId = 2L, slug = "data-center") + service.getMapStopOverviewBySlug(currentUser = pupilCurrentUser(), classroomId = 2L, slug = "data-center") } assertEquals(HttpStatus.NOT_FOUND, exception.statusCode) @@ -168,58 +185,94 @@ class MapStopServiceTests { fun `get map overview awards 0 stars when best score is below 25 percent of max`() { val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val service = MapStopService(mapStopsRepository, progressRepository) + val resolver = Mockito.mock(GameAccessContextResolver::class.java) + val service = MapStopService(mapStopsRepository, progressRepository, resolver) val stop = mapStop(id = 1L, maxScore = 100) val progress = progress(stopId = 1L, bestScore = 24) + Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) Mockito.`when`(progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(listOf(progress)) - assertEquals(0, service.getMapOverview(1L, 2L)[0].stars) + assertEquals(0, service.getMapOverview(pupilCurrentUser(), 2L)[0].stars) } @Test fun `get map overview awards 1 star when best score is exactly 25 percent of max`() { val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val service = MapStopService(mapStopsRepository, progressRepository) + val resolver = Mockito.mock(GameAccessContextResolver::class.java) + val service = MapStopService(mapStopsRepository, progressRepository, resolver) val stop = mapStop(id = 1L, maxScore = 100) val progress = progress(stopId = 1L, bestScore = 25) + Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) Mockito.`when`(progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(listOf(progress)) - assertEquals(1, service.getMapOverview(1L, 2L)[0].stars) + assertEquals(1, service.getMapOverview(pupilCurrentUser(), 2L)[0].stars) } @Test fun `get map overview awards 2 stars when best score is exactly 50 percent of max`() { val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val service = MapStopService(mapStopsRepository, progressRepository) + val resolver = Mockito.mock(GameAccessContextResolver::class.java) + val service = MapStopService(mapStopsRepository, progressRepository, resolver) val stop = mapStop(id = 1L, maxScore = 100) val progress = progress(stopId = 1L, bestScore = 50) + Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) Mockito.`when`(progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(listOf(progress)) - assertEquals(2, service.getMapOverview(1L, 2L)[0].stars) + assertEquals(2, service.getMapOverview(pupilCurrentUser(), 2L)[0].stars) } @Test fun `get map overview awards 0 stars when max score is zero`() { val mapStopsRepository = Mockito.mock(MapStopsRepository::class.java) val progressRepository = Mockito.mock(PupilStopProgressRepository::class.java) - val service = MapStopService(mapStopsRepository, progressRepository) + val resolver = Mockito.mock(GameAccessContextResolver::class.java) + val service = MapStopService(mapStopsRepository, progressRepository, resolver) val stop = mapStop(id = 1L, maxScore = 0) val progress = progress(stopId = 1L, bestScore = 100) + Mockito.`when`(resolver.resolveReadContext(pupilCurrentUser(), 2L)).thenReturn(pupilAccessContext()) Mockito.`when`(mapStopsRepository.findAllByIsActiveTrueOrderByDisplayOrderAsc()).thenReturn(listOf(stop)) Mockito.`when`(progressRepository.findAllByIdPupilUserIdAndIdClassroomId(1L, 2L)).thenReturn(listOf(progress)) - assertEquals(0, service.getMapOverview(1L, 2L)[0].stars) + assertEquals(0, service.getMapOverview(pupilCurrentUser(), 2L)[0].stars) } + private fun pupilCurrentUser(): CurrentUser = + CurrentUser( + subject = "1", + portalType = "PUPIL", + email = null, + authorities = setOf("ROLE_PUPIL", "PORTAL_PUPIL"), + sessionMode = SessionMode.NORMAL, + viewAs = ViewAs.PUPIL, + previewClassroomId = null, + ) + + private fun pupilAccessContext(): GameAccessContext = + GameAccessContext( + classroom = Classroom(id = 2L, ownerTeacherId = 99L, title = "Test Classroom"), + user = User( + id = 1L, + username = "pupil-one", + passwordHash = "hash", + role = UserRole.PUPIL, + status = UserStatus.ACTIVE, + ), + pupilUserId = 1L, + publishedOnly = true, + includeAnswers = false, + allStopsOpen = false, + readOnly = false, + ) + private fun mapStop( id: Long, slug: String? = "stop $id", @@ -261,4 +314,4 @@ class MapStopServiceTests { this.medalAwarded = medalAwarded } } -} \ No newline at end of file +} From 1bc93e3ecbce91e43d2116af5cadee05b042b92e Mon Sep 17 00:00:00 2001 From: Johannes Aamot-Skeidsvoll Date: Mon, 20 Apr 2026 14:28:18 +0200 Subject: [PATCH 06/11] Expose task answers in teacher preview mode --- .../backend/game/tasks/api/TaskController.kt | 6 +-- .../game/tasks/application/TaskModels.kt | 5 ++ .../game/tasks/application/TaskService.kt | 49 ++++++------------- 3 files changed, 24 insertions(+), 36 deletions(-) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskController.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskController.kt index fe5594ee..2fb82b66 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskController.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskController.kt @@ -34,7 +34,7 @@ class TaskController( @RequestParam(required = false) stopId: Long?, @AuthenticationPrincipal currentUser: CurrentUser, ): List = - taskService.listTasks(currentUser.subject, classroomId, stopId).map { it.toResponse() } + taskService.listTasks(currentUser, classroomId, stopId).map { it.toResponse() } /** * Returns the full contents of one task. @@ -48,8 +48,8 @@ class TaskController( @AuthenticationPrincipal currentUser: CurrentUser, ): TaskResponse = taskService - .getTask(currentUser.subject, classroomId, taskId) - .toResponse(includeAnswers = currentUser.portalType != "PUPIL") + .getTask(currentUser, classroomId, taskId) + .let { it.task.toResponse(includeAnswers = it.includeAnswers) } /** * Creates a new draft task owned by the classroom's teacher. 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 33d7738a..8b4a2123 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 @@ -120,6 +120,11 @@ data class TaskDetails( val items: List, ) +data class TaskReadResult( + val task: TaskDetails, + val includeAnswers: Boolean, +) + /** * Lightweight task projection used by list endpoints. */ 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 e7f75639..318c11b8 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 @@ -2,9 +2,11 @@ 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.CurrentUserResolver 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.security.CurrentUser import edu.ntnu.idi.idatt.backend.game.tasks.domain.Task import edu.ntnu.idi.idatt.backend.game.tasks.domain.TaskItem import edu.ntnu.idi.idatt.backend.game.tasks.domain.TaskItemTranslation @@ -31,38 +33,40 @@ class TaskService( private val taskRepository: TaskRepository, private val classroomRepository: ClassroomRepository, private val currentUserResolver: CurrentUserResolver, + private val gameAccessContextResolver: GameAccessContextResolver, ) { @Transactional(readOnly = true) fun listTasks( - authenticatedSubject: String, + currentUser: CurrentUser, classroomId: Long, stopId: Long?, ): List { - val (classroom, user) = requireParticipatingClassroom(authenticatedSubject, classroomId) - val isPupil = user.role == UserRole.PUPIL + val accessContext = gameAccessContextResolver.resolveReadContext(currentUser, classroomId) val tasks = if (stopId != null) { - taskRepository.findAllByClassroomIdAndStopIdOrderByDifficultyLevelAsc(classroom.id, stopId) + taskRepository.findAllByClassroomIdAndStopIdOrderByDifficultyLevelAsc(accessContext.classroom.id, stopId) } else { - taskRepository.findAllByClassroomIdOrderByStopIdAscDifficultyLevelAsc(classroom.id) + taskRepository.findAllByClassroomIdOrderByStopIdAscDifficultyLevelAsc(accessContext.classroom.id) } return tasks - .filter { if (isPupil) it.isPublished else true } + .filter { if (accessContext.publishedOnly) it.isPublished else true } .map { it.toSummary() } } @Transactional(readOnly = true) fun getTask( - authenticatedSubject: String, + currentUser: CurrentUser, classroomId: Long, taskId: Long, - ): TaskDetails { - val (_, user) = requireParticipatingClassroom(authenticatedSubject, classroomId) - val isPupil = user.role == UserRole.PUPIL + ): TaskReadResult { + val accessContext = gameAccessContextResolver.resolveReadContext(currentUser, classroomId) val task = requireTask(classroomId, taskId) - if (isPupil && !task.isPublished) { + if (accessContext.publishedOnly && !task.isPublished) { throw ResponseStatusException(HttpStatus.FORBIDDEN, "Pupils cannot view unpublished tasks") } - return task.toDetails() + return TaskReadResult( + task = task.toDetails(), + includeAnswers = accessContext.includeAnswers, + ) } @Transactional @@ -178,27 +182,6 @@ class TaskService( return classroom } - private fun requireParticipatingClassroom(authenticatedSubject: String, classroomId: Long): Pair { - val user = currentUserResolver.requireUser(authenticatedSubject) - val userId = requireNotNull(user.id) { "Authenticated user is missing an id" } - val classroom = classroomRepository.findById(classroomId) - .orElseThrow { - ResponseStatusException(HttpStatus.NOT_FOUND, "Classroom not found") - } - - val hasAccess = when (user.role) { - UserRole.ADMIN -> true - UserRole.TEACHER -> classroom.ownerTeacherId == userId - UserRole.PUPIL -> classroom.hasPupilMembership(userId) - } - - if (!hasAccess) { - throw ResponseStatusException(HttpStatus.FORBIDDEN, "User does not have access to this classroom") - } - - return Pair(classroom, user) - } - private fun requireTask(classroomId: Long, taskId: Long): Task = taskRepository.findByIdAndClassroomId(taskId, classroomId) ?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "Task not found") From 918e51106cef080feefe226068a089f57587ff8e Mon Sep 17 00:00:00 2001 From: Johannes Aamot-Skeidsvoll Date: Mon, 20 Apr 2026 14:28:32 +0200 Subject: [PATCH 07/11] Restrict game progress updates to pupil sessions --- .../game/mapstops/api/PupilStopProgressController.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/api/PupilStopProgressController.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/api/PupilStopProgressController.kt index 58ff9fd7..9fc5a1ee 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/api/PupilStopProgressController.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/mapstops/api/PupilStopProgressController.kt @@ -89,15 +89,17 @@ class PupilStopProgressController( * @return updated progress record */ @PatchMapping("/{stopId}") - @PreAuthorize("#pupilUserId == T(java.lang.Long).parseLong(authentication.principal.subject)") + @PreAuthorize("hasRole('PUPIL') and #pupilUserId == T(java.lang.Long).parseLong(authentication.principal.subject)") fun updateStopProgress( @AuthenticationPrincipal currentUser: CurrentUser, @PathVariable classroomId: Long, @PathVariable pupilUserId: Long, @PathVariable stopId: Long, @Valid @RequestBody request: UpdateStopProgressRequest, - ): StopProgressResponse = - progressService + ): StopProgressResponse { + currentUserResolver.requirePupil(currentUser.subject) + return progressService .updateProgress(pupilUserId, classroomId, stopId, request.toCommand()) .toStopProgressResponse() -} \ No newline at end of file + } +} From bd005e8fbcbaf2bf5c9d63b2156f4c7bb4eaaf46 Mon Sep 17 00:00:00 2001 From: Johannes Aamot-Skeidsvoll Date: Mon, 20 Apr 2026 14:28:45 +0200 Subject: [PATCH 08/11] Add preview session integration tests --- .../TeacherGamePreviewIntegrationTests.kt | 516 ++++++++++++++++++ 1 file changed, 516 insertions(+) create mode 100644 src/test/kotlin/edu/ntnu/idi/idatt/backend/game/TeacherGamePreviewIntegrationTests.kt 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 new file mode 100644 index 00000000..0511541f --- /dev/null +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/TeacherGamePreviewIntegrationTests.kt @@ -0,0 +1,516 @@ +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.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 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 + +@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 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() + 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/classrooms/${classroom.id}/game-preview/session") { + 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")) + val intruder = userRepository.save(activeTeacher("intruder@example.com")) + val classroom = createClassroom(owner, "PREVIEW4") + val intruderSession = teacherSession("intruder@example.com", "secret123") + + mockMvc.post("/api/v1/classrooms/${classroom.id}/game-preview/session") { + 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 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/classrooms/$classroomId/game-preview/session") { + 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, + ) +} From 7b60eb275a1a59462381fe7257061b044f4aabc0 Mon Sep 17 00:00:00 2001 From: Johannes Aamot-Skeidsvoll Date: Mon, 20 Apr 2026 14:40:25 +0200 Subject: [PATCH 09/11] Refactor task and classroom access to use CurrentUser for session handling --- .../backend/game/tasks/api/TaskController.kt | 8 +- .../backend/game/tasks/api/TaskRequests.kt | 11 +- .../game/tasks/application/TaskModels.kt | 3 + .../game/tasks/application/TaskService.kt | 20 +++- .../iam/application/CurrentUserResolver.kt | 24 ++++ .../leaderboard/api/LeaderboardController.kt | 2 +- .../application/LeaderboardService.kt | 7 +- .../TeacherGamePreviewIntegrationTests.kt | 112 +++++++++++++++++- 8 files changed, 169 insertions(+), 18 deletions(-) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskController.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskController.kt index 2fb82b66..b1a2d731 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskController.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/api/TaskController.kt @@ -61,7 +61,7 @@ class TaskController( @RequestBody @Valid request: CreateTaskRequest, @AuthenticationPrincipal currentUser: CurrentUser, ): TaskResponse = - taskService.createTask(request.toCommand(classroomId, currentUser.subject)).toResponse() + taskService.createTask(request.toCommand(classroomId, currentUser)).toResponse() /** * Replaces the editable contents of an existing task. @@ -73,7 +73,7 @@ class TaskController( @RequestBody @Valid request: UpdateTaskRequest, @AuthenticationPrincipal currentUser: CurrentUser, ): TaskResponse = - taskService.updateTask(request.toCommand(classroomId, taskId, currentUser.subject)).toResponse() + taskService.updateTask(request.toCommand(classroomId, taskId, currentUser)).toResponse() /** * Publishes or unpublishes a task. @@ -85,7 +85,7 @@ class TaskController( @RequestBody request: UpdateTaskPublishStateRequest, @AuthenticationPrincipal currentUser: CurrentUser, ): TaskResponse = - taskService.updatePublishState(currentUser.subject, classroomId, taskId, request.published).toResponse() + taskService.updatePublishState(currentUser, classroomId, taskId, request.published).toResponse() /** * Deletes a task from the classroom. @@ -97,6 +97,6 @@ class TaskController( @PathVariable taskId: Long, @AuthenticationPrincipal currentUser: CurrentUser, ) { - taskService.deleteTask(currentUser.subject, classroomId, taskId) + taskService.deleteTask(currentUser, classroomId, taskId) } } 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 7b284e3f..0d3529a0 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 @@ -8,6 +8,7 @@ import edu.ntnu.idi.idatt.backend.game.tasks.application.ReplaceTaskOptionComman import edu.ntnu.idi.idatt.backend.game.tasks.application.UpdateTaskCommand import edu.ntnu.idi.idatt.backend.game.tasks.domain.TaskPassingRule import edu.ntnu.idi.idatt.backend.game.tasks.domain.TaskType +import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser import jakarta.validation.Valid import jakarta.validation.constraints.Min import jakarta.validation.constraints.NotBlank @@ -122,10 +123,11 @@ data class UpdateTaskPublishStateRequest( */ fun CreateTaskRequest.toCommand( classroomId: Long, - authenticatedSubject: String, + currentUser: CurrentUser, ): CreateTaskCommand = CreateTaskCommand( - authenticatedSubject = authenticatedSubject, + authenticatedSubject = currentUser.subject, + sessionMode = currentUser.sessionMode, classroomId = classroomId, stopId = stopId, title = title.toLocalizedText(), @@ -144,10 +146,11 @@ fun CreateTaskRequest.toCommand( fun UpdateTaskRequest.toCommand( classroomId: Long, taskId: Long, - authenticatedSubject: String, + currentUser: CurrentUser, ): UpdateTaskCommand = UpdateTaskCommand( - authenticatedSubject = authenticatedSubject, + 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/application/TaskModels.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/game/tasks/application/TaskModels.kt index 8b4a2123..f2faf8b6 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,5 +1,6 @@ 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 @@ -46,6 +47,7 @@ data class ReplaceTaskItemCommand( */ data class CreateTaskCommand( val authenticatedSubject: String, + val sessionMode: SessionMode, val classroomId: Long, val stopId: Long, val title: LocalizedText, @@ -63,6 +65,7 @@ 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 318c11b8..5d4ff0b3 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,8 +3,8 @@ 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.iam.application.CurrentUserResolver -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.security.CurrentUser import edu.ntnu.idi.idatt.backend.game.tasks.domain.Task @@ -71,6 +71,7 @@ class TaskService( @Transactional fun createTask(command: CreateTaskCommand): TaskDetails { + requireWritableTeacherSession(command.sessionMode) val teacher = currentUserResolver.requireTeacherOrAdmin(command.authenticatedSubject) val classroom = requireOwnedClassroom(command.authenticatedSubject, command.classroomId) @@ -104,6 +105,7 @@ class TaskService( @Transactional fun updateTask(command: UpdateTaskCommand): TaskDetails { + requireWritableTeacherSession(command.sessionMode) requireOwnedClassroom(command.authenticatedSubject, command.classroomId) val task = requireTask(command.classroomId, command.taskId) @@ -144,12 +146,13 @@ class TaskService( @Transactional fun updatePublishState( - authenticatedSubject: String, + currentUser: CurrentUser, classroomId: Long, taskId: Long, published: Boolean, ): TaskDetails { - requireOwnedClassroom(authenticatedSubject, classroomId) + requireWritableTeacherSession(currentUser.sessionMode) + requireOwnedClassroom(currentUser.subject, classroomId) val task = requireTask(classroomId, taskId) if (published) { validatePublishable(task) @@ -160,15 +163,22 @@ class TaskService( @Transactional fun deleteTask( - authenticatedSubject: String, + currentUser: CurrentUser, classroomId: Long, taskId: Long, ) { - requireOwnedClassroom(authenticatedSubject, classroomId) + 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/iam/application/CurrentUserResolver.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/iam/application/CurrentUserResolver.kt index c4ca05af..f3bb8208 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 @@ -5,6 +5,7 @@ import edu.ntnu.idi.idatt.backend.classroom.infrastructure.ClassroomRepository 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.UserRepository +import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser import edu.ntnu.idi.idatt.backend.users.profile.infrastructure.PupilProfileRepository import org.springframework.http.HttpStatus import org.springframework.stereotype.Service @@ -103,4 +104,27 @@ class CurrentUserResolver( ) } } + + /** + * Resolves a classroom for the authenticated principal, honoring preview-session scoping when + * present on teacher/admin sessions. + */ + fun getClassroomByUser(currentUser: CurrentUser): Classroom { + if (currentUser.isPreviewSession()) { + 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 + } + + return getClassroomByUser(currentUser.subject) + } } diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/leaderboard/api/LeaderboardController.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/leaderboard/api/LeaderboardController.kt index 86843c26..e4709552 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/leaderboard/api/LeaderboardController.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/leaderboard/api/LeaderboardController.kt @@ -27,5 +27,5 @@ class LeaderboardController( fun getLeaderboard( @AuthenticationPrincipal currentUser: CurrentUser, ): LeaderboardResponse = - leaderboardService.getClassLeaderboardList(currentUser.subject).toLeaderboardResponse() + leaderboardService.getClassLeaderboardList(currentUser).toLeaderboardResponse() } diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/leaderboard/application/LeaderboardService.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/leaderboard/application/LeaderboardService.kt index 4810ca09..295d28c5 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/leaderboard/application/LeaderboardService.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/leaderboard/application/LeaderboardService.kt @@ -2,6 +2,7 @@ package edu.ntnu.idi.idatt.backend.leaderboard.application import edu.ntnu.idi.idatt.backend.game.gameProgress.infrastructure.PupilGameProgressRepository import edu.ntnu.idi.idatt.backend.iam.application.CurrentUserResolver +import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser import edu.ntnu.idi.idatt.backend.users.profile.infrastructure.PupilProfileRepository import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional @@ -25,12 +26,12 @@ class LeaderboardService( * * Entries are sorted so the leaderboard is deterministic. * - * @param authenticatedSubject JWT subject containing the persisted user id + * @param currentUser JWT subject containing the persisted user id * @return classroom leaderboard entries ordered by rank */ @Transactional(readOnly = true) - fun getClassLeaderboardList(authenticatedSubject: String): List { - val classroom = currentUserResolver.getClassroomByUser(authenticatedSubject) + fun getClassLeaderboardList(currentUser: CurrentUser): List { + val classroom = currentUserResolver.getClassroomByUser(currentUser) val progressEntries = pupilGameProgressRepository .findAllByClassroomIdOrderByTotalScoreDescTotalXpDescCurrentLevelDescLastActivityAtDesc(classroom.id) 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 index 0511541f..8a770fdb 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/TeacherGamePreviewIntegrationTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/TeacherGamePreviewIntegrationTests.kt @@ -11,6 +11,9 @@ 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 @@ -24,6 +27,7 @@ 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 @@ -38,6 +42,7 @@ 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 @@ -57,6 +62,9 @@ class TeacherGamePreviewIntegrationTests { @Autowired private lateinit var progressRepository: PupilStopProgressRepository + @Autowired + private lateinit var pupilGameProgressRepository: PupilGameProgressRepository + @Autowired private lateinit var taskRepository: TaskRepository @@ -81,6 +89,7 @@ class TeacherGamePreviewIntegrationTests { fun setUp() { refreshTokenRepository.deleteAll() progressRepository.deleteAll() + pupilGameProgressRepository.deleteAll() taskRepository.deleteAll() mapStopsRepository.deleteAll() classroomRepository.deleteAll() @@ -154,7 +163,7 @@ class TeacherGamePreviewIntegrationTests { @Test fun `teacher cannot start preview for another teachers classroom`() { val owner = userRepository.save(activeTeacher("owner@example.com")) - val intruder = userRepository.save(activeTeacher("intruder@example.com")) + userRepository.save(activeTeacher("intruder@example.com")) val classroom = createClassroom(owner, "PREVIEW4") val intruderSession = teacherSession("intruder@example.com", "secret123") @@ -270,6 +279,107 @@ class TeacherGamePreviewIntegrationTests { } } + @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 `preview leaderboard uses the preview classroom`() { + 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(1) } + jsonPath("$.entries[0].displayName") { value("leaderboard_preview") } + jsonPath("$.entries[0].totalScore") { value(90) } + } + } + @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")) From ce1ba5e641c1ef61026b55b1a265a0e287c81fb9 Mon Sep 17 00:00:00 2001 From: Johannes Aamot-Skeidsvoll Date: Mon, 20 Apr 2026 14:55:24 +0200 Subject: [PATCH 10/11] Add KDocs --- .../api/GamePreviewSessionController.kt | 14 ++++++++++++++ .../application/GameAccessContextResolver.kt | 16 ++++++++++++++++ .../backend/game/tasks/application/TaskModels.kt | 3 +++ .../idatt/backend/iam/application/AuthService.kt | 15 +++++++++++++++ .../iam/application/CurrentUserResolver.kt | 3 +++ .../backend/iam/application/SessionContext.kt | 13 +++++++++++++ .../application/LeaderboardService.kt | 2 +- 7 files changed, 65 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/GamePreviewSessionController.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/GamePreviewSessionController.kt index 4b9d6bc9..ade630a1 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/GamePreviewSessionController.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/GamePreviewSessionController.kt @@ -15,12 +15,26 @@ import org.springframework.web.bind.annotation.PostMapping import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController +/** + * Starts teacher game preview sessions scoped to a specific classroom. + * + * The caller keeps their teacher/admin actor identity, but receives a session that should be + * rendered with pupil-facing game semantics for the selected classroom. + */ @RestController @RequestMapping("/api/v1/classrooms/{classroomId}/game-preview") class GamePreviewSessionController( private val authService: AuthService, private val securityProperties: AppSecurityProperties, ) { + /** + * Creates a new classroom-scoped preview session and rotates the refresh cookie. + * + * @param currentUser authenticated teacher/admin principal + * @param classroomId classroom to preview + * @param request servlet request used to extract the existing refresh-token cookie + * @return login response for the new preview session + */ @PostMapping("/session") fun startPreviewSession( @AuthenticationPrincipal currentUser: CurrentUser, 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 e427f136..6c565e44 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,24 @@ import org.springframework.http.HttpStatus import org.springframework.stereotype.Service import org.springframework.web.server.ResponseStatusException +/** + * 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. + */ @Service class GameAccessContextResolver( private val currentUserResolver: CurrentUserResolver, private val classroomRepository: ClassroomRepository, ) { + /** + * Resolves the caller's effective read capabilities for one classroom. + * + * @param currentUser authenticated principal from the access token + * @param classroomId classroom being accessed + * @return effective access context for classroom game reads + */ fun resolveReadContext( currentUser: CurrentUser, classroomId: Long, @@ -91,6 +104,9 @@ class GameAccessContextResolver( } } +/** + * Effective classroom game-read capabilities for one authenticated request. + */ data class GameAccessContext( val classroom: Classroom, val user: User, 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 f2faf8b6..5078f9b7 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 @@ -123,6 +123,9 @@ data class TaskDetails( val items: List, ) +/** + * Task read result bundled with the caller's answer-visibility capability. + */ data class TaskReadResult( val task: TaskDetails, val includeAnswers: Boolean, 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 afeaf2c9..4df2a7b1 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 @@ -90,6 +90,14 @@ 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, @@ -110,6 +118,13 @@ class AuthService( ) } + /** + * 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, 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 f3bb8208..1d36a5ad 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 @@ -108,6 +108,9 @@ class CurrentUserResolver( /** * Resolves a classroom for the authenticated principal, honoring preview-session scoping when * present on teacher/admin sessions. + * + * @param currentUser authenticated principal from the access token + * @return resolved classroom for the effective session context */ fun getClassroomByUser(currentUser: CurrentUser): Classroom { if (currentUser.isPreviewSession()) { 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 index 98787940..f7d0416b 100644 --- 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 @@ -1,15 +1,28 @@ 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, diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/leaderboard/application/LeaderboardService.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/leaderboard/application/LeaderboardService.kt index 295d28c5..3bf0676f 100644 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/leaderboard/application/LeaderboardService.kt +++ b/src/main/kotlin/edu/ntnu/idi/idatt/backend/leaderboard/application/LeaderboardService.kt @@ -26,7 +26,7 @@ class LeaderboardService( * * Entries are sorted so the leaderboard is deterministic. * - * @param currentUser JWT subject containing the persisted user id + * @param currentUser authenticated principal from the access token * @return classroom leaderboard entries ordered by rank */ @Transactional(readOnly = true) From 968b4192b3981818061df4f46e5440017613e872 Mon Sep 17 00:00:00 2001 From: Johannes Aamot-Skeidsvoll Date: Mon, 20 Apr 2026 16:23:13 +0200 Subject: [PATCH 11/11] Fix issues: add teacher game preview session management and integration tests --- .../api/GamePreviewSessionController.kt | 67 ------------------- .../idatt/backend/iam/api/AuthController.kt | 34 ++++++++++ .../iam/application/CurrentUserResolver.kt | 57 +++++++--------- .../backend/iam/security/SecurityConfig.kt | 8 ++- .../TeacherGamePreviewIntegrationTests.kt | 6 +- .../iam/AuthControllerIntegrationTests.kt | 58 ++++++++++++++++ .../backend/iam/CurrentUserResolverTests.kt | 48 ++++++++++++- 7 files changed, 171 insertions(+), 107 deletions(-) delete mode 100644 src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/GamePreviewSessionController.kt diff --git a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/GamePreviewSessionController.kt b/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/GamePreviewSessionController.kt deleted file mode 100644 index ade630a1..00000000 --- a/src/main/kotlin/edu/ntnu/idi/idatt/backend/classroom/api/GamePreviewSessionController.kt +++ /dev/null @@ -1,67 +0,0 @@ -package edu.ntnu.idi.idatt.backend.classroom.api - -import edu.ntnu.idi.idatt.backend.iam.api.LoginResponse -import edu.ntnu.idi.idatt.backend.iam.api.toLoginResponse -import edu.ntnu.idi.idatt.backend.iam.application.AuthService -import edu.ntnu.idi.idatt.backend.iam.security.AppSecurityProperties -import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser -import jakarta.servlet.http.HttpServletRequest -import org.springframework.http.HttpHeaders -import org.springframework.http.ResponseCookie -import org.springframework.http.ResponseEntity -import org.springframework.security.core.annotation.AuthenticationPrincipal -import org.springframework.web.bind.annotation.PathVariable -import org.springframework.web.bind.annotation.PostMapping -import org.springframework.web.bind.annotation.RequestMapping -import org.springframework.web.bind.annotation.RestController - -/** - * Starts teacher game preview sessions scoped to a specific classroom. - * - * The caller keeps their teacher/admin actor identity, but receives a session that should be - * rendered with pupil-facing game semantics for the selected classroom. - */ -@RestController -@RequestMapping("/api/v1/classrooms/{classroomId}/game-preview") -class GamePreviewSessionController( - private val authService: AuthService, - private val securityProperties: AppSecurityProperties, -) { - /** - * Creates a new classroom-scoped preview session and rotates the refresh cookie. - * - * @param currentUser authenticated teacher/admin principal - * @param classroomId classroom to preview - * @param request servlet request used to extract the existing refresh-token cookie - * @return login response for the new preview session - */ - @PostMapping("/session") - fun startPreviewSession( - @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()) - } - - private fun refreshCookie(rawToken: String): ResponseCookie = - ResponseCookie.from(securityProperties.refresh.cookieName, rawToken) - .httpOnly(true) - .secure(securityProperties.refresh.secureCookie) - .path(securityProperties.refresh.cookiePath) - .sameSite(securityProperties.refresh.sameSite) - .maxAge(securityProperties.refresh.ttl) - .build() - - private fun extractRefreshCookie(request: HttpServletRequest): String? = - request.cookies - ?.firstOrNull { it.name == securityProperties.refresh.cookieName } - ?.value -} 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 ea4e6f6c..f38bc34c 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 @@ -16,6 +16,7 @@ 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.PostMapping import org.springframework.web.bind.annotation.PutMapping import org.springframework.web.bind.annotation.RequestBody @@ -85,6 +86,39 @@ 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, 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 1d36a5ad..73737557 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,21 @@ class CurrentUserResolver( } /** - * Resolves a classroom for the authenticated user. - * - * Pupils resolve through `PupilProfile.currentClassroomId`. - * Teachers resolve through the first classroom they own. - * - * Note: teachers can own multiple classrooms. This method therefore only - * works as a fallback when no explicit classroom id is supplied. + * 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. * - * @param authenticatedSubject JWT subject containing the persisted user id - * @return resolved classroom + * @param currentUser authenticated principal from the access token + * @return resolved classroom for the effective session context */ - fun getClassroomByUser(authenticatedSubject: String): Classroom { - val user = requireUser(authenticatedSubject) + fun getClassroomByUser(currentUser: CurrentUser): Classroom { + if (currentUser.isPreviewSession()) { + return resolvePreviewClassroom(currentUser) + } + + return resolveDefaultClassroom(requireUser(currentUser.subject)) + } + + private fun resolveDefaultClassroom(user: User): Classroom { val userId = requireNotNull(user.id) { "Authenticated user is missing an id" } return when (user.role) { @@ -105,29 +107,18 @@ class CurrentUserResolver( } } - /** - * Resolves a classroom for the authenticated principal, honoring preview-session scoping when - * present on teacher/admin sessions. - * - * @param currentUser authenticated principal from the access token - * @return resolved classroom for the effective session context - */ - fun getClassroomByUser(currentUser: CurrentUser): Classroom { - if (currentUser.isPreviewSession()) { - 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") + 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") } - return classroom + 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 getClassroomByUser(currentUser.subject) + return classroom } } 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 e51b865c..728b24ad 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 @@ -160,18 +160,22 @@ class SecurityConfig( private fun toAuthentication(jwt: Jwt): AbstractAuthenticationToken { val authorities = jwt.getClaimAsStringList("authorities")?.toSet().orEmpty() + val portalType = jwt.getClaimAsString("portal_type") ?: "UNKNOWN" val principal = CurrentUser( subject = jwt.subject, - portalType = jwt.getClaimAsString("portal_type") ?: "UNKNOWN", + 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) ?: ViewAs.TEACHER, + 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/test/kotlin/edu/ntnu/idi/idatt/backend/game/TeacherGamePreviewIntegrationTests.kt b/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/TeacherGamePreviewIntegrationTests.kt index 8a770fdb..7c83aa33 100644 --- a/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/TeacherGamePreviewIntegrationTests.kt +++ b/src/test/kotlin/edu/ntnu/idi/idatt/backend/game/TeacherGamePreviewIntegrationTests.kt @@ -151,7 +151,7 @@ class TeacherGamePreviewIntegrationTests { classroomRepository.saveAndFlush(classroom) val pupilSession = pupilSession("preview_pupil", "secret123") - mockMvc.post("/api/v1/classrooms/${classroom.id}/game-preview/session") { + 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)) @@ -167,7 +167,7 @@ class TeacherGamePreviewIntegrationTests { val classroom = createClassroom(owner, "PREVIEW4") val intruderSession = teacherSession("intruder@example.com", "secret123") - mockMvc.post("/api/v1/classrooms/${classroom.id}/game-preview/session") { + 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)) @@ -523,7 +523,7 @@ class TeacherGamePreviewIntegrationTests { session: SessionResponse, classroomId: Long, ): SessionResponse { - val response = mockMvc.post("/api/v1/classrooms/$classroomId/game-preview/session") { + 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)) 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 4f8d0f47..c0e23f92 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 @@ -1,5 +1,6 @@ package edu.ntnu.idi.idatt.backend.iam +import edu.ntnu.idi.idatt.backend.iam.security.AppSecurityProperties 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 @@ -8,6 +9,7 @@ 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.TeacherProfileRepository import jakarta.servlet.http.Cookie +import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertNotEquals import org.junit.jupiter.api.Assertions.assertNotNull @@ -20,6 +22,11 @@ import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc import org.springframework.http.MediaType import org.springframework.security.crypto.password.PasswordEncoder +import org.springframework.security.oauth2.jose.jws.MacAlgorithm +import org.springframework.security.oauth2.jwt.JwsHeader +import org.springframework.security.oauth2.jwt.JwtClaimsSet +import org.springframework.security.oauth2.jwt.JwtEncoder +import org.springframework.security.oauth2.jwt.JwtEncoderParameters import org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.get @@ -48,6 +55,12 @@ class AuthControllerIntegrationTests { @Autowired private lateinit var passwordEncoder: PasswordEncoder + @Autowired + private lateinit var jwtEncoder: JwtEncoder + + @Autowired + private lateinit var securityProperties: AppSecurityProperties + @BeforeEach fun setUp() { refreshTokenRepository.deleteAll() @@ -510,6 +523,27 @@ class AuthControllerIntegrationTests { } } + @Test + fun `auth me derives pupil viewAs from legacy tokens without view_as claim`() { + val pupil = userRepository.save(activePupil()) + val token = legacyAccessToken( + subject = requireNotNull(pupil.id).toString(), + portalType = "PUPIL", + authorities = listOf("PORTAL_PUPIL", "ROLE_PUPIL"), + ) + + val response = mockMvc.get("/api/v1/auth/me") { + header("Authorization", "Bearer $token") + }.andExpect { + status { isOk() } + jsonPath("$.portalType") { value("PUPIL") } + jsonPath("$.sessionMode") { value("NORMAL") } + jsonPath("$.viewAs") { value("PUPIL") } + }.andReturn().response + + assertFalse(response.contentAsString.contains("TEACHER")) + } + private fun teacherLogin() = mockMvc.post("/api/v1/auth/teacher/login") { with(csrf()) @@ -541,6 +575,30 @@ class AuthControllerIntegrationTests { .substringAfter(""""accessToken":"""") .substringBefore('"') + private fun legacyAccessToken( + subject: String, + portalType: String, + authorities: List, + ): String { + val now = Instant.now() + val claims = JwtClaimsSet.builder() + .issuer(securityProperties.jwt.issuer) + .audience(listOf(securityProperties.jwt.audience)) + .subject(subject) + .issuedAt(now) + .expiresAt(now.plus(securityProperties.jwt.accessTokenTtl)) + .claim("portal_type", portalType) + .claim("authorities", authorities) + .build() + + return jwtEncoder.encode( + JwtEncoderParameters.from( + JwsHeader.with(MacAlgorithm.HS256).build(), + claims, + ), + ).tokenValue + } + private fun activeTeacher() = User( email = "teacher@example.com", 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 19ce77a6..5e5cefc2 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,10 +3,13 @@ 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 import edu.ntnu.idi.idatt.backend.iam.infrastructure.UserRepository +import edu.ntnu.idi.idatt.backend.iam.security.CurrentUser import edu.ntnu.idi.idatt.backend.users.profile.domain.PupilProfile import edu.ntnu.idi.idatt.backend.users.profile.infrastructure.PupilProfileRepository import org.junit.jupiter.api.Assertions.assertEquals @@ -116,7 +119,7 @@ class CurrentUserResolverTests { Mockito.`when`(pupilProfileRepository.findById(11L)).thenReturn(Optional.of(pupilProfile)) Mockito.`when`(classroomRepository.findById(101L)).thenReturn(Optional.of(classroom)) - val resolvedClassroom = resolver.getClassroomByUser("11") + val resolvedClassroom = resolver.getClassroomByUser(currentUser(subject = "11", portalType = "PUPIL")) assertSame(classroom, resolvedClassroom) } @@ -133,7 +136,32 @@ class CurrentUserResolverTests { Mockito.`when`(userRepository.findById(12L)).thenReturn(Optional.of(user)) Mockito.`when`(classroomRepository.findFirstByOwnerTeacherIdOrderByIdAsc(12L)).thenReturn(classroom) - val resolvedClassroom = resolver.getClassroomByUser("12") + val resolvedClassroom = resolver.getClassroomByUser(currentUser(subject = "12", portalType = "TEACHER")) + + 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) } @@ -149,4 +177,20 @@ class CurrentUserResolverTests { role = role, status = UserStatus.ACTIVE, ) + + 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, + ) }