[libeufin] 01/02: move HTTP client work to helper function (nexus)

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository libeufin.

commit 845dae82a57ca8e088ee0724490811f8e95c0827
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Nov 7 14:11:51 2019 +0100

    move HTTP client work to helper function (nexus)
---
 nexus/src/main/kotlin/Main.kt | 49 ++++++++++++++++++++++++++++---------------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/nexus/src/main/kotlin/Main.kt b/nexus/src/main/kotlin/Main.kt
index 1a4c076..50b1ad9 100644
--- a/nexus/src/main/kotlin/Main.kt
+++ b/nexus/src/main/kotlin/Main.kt
@@ -83,8 +83,31 @@ fun expectId(param: String?) : Int {
     }
 }
 
+/**
+ * @return null when the bank could not be reached, otherwise returns the
+ * response already converted in JAXB.
+ */
+suspend inline fun <reified S, reified T>HttpClient.postToBank(url: String, 
body: T) : JAXBElement<S>? {
+
+    val response = try {
+        this.post<String>(
+            urlString = url,
+            block = {
+                this.body = XMLUtil.convertJaxbToString(body)
+            }
+        )
+    } catch (e: Exception) {
+        e.printStackTrace()
+        return null
+    }
+
+    // note: not checking status code, as EBICS mandates to return "200 OK" 
for ANY outcome.
+    return XMLUtil.convertStringToJaxb(response)
+}
+
 data class NotAnIdError(val statusCode: HttpStatusCode) : Exception("String ID 
not convertible in number")
 data class SubscriberNotFoundError(val statusCode: HttpStatusCode) : 
Exception("Subscriber not found in database")
+data class UnreachableBankError(val statusCode: HttpStatusCode) : 
Exception("Could not reach the bank")
 
 
 fun main() {
@@ -114,6 +137,11 @@ fun main() {
                 call.respondText("Bad request\n", ContentType.Text.Plain, 
HttpStatusCode.BadRequest)
             }
 
+            exception<UnreachableBankError> { cause ->
+                logger.error("Exception while handling '${call.request.uri}'", 
cause)
+                call.respondText("Could not reach the bank\n", 
ContentType.Text.Plain, HttpStatusCode.InternalServerError)
+            }
+
             exception<SubscriberNotFoundError> { cause ->
                 logger.error("Exception while handling '${call.request.uri}'", 
cause)
                 call.respondText("Subscriber not found\n", 
ContentType.Text.Plain, HttpStatusCode.NotFound)
@@ -234,24 +262,11 @@ fun main() {
                     subscriber.ebicsURL
                 }
 
-                val response = try {
-                    client.post<String>(
-                        urlString = url,
-                        block = {
-                            body = XMLUtil.convertJaxbToString(iniRequest)
-                        }
-                    )
-                } catch (e: Exception) {
-                    e.printStackTrace()
-
-                    call.respond(
-                        HttpStatusCode.OK,
-                        NexusError("Could not reach the bank.\n")
-                    )
-                    return@post
-                }
+                val responseJaxb = 
client.postToBank<EbicsKeyManagementResponse, EbicsUnsecuredRequest>(
+                    url,
+                    iniRequest
+                ) ?: throw 
UnreachableBankError(HttpStatusCode.InternalServerError)
 
-                val responseJaxb = 
XMLUtil.convertStringToJaxb<EbicsKeyManagementResponse>(response)  // caught 
above
                 val returnCode = responseJaxb.value.body.returnCode.value
                 if (returnCode == "000000") {
                     call.respond(

-- 
To stop receiving notification emails like this one, please contact
address@hidden.