taler-typescript-core

commit 339080e014e2a94cf93bb8ef8d5fbe6793ee4c48
parent 7985b0a33ffc3e258da5d73f4056384c38e626fe
Author: Florian Dold <florian@dold.me>
Date:   Thu, 23 Feb 2023 15:18:30 +0100

embedded: add missing DB remove call in reset

Diffstat:
M
packages/taler-util/src/qtart.ts
 | 
1
+
M
packages/taler-wallet-embedded/src/wallet-qjs.ts
 | 
26
++++++++++++++++++--------

2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/packages/taler-util/src/qtart.ts b/packages/taler-util/src/qtart.ts
@@ -23,6 +23,7 @@ export interface QjsOsLib {
   postMessageToHost(s: string): void;
   setMessageFromHostHandler(h: (s: string) => void): void;
   rename(oldPath: string, newPath: string): number;
+  remove(path: string): number;
 }
 
 export interface QjsStdLib {
diff --git a/packages/taler-wallet-embedded/src/wallet-qjs.ts b/packages/taler-wallet-embedded/src/wallet-qjs.ts
@@ -30,6 +30,7 @@ import {
   Logger,
   setGlobalLogLevelFromString,
   setPRNG,
+  TalerErrorCode,
   WalletNotification,
 } from "@gnu-taler/taler-util";
 import { createPlatformHttpLib } from "@gnu-taler/taler-util/http";
@@ -74,7 +75,7 @@ class NativeWalletMessageHandler {
     id: string,
     args: any,
   ): Promise<CoreApiResponse> {
-    const wrapResponse = (result: unknown): CoreApiResponseSuccess => {
+    const wrapSuccessResponse = (result: unknown): CoreApiResponseSuccess => {
       return {
         type: "response",
         id,
@@ -120,7 +121,7 @@ class NativeWalletMessageHandler {
           setGlobalLogLevelFromString(logLevel);
         }
         await reinit();
-        return wrapResponse({
+        return wrapSuccessResponse({
           ...initResponse,
         });
       }
@@ -137,14 +138,22 @@ class NativeWalletMessageHandler {
         throw Error("not implemented");
       }
       case "reset": {
+        logger.info("resetting wallet");
         const oldArgs = this.walletArgs;
         this.walletArgs = { ...oldArgs };
         if (oldArgs && oldArgs.persistentStoragePath) {
-          try {
-            logger.error("FIXME: reset not implemented");
-            // fs.unlinkSync(oldArgs.persistentStoragePath);
-          } catch (e) {
-            logger.error("Error while deleting the wallet db:", e);
+          const ret = qjsOs.remove(oldArgs.persistentStoragePath);
+          if (ret != null) {
+            return {
+              type: "error",
+              id,
+              operation,
+              error: {
+                code: TalerErrorCode.GENERIC_UNEXPECTED_REQUEST_ERROR,
+                hint: `path ${oldArgs.persistentStoragePath}`,
+                message: "removing DB file failed",
+              },
+            };
           }
           // Prevent further storage!
           this.walletArgs.persistentStoragePath = undefined;
@@ -154,7 +163,8 @@ class NativeWalletMessageHandler {
         this.wp = openPromise<Wallet>();
         this.maybeWallet = undefined;
         await reinit();
-        return wrapResponse({});
+        logger.info("wallet re-initialized after reset");
+        return wrapSuccessResponse({});
       }
       default: {
         const wallet = await this.wp.promise;