[libeufin] branch master updated (898eddf -> d7ff9d9)

[gnunet]

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

ms pushed a change to branch master
in repository libeufin.

    from 898eddf  extend makefile
     new 2d3ac18  fix cli
     new 35b3bee  extend /config API
     new e257fca  cli-based tests preparation
     new d7ff9d9  Idea files

The 4 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:
 .idea/vcs.xml                                      |  1 +
 cli/libeufin-cli                                   | 59 +++++++++++-----------
 cli/setup-template.sh                              | 15 ++++--
 .../tech/libeufin/nexus/server/NexusServer.kt      |  7 ++-
 4 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 37d8908..246ffef 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,6 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/build-common" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/build-system/taler-build-scripts" 
vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/cli/libeufin-cli b/cli/libeufin-cli
index 0f705c5..ab42881 100755
--- a/cli/libeufin-cli
+++ b/cli/libeufin-cli
@@ -66,11 +66,11 @@ def sandbox(ctx):
 @click.argument("connection-name")
 @click.pass_obj
 def export_backup(obj, connection_name, passphrase, output_file):
-    url = urljoin(nexus_base_url, 
"/bank-connections/{}/export-backup".format(connection_name))
+    url = urljoin(obj.nexus_base_url, 
"/bank-connections/{}/export-backup".format(connection_name))
     try:
         resp = post(
             url, json=dict(passphrase=passphrase),
-            auth=auth.HTTPBasicAuth(obj.nexus_user_id, obj.nexus_password)
+            auth=auth.HTTPBasicAuth(obj.username, obj.password)
         )
     except Exception:
         print("Could not reach nexus at " + url)
@@ -88,12 +88,12 @@ def export_backup(obj, connection_name, passphrase, 
output_file):
 @click.pass_obj
 def delete(obj, connection_name):
 
-    url = urljoin(nexus_base_url, 
"/bank-connections/delete-connection".format(connection_name))
+    url = urljoin(obj.nexus_base_url, 
"/bank-connections/delete-connection".format(connection_name))
     try:
         resp = post(
             url,
             json=dict(bankConnectionId=connection_name),
-            auth=auth.HTTPBasicAuth(obj.nexus_user_id, obj.nexus_password)
+            auth=auth.HTTPBasicAuth(obj.username, obj.password)
         )
     except Exception:
         print("Could not reach nexus at " + url)
@@ -107,7 +107,7 @@ def delete(obj, connection_name):
 @click.argument("connection-name")
 @click.pass_obj
 def restore_backup(obj, backup_file, passphrase, connection_name):
-    url = urljoin(nexus_base_url, "/bank-connections")
+    url = urljoin(obj.nexus_base_url, "/bank-connections")
     try:
         backup = open(backup_file, "r")
     except Exception:
@@ -126,7 +126,7 @@ def restore_backup(obj, backup_file, passphrase, 
connection_name):
                 passphrase=passphrase,
                 source="backup"
             ),
-            auth=auth.HTTPBasicAuth(obj.nexus_user_id, obj.nexus_password)
+            auth=auth.HTTPBasicAuth(obj.username, obj.password)
 
         )
     except Exception:
@@ -177,7 +177,7 @@ def sync(obj, connection_name):
 @click.argument("connection-name")
 @click.pass_obj
 def import_bank_account(obj, connection_name, offered_account_id, 
nexus_bank_account_id):
-    url = urljoin(nexus_base_url, 
"/bank-connections/{}/import-account".format(connection_name))
+    url = urljoin(obj.nexus_base_url, 
"/bank-connections/{}/import-account".format(connection_name))
     try:
         resp = post(
             url,
@@ -185,11 +185,10 @@ def import_bank_account(obj, connection_name, 
offered_account_id, nexus_bank_acc
                 offeredAccountId=offered_account_id,
                 nexusBankAccountId=nexus_bank_account_id
             ),
-            auth = auth.HTTPBasicAuth(obj.nexus_user_id, obj.nexus_password)
+            auth = auth.HTTPBasicAuth(obj.username, obj.password)
         )
-    except Exception as ee:
-        print(ee)
-        print("Could not reach nexus at " + url)
+    except Exception as e:
+        print(f"Could not reach nexus at {url}: {e}")
         return
     print(resp.content.decode("utf-8"))
 
@@ -197,19 +196,20 @@ def import_bank_account(obj, connection_name, 
offered_account_id, nexus_bank_acc
 @click.argument("connection-name")
 @click.pass_obj
 def download_bank_accounts(obj, connection_name):
-    url = urljoin(nexus_base_url, 
"/bank-connections/{}/fetch-accounts".format(connection_name))
+    url = urljoin(obj.nexus_base_url, 
"/bank-connections/{}/fetch-accounts".format(connection_name))
     try:
-        resp = post(url, json=dict(), auth = 
auth.HTTPBasicAuth(obj.nexus_user_id, obj.nexus_password))
+        resp = post(url, json=dict(), auth = auth.HTTPBasicAuth(obj.username, 
obj.password))
     except Exception:
         print("Could not reach nexus at " + url)
         return
     print(resp.content.decode("utf-8"))
 
 @connections.command(help="list the connections")
-def list_connections():
-    url = urljoin(nexus_base_url, "/bank-connections/")
+@click.pass_obj
+def list_connections(obj):
+    url = urljoin(obj.nexus_base_url, "/bank-connections/")
     try:
-        resp = get(url, json=dict(), auth = 
auth.HTTPBasicAuth(obj.nexus_user_id, obj.nexus_password))
+        resp = get(url, json=dict(), auth = auth.HTTPBasicAuth(obj.username, 
obj.password))
     except Exception:
         print("Could not reach nexus at " + url)
         return
@@ -219,9 +219,9 @@ def list_connections():
 @click.argument("connection-name")
 @click.pass_obj
 def list_offered_bank_accounts(obj, connection_name):
-    url = urljoin(nexus_base_url, 
"/bank-connections/{}/accounts".format(connection_name))
+    url = urljoin(obj.nexus_base_url, 
"/bank-connections/{}/accounts".format(connection_name))
     try:
-        resp = get(url, json=dict(), auth = 
auth.HTTPBasicAuth(obj.nexus_user_id, obj.nexus_password))
+        resp = get(url, json=dict(), auth = auth.HTTPBasicAuth(obj.username, 
obj.password))
     except Exception:
         print("Could not reach nexus at " + url)
         return
@@ -248,7 +248,7 @@ def show(obj):
 @click.pass_obj
 def prepare_payment(obj, account_name, credit_iban, credit_bic, credit_name,
                     payment_amount, payment_subject):
-    url = urljoin(nexus_base_url, 
"/bank-accounts/{}/prepared-payments".format(account_name))
+    url = urljoin(obj.nexus_base_url, 
"/bank-accounts/{}/prepared-payments".format(account_name))
     body = dict(
         iban=credit_iban,
         bic=credit_bic,
@@ -258,7 +258,7 @@ def prepare_payment(obj, account_name, credit_iban, 
credit_bic, credit_name,
     )
 
     try:
-        resp = post(url, json=body, auth=auth.HTTPBasicAuth(obj.nexus_user_id, 
obj.nexus_password))
+        resp = post(url, json=body, auth=auth.HTTPBasicAuth(obj.username, 
obj.password))
     except Exception:
         print("Could not reach nexus at " + url)
         return
@@ -270,10 +270,11 @@ def prepare_payment(obj, account_name, credit_iban, 
credit_bic, credit_name,
 @click.pass_obj
 def submit_payment(obj, account_name, payment_uuid):
     url = urljoin(
-        nexus_base_url, 
"/bank-accounts/{}/prepared-payments/{}/submit".format(account_name, 
payment_uuid)
+        obj.nexus_base_url,
+        "/bank-accounts/{}/prepared-payments/{}/submit".format(account_name, 
payment_uuid)
     )
     try:
-        resp = post(url, json=dict(), auth = 
auth.HTTPBasicAuth(obj.nexus_user_id, obj.nexus_password))
+        resp = post(url, json=dict(), auth = auth.HTTPBasicAuth(obj.username, 
obj.password))
     except Exception:
         print("Could not reach nexus at" + url)
         return
@@ -284,10 +285,10 @@ def submit_payment(obj, account_name, payment_uuid):
 @click.pass_obj
 def fetch_transactions(obj, account_name):
     url = urljoin(
-        nexus_base_url, 
"/bank-accounts/{}/fetch-transactions".format(account_name)
+        obj.nexus_base_url, 
"/bank-accounts/{}/fetch-transactions".format(account_name)
     )
     try:
-        resp = post(url, auth = auth.HTTPBasicAuth(obj.nexus_user_id, 
obj.nexus_password))
+        resp = post(url, auth = auth.HTTPBasicAuth(obj.username, obj.password))
     except Exception:
         print("Could not reach nexus " + url)
         return
@@ -297,9 +298,9 @@ def fetch_transactions(obj, account_name):
 @click.argument("account-name")
 @click.pass_obj
 def transactions(obj, account_name):
-    url = urljoin(nexus_base_url, 
"/bank-accounts/{}/transactions".format(account_name))
+    url = urljoin(obj.nexus_base_url, 
"/bank-accounts/{}/transactions".format(account_name))
     try:
-        resp = get(url, auth = auth.HTTPBasicAuth(obj.nexus_user_id, 
obj.nexus_password))
+        resp = get(url, auth = auth.HTTPBasicAuth(obj.username, obj.password))
     except Exception:
         print("Could not reach nexus " + url)
         return
@@ -311,15 +312,15 @@ def transactions(obj, account_name):
 @click.argument("account-name")
 @click.pass_obj
 def new_facade(obj, facade_name, connection_name, account_name):
-    url = urljoin(nexus_base_url, "/facades")
+    url = urljoin(obj.nexus_base_url, "/facades")
     try:
         resp = post(
             url,
-            auth=auth.HTTPBasicAuth(obj.nexus_user_id, obj.nexus_password,
+            auth=auth.HTTPBasicAuth(obj.username, obj.password,
             json=dict(
             name=facade_name,
             type="taler-wire-gateway",
-            creator=obj.nexus_user_id,
+            creator=obj.username,
             config=dict(
                 bankAccount=account_name,
                 bankConnection=connection_name,
diff --git a/cli/setup-template.sh b/cli/setup-template.sh
index 6795053..a006b53 100755
--- a/cli/setup-template.sh
+++ b/cli/setup-template.sh
@@ -5,17 +5,20 @@
 
 set -eu
 
+# EBICS details.
 SANDBOX_URL="http://localhost:5000";
 EBICS_HOST_ID=ebicshost
 EBICS_PARTNER_ID=ebicspartner
 EBICS_USER_ID=ebicsuser
 EBICS_BASE_URL="$SANDBOX_URL/ebicsweb"
 
+# A bank account details.
 IBAN=x
 BIC=y
 PERSON_NAME=z
 ACCOUNT_NAME=a
 
+# A Nexus user details.
 NEXUS_USER=u
 NEXUS_PASSWORD=p
 NEXUS_BANK_CONNECTION_NAME=b
@@ -25,6 +28,7 @@ if test -z $1; then
   exit 1
 fi
 
+# Exports needed by the CLI.
 export NEXUS_BASE_URL="http://localhost:5001/";
 export NEXUS_USERNAME=$NEXUS_USER
 export NEXUS_PASSWORD=$NEXUS_PASSWORD
@@ -85,12 +89,13 @@ echo Creating a bank connection for such user
       $NEXUS_BANK_CONNECTION_NAME > /dev/null
 sleep 2
 
-# Bootstrapping such connection
+# Bootstrapping such connection.
 echo Bootstrapping the bank connection
 ./libeufin-cli \
   connections sync $NEXUS_BANK_CONNECTION_NAME > /dev/null
 
-echo The following exports will make it possible to access Nexus:
-echo export NEXUS_BASE_URL="http://localhost:5001/";
-echo export NEXUS_USERNAME=$NEXUS_USER
-echo export NEXUS_PASSWORD=$NEXUS_PASSWORD
+# Download bank accounts.
+echo Download bank accounts
+./libeufin-cli \
+  connections download-bank-accounts \
+    $NEXUS_BANK_CONNECTION_NAME > /dev/null
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt 
b/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt
index 08e709c..c31d7de 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/server/NexusServer.kt
@@ -281,7 +281,12 @@ fun serverMain(dbName: String, host: String) {
         routing {
             get("/config") {
                  call.respond(
-                     object {val version = "0.0.0"; val currency = "EUR"}
+                     object {
+                         val version = "0.0.0"
+                         val currency = "EUR"
+                         val databaseType = "sqlite"
+                         val databaseName = dbName
+                     }
                  )
                 return@get
             }

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