1 files changed, 77 insertions, 48 deletions

diff --git a/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx
index f3c9a52ea..c23e5be17 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx
@@ -13,55 +13,57 @@
  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 { HttpStatusCode, TalerErrorDetail } from "@gnu-taler/taler-util";
-import { ErrorType, HttpError, useMerchantApiContext, useTranslationContext } from "@gnu-taler/web-util/browser";
+import {
+  HttpStatusCode,
+  TalerError,
+  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 { useSessionContext } from "../../../context/session.js";
 import { useInstanceDetails } from "../../../hooks/instance.js";
 import { Notification } from "../../../utils/types.js";
+import { LoginPage } from "../../login/index.js";
+import { NotFoundPageOrAdminCreate } from "../../notfound/index.js";
 import { DetailPage } from "./DetailPage.js";
 
 interface Props {
-  onUnauthorized: () => VNode;
-  onLoadError: (error: HttpError<TalerErrorDetail>) => VNode;
   onChange: () => void;
-  onNotFound: () => VNode;
   onCancel: () => void;
 }
 
-export default function Token({
-  onLoadError,
-  onChange,
-  onUnauthorized,
-  onNotFound,
-  onCancel,
-}: Props): VNode {
+export default function Token({ onChange, onCancel }: Props): VNode {
   const { i18n } = useTranslationContext();
-  const { lib } = useMerchantApiContext();
+  const { lib } = useSessionContext();
   const { logIn } = useSessionContext();
   const [notif, setNotif] = useState<Notification | undefined>(undefined);
-  // const { clearAccessToken } = useInstanceAPI();
-  const result = useInstanceDetails()
+  const result = useInstanceDetails();
 
-  if (result.loading) return <Loading />;
-  if (!result.ok) {
-    if (
-      result.type === ErrorType.CLIENT &&
-      result.status === HttpStatusCode.Unauthorized
-    )
-      return onUnauthorized();
-    if (
-      result.type === ErrorType.CLIENT &&
-      result.status === HttpStatusCode.NotFound
-    )
-      return onNotFound();
-    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);
+      }
+    }
   }
 
-  const hasToken = result.data.auth.type === "token"
+  const hasToken = result.body.auth.method === "token";
 
   return (
     <Fragment>
@@ -71,13 +73,24 @@ export default function Token({
         hasToken={hasToken}
         onClearToken={async (currentToken): Promise<void> => {
           try {
-            await lib.management.updateCurrentInstanceAuthentication(currentToken, {
-              method: "external",
-            })
-            onChange();
+            const resp = await lib.instance.updateCurrentInstanceAuthentication(
+              currentToken,
+              {
+                method: "external",
+              },
+            );
+            if (resp.type === "ok") {
+              onChange();
+            } else {
+              return setNotif({
+                message: i18n.str`Failed to clear token`,
+                type: "ERROR",
+                description: resp.detail.hint,
+              });
+            }
           } catch (error) {
             if (error instanceof Error) {
-              setNotif({
+              return setNotif({
                 message: i18n.str`Failed to clear token`,
                 type: "ERROR",
                 description: error.message,
@@ -87,29 +100,45 @@ export default function Token({
         }}
         onNewToken={async (currentToken, newToken): Promise<void> => {
           try {
-            await lib.management.updateCurrentInstanceAuthentication(currentToken, {
-              token: newToken,
-              method: "token"
-            })
-            const resp = await lib.authenticate.createAccessTokenBearer(newToken, {
-              scope: "write",
-              duration: {
-                d_us: "forever"
+            {
+              const resp =
+                await lib.instance.updateCurrentInstanceAuthentication(
+                  currentToken,
+                  {
+                    token: newToken,
+                    method: "token",
+                  },
+                );
+              if (resp.type === "fail") {
+                return setNotif({
+                  message: i18n.str`Failed to set new token`,
+                  type: "ERROR",
+                  description: resp.detail.hint,
+                });
+              }
+            }
+            const resp = await lib.authenticate.createAccessTokenBearer(
+              newToken,
+              {
+                scope: "write",
+                duration: {
+                  d_us: "forever",
+                },
+                refreshable: true,
               },
-              refreshable: true,
-            })
+            );
             if (resp.type === "ok") {
-              logIn({ token: resp.body.token })
-              onChange();
+              logIn(resp.body.token);
+              return onChange();
             } else {
-              setNotif({
+              return setNotif({
                 message: i18n.str`Failed to set new token`,
                 type: "ERROR",
               });
             }
           } catch (error) {
             if (error instanceof Error) {
-              setNotif({
+              return setNotif({
                 message: i18n.str`Failed to set new token`,
                 type: "ERROR",
                 description: error.message,