option to allow sync to throw error

bitwarden · Oct 15, 2019 · 669f6dd · 669f6dd
1 parent e35431f
commit 669f6dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/abstractions/sync.service.ts b/src/abstractions/sync.service.ts
@@ -8,7 +8,7 @@ export abstract class SyncService {
 
     getLastSync: () => Promise<Date>;
     setLastSync: (date: Date) => Promise<any>;
-    fullSync: (forceSync: boolean) => Promise<boolean>;
+    fullSync: (forceSync: boolean, allowThrowOnError?: boolean) => Promise<boolean>;
     syncUpsertFolder: (notification: SyncFolderNotification, isEdit: boolean) => Promise<boolean>;
     syncDeleteFolder: (notification: SyncFolderNotification) => Promise<boolean>;
     syncUpsertCipher: (notification: SyncCipherNotification, isEdit: boolean) => Promise<boolean>;

diff --git a/src/services/sync.service.ts b/src/services/sync.service.ts
@@ -61,7 +61,7 @@ export class SyncService implements SyncServiceAbstraction {
         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();
         const isAuthenticated = await this.userService.isAuthenticated();
         if (!isAuthenticated) {
@@ -95,7 +95,11 @@ export class SyncService implements SyncServiceAbstraction {
             await this.setLastSync(now);
             return this.syncCompleted(true);
         } catch (e) {
-            return this.syncCompleted(false);
+            if (allowThrowOnError) {
+                throw e;
+            } else {
+                return this.syncCompleted(false);
+            }
         }
     }