taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

embedded: add missing DB remove call in reset

Browse Source
This commit is contained in:
Florian Dold 2023-02-23 15:18:30 +01:00
parent 7985b0a33f
commit 339080e014
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/taler-util/src/qtart.ts
View File

@ -23,6 +23,7 @@ export interface QjsOsLib {
postMessageToHost(s: string): void; postMessageToHost(s: string): void;
setMessageFromHostHandler(h: (s: string) => void): void; setMessageFromHostHandler(h: (s: string) => void): void;
rename(oldPath: string, newPath: string): number; rename(oldPath: string, newPath: string): number;
remove(path: string): number;
} }
export interface QjsStdLib { export interface QjsStdLib {

26
packages/taler-wallet-embedded/src/wallet-qjs.ts
View File

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