libeufin

commit 0d0a858cbdbb9d47e874e17efedd40caff62b20b
parent af6681d5b3d05031ebae2439a7d29563435ce88d
Author: MS <ms@taler.net>
Date:   Mon,  5 Oct 2020 16:43:31 +0200

fix setup script based on CLI

Diffstat:
M
cli/libeufin-cli
 | 
15
+--------------
M
cli/setup-template.sh
 | 
12
++++++------

2 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/cli/libeufin-cli b/cli/libeufin-cli
@@ -20,11 +20,6 @@ def cli():
 
 @cli.group()
 @click.pass_context
-def users(ctx):
-    pass
-
-@cli.group()
-@click.pass_context
 def connections(ctx):
     pass
 
@@ -38,14 +33,6 @@ def accounts(ctx):
 def sandbox(ctx):
     pass
 
-@users.command(help="add a new user to nexus")
-@click.option("--nexus-user-id", help="Nexus user ID", required=True)
-@click.option("--nexus-password", help="Nexus password", required=True)
-@click.argument("nexus-base-url")
-def new_user(nexus_user_id, nexus_password, nexus_base_url):
-
-
-
 @connections.command(help="export backup")
 @click.option("--connection-name", help="Name of the bank connection to backup", required=True)
 @click.option("--nexus-user-id", help="Nexus user ID", required=True)
@@ -163,7 +150,7 @@ def new_ebics_connection(obj, connection_name, ebics_url, host_id, partner_id,
 @click.option("--nexus-password", help="Nexus password", required=True)
 @click.argument("nexus-base-url")
 @click.pass_obj
-def bootstrap_connections(obj, connection_name, nexus_user_id, nexus_password, nexus_base_url):
+def bootstrap_connection(obj, connection_name, nexus_user_id, nexus_password, nexus_base_url):
     url = urljoin(nexus_base_url, "/bank-connections/{}/connect".format(connection_name))
     try:
         resp = post(url, json=dict(), auth = auth.HTTPBasicAuth(nexus_user_id, nexus_password))
diff --git a/cli/setup-template.sh b/cli/setup-template.sh
@@ -65,13 +65,13 @@ sleep 2
 
 # create a user
 echo "Creating a nexus user (giving time to settle)"
-nexus superuser --db-name $1 --password $NEXUS_PASSWORD $NEXUS_USER
+libeufin-nexus superuser --db-name $1 --password $NEXUS_PASSWORD $NEXUS_USER
 sleep 2
 
 # create a bank connection
 echo Creating a bank connection for such user
 ./libeufin-cli \
-  bank-connection \
+  connections \
     new-ebics-connection \
       --connection-name $NEXUS_BANK_CONNECTION_NAME \
       --ebics-url $EBICS_BASE_URL \
@@ -80,15 +80,15 @@ echo Creating a bank connection for such user
       --ebics-user-id $EBICS_USER_ID \
       --nexus-user-id $NEXUS_USER \
       --nexus-password $NEXUS_PASSWORD \
-      $NEXUS_URL
+      $NEXUS_URL > /dev/null
 sleep 2
 
 # Bootstrapping such connection
 echo Bootstrapping the bank connection
 ./libeufin-cli \
-  bank-connection \
-    bootstrap-bank-connection \
+  connections \
+    bootstrap-connection \
       --connection-name $NEXUS_BANK_CONNECTION_NAME \
       --nexus-user-id $NEXUS_USER \
       --nexus-password $NEXUS_PASSWORD \
-      $NEXUS_URL
+      $NEXUS_URL > /dev/null