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

[PM-5277] Migrate Sync Service to State Provider (#7680)

Browse Source 
* [PM-5277] Introduce lastSync state via State Providers

* [PM-5277] Add migrator and tests

* [PM-5277] Use memory for web storage location

* [PM-5277] Remove lastSync methods from state service

* [PM-5277] Remove lastSync from AccountProfile

* [PM-5277] Use string instead of Date to fix serialization for chrome.storage API in Browser

* [PM-5277] Only set account if lastSync was deleted during migration

* [PM-5277] Fix spec file
This commit is contained in:
Shane Melton
2024-02-06 12:00:41 -08:00
committed by GitHub
parent 7e00ece092
commit 78008a9e1e
15 changed files with 210 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/common/src/vault/abstractions/sync/sync.service.abstraction.ts
View File

@@ -1,14 +1,18 @@
import { Observable } from "rxjs";
import {
SyncCipherNotification,
SyncFolderNotification,
SyncSendNotification,
} from "../../../models/response/notification.response";
import { UserId } from "../../../types/guid";
export abstract class SyncService {
syncInProgress: boolean;
lastSync$: Observable<Date | null>;
getLastSync: () => Promise<Date>;
setLastSync: (date: Date, userId?: string) => Promise<any>;
setLastSync: (date: Date, userId?: UserId) => Promise<any>;
fullSync: (forceSync: boolean, allowThrowOnError?: boolean) => Promise<boolean>;
syncUpsertFolder: (notification: SyncFolderNotification, isEdit: boolean) => Promise<boolean>;
syncDeleteFolder: (notification: SyncFolderNotification) => Promise<boolean>;

40
libs/common/src/vault/services/sync/sync.service.ts
View File

@@ -1,3 +1,5 @@
import { firstValueFrom, map } from "rxjs";
import { ApiService } from "../../../abstractions/api.service";
import { SettingsService } from "../../../abstractions/settings.service";
import { InternalOrganizationServiceAbstraction } from "../../../admin-console/abstractions/organization/organization.service.abstraction";
@@ -23,10 +25,12 @@ import { MessagingService } from "../../../platform/abstractions/messaging.servi
import { StateService } from "../../../platform/abstractions/state.service";
import { sequentialize } from "../../../platform/misc/sequentialize";
import { AccountDecryptionOptions } from "../../../platform/models/domain/account";
import { KeyDefinition, StateProvider, SYNC_STATE } from "../../../platform/state";
import { SendData } from "../../../tools/send/models/data/send.data";
import { SendResponse } from "../../../tools/send/models/response/send.response";
import { SendApiService } from "../../../tools/send/services/send-api.service.abstraction";
import { InternalSendService } from "../../../tools/send/services/send.service.abstraction";
import { UserId } from "../../../types/guid";
import { CipherService } from "../../../vault/abstractions/cipher.service";
import { FolderApiServiceAbstraction } from "../../../vault/abstractions/folder/folder-api.service.abstraction";
import { InternalFolderService } from "../../../vault/abstractions/folder/folder.service.abstraction";
@@ -39,8 +43,22 @@ import { CollectionService } from "../../abstractions/collection.service";
import { CollectionData } from "../../models/data/collection.data";
import { CollectionDetailsResponse } from "../../models/response/collection.response";
const LAST_SYNC_KEY = new KeyDefinition<string | null>(SYNC_STATE, "lastSync", {
deserializer: (value) => value,
});
export class SyncService implements SyncServiceAbstraction {
private lastSyncState = this.stateProvider.getActive(LAST_SYNC_KEY);
syncInProgress = false;
lastSync$ = this.lastSyncState.state$.pipe(
map((value) => {
if (value == null) {
return null;
}
return new Date(value);
}),
);
constructor(
private apiService: ApiService,
@@ -59,24 +77,20 @@ export class SyncService implements SyncServiceAbstraction {
private folderApiService: FolderApiServiceAbstraction,
private organizationService: InternalOrganizationServiceAbstraction,
private sendApiService: SendApiService,
private stateProvider: StateProvider,
private logoutCallback: (expired: boolean) => Promise<void>,
) {}
async getLastSync(): Promise<Date> {
if ((await this.stateService.getUserId()) == null) {
return null;
}
const lastSync = await this.stateService.getLastSync();
if (lastSync) {
return new Date(lastSync);
}
return null;
async getLastSync(): Promise<Date | null> {
return await firstValueFrom(this.lastSync$);
}
async setLastSync(date: Date, userId?: string): Promise<any> {
await this.stateService.setLastSync(date.toJSON(), { userId: userId });
async setLastSync(date: Date, userId?: UserId): Promise<any> {
if (userId !== undefined) {
await this.stateProvider.getUser(userId, LAST_SYNC_KEY).update(() => date.toJSON());
} else {
await this.lastSyncState.update(() => date.toJSON());
}
}
@sequentialize(() => "fullSync")