From 81ee8f01d89bab616fd86741fc5886d32f58c41c Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Fri, 4 Nov 2022 14:23:15 +0100
Subject: [PATCH] work around libeufin-cli bug

---
 src/auditor/generate-auditor-basedb.sh | 9 ++++++---
 src/auditor/generate-revoke-basedb.sh  | 7 ++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/auditor/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh
index 6ce01725c..b738823d5 100755
--- a/src/auditor/generate-auditor-basedb.sh
+++ b/src/auditor/generate-auditor-basedb.sh
@@ -142,13 +142,15 @@ echo "Launching services (pre audit DB: $TARGET_DB)"
 export LIBEUFIN_SANDBOX_DB_CONNECTION="jdbc:sqlite:${TARGET_DB}-sandbox.sqlite3"
 # Create the default demobank.
 cd $MY_TMP_DIR
+export LIBEUFIN_SANDBOX_ADMIN_PASSWORD=secret
 libeufin-sandbox config --currency "TESTKUDOS" default
-libeufin-sandbox serve --no-auth --port "1${BANK_PORT}" \
+libeufin-sandbox serve --port "1${BANK_PORT}" \
   > ${MY_TMP_DIR}/libeufin-sandbox-stdout.log \
   2> ${MY_TMP_DIR}/libeufin-sandbox-stderr.log &
 echo $! > ${MY_TMP_DIR}/libeufin-sandbox.pid
 cd $ORIGIN
-export LIBEUFIN_SANDBOX_URL="http://localhost:1${BANK_PORT}/"
+export LIBEUFIN_SANDBOX_URL="http://localhost:1${BANK_PORT}/demobanks/default"
+echo $LIBEUFIN_SANDBOX_URL
 set +e
 echo -n "Waiting for Sandbox..."
 OK=0
@@ -156,9 +158,10 @@ for n in `seq 1 50`; do
   echo -n "."
   sleep 1
   if wget --timeout=1 \
+    --user admin --password secret \
     --tries=3 --waitretry=0 \
     -o /dev/null -O /dev/null \
-    ${LIBEUFIN_SANDBOX_URL}demobanks;
+    ${LIBEUFIN_SANDBOX_URL};
   then
     OK=1
     break
diff --git a/src/auditor/generate-revoke-basedb.sh b/src/auditor/generate-revoke-basedb.sh
index 0872d81bd..e70e0130b 100755
--- a/src/auditor/generate-revoke-basedb.sh
+++ b/src/auditor/generate-revoke-basedb.sh
@@ -145,14 +145,14 @@ echo "Launching services"
 export LIBEUFIN_SANDBOX_DB_CONNECTION="jdbc:sqlite:${TARGET_DB}-sandbox.sqlite3"
 # Create the default demobank.
 cd $MY_TMP_DIR
-libeufin-sandbox config --currency "TESTKUDOS" default
 export LIBEUFIN_SANDBOX_ADMIN_PASSWORD=secret
+libeufin-sandbox config --currency "TESTKUDOS" default
 libeufin-sandbox serve --port "1${BANK_PORT}" \
   > ${MY_TMP_DIR}/libeufin-sandbox-stdout.log \
   2> ${MY_TMP_DIR}/libeufin-sandbox-stderr.log &
 echo $! > ${MY_TMP_DIR}/libeufin-sandbox.pid
 cd $ORIGIN
-export LIBEUFIN_SANDBOX_URL="http://localhost:1${BANK_PORT}/"
+export LIBEUFIN_SANDBOX_URL="http://localhost:1${BANK_PORT}/demobanks/default"
 set +e
 echo -n "Waiting for Sandbox..."
 OK=0
@@ -160,9 +160,10 @@ for n in `seq 1 50`; do
   echo -n "."
   sleep 1
   if wget --timeout=1 \
+    --user admin --password secret \
     --tries=3 --waitretry=0 \
     -o /dev/null -O /dev/null \
-    ${LIBEUFIN_SANDBOX_URL}demobanks;
+    ${LIBEUFIN_SANDBOX_URL};
   then
     OK=1
     break