Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-07 09:31:31 +01:00
Code Issues Projects Releases Wiki Activity

option to allow sync to throw error

Browse Source
This commit is contained in:
Kyle Spearrin 2019-10-15 11:06:55 -04:00
parent e35431f374
commit 669f6ddf93
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/abstractions/sync.service.ts
View File

@ -8,7 +8,7 @@ export abstract class SyncService {
getLastSync: () => Promise<Date>; getLastSync: () => Promise<Date>;
setLastSync: (date: Date) => Promise<any>; setLastSync: (date: Date) => Promise<any>;
fullSync: (forceSync: boolean) => Promise<boolean>; fullSync: (forceSync: boolean, allowThrowOnError?: boolean) => Promise<boolean>;
syncUpsertFolder: (notification: SyncFolderNotification, isEdit: boolean) => Promise<boolean>; syncUpsertFolder: (notification: SyncFolderNotification, isEdit: boolean) => Promise<boolean>;
syncDeleteFolder: (notification: SyncFolderNotification) => Promise<boolean>; syncDeleteFolder: (notification: SyncFolderNotification) => Promise<boolean>;
syncUpsertCipher: (notification: SyncCipherNotification, isEdit: boolean) => Promise<boolean>; syncUpsertCipher: (notification: SyncCipherNotification, isEdit: boolean) => Promise<boolean>;

8
src/services/sync.service.ts
View File

@ -61,7 +61,7 @@ export class SyncService implements SyncServiceAbstraction {
await this.storageService.save(Keys.lastSyncPrefix + userId, date.toJSON()); await this.storageService.save(Keys.lastSyncPrefix + userId, date.toJSON());
} }
async fullSync(forceSync: boolean): Promise<boolean> { async fullSync(forceSync: boolean, allowThrowOnError = false): Promise<boolean> {
this.syncStarted(); this.syncStarted();
const isAuthenticated = await this.userService.isAuthenticated(); const isAuthenticated = await this.userService.isAuthenticated();
if (!isAuthenticated) { if (!isAuthenticated) {
@ -95,7 +95,11 @@ export class SyncService implements SyncServiceAbstraction {
await this.setLastSync(now); await this.setLastSync(now);
return this.syncCompleted(true); return this.syncCompleted(true);
} catch (e) { } catch (e) {
return this.syncCompleted(false); if (allowThrowOnError) {
throw e;
} else {
return this.syncCompleted(false);
}
} }
} }