Adapt taler-local to Sandbox auth token scheme.

1 files changed, 18 insertions, 18 deletions

diff --git a/bin/WIP/taler-local b/bin/WIP/taler-local
index f838fa9..3c9462d 100755
--- a/bin/WIP/taler-local
+++ b/bin/WIP/taler-local
@@ -556,21 +556,23 @@ def prepare():
         return env
     
     def get_sandbox_cli_env(
-        username, password
+        username, password, admin_token
     ):
        env = os.environ.copy()
        env["LIBEUFIN_SANDBOX_USERNAME"] = username
        env["LIBEUFIN_SANDBOX_PASSWORD"] = password
+       env["LIBEUFIN_SANDBOX_TOKEN"] = admin_token
        return env
 
     # Will be extended to include a SANDBOX_ADMIN_TOKEN
     # that will obsolete the 'superuser' flag of ordinary
     # user accounts.  Likewise, the client side will be
     # modified to use such token.
-    def get_sandbox_server_env(db_file, base_url):
+    def get_sandbox_server_env(db_file, base_url, admin_token):
         env = os.environ.copy()
         env["LIBEUFIN_SANDBOX_DB_CONNECTION"] = f"jdbc:sqlite:{db_file}"
         env["LIBEUFIN_SANDBOX_BASE_URL"] = base_url
+        env["LIBEUFIN_SANDBOX_TOKEN"] = admin_token
         return env
 
     def get_nexus_server_env(db_file, base_url):
@@ -727,6 +729,7 @@ def prepare():
     EXCHANGE_NEXUS_PASSWORD = "exchange-nexus-password"
     FRONTENDS_API_TOKEN = "secret-token:secret"
     TALER_MERCHANT_TOKEN = "secret-token:secret"
+    LIBEUFIN_SANDBOX_TOKEN = "secret-token:secret"
 
     # Network locations
     REV_PROXY_NETLOC = "localhost:8080"
@@ -1234,24 +1237,17 @@ Logs: {rev_proxy.get_log_filename()}"
             raise error
     print(" OK")
     
-    print_nn("Create Sandbox superuser...")
-    Command(
-        [
-            "libeufin-sandbox", "superuser",
-             SANDBOX_ADMIN_USERNAME,
-             "--password", SANDBOX_ADMIN_PASSWORD
-        ],
-        custom_name="sandbox-superuser",
-        env=get_sandbox_server_env(SANDBOX_DB_FILE, SANDBOX_URL)
-    ).run()
-    print(" OK")
     print_nn("Launching Sandbox...")
     sandbox_handle = Command(
         [
             "libeufin-sandbox", "serve",
             "--with-unix-socket", UNIX_SOCKETS_DIR / "sandbox.sock",
         ],
-        env=get_sandbox_server_env(SANDBOX_DB_FILE, SANDBOX_URL)
+        env=get_sandbox_server_env(
+            SANDBOX_DB_FILE,
+            SANDBOX_URL,
+            LIBEUFIN_SANDBOX_TOKEN
+        )
     ).launch()
     if not Command.is_serving(SANDBOX_URL):
         fail(f"Sandbox did not start correctly.  Logs: {sandbox_handle.get_log_filename()}")
@@ -1266,7 +1262,8 @@ Logs: {rev_proxy.get_log_filename()}"
         ],
         env=get_sandbox_cli_env(
             SANDBOX_ADMIN_USERNAME,
-            SANDBOX_ADMIN_PASSWORD
+            SANDBOX_ADMIN_PASSWORD,
+            LIBEUFIN_SANDBOX_TOKEN
         ),
         custom_name="sandbox-create-ebicshost",
     ).run()
@@ -1284,7 +1281,8 @@ Logs: {rev_proxy.get_log_filename()}"
         bank_account_iban=IBAN_EXCHANGE,
         env=get_sandbox_cli_env(
             SANDBOX_ADMIN_USERNAME,
-            SANDBOX_ADMIN_PASSWORD
+            SANDBOX_ADMIN_PASSWORD,
+            LIBEUFIN_SANDBOX_TOKEN
         )
     )
     print(" OK")
@@ -1305,7 +1303,8 @@ Logs: {rev_proxy.get_log_filename()}"
             bank_account_iban=iban,
             env=get_sandbox_cli_env(
                 SANDBOX_ADMIN_USERNAME,
-                SANDBOX_ADMIN_PASSWORD
+                SANDBOX_ADMIN_PASSWORD,
+                LIBEUFIN_SANDBOX_TOKEN
             )
         )
         print(" OK")
@@ -1321,7 +1320,8 @@ Logs: {rev_proxy.get_log_filename()}"
         bank_account_iban=IBAN_CUSTOMER,
         env=get_sandbox_cli_env(
             SANDBOX_ADMIN_USERNAME,
-            SANDBOX_ADMIN_PASSWORD
+            SANDBOX_ADMIN_PASSWORD,
+            LIBEUFIN_SANDBOX_TOKEN
         )
     )
     print(" OK")