diff --git a/backend/src/main/kotlin/com/infendro/account/config/Security.kt b/backend/src/main/kotlin/com/infendro/account/config/Security.kt index 15a226e..5e082ae 100644 --- a/backend/src/main/kotlin/com/infendro/account/config/Security.kt +++ b/backend/src/main/kotlin/com/infendro/account/config/Security.kt @@ -42,12 +42,12 @@ fun Application.configureSecurity() { } install(Authentication) { session { - validate { authenticationSession -> + validate { session -> val session = SessionRepository - .singleOrNull { SessionTable.tokenHash eq Hasher.hash(authenticationSession.token) } + .singleOrNull { SessionTable.tokenHash eq Hasher.hash(session.token) } ?: return@validate null - sessions.set(authenticationSession) + sessions.set(session) AuthenticationPrincipal(session.account(), session) } diff --git a/backend/src/main/kotlin/com/infendro/account/dto/request/PostAccountRequest.kt b/backend/src/main/kotlin/com/infendro/account/dto/request/PostAccountRequest.kt index 6ab27f6..63ea3b3 100644 --- a/backend/src/main/kotlin/com/infendro/account/dto/request/PostAccountRequest.kt +++ b/backend/src/main/kotlin/com/infendro/account/dto/request/PostAccountRequest.kt @@ -10,13 +10,13 @@ import kotlinx.serialization.Serializable data class PostAccountRequest( val username: String, val password: String, - val access: PostAccountRequestAccess, -) - -@Serializable -data class PostAccountRequestAccess( - val token: String, -) + val access: Access, +) { + @Serializable + data class Access( + val token: String, + ) +} fun RequestValidationConfig.validatePostAccountRequest() { validate { request ->