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

[PM-8748] Make 5 Seconds the Max we wait for a sync to complete on unlock (#11882)

Browse Source 
* Make 5 Seconds the Max we wait for a sync to complete on unlock

* Move Comment

---------

Co-authored-by: Matt Bishop <mbishop@bitwarden.com>
This commit is contained in:
Justin Baur 2024-11-19 09:06:29 -05:00 committed by GitHub
parent ce042d4ad0
commit 8823c7b0b2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/angular/src/auth/components/lock.component.ts
View File

@ -22,6 +22,7 @@ import {
MasterPasswordVerification, MasterPasswordVerification,
MasterPasswordVerificationResponse, MasterPasswordVerificationResponse,
} from "@bitwarden/common/auth/types/verification"; } from "@bitwarden/common/auth/types/verification";
import { ClientType } from "@bitwarden/common/enums";
import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
@ -318,7 +319,24 @@ export class LockComponent implements OnInit, OnDestroy {
} }
// Vault can be de-synced since notifications get ignored while locked. Need to check whether sync is required using the sync service. // Vault can be de-synced since notifications get ignored while locked. Need to check whether sync is required using the sync service.
await this.syncService.fullSync(false); const clientType = this.platformUtilsService.getClientType();
if (clientType === ClientType.Browser || clientType === ClientType.Desktop) {
// Desktop and Browser have better offline support and to facilitate this we don't make the user wait for what
// could be an HTTP Timeout because their server is unreachable.
await Promise.race([
this.syncService
.fullSync(false)
.catch((err) => this.logService.error("Error during unlock sync", err)),
new Promise<void>((resolve) =>
setTimeout(() => {
this.logService.warning("Skipping sync wait, continuing to unlock.");
resolve();
}, 5_000),
),
]);
} else {
await this.syncService.fullSync(false);
}
if (this.onSuccessfulSubmit != null) { if (this.onSuccessfulSubmit != null) {
await this.onSuccessfulSubmit(); await this.onSuccessfulSubmit();