taler-typescript-core

commit 2d61180dce798ab260d47f94b382fd4f843a55bf
parent fdce0509a0f78d18fe5296cd1dda4a63b15daf5d
Author: Sebastian <sebasjm@gmail.com>
Date:   Fri, 29 Mar 2024 17:56:48 -0300

fix #8279

Diffstat:
M
packages/merchant-backoffice-ui/src/hooks/order.ts
 | 
2
+-
M
packages/merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx
 | 
39
++++++++++++++++++++-------------------
M
packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx
 | 
2
+-
M
packages/taler-util/src/http-client/types.ts
 | 
6
+++---

4 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/packages/merchant-backoffice-ui/src/hooks/order.ts b/packages/merchant-backoffice-ui/src/hooks/order.ts
@@ -21,7 +21,7 @@ import {
 } from "@gnu-taler/web-util/browser";
 import { useEffect, useState } from "preact/hooks";
 import { MAX_RESULT_SIZE, PAGE_SIZE } from "../utils/constants.js";
-import { useBackendInstanceRequest, useMatchMutate } from "./backend.js";
+import { useBackendInstanceRequest } from "./backend.js";
 
 // FIX default import https://github.com/microsoft/TypeScript/issues/49189
 import { TalerErrorDetail, TalerMerchantApi } from "@gnu-taler/taler-util";
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/token/DetailPage.tsx
@@ -80,7 +80,7 @@ export function DetailPage({
       ? (form.old_token as AccessToken)
       : undefined;
     const newToken = form.new_token as AccessToken;
-    onNewToken(oldToken, newToken);
+    onNewToken(oldToken, `secret-token:${newToken}` as AccessToken);
   }
 
   return (
@@ -159,25 +159,26 @@ export function DetailPage({
                   inputType="password"
                 />
               </Fragment>
+              <div class="buttons is-right mt-5">
+                {onBack && (
+                  <a class="button" onClick={onBack}>
+                    <i18n.Translate>Cancel</i18n.Translate>
+                  </a>
+                )}
+                <AsyncButton
+                  type="submit"
+                  disabled={hasErrors}
+                  data-tooltip={
+                    hasErrors
+                      ? i18n.str`Need to complete marked fields`
+                      : "confirm operation"
+                  }
+                  onClick={submitForm}
+                >
+                  <i18n.Translate>Confirm change</i18n.Translate>
+                </AsyncButton>
+              </div>
             </FormProvider>
-            <div class="buttons is-right mt-5">
-              {onBack && (
-                <button class="button" onClick={onBack}>
-                  <i18n.Translate>Cancel</i18n.Translate>
-                </button>
-              )}
-              <AsyncButton
-                disabled={hasErrors}
-                data-tooltip={
-                  hasErrors
-                    ? i18n.str`Need to complete marked fields`
-                    : "confirm operation"
-                }
-                onClick={submitForm}
-              >
-                <i18n.Translate>Confirm change</i18n.Translate>
-              </AsyncButton>
-            </div>
           </div>
           <div class="column" />
         </div>
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx b/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx
@@ -61,7 +61,7 @@ export default function Token({
     return onLoadError(result);
   }
 
-  const hasToken = result.data.auth.type === "token"
+  const hasToken = result.data.auth.method === "token"
 
   return (
     <Fragment>
diff --git a/packages/taler-util/src/http-client/types.ts b/packages/taler-util/src/http-client/types.ts
@@ -473,10 +473,10 @@ export const codecForQueryInstancesResponse =
       .property(
         "auth",
         buildCodecForObject<{
-          type: "external" | "token";
+          method: "external" | "token";
         }>()
           .property(
-            "type",
+            "method",
             codecForEither(
               codecForConstString("token"),
               codecForConstString("external"),
@@ -3672,7 +3672,7 @@ export namespace TalerMerchantApi {
     // Authentication configuration.
     // Does not contain the token when token auth is configured.
     auth: {
-      type: "external" | "token";
+      method: "external" | "token";
     };
   }