bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-20 10:13:31 +00:00
Code Issues Releases Wiki Activity

[bug] Make activity a top level storage key (#656)

Browse Source 
* [bug] Make activity a top level storage key

* [bug] use correct index for migration

* [bug] use correct index for migration part 2
This commit is contained in:
Addison Beck
2022-02-07 11:36:53 -05:00
committed by GitHub
parent 0760b53296
commit 6c08b40847
4 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,7 @@ const keys = {
authenticatedAccounts: "authenticatedAccounts",
activeUserId: "activeUserId",
tempAccountSettings: "tempAccountSettings", // used to hold account specific settings (i.e clear clipboard) between initial migration and first account authentication
accountActivity: "accountActivity",
};
const partialKeys = {
@@ -117,7 +118,7 @@ export class StateService<
async addAccount(account: TAccount) {
account = await this.setAccountEnvironmentUrls(account);
this.state.authenticatedAccounts.push(account.profile.userId);
this.storageService.save(keys.authenticatedAccounts, this.state.authenticatedAccounts);
await this.storageService.save(keys.authenticatedAccounts, this.state.authenticatedAccounts);
this.state.accounts[account.profile.userId] = account;
await this.scaffoldNewAccountStorage(account);
await this.setActiveUser(account.profile.userId);
@@ -1561,22 +1562,32 @@ export class StateService<
}
async getLastActive(options?: StorageOptions): Promise<number> {
return (
await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskOptions()))
)?.profile?.lastActive;
options = this.reconcileOptions(options, await this.defaultOnDiskOptions());
const accountActivity = await this.storageService.get<{ [userId: string]: number }>(
keys.accountActivity,
options
);
if (accountActivity == null || Object.keys(accountActivity).length < 1) {
return null;
}
return accountActivity[options.userId];
}
async setLastActive(value: number, options?: StorageOptions): Promise<void> {
const account = await this.getAccount(
this.reconcileOptions(options, await this.defaultOnDiskOptions())
);
if (account != null) {
account.profile.lastActive = value;
await this.saveAccount(
account,
this.reconcileOptions(options, await this.defaultOnDiskOptions())
);
options = this.reconcileOptions(options, await this.defaultOnDiskOptions());
if (options.userId == null) {
return;
}
const accountActivity =
(await this.storageService.get<{ [userId: string]: number }>(
keys.accountActivity,
options
)) ?? {};
accountActivity[options.userId] = value;
await this.storageService.save(keys.accountActivity, accountActivity, options);
}
async getLastSync(options?: StorageOptions): Promise<string> {