libeufin

commit 844be31478752257916a9c2edca232854f225965
parent a64df3f0fdfd9feb74d19aa3da31182740a6f814
Author: Antoine A <>
Date:   Thu, 23 Nov 2023 16:29:07 +0000

Serve SPA files

Diffstat:
M
bank/conf/test.conf
 | 
1
+
M
bank/src/main/kotlin/tech/libeufin/bank/Config.kt
 | 
2
++
M
bank/src/main/kotlin/tech/libeufin/bank/Main.kt
 | 
5
+++++
M
bank/src/main/kotlin/tech/libeufin/bank/TalerMessage.kt
 | 
2
++
M
contrib/libeufin-bank.conf
 | 
3
+++

5 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/bank/conf/test.conf b/bank/conf/test.conf
@@ -7,6 +7,7 @@ SUGGESTED_WITHDRAWAL_EXCHANGE = https://exchange.example.com
 allow_conversion = YES
 tan_sms = libeufin-tan-file.sh
 tan_email = libeufin-tan-fail.sh
+spa = $DATADIR/spa/
 
 [libeufin-bankdb-postgres]
 SQL_DIR = $DATADIR/sql/
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/Config.kt b/bank/src/main/kotlin/tech/libeufin/bank/Config.kt
@@ -82,6 +82,7 @@ data class BankConfig(
     val conversionInfo: ConversionInfo?,
     val tanSms: String?,
     val tanEmail: String?,
+    val spaPath: String?
 )
 
 @Serializable
@@ -144,6 +145,7 @@ fun TalerConfig.loadBankConfig(): BankConfig = catchError  {
         suggestedWithdrawalExchange = lookupString("libeufin-bank", "suggested_withdrawal_exchange"),
         defaultAdminDebtLimit = requireAmount("libeufin-bank", "default_admin_debt_limit", regionalCurrency),
         spaCaptchaURL = lookupString("libeufin-bank", "spa_captcha_url"),
+        spaPath = lookupPath("libeufin-bank", "spa"),
         restrictAccountDeletion = lookupBoolean("libeufin-bank", "restrict_account_deletion") ?: true,
         allowConversion = allowConversion,
         fiatCurrency = fiatCurrency,
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/Main.kt b/bank/src/main/kotlin/tech/libeufin/bank/Main.kt
@@ -27,6 +27,8 @@ import com.github.ajalt.clikt.parameters.options.flag
 import com.github.ajalt.clikt.parameters.options.option
 import com.github.ajalt.clikt.parameters.options.versionOption
 import io.ktor.http.*
+import io.ktor.server.application.*
+import io.ktor.server.http.content.*
 import io.ktor.serialization.kotlinx.json.*
 import io.ktor.server.application.*
 import io.ktor.server.engine.*
@@ -226,6 +228,9 @@ fun Application.corebankWebApp(db: Database, ctx: BankConfig) {
         bankIntegrationApi(db, ctx)
         wireGatewayApi(db, ctx)
         revenueApi(db)
+        ctx.spaPath?.let { 
+            staticFiles("/", File(it))
+        }
     }
 }
 
diff --git a/bank/src/main/kotlin/tech/libeufin/bank/TalerMessage.kt b/bank/src/main/kotlin/tech/libeufin/bank/TalerMessage.kt
@@ -221,6 +221,8 @@ data class Config(
 ) {
     val name: String = "libeufin-bank"
     val version: String = "0:0:0"
+    val bank_name: String = "Stater Bank"
+    val show_demo_nav: Boolean = false
 }
 
 @Serializable
diff --git a/contrib/libeufin-bank.conf b/contrib/libeufin-bank.conf
@@ -33,6 +33,9 @@ SPA_CAPTCHA_URL = https://bank.test.taler.net/webui/#/operation/{woid}
 SERVE = tcp
 PORT = 8080
 
+# Path to spa files
+spa = $DATADIR/spa/
+
 
 [libeufin-bankdb-postgres]
 # Where are the SQL files to setup our tables?