Allow card revoke by UUID or cardId
All checks were successful
build-and-deploy / build-deploy (push) Successful in 32s
All checks were successful
build-and-deploy / build-deploy (push) Successful in 32s
This commit is contained in:
@@ -153,11 +153,11 @@ class IssuedCards(
|
||||
@PostMapping("/cards/{cardId}/revoke")
|
||||
fun revoke(
|
||||
@PathVariable propertyId: UUID,
|
||||
@PathVariable cardId: UUID,
|
||||
@PathVariable cardId: String,
|
||||
@AuthenticationPrincipal principal: MyPrincipal?
|
||||
): CardRevokeResponse {
|
||||
requireRevokeActor(propertyId, principal)
|
||||
val card = issuedCardRepo.findByIdAndPropertyId(cardId, propertyId)
|
||||
val card = findCardForRevoke(cardId, propertyId)
|
||||
?: throw ResponseStatusException(HttpStatus.NOT_FOUND, "Card not found")
|
||||
if (card.revokedAt == null) {
|
||||
val now = nowForProperty(card.property.timezone)
|
||||
@@ -238,6 +238,21 @@ class IssuedCards(
|
||||
propertyAccess.requireAnyRole(propertyId, principal.userId, Role.ADMIN)
|
||||
}
|
||||
|
||||
private fun findCardForRevoke(cardId: String, propertyId: UUID): IssuedCard? {
|
||||
val trimmed = cardId.trim()
|
||||
if (trimmed.isBlank()) return null
|
||||
val uuid = try {
|
||||
java.util.UUID.fromString(trimmed)
|
||||
} catch (_: Exception) {
|
||||
null
|
||||
}
|
||||
return if (uuid != null) {
|
||||
issuedCardRepo.findByIdAndPropertyId(uuid, propertyId)
|
||||
} else {
|
||||
issuedCardRepo.findByCardIdIgnoreCaseAndPropertyId(trimmed, propertyId)
|
||||
}
|
||||
}
|
||||
|
||||
private fun nextCardIndex(propertyId: UUID): Int {
|
||||
var counter = counterRepo.findByPropertyIdForUpdate(propertyId)
|
||||
if (counter == null) {
|
||||
|
||||
Reference in New Issue
Block a user