bitwarden/jslib
1
0
Fork 0
mirror of https://github.com/bitwarden/jslib synced 2026-01-04 17:43:14 +00:00
Code Issues Releases Wiki Activity

[bug] Adjusted state scope of vault timeout and action

Browse Source
This commit is contained in:
addison
2021-11-16 12:41:03 -05:00
parent 3d314018fb
commit 1cec8100c3
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/services/state.service.ts
View File

@@ -1129,25 +1129,25 @@ export class StateService implements StateServiceAbstraction {
}
async getVaultTimeout(options?: StorageOptions): Promise<number> {
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<void> {
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<string> {
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<void> {
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<Map<string, any>> {