1 files changed, 51 insertions, 47 deletions

diff --git a/packages/merchant-backoffice-ui/src/paths/instance/update/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/update/index.tsx
index c0780fadf..9da7f7efb 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/update/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/update/index.tsx
@@ -1,6 +1,6 @@
 /*
  This file is part of GNU Taler
- (C) 2021 Taler Systems S.A.
+ (C) 2021-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
@@ -13,69 +13,80 @@
  You should have received a copy of the GNU General Public License along with
  GNU Taler; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
  */
-import { Fragment, h, VNode } from "preact";
+import { HttpStatusCode, TalerError, TalerMerchantApi, TalerMerchantInstanceHttpClient, TalerMerchantManagementResultByMethod, assertUnreachable } from "@gnu-taler/taler-util";
+import {
+  useTranslationContext
+} from "@gnu-taler/web-util/browser";
+import { Fragment, VNode, h } from "preact";
 import { useState } from "preact/hooks";
+import { ErrorLoadingMerchant } from "../../../components/ErrorLoadingMerchant.js";
 import { Loading } from "../../../components/exception/loading.js";
 import { NotificationCard } from "../../../components/menu/index.js";
-import { useInstanceContext } from "../../../context/instance.js";
-import { MerchantBackend } from "../../../declaration.js";
-import { HttpError, HttpResponse } from "../../../hooks/backend.js";
+import { useSessionContext } from "../../../context/session.js";
 import {
-  useInstanceAPI,
   useInstanceDetails,
   useManagedInstanceDetails,
-  useManagementAPI,
 } from "../../../hooks/instance.js";
-import { useTranslator } from "../../../i18n/index.js";
 import { Notification } from "../../../utils/types.js";
+import { LoginPage } from "../../login/index.js";
+import { NotFoundPageOrAdminCreate } from "../../notfound/index.js";
 import { UpdatePage } from "./UpdatePage.js";
 
 export interface Props {
   onBack: () => void;
   onConfirm: () => void;
 
-  onUnauthorized: () => VNode;
-  onNotFound: () => VNode;
-  onLoadError: (e: HttpError) => VNode;
-  onUpdateError: (e: HttpError) => void;
+  // onUnauthorized: () => VNode;
+  // onNotFound: () => VNode;
+  // onLoadError: (e: HttpError<TalerErrorDetail>) => VNode;
+  // onUpdateError: (e: HttpError<TalerErrorDetail>) => void;
 }
 
 export default function Update(props: Props): VNode {
-  const { updateInstance, clearToken, setNewToken } = useInstanceAPI();
+  const { lib } = useSessionContext();
+  const updateInstance = lib.instance.updateCurrentInstance.bind(lib.instance)
   const result = useInstanceDetails();
-  return CommonUpdate(props, result, updateInstance, clearToken, setNewToken);
+  return CommonUpdate(props, result, updateInstance,);
 }
 
 export function AdminUpdate(props: Props & { instanceId: string }): VNode {
-  const { updateInstance, clearToken, setNewToken } = useManagementAPI(
-    props.instanceId
-  );
+  const { lib } = useSessionContext();
+  const t = lib.subInstanceApi(props.instanceId).instance;
+  const updateInstance = t.updateCurrentInstance.bind(t)
   const result = useManagedInstanceDetails(props.instanceId);
-  return CommonUpdate(props, result, updateInstance, clearToken, setNewToken);
+  return CommonUpdate(props, result, updateInstance,);
 }
 
+
 function CommonUpdate(
   {
     onBack,
     onConfirm,
-    onLoadError,
-    onNotFound,
-    onUpdateError,
-    onUnauthorized,
   }: Props,
-  result: HttpResponse<MerchantBackend.Instances.QueryInstancesResponse>,
-  updateInstance: any,
-  clearToken: any,
-  setNewToken: any
+  result: TalerMerchantManagementResultByMethod<"getInstanceDetails"> | TalerError | undefined,
+  updateInstance: typeof TalerMerchantInstanceHttpClient.prototype.updateCurrentInstance,
 ): VNode {
-  const { changeToken } = useInstanceContext();
   const [notif, setNotif] = useState<Notification | undefined>(undefined);
-  const i18n = useTranslator();
+  const { i18n } = useTranslationContext();
+  const { state } = useSessionContext();
 
-  if (result.clientError && result.isUnauthorized) return onUnauthorized();
-  if (result.clientError && result.isNotfound) return onNotFound();
-  if (result.loading) return <Loading />;
-  if (!result.ok) return onLoadError(result);
+  if (!result) return <Loading />
+  if (result instanceof TalerError) {
+    return <ErrorLoadingMerchant error={result} />
+  }
+  if (result.type === "fail") {
+    switch(result.case) {
+      case HttpStatusCode.Unauthorized: {
+        return <LoginPage />
+      }
+      case HttpStatusCode.NotFound: {
+        return <NotFoundPageOrAdminCreate />;
+      }
+      default: {
+        assertUnreachable(result)
+      }
+    }
+  }
 
   return (
     <Fragment>
@@ -83,30 +94,23 @@ function CommonUpdate(
       <UpdatePage
         onBack={onBack}
         isLoading={false}
-        selected={result.data}
+        selected={result.body}
         onUpdate={(
-          d: MerchantBackend.Instances.InstanceReconfigurationMessage
+          d: TalerMerchantApi.InstanceReconfigurationMessage,
         ): Promise<void> => {
-          return updateInstance(d)
+          if (state.status !== "loggedIn") {
+            return Promise.resolve();
+          }
+          return updateInstance(state.token, d)
             .then(onConfirm)
             .catch((error: Error) =>
               setNotif({
-                message: i18n`Failed to create instance`,
+                message: i18n.str`Failed to update instance`,
                 type: "ERROR",
                 description: error.message,
-              })
+              }),
             );
         }}
-        onChangeAuth={(
-          d: MerchantBackend.Instances.InstanceAuthConfigurationMessage
-        ): Promise<void> => {
-          const apiCall =
-            d.method === "external" ? clearToken() : setNewToken(d.token!);
-          return apiCall
-            .then(() => changeToken(d.token))
-            .then(onConfirm)
-            .catch(onUpdateError);
-        }}
       />
     </Fragment>
   );