androidlover5842/TrisolarisServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept legacy settings payload for Razorpay
All checks were successful
build-and-deploy / build-deploy (push) Successful in 33s
Details

Browse Source
This commit is contained in:
androidlover5842
2026-02-01 10:12:40 +05:30
parent 0624e6bcc8
commit 2deecf1bf2
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/kotlin/com/android/trisolarisserver/controller/RazorpaySettingsController.kt
View File

@@ -59,19 +59,29 @@ class RazorpaySettingsController(
val property = propertyRepo.findById(propertyId).orElseThrow {
ResponseStatusException(HttpStatus.NOT_FOUND, "Property not found")
}
val keyId = request.keyId?.trim()?.ifBlank { null } ?: request.merchantKey?.trim()?.ifBlank { null }
val keySecret = request.keySecret?.trim()?.ifBlank { null }
?: run {
val prefer256 = request.useSalt256 == true
val candidate = if (prefer256) request.salt256 else request.salt32
candidate?.trim()?.ifBlank { null } ?: request.salt256?.trim()?.ifBlank { null } ?: request.salt32?.trim()?.ifBlank { null }
}
if (keyId == null || keySecret == null) {
throw ResponseStatusException(HttpStatus.BAD_REQUEST, "keyId/keySecret required")
}
val existing = settingsRepo.findByPropertyId(propertyId)
val updated = if (existing == null) {
RazorpaySettings(
property = property,
keyId = request.keyId.trim(),
keySecret = request.keySecret.trim(),
keyId = keyId,
keySecret = keySecret,
webhookSecret = request.webhookSecret?.trim(),
isTest = request.isTest ?: false,
updatedAt = OffsetDateTime.now()
)
} else {
existing.keyId = request.keyId.trim()
existing.keySecret = request.keySecret.trim()
existing.keyId = keyId
existing.keySecret = keySecret
existing.webhookSecret = request.webhookSecret?.trim()
request.isTest?.let { existing.isTest = it }
existing.updatedAt = OffsetDateTime.now()

11
src/main/kotlin/com/android/trisolarisserver/controller/dto/RazorpayDtos.kt
View File

@@ -3,10 +3,15 @@ package com.android.trisolarisserver.controller.dto
import java.util.UUID
data class RazorpaySettingsUpsertRequest(
val keyId: String,
val keySecret: String,
val keyId: String? = null,
val keySecret: String? = null,
val webhookSecret: String? = null,
val isTest: Boolean? = null
val isTest: Boolean? = null,
// Backward-compatible aliases (older clients sending PayU-shaped payloads)
val merchantKey: String? = null,
val salt32: String? = null,
val salt256: String? = null,
val useSalt256: Boolean? = null
)
data class RazorpaySettingsResponse(