Mermutef/LMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(web): перепроверять статус сессии

Browse Source
This commit is contained in:
Vladislav Kopnin
2026-10-27 19:15:15 +03:00
parent 520a61085a
commit fba648ea54
8 changed files with 393 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/AuthDtos.kt
View File

@@ -42,4 +42,5 @@ data class MeResponse(
val role: String,
val name: String,
val mustChangePassword: Boolean,
val active: Boolean = true,
)

30
services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/AuthService.kt
View File

@@ -73,22 +73,25 @@ class AuthService(
}
private fun ensureLoginAllowed(account: Account) {
if (account.status != AccountStatus.ACTIVE) {
throw UnauthorizedException("Аккаунт архивирован")
}
if (account.role != LmsRole.STUDENT) return
val status = students.findById(account.id).map { it.status }.orElse(null)
if (status in setOf(StudentStatus.EXPELLED, StudentStatus.GRADUATED, StudentStatus.ARCHIVED)) {
throw UnauthorizedException("Доступ к системе закрыт")
}
ensureGroupOpen(account)
loginDeniedReason(account)?.let { throw UnauthorizedException(it) }
}
private fun ensureGroupOpen(account: Account) {
val groupStatus = enrollments.findByStudentAccountId(account.id)?.group?.status
if (groupStatus in setOf(GroupStatus.GRADUATED, GroupStatus.ARCHIVED)) {
throw UnauthorizedException("Группа закрыта")
/** Причина запрета входа или null, если вход разрешён. Используется и в me(). */
private fun loginDeniedReason(account: Account): String? {
if (account.status != AccountStatus.ACTIVE) {
return "Аккаунт архивирован"
}
if (account.role != LmsRole.STUDENT) return null
val status = students.findById(account.id).map { it.status }.orElse(null)
if (status in setOf(StudentStatus.EXPELLED, StudentStatus.GRADUATED, StudentStatus.ARCHIVED)) {
return "Доступ к системе закрыт"
}
return groupDeniedReason(account)
}
private fun groupDeniedReason(account: Account): String? {
val groupStatus = enrollments.findByStudentAccountId(account.id)?.group?.status
return if (groupStatus in setOf(GroupStatus.GRADUATED, GroupStatus.ARCHIVED)) "Группа закрыта" else null
}
@Transactional(readOnly = true)
@@ -103,6 +106,7 @@ class AuthService(
role = account.role.name,
name = displayName(account),
mustChangePassword = account.mustChangePassword,
active = loginDeniedReason(account) == null,
)
}