util: unify the two merchant API clients, pass options as object

5 files changed, 41 insertions, 22 deletions

diff --git a/packages/taler-harness/src/index.ts b/packages/taler-harness/src/index.ts
index 889fbe4ca..561d70c4f 100644
--- a/packages/taler-harness/src/index.ts
+++ b/packages/taler-harness/src/index.ts
@@ -64,12 +64,12 @@ import {
   delayMs,
   runTestWithState,
 } from "./harness/harness.js";
-import { getTestInfo, runTests } from "./integrationtests/testrunner.js";
-import { lintExchangeDeployment } from "./lint.js";
 import {
   createSimpleTestkudosEnvironmentV2,
   createWalletDaemonWithClient,
 } from "./harness/helpers.js";
+import { getTestInfo, runTests } from "./integrationtests/testrunner.js";
+import { lintExchangeDeployment } from "./lint.js";
 
 const logger = new Logger("taler-harness:index.ts");
 
@@ -396,8 +396,10 @@ deploymentCli
     const merchantClient = new MerchantApiClient(
       args.tipTopup.merchantBaseUrl,
       {
-        method: "token",
-        token: args.tipTopup.merchantApikey,
+        auth: {
+          method: "token",
+          token: args.tipTopup.merchantApikey,
+        },
       },
     );
 
@@ -447,8 +449,10 @@ deploymentCli
     const merchantClient = new MerchantApiClient(
       args.tipCleanup.merchantBaseUrl,
       {
-        method: "token",
-        token: args.tipCleanup.merchantApikey,
+        auth: {
+          method: "token",
+          token: args.tipCleanup.merchantApikey,
+        },
       },
     );
 
@@ -567,8 +571,10 @@ deploymentCli
     const merchantClient = new MerchantApiClient(
       args.tipStatus.merchantBaseUrl,
       {
-        method: "token",
-        token: args.tipStatus.merchantApikey,
+        auth: {
+          method: "token",
+          token: args.tipStatus.merchantApikey,
+        },
       },
     );
 
diff --git a/packages/taler-harness/src/integrationtests/test-merchant-instances-delete.ts b/packages/taler-harness/src/integrationtests/test-merchant-instances-delete.ts
index 4508b9976..c0c9353e4 100644
--- a/packages/taler-harness/src/integrationtests/test-merchant-instances-delete.ts
+++ b/packages/taler-harness/src/integrationtests/test-merchant-instances-delete.ts
@@ -95,7 +95,9 @@ export async function runMerchantInstancesDeleteTest(t: GlobalTestState) {
   });
 
   let merchantClient = new MerchantApiClient(merchant.makeInstanceBaseUrl(), {
-    method: "external",
+    auth: {
+      method: "external",
+    },
   });
 
   await merchantClient.changeAuth({
@@ -104,8 +106,10 @@ export async function runMerchantInstancesDeleteTest(t: GlobalTestState) {
   });
 
   merchantClient = new MerchantApiClient(merchant.makeInstanceBaseUrl(), {
-    method: "token",
-    token: "secret-token:foobar",
+    auth: {
+      method: "token",
+      token: "secret-token:foobar",
+    },
   });
 
   // Check that deleting an instance checks the auth
@@ -114,8 +118,10 @@ export async function runMerchantInstancesDeleteTest(t: GlobalTestState) {
     const unauthMerchantClient = new MerchantApiClient(
       merchant.makeInstanceBaseUrl(),
       {
-        method: "token",
-        token: "secret-token:invalid",
+        auth: {
+          method: "token",
+          token: "secret-token:invalid",
+        },
       },
     );
 
diff --git a/packages/taler-harness/src/integrationtests/test-merchant-instances-urls.ts b/packages/taler-harness/src/integrationtests/test-merchant-instances-urls.ts
index 7236436ac..b631ea1a4 100644
--- a/packages/taler-harness/src/integrationtests/test-merchant-instances-urls.ts
+++ b/packages/taler-harness/src/integrationtests/test-merchant-instances-urls.ts
@@ -22,7 +22,6 @@ import {
   ExchangeService,
   GlobalTestState,
   MerchantService,
-  generateRandomPayto,
   harnessHttpLib,
   setupDb,
 } from "../harness/harness.js";
@@ -55,8 +54,10 @@ export async function runMerchantInstancesUrlsTest(t: GlobalTestState) {
   const clientForDefault = new MerchantApiClient(
     merchant.makeInstanceBaseUrl(),
     {
-      method: "token",
-      token: "secret-token:i-am-default",
+      auth: {
+        method: "token",
+        token: "secret-token:i-am-default",
+      },
     },
   );
 
diff --git a/packages/taler-harness/src/integrationtests/test-merchant-instances.ts b/packages/taler-harness/src/integrationtests/test-merchant-instances.ts
index a77e9ca51..188451e15 100644
--- a/packages/taler-harness/src/integrationtests/test-merchant-instances.ts
+++ b/packages/taler-harness/src/integrationtests/test-merchant-instances.ts
@@ -22,9 +22,9 @@ import {
   ExchangeService,
   GlobalTestState,
   MerchantService,
-  setupDb,
   generateRandomPayto,
   harnessHttpLib,
+  setupDb,
 } from "../harness/harness.js";
 
 /**
@@ -105,7 +105,9 @@ export async function runMerchantInstancesTest(t: GlobalTestState) {
   });
 
   let merchantClient = new MerchantApiClient(merchant.makeInstanceBaseUrl(), {
-    method: "external",
+    auth: {
+      method: "external",
+    },
   });
 
   {
@@ -148,8 +150,10 @@ export async function runMerchantInstancesTest(t: GlobalTestState) {
   t.assertTrue(exc.errorDetail.httpStatusCode === 401);
 
   merchantClient = new MerchantApiClient(merchant.makeInstanceBaseUrl(), {
-    method: "token",
-    token: "secret-token:foobar",
+    auth: {
+      method: "token",
+      token: "secret-token:foobar",
+    },
   });
 
   // With the new client auth settings, request should work again.
@@ -184,7 +188,9 @@ export async function runMerchantInstancesTest(t: GlobalTestState) {
     const unauthMerchantClient = new MerchantApiClient(
       merchant.makeInstanceBaseUrl(),
       {
-        method: "external",
+        auth: {
+          method: "external",
+        },
       },
     );
 
diff --git a/packages/taler-harness/src/integrationtests/test-otp.ts b/packages/taler-harness/src/integrationtests/test-otp.ts
index d7c82ecdf..dd6c45e4c 100644
--- a/packages/taler-harness/src/integrationtests/test-otp.ts
+++ b/packages/taler-harness/src/integrationtests/test-otp.ts
@@ -1,6 +1,6 @@
 /*
  This file is part of GNU Taler
- (C) 2020 Taler Systems S.A.
+ (C) 2024 Taler Systems S.A.
 
  GNU Taler is free software; you can redistribute it and/or modify it under the
  terms of the GNU General Public License as published by the Free Software