Add missing port in withdraw uris

4 files changed, 9 insertions, 6 deletions

diff --git a/bank/src/main/kotlin/tech/libeufin/bank/helpers.kt b/bank/src/main/kotlin/tech/libeufin/bank/helpers.kt
index e0ea90d5..39d21cf4 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/helpers.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/helpers.kt
@@ -65,7 +65,7 @@ fun ApplicationRequest.talerWithdrawUri(id: UUID) = url {
         defaultPort = -1
     )
     host = "withdraw"
-    appendPathSegments(origin.serverHost)
+    appendPathSegments("${origin.serverHost}:${origin.serverPort}")
     headers["X-Forward-Prefix"]?.let {
         appendPathSegments(it)
     }
@@ -77,7 +77,7 @@ fun ApplicationRequest.withdrawConfirmUrl(id: UUID) = url {
         name = origin.scheme,
         defaultPort = -1
     )
-    host = origin.serverHost
+    host = "${origin.serverHost}:${origin.serverPort}"
     headers["X-Forward-Prefix"]?.let {
         appendPathSegments(it)
     }
diff --git a/bank/src/test/kotlin/AmountTest.kt b/bank/src/test/kotlin/AmountTest.kt
index 417ef469..5f51b5ad 100644
--- a/bank/src/test/kotlin/AmountTest.kt
+++ b/bank/src/test/kotlin/AmountTest.kt
@@ -242,6 +242,9 @@ class AmountTest {
                     }
                 }
             }
+            for (mode in listOf("zero", "up", "nearest")) {
+                assertEquals(TalerAmount("HUF:5"), apply(TalerAmount("HUF:5"), DecimalNumber("1"), DecimalNumber("1"), mode))
+            }
         }
     }
 
@@ -296,7 +299,7 @@ class AmountTest {
             for (mode in listOf("zero", "up", "nearest")) {
                 for (amount in listOf(10, 11, 12, 12, 14, 15, 16, 17, 18, 19)) {
                     for (tiny in listOf("0.01", "0.00000001", "5")) {
-                        for (ratio in listOf("0.341", "0.00000001")) {
+                        for (ratio in listOf("1", "0.341", "0.00000001")) {
                             val tiny = DecimalNumber(tiny)
                             val ratio = DecimalNumber(ratio)
                             val base = TalerAmount("EUR:$amount")
diff --git a/bank/src/test/kotlin/BankIntegrationApiTest.kt b/bank/src/test/kotlin/BankIntegrationApiTest.kt
index 90ea13f9..5f516525 100644
--- a/bank/src/test/kotlin/BankIntegrationApiTest.kt
+++ b/bank/src/test/kotlin/BankIntegrationApiTest.kt
@@ -99,14 +99,14 @@ class BankIntegrationApiTest {
                 json(req)
             }.assertOkJson<BankWithdrawalOperationPostResponse> {
                 assertEquals(WithdrawalStatus.selected, it.status)
-                assertEquals("http://localhost/webui/#/operation/$uuid", it.confirm_transfer_url)
+                assertEquals("http://localhost:80/webui/#/operation/$uuid", it.confirm_transfer_url)
             }
             // Check idempotence
             client.post("/taler-integration/withdrawal-operation/$uuid") {
                 json(req)
             }.assertOkJson<BankWithdrawalOperationPostResponse> {
                 assertEquals(WithdrawalStatus.selected, it.status)
-                assertEquals("http://localhost/webui/#/operation/$uuid", it.confirm_transfer_url)
+                assertEquals("http://localhost:80/webui/#/operation/$uuid", it.confirm_transfer_url)
             }
             // Check already selected
             client.post("/taler-integration/withdrawal-operation/$uuid") {
diff --git a/bank/src/test/kotlin/CoreBankApiTest.kt b/bank/src/test/kotlin/CoreBankApiTest.kt
index 1afb05cd..0660b892 100644
--- a/bank/src/test/kotlin/CoreBankApiTest.kt
+++ b/bank/src/test/kotlin/CoreBankApiTest.kt
@@ -991,7 +991,7 @@ class CoreBankWithdrawalApiTest {
         client.postA("/accounts/merchant/withdrawals") {
             json { "amount" to "KUDOS:9.0" } 
         }.assertOkJson<BankAccountCreateWithdrawalResponse> {
-            assertEquals("taler+http://withdraw/localhost/taler-integration/${it.withdrawal_id}", it.taler_withdraw_uri)
+            assertEquals("taler+http://withdraw/localhost:80/taler-integration/${it.withdrawal_id}", it.taler_withdraw_uri)
         }
 
         // Check exchange account