1 files changed, 32 insertions, 52 deletions

diff --git a/packages/merchant-backoffice-ui/src/hooks/index.ts b/packages/merchant-backoffice-ui/src/hooks/index.ts
index 79b22304a..ee696779f 100644
--- a/packages/merchant-backoffice-ui/src/hooks/index.ts
+++ b/packages/merchant-backoffice-ui/src/hooks/index.ts
@@ -19,9 +19,11 @@
  * @author Sebastian Javier Marchano (sebasjm)
  */
 
-import { StateUpdater, useCallback, useEffect, useState } from "preact/hooks";
+import { buildCodecForObject, codecForMap, codecForString, codecForTimestamp } from "@gnu-taler/taler-util";
+import { buildStorageKey, useLocalStorage } from "@gnu-taler/web-util/browser";
+import { StateUpdater, useEffect, useState } from "preact/hooks";
+import { LoginToken } from "../declaration.js";
 import { ValueOrFunction } from "../utils/types.js";
-import { useMemoryStorage } from "@gnu-taler/web-util/browser";
 import { useMatchMutate } from "./backend.js";
 
 const calculateRootPath = () => {
@@ -32,53 +34,55 @@ const calculateRootPath = () => {
   return rootPath;
 };
 
+const loginTokenCodec = buildCodecForObject<LoginToken>()
+  .property("token", codecForString())
+  .property("expiration", codecForTimestamp)
+  .build("loginToken")
+const TOKENS_KEY = buildStorageKey("backend-token", codecForMap(loginTokenCodec));
+
+
 export function useBackendURL(
   url?: string,
-): [string, boolean, StateUpdater<string>, () => void] {
-  const [value, setter] = useNotNullLocalStorage(
+): [string, StateUpdater<string>] {
+  const [value, setter] = useSimpleLocalStorage(
     "backend-url",
     url || calculateRootPath(),
   );
-  const [triedToLog, setTriedToLog] = useLocalStorage("tried-login");
 
   const checkedSetter = (v: ValueOrFunction<string>) => {
-    setTriedToLog("yes");
-    return setter((p) => (v instanceof Function ? v(p) : v).replace(/\/$/, ""));
+    return setter((p) => (v instanceof Function ? v(p ?? "") : v).replace(/\/$/, ""));
   };
 
-  const resetBackend = () => {
-    setTriedToLog(undefined);
-  };
-  return [value, !!triedToLog, checkedSetter, resetBackend];
+  return [value!, checkedSetter];
 }
 
 export function useBackendDefaultToken(
-  initialValue?: string,
-): [string | undefined, ((d: string | undefined) => void)] {
-  // uncomment for testing
-  initialValue = "secret-token:secret" as string | undefined
-  const { update: setToken, value: token, reset } = useMemoryStorage(`backend-token`, initialValue)
+): [LoginToken | undefined, ((d: LoginToken | undefined) => void)] {
+  const { update: setToken, value: tokenMap, reset } = useLocalStorage(TOKENS_KEY, {})
+
+  const tokenOfDefaultInstance = tokenMap["default"]
   const clearCache = useMatchMutate()
   useEffect(() => {
     clearCache()
-  }, [token])
+  }, [tokenOfDefaultInstance])
 
   function updateToken(
-    value: (string | undefined)
+    value: (LoginToken | undefined)
   ): void {
     if (value === undefined) {
       reset()
     } else {
-      setToken(value)
+      const res = { ...tokenMap, "default": value }
+      setToken(res)
     }
   }
-  return [token, updateToken];
+  return [tokenMap["default"], updateToken];
 }
 
 export function useBackendInstanceToken(
   id: string,
-): [string | undefined, ((d: string | undefined) => void)] {
-  const { update: setToken, value: token, reset } = useMemoryStorage(`backend-token-${id}`)
+): [LoginToken | undefined, ((d: LoginToken | undefined) => void)] {
+  const { update: setToken, value: tokenMap, reset } = useLocalStorage(TOKENS_KEY, {})
   const [defaultToken, defaultSetToken] = useBackendDefaultToken();
 
   // instance named 'default' use the default token
@@ -86,16 +90,17 @@ export function useBackendInstanceToken(
     return [defaultToken, defaultSetToken];
   }
   function updateToken(
-    value: (string | undefined)
+    value: (LoginToken | undefined)
   ): void {
     if (value === undefined) {
       reset()
     } else {
-      setToken(value)
+      const res = { ...tokenMap, [id]: value }
+      setToken(res)
     }
   }
 
-  return [token, updateToken];
+  return [tokenMap[id], updateToken];
 }
 
 export function useLang(initial?: string): [string, StateUpdater<string>] {
@@ -104,10 +109,10 @@ export function useLang(initial?: string): [string, StateUpdater<string>] {
       ? navigator.language || (navigator as any).userLanguage
       : undefined;
   const defaultLang = (browserLang || initial || "en").substring(0, 2);
-  return useNotNullLocalStorage("lang-preference", defaultLang);
+  return useSimpleLocalStorage("lang-preference", defaultLang) as [string, StateUpdater<string>];
 }
 
-export function useLocalStorage(
+export function useSimpleLocalStorage(
   key: string,
   initialValue?: string,
 ): [string | undefined, StateUpdater<string | undefined>] {
@@ -137,28 +142,3 @@ export function useLocalStorage(
 
   return [storedValue, setValue];
 }
-
-export function useNotNullLocalStorage(
-  key: string,
-  initialValue: string,
-): [string, StateUpdater<string>] {
-  const [storedValue, setStoredValue] = useState<string>((): string => {
-    return typeof window !== "undefined"
-      ? window.localStorage.getItem(key) || initialValue
-      : initialValue;
-  });
-
-  const setValue = (value: string | ((val: string) => string)) => {
-    const valueToStore = value instanceof Function ? value(storedValue) : value;
-    setStoredValue(valueToStore);
-    if (typeof window !== "undefined") {
-      if (!valueToStore) {
-        window.localStorage.removeItem(key);
-      } else {
-        window.localStorage.setItem(key, valueToStore);
-      }
-    }
-  };
-
-  return [storedValue, setValue];
-}