From 8c20f4b27946679267bb44255721a9f14ae1077a Mon Sep 17 00:00:00 2001
From: Sebastian <sebasjm@gmail.com>
Date: Mon, 11 Sep 2023 15:07:55 -0300
Subject: new login token

---
 .../src/paths/instance/token/DetailPage.tsx                       | 6 ++++--
 .../merchant-backoffice-ui/src/paths/instance/token/index.tsx     | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'packages/merchant-backoffice-ui/src/paths/instance/token')

diff --git a/packages/merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx
index 984880752..4b0db200a 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx
@@ -26,12 +26,13 @@ import { AsyncButton } from "../../../components/exception/AsyncButton.js";
 import { FormProvider } from "../../../components/form/FormProvider.js";
 import { Input } from "../../../components/form/Input.js";
 import { useInstanceContext } from "../../../context/instance.js";
+import { AccessToken } from "../../../declaration.js";
 
 interface Props {
   instanceId: string;
   currentToken: string | undefined;
   onClearToken: () => void;
-  onNewToken: (s: string) => void;
+  onNewToken: (s: AccessToken) => void;
   onBack?: () => void;
 }
 
@@ -71,7 +72,8 @@ export function DetailPage({ instanceId, currentToken: oldToken, onBack, onNewTo
 
   async function submitForm() {
     if (hasErrors) return;
-    onNewToken(form.new_token as any)
+    const nt = `secret-token:${form.new_token}` as AccessToken;
+    onNewToken(nt)
   }
 
   return (
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 d5910361b..0a49448f8 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx
@@ -17,7 +17,7 @@ import { HttpStatusCode } from "@gnu-taler/taler-util";
 import { ErrorType, HttpError, useTranslationContext } from "@gnu-taler/web-util/browser";
 import { Fragment, VNode, h } from "preact";
 import { Loading } from "../../../components/exception/loading.js";
-import { MerchantBackend } from "../../../declaration.js";
+import { AccessToken, MerchantBackend } from "../../../declaration.js";
 import { useInstanceAPI, useInstanceDetails } from "../../../hooks/instance.js";
 import { DetailPage } from "./DetailPage.js";
 import { useInstanceContext } from "../../../context/instance.js";
@@ -49,13 +49,13 @@ export default function Token({
   const { token: instanceToken, id, admin } = useInstanceContext();
 
   const currentToken = !admin ? rootToken : instanceToken
-  const hasPrefix = currentToken !== undefined && currentToken.startsWith(PREFIX)
+  const hasPrefix = currentToken !== undefined && currentToken.token.startsWith(PREFIX)
   return (
     <Fragment>
       <NotificationCard notification={notif} />
       <DetailPage
         instanceId={id}
-        currentToken={hasPrefix ? currentToken.substring(PREFIX.length) : currentToken}
+        currentToken={hasPrefix ? currentToken.token.substring(PREFIX.length) : currentToken?.token}
         onClearToken={async (): Promise<void> => {
           try {
             await clearToken();
@@ -72,7 +72,7 @@ export default function Token({
         }}
         onNewToken={async (newToken): Promise<void> => {
           try {
-            await setNewToken(`secret-token:${newToken}`);
+            await setNewToken(newToken);
             onChange();
           } catch (error) {
             if (error instanceof Error) {
-- 
cgit v1.2.3