libeufin

commit 367d56d01f4b88b7642c026f1110ba774569d0df
parent 53fa99fd3746a17e14bddad9ac4c22dc9ac62240
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date:   Tue, 26 Nov 2019 14:29:37 +0100

fix HTD

Diffstat:
M
nexus/src/main/kotlin/Main.kt
 | 
9
++++-----
M
sandbox/src/main/python/libeufin-cli
 | 
4
++--

2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/nexus/src/main/kotlin/Main.kt b/nexus/src/main/kotlin/Main.kt
@@ -405,7 +405,7 @@ fun main() {
                 }
 
 
-                val response = client.postToBankUnsigned<EbicsRequest, EbicsResponse>(
+                val response = client.postToBankSigned<EbicsRequest, EbicsResponse>(
                     subscriberData.ebicsUrl,
                     EbicsRequest.createForDownloadInitializationPhase(
                         subscriberData.userId,
@@ -416,7 +416,8 @@ fun main() {
                         subscriberData.bankEncPub ?: throw BankKeyMissing(HttpStatusCode.PreconditionFailed),
                         subscriberData.bankAuthPub ?: throw BankKeyMissing(HttpStatusCode.PreconditionFailed),
                         "HTD"
-                    )
+                    ),
+                    subscriberData.customerAuthPriv
                 )
                 logger.debug("HTD response: " + XMLUtil.convertJaxbToString<EbicsResponse>(response.value))
 
@@ -424,8 +425,6 @@ fun main() {
                     throw EbicsError(response.value.body.returnCode.value)
                 }
 
-                // extract payload
-
                 val er = CryptoUtil.EncryptionResult(
                     response.value.body.dataTransfer!!.dataEncryptionInfo!!.transactionKey,
                     (response.value.body.dataTransfer!!.dataEncryptionInfo as EbicsTypes.DataEncryptionInfo)
@@ -444,7 +443,7 @@ fun main() {
 
                 val ackRequest = EbicsRequest.createForDownloadReceiptPhase(
                     response.value.header._static.transactionID ?: throw BankInvalidResponse(HttpStatusCode.ExpectationFailed),
-                    subscriberData.userId
+                    subscriberData.hostId
                 )
 
                 val ackResponse = client.postToBankSignedAndVerify<EbicsRequest, EbicsResponse>(
diff --git a/sandbox/src/main/python/libeufin-cli b/sandbox/src/main/python/libeufin-cli
@@ -163,10 +163,10 @@ def prepare(ctx, customer_id):
     required=False,
     default=1)
 @click.option(
-    "--prepare",
+    "--prepare/--no-prepare",
     help="Gets keying done before requesting HTD",
     required=False,
-    default=True)
+    default=False)
 def htd(ctx, customer_id, prepare):
 
     if prepare: