Skip to content

Use json for parsing in demo vasp #163

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Mar 19, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions umaserverdemo/src/main/kotlin/com/lightspark/Vasp1.kt
Original file line number Diff line number Diff line change
@@ -141,7 +141,7 @@ class Vasp1(
}

val lnurlpResponse = try {
response.body<LnurlpResponse>()
uma.parseAsLnurlpResponse(response.body())
} catch (e: Exception) {
call.application.environment.log.error("Failed to parse as UMA lnurlp response, attempting to parse as " +
"non-UMA lnurlp response \n${response.bodyAsText()}", e)
@@ -292,7 +292,7 @@ class Vasp1(

val response = httpClient.post(initialRequestData.lnurlpResponse.callback) {
contentType(ContentType.Application.Json)
setBody(payReq)
setBody(payReq.toJson())
}

if (response.status != HttpStatusCode.OK) {
@@ -301,7 +301,7 @@ class Vasp1(
}

val payReqResponse = try {
response.body<PayReqResponse>()
uma.parseAsPayReqResponse(response.body())
} catch (e: Exception) {
call.respond(HttpStatusCode.InternalServerError, "Failed to parse payreq response.")
return "Failed to parse payreq response."
6 changes: 3 additions & 3 deletions umaserverdemo/src/main/kotlin/com/lightspark/Vasp2.kt
Original file line number Diff line number Diff line change
@@ -132,7 +132,7 @@ class Vasp2(
return "Failed to generate UMA lnurlp response."
}

call.respond(response)
call.respond(response.toJson())

return "OK"
}
@@ -188,7 +188,7 @@ class Vasp2(
}

val request = try {
call.receive<PayRequest>()
uma.parseAsPayRequest(call.receive<String>())
} catch (e: Exception) {
call.respond(HttpStatusCode.BadRequest, "Invalid pay request. ${e.message}")
return "Invalid pay request."
@@ -236,7 +236,7 @@ class Vasp2(
return "Failed to create payreq response."
}

call.respond(response)
call.respond(response.toJson())

return "OK"
}