From 1cec8100c32e0d033e8b3c0554d208b10733589c Mon Sep 17 00:00:00 2001 From: addison Date: Tue, 16 Nov 2021 12:41:03 -0500 Subject: [PATCH] [bug] Adjusted state scope of vault timeout and action --- common/src/services/state.service.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/common/src/services/state.service.ts b/common/src/services/state.service.ts index 182b41ce..b009487a 100644 --- a/common/src/services/state.service.ts +++ b/common/src/services/state.service.ts @@ -1129,25 +1129,25 @@ export class StateService implements StateServiceAbstraction { } async getVaultTimeout(options?: StorageOptions): Promise { - const accountVaultTimeout = (await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskOptions())))?.vaultTimeout; - const globalVaultTimeout = (await this.getGlobals(this.reconcileOptions(options, await this.defaultOnDiskOptions())))?.vaultTimeout; + const accountVaultTimeout = (await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())))?.vaultTimeout; + const globalVaultTimeout = (await this.getGlobals(this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())))?.vaultTimeout; return accountVaultTimeout ?? globalVaultTimeout; } async setVaultTimeout(value: number, options?: StorageOptions): Promise { - const account = await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskOptions())); + const account = await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())); account.vaultTimeout = value; - await this.saveAccount(account, this.reconcileOptions(options, await this.defaultOnDiskOptions())); + await this.saveAccount(account, this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())); } async getVaultTimeoutAction(options?: StorageOptions): Promise { - const accountVaultTimeoutAction = (await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskOptions())))?.vaultTimeoutAction; - const globalVaultTimeoutAction = (await this.getGlobals(this.reconcileOptions(options, await this.defaultOnDiskOptions())))?.vaultTimeoutAction; + const accountVaultTimeoutAction = (await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())))?.vaultTimeoutAction; + const globalVaultTimeoutAction = (await this.getGlobals(this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())))?.vaultTimeoutAction; return accountVaultTimeoutAction ?? globalVaultTimeoutAction; } async setVaultTimeoutAction(value: string, options?: StorageOptions): Promise { - const account = await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskOptions())); + const account = await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())); account.vaultTimeoutAction = value; - await this.saveAccount(account, this.reconcileOptions(options, await this.defaultOnDiskOptions())); + await this.saveAccount(account, this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())); } async getWindow(): Promise> {