1 files changed, 19 insertions, 18 deletions

diff --git a/packages/merchant-backoffice-ui/src/hooks/instance.test.ts b/packages/merchant-backoffice-ui/src/hooks/instance.test.ts
index 35147d988..3b02d7758 100644
--- a/packages/merchant-backoffice-ui/src/hooks/instance.test.ts
+++ b/packages/merchant-backoffice-ui/src/hooks/instance.test.ts
@@ -19,15 +19,12 @@
  * @author Sebastian Javier Marchano (sebasjm)
  */
 
-import { AccessToken, TalerMerchantApi } from "@gnu-taler/taler-util";
+import { TalerMerchantApi } from "@gnu-taler/taler-util";
 import * as tests from "@gnu-taler/web-util/testing";
 import { expect } from "chai";
 import {
-  useAdminAPI,
   useBackendInstances,
-  useInstanceAPI,
   useInstanceDetails,
-  useManagementAPI,
 } from "./instance.js";
 import { ApiMockEnvironment } from "./testing.js";
 import {
@@ -39,6 +36,7 @@ import {
   API_UPDATE_CURRENT_INSTANCE_AUTH,
   API_UPDATE_INSTANCE_BY_ID,
 } from "./urls.js";
+import { useMerchantApiContext } from "@gnu-taler/web-util/browser";
 
 describe("instance api interaction with details", () => {
   it("should evict cache when updating an instance", async () => {
@@ -52,7 +50,8 @@ describe("instance api interaction with details", () => {
 
     const hookBehavior = await tests.hookBehaveLikeThis(
       () => {
-        const api = useInstanceAPI();
+        // const api = useInstanceAPI();
+        const { lib: api } = useMerchantApiContext()
         const query = useInstanceDetails();
         return { query, api };
       },
@@ -82,7 +81,7 @@ describe("instance api interaction with details", () => {
               name: "other_name",
             } as TalerMerchantApi.QueryInstancesResponse,
           });
-          api.updateInstance({
+          api.management.updateCurrentInstance(undefined, {
             name: "other_name",
           } as TalerMerchantApi.InstanceReconfigurationMessage);
         },
@@ -120,7 +119,7 @@ describe("instance api interaction with details", () => {
 
     const hookBehavior = await tests.hookBehaveLikeThis(
       () => {
-        const api = useInstanceAPI();
+        const { lib: api } = useMerchantApiContext()
         const query = useInstanceDetails();
         return { query, api };
       },
@@ -206,7 +205,7 @@ describe("instance api interaction with details", () => {
 
     const hookBehavior = await tests.hookBehaveLikeThis(
       () => {
-        const api = useInstanceAPI();
+        const { lib: api } = useMerchantApiContext()
         const query = useInstanceDetails();
         return { query, api };
       },
@@ -243,7 +242,9 @@ describe("instance api interaction with details", () => {
             } as TalerMerchantApi.QueryInstancesResponse,
           });
 
-          api.clearAccessToken(undefined);
+          api.management.updateCurrentInstanceAuthentication(undefined, {
+            method: "external"
+          });
         },
         ({ query, api }) => {
           expect(env.assertJustExpectedRequestWereMade()).deep.eq({
@@ -337,7 +338,7 @@ describe("instance admin api interaction with listing", () => {
 
     const hookBehavior = await tests.hookBehaveLikeThis(
       () => {
-        const api = useAdminAPI();
+        const { lib: api } = useMerchantApiContext()
         const query = useBackendInstances();
         return { query, api };
       },
@@ -379,9 +380,9 @@ describe("instance admin api interaction with listing", () => {
             },
           });
 
-          api.createInstance({
+          api.management.createInstance(undefined, {
             name: "other_name",
-          } as TalerMerchantApi.InstanceConfigurationMessage);
+          } as TalerMerchantApi.InstanceConfigurationMessage)
         },
         ({ query, api }) => {
           expect(env.assertJustExpectedRequestWereMade()).deep.eq({
@@ -428,7 +429,7 @@ describe("instance admin api interaction with listing", () => {
 
     const hookBehavior = await tests.hookBehaveLikeThis(
       () => {
-        const api = useAdminAPI();
+        const { lib: api } = useMerchantApiContext()
         const query = useBackendInstances();
         return { query, api };
       },
@@ -469,7 +470,7 @@ describe("instance admin api interaction with listing", () => {
             },
           });
 
-          api.deleteInstance("the_id");
+          api.management.deleteInstance(undefined, "the_id");
         },
         ({ query, api }) => {
           expect(env.assertJustExpectedRequestWereMade()).deep.eq({
@@ -582,7 +583,7 @@ describe("instance admin api interaction with listing", () => {
 
     const hookBehavior = await tests.hookBehaveLikeThis(
       () => {
-        const api = useAdminAPI();
+        const { lib: api } = useMerchantApiContext()
         const query = useBackendInstances();
         return { query, api };
       },
@@ -627,7 +628,7 @@ describe("instance admin api interaction with listing", () => {
             },
           });
 
-          api.purgeInstance("the_id");
+          api.management.deleteInstance(undefined, "the_id", { purge: true })
         },
         ({ query, api }) => {
           expect(env.assertJustExpectedRequestWereMade()).deep.eq({
@@ -670,7 +671,7 @@ describe("instance management api interaction with listing", () => {
 
     const hookBehavior = await tests.hookBehaveLikeThis(
       () => {
-        const api = useManagementAPI("managed");
+        const { lib: api } = useMerchantApiContext()
         const query = useBackendInstances();
         return { query, api };
       },
@@ -711,7 +712,7 @@ describe("instance management api interaction with listing", () => {
             },
           });
 
-          api.updateInstance({
+          api.management.updateCurrentInstance(undefined, {
             name: "other_name",
           } as TalerMerchantApi.InstanceConfigurationMessage);
         },