Max/MewoLab_AquaDX
1
0
Fork 0
mirror of https://github.com/MewoLab/AquaDX.git synced 2026-09-22 22:38:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

revert: generate keychip on /keychip api

Browse Source 
fixes regression causing 3,000+ users to not be assigned a keychip
This commit is contained in:
Raymond
2026-07-08 19:42:49 -04:00
parent 7ea5add407
commit 0d70471bd6
2 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/icu/samnyan/aqua/net/UserRegistrar.kt
+13 -2
View File
@@ -244,16 +244,22 @@ class UserRegistrar(
val keychipPattern = Regex("^([A-Z\\d]{4}-[A-Z\\d]{11}|[A-Z\\d]{15})$")
val keychipRange = 1e9.toULong()..1e10.toULong() - 1UL
private fun generateKeychipId(): String {
// 1337 is retained for backwards compatibility, it's no longer required for cabinet keychips
var keychip = "A" + keychipRange.random() + "1337"
while ( userKeychipRepo.existsByKeychipId(keychip) )
keychip = "A" + keychipRange.random() + "1337"
return keychip
}
private fun ensureCanModifyKeychips(u: AquaNetUser) {
if (!u.canModifyKeychips) 403 - "You don't have permission to modify keychips"
}
private fun validateCustomKeychip(keychipId: Str): Str {
val raw = keychipId.trim().uppercase()
if (!keychipPattern.matches(raw))
400 - "Invalid keychip format. Expected 15 or 11 characters (with optional dash)"
400 - "Invalid keychip format. Expected 11 or 15 characters (with optional dash)"
return raw.replace("-", "")
}
@@ -262,6 +268,11 @@ class UserRegistrar(
@Doc("List all keychip IDs associated with the current user's account.", "List of keychip IDs")
suspend fun listKeychips(@RP token: Str) = jwt.auth(token) { u ->
val keychips = async { userKeychipRepo.findAllByUserAuId(u.auId) }
if (keychips.isEmpty() && !u.canModifyKeychips) {
val keychip = UserKeychip(0, u, generateKeychipId())
userKeychipRepo.save(keychip)
log.info("Net: Assigned keychip ${keychip.keychipId} to ${u.auId}")
}
mapOf("keychips" to keychips.map { it.keychipId })
}
src/main/java/icu/samnyan/aqua/net/db/AquaNetUser.kt
-13
View File
@@ -147,15 +147,6 @@ class AquaUserServices(
}
}
val keychipRange = 1e9.toULong()..1e10.toULong() - 1UL
private fun generateKeychipId(): String {
// 1337 is retained for backwards compatibility, it's no longer required for cabinet keychips
var keychip = "A" + keychipRange.random() + "1337"
while ( userKeychipRepo.existsByKeychipId(keychip) )
keychip = "A" + keychipRange.random() + "1337"
return keychip
}
fun create(username: Str, email: Str, password: Str, country: Str, emailConfirmed: Boolean = false): AquaNetUser {
// Create user
val user = AquaNetUser(
@@ -177,13 +168,9 @@ class AquaUserServices(
}
user.ghostCard = card
// Create an automatic keychip
val keychip = UserKeychip(0, user, generateKeychipId())
// Save the user
userRepo.save(user)
cardRepo.save(card)
userKeychipRepo.save(keychip)
return user
}