[+] Keychip session

This commit is contained in:
Azalea
2024-02-26 00:23:51 -05:00
parent a873b28d9b
commit 04e11b0fea
7 changed files with 110 additions and 17 deletions

View File

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore
import ext.Str
import ext.isValidEmail
import ext.minus
import icu.samnyan.aqua.sega.allnet.KeychipSession
import icu.samnyan.aqua.sega.general.model.Card
import jakarta.persistence.*
import org.springframework.data.jpa.repository.JpaRepository
@@ -59,7 +60,17 @@ class AquaNetUser(
// One user can have multiple cards
@OneToMany(mappedBy = "aquaUser", cascade = [CascadeType.ALL])
var cards: MutableList<Card> = mutableListOf()
var cards: MutableList<Card> = mutableListOf(),
// Each user can have one keychip (if the user owns a cabinet)
@JsonIgnore
@Column(nullable = true, length = 32, unique = true)
var keychip: Str? = null,
// Each user's keychip can have multiple sessions
@JsonIgnore
@OneToMany(mappedBy = "user", cascade = [CascadeType.ALL])
var keychipSessions: MutableList<KeychipSession> = mutableListOf(),
) : Serializable {
val computedName get() = displayName.ifEmpty { username }
}
@@ -69,9 +80,7 @@ interface AquaNetUserRepo : JpaRepository<AquaNetUser, Long> {
fun findByAuId(auId: Long): AquaNetUser?
fun findByEmailIgnoreCase(email: String): AquaNetUser?
fun findByUsernameIgnoreCase(username: String): AquaNetUser?
fun <T> byName(username: Str, callback: (AquaNetUser) -> T) =
findByUsernameIgnoreCase(username)?.let(callback) ?: (404 - "User not found")
fun findByKeychip(keychip: String): AquaNetUser?
}
data class SettingField(
@@ -85,12 +94,12 @@ data class SettingField(
* throw an ApiException if the field is invalid.
*/
@Service
class AquaUserValidator(
class AquaUserServices(
val userRepo: AquaNetUserRepo,
val hasher: PasswordEncoder,
) {
companion object {
val SETTING_FIELDS = AquaUserValidator::class.functions
val SETTING_FIELDS = AquaUserServices::class.functions
.filter { it.name.startsWith("check") }
.map {
val name = it.name.removePrefix("check").replaceFirstChar { c -> c.lowercase() }
@@ -99,6 +108,9 @@ class AquaUserValidator(
}
}
fun <T> byName(username: Str, callback: (AquaNetUser) -> T) =
userRepo.findByUsernameIgnoreCase(username)?.let(callback) ?: (404 - "User not found")
fun checkUsername(username: Str) = username.apply {
// Check if username is valid
if (length < 2) 400 - "Username must be at least 2 letters"