[libeufin] branch master updated (0b5b6abe -> 7f84324c)

[gnunet]

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

antoine pushed a change to branch master
in repository libeufin.

    from 0b5b6abe Fix logging message
     new df7db135 Fix socket timeout for HAC files
     new 7f84324c Fix withdrawal status

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bank/src/main/kotlin/tech/libeufin/bank/BankIntegrationApi.kt | 4 ++--
 nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt       | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bank/src/main/kotlin/tech/libeufin/bank/BankIntegrationApi.kt 
b/bank/src/main/kotlin/tech/libeufin/bank/BankIntegrationApi.kt
index 757fc0b3..f5477896 100644
--- a/bank/src/main/kotlin/tech/libeufin/bank/BankIntegrationApi.kt
+++ b/bank/src/main/kotlin/tech/libeufin/bank/BankIntegrationApi.kt
@@ -49,7 +49,7 @@ fun Routing.bankIntegrationApi(db: Database, ctx: BankConfig) 
{
         )
         call.respond(op.copy(
             suggested_exchange = ctx.suggestedWithdrawalExchange,
-            confirm_transfer_url = if (op.status == WithdrawalStatus.selected) 
call.request.withdrawConfirmUrl(uuid) else null
+            confirm_transfer_url = if (op.status == WithdrawalStatus.pending 
|| op.status == WithdrawalStatus.selected) 
call.request.withdrawConfirmUrl(uuid) else null
         ))
     }
     post("/taler-integration/withdrawal-operation/{wopid}") {
@@ -84,7 +84,7 @@ fun Routing.bankIntegrationApi(db: Database, ctx: BankConfig) 
{
                 call.respond(BankWithdrawalOperationPostResponse(
                     transfer_done = res.status == WithdrawalStatus.confirmed, 
                     status = res.status,
-                    confirm_transfer_url = if (res.status == 
WithdrawalStatus.selected) call.request.withdrawConfirmUrl(uuid) else null
+                    confirm_transfer_url = if (res.status == 
WithdrawalStatus.pending || res.status == WithdrawalStatus.selected) 
call.request.withdrawConfirmUrl(uuid) else null
                 ))
             }
         }
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt
index 5ea9cf83..407e2818 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt
@@ -24,6 +24,7 @@ import com.github.ajalt.clikt.parameters.groups.*
 import com.github.ajalt.clikt.parameters.arguments.*
 import com.github.ajalt.clikt.parameters.types.*
 import io.ktor.client.*
+import io.ktor.client.plugins.*
 import kotlinx.coroutines.*
 import tech.libeufin.nexus.ebics.*
 import tech.libeufin.common.*
@@ -463,7 +464,12 @@ class EbicsFetch: CliktCommand("Fetches EBICS files") {
             val (clientKeys, bankKeys) = expectFullKeys(cfg)
             val ctx = FetchContext(
                 cfg,
-                HttpClient(),
+                HttpClient {
+                    install(HttpTimeout) {
+                        // It can take a lot of time for the bank to generate 
documents
+                        socketTimeoutMillis = 5 * 60 * 1000
+                    }
+                },
                 clientKeys,
                 bankKeys,
                 null,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.