1 files changed, 23 insertions, 39 deletions

diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/api/WireGatewayApi.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/api/WireGatewayApi.kt
index f7374204..d645b953 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/api/WireGatewayApi.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/api/WireGatewayApi.kt
@@ -29,10 +29,12 @@ import tech.libeufin.common.*
 import tech.libeufin.nexus.*
 import tech.libeufin.nexus.db.*
 import tech.libeufin.nexus.db.PaymentDAO.*
+import tech.libeufin.nexus.db.InitiatedDAO.*
+import tech.libeufin.nexus.db.ExchangeDAO.*
 import java.time.Instant
 
 
-fun Routing.wireGatewayApi(db: Database, cfg: NexusConfig) {
+fun Routing.wireGatewayApi(db: Database, cfg: NexusConfig) = authApi(cfg.wireGatewayApiCfg) {
     get("/taler-wire-gateway/config") {
         call.respond(WireGatewayConfig(
             currency = cfg.currency
@@ -41,69 +43,52 @@ fun Routing.wireGatewayApi(db: Database, cfg: NexusConfig) {
     post("/taler-wire-gateway/transfer") {
         val req = call.receive<TransferRequest>()
         cfg.checkCurrency(req.amount)
-        // TODO
-        /*val res = db.exchange.transfer(
-            req = req,
-            login = username,
-            now = Instant.now()
+        req.credit_account.expectRequestIban()
+        val bankId = run {
+            val bytes = ByteArray(16)
+            kotlin.random.Random.nextBytes(bytes)
+            Base32Crockford.encode(bytes)
+        }
+        val res = db.exchange.transfer(
+            req,
+            bankId,
+            Instant.now()
         )
         when (res) {
-            is TransferResult.UnknownExchange -> throw unknownAccount(username)
-            is TransferResult.NotAnExchange -> throw conflict(
-                "$username is not an exchange account.",
-                TalerErrorCode.BANK_ACCOUNT_IS_NOT_EXCHANGE
-            )
-            is TransferResult.UnknownCreditor -> throw unknownCreditorAccount(req.credit_account.canonical)
-            is TransferResult.BothPartyAreExchange -> throw conflict(
-                "Wire transfer attempted with credit and debit party being both exchange account",
-                TalerErrorCode.BANK_ACCOUNT_IS_EXCHANGE
-            )
-            is TransferResult.ReserveUidReuse -> throw conflict(
+            TransferResult.RequestUidReuse -> throw conflict(
                 "request_uid used already",
                 TalerErrorCode.BANK_TRANSFER_REQUEST_UID_REUSED
             )
-            is TransferResult.BalanceInsufficient -> throw conflict(
-                "Insufficient balance for exchange",
-                TalerErrorCode.BANK_UNALLOWED_DEBIT
-            )
             is TransferResult.Success -> call.respond(
                 TransferResponse(
                     timestamp = res.timestamp,
                     row_id = res.id
                 )
             )
-        }*/
+        }
     }
-    /*suspend fun <T> PipelineContext<Unit, ApplicationCall>.historyEndpoint(
+    suspend fun <T> PipelineContext<Unit, ApplicationCall>.historyEndpoint(
         reduce: (List<T>, String) -> Any, 
-        dbLambda: suspend ExchangeDAO.(HistoryParams, Long, BankPaytoCtx) -> List<T>
+        dbLambda: suspend ExchangeDAO.(HistoryParams) -> List<T>
     ) {
         val params = HistoryParams.extract(context.request.queryParameters)
-        val bankAccount = call.bankInfo(db, ctx.payto)
-        
-        if (!bankAccount.isTalerExchange)
-            throw conflict(
-                "$username is not an exchange account.",
-                TalerErrorCode.BANK_ACCOUNT_IS_NOT_EXCHANGE
-            )
-
-        val items = db.exchange.dbLambda(params, bankAccount.bankAccountId, ctx.payto)
-
+        val items = db.exchange.dbLambda(params)
         if (items.isEmpty()) {
             call.respond(HttpStatusCode.NoContent)
         } else {
-            call.respond(reduce(items, bankAccount.payto))
+            call.respond(reduce(items, cfg.payto))
         }
-    }*/
-    /*get("/taler-wire-gateway/history/incoming") {
+    }
+    get("/taler-wire-gateway/history/incoming") {
         historyEndpoint(::IncomingHistory, ExchangeDAO::incomingHistory)
     }
     get("/taler-wire-gateway/history/outgoing") {
         historyEndpoint(::OutgoingHistory, ExchangeDAO::outgoingHistory)
-    }*/
+    }
     post("/taler-wire-gateway/admin/add-incoming") {
         val req = call.receive<AddIncomingRequest>()
         cfg.checkCurrency(req.amount)
+        req.debit_account.expectRequestIban()
         val timestamp = Instant.now()
         val bankId = run {
             val bytes = ByteArray(16)
@@ -122,7 +107,6 @@ fun Routing.wireGatewayApi(db: Database, cfg: NexusConfig) {
                 "reserve_pub used already",
                 TalerErrorCode.BANK_DUPLICATE_RESERVE_PUB_SUBJECT
             )
-            // TODO timestamp when idempotent
             is IncomingRegistrationResult.Success -> call.respond(
                 AddIncomingResponse(
                     timestamp = TalerProtocolTimestamp(timestamp),