devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

PM-7392 - Desktop AppComp - cleanup messaging

This commit is contained in:
Jared Snider 2024-05-07 18:25:39 -04:00
parent 2f414d6f72
commit 00cac8eb38
No known key found for this signature in database
GPG Key ID: A149DDD612516286
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/desktop/src/app/app.component.ts
View File

@ -26,7 +26,6 @@ import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-con
import { MasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction";
import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
import { LogoutReason } from "@bitwarden/common/auth/enums/logout-reason.enum";
import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum";
import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
@ -212,7 +211,7 @@ export class AppComponent implements OnInit, OnDestroy {
break;
case "logout":
this.loading = message.userId == null || message.userId === this.activeUserId;
await this.logOut(!!message.expired, message.userId, message.reason);
await this.logOut(!!message.expired, message.userId);
this.loading = false;
break;
case "lockVault":
@ -569,17 +568,7 @@ export class AppComponent implements OnInit, OnDestroy {
// Even though the userId parameter is no longer optional doesn't mean a message couldn't be
// passing null-ish values to us.
private async logOut(expired: boolean, userId: UserId, reason?: LogoutReason) {
if (reason) {
this.toastService.showToast({
variant: "error",
title: this.i18nService.t("loggedOut"),
message: this.i18nService.t(reason),
});
// delay the logout to allow the toast to be displayed before the process reload destroys the toast.
await new Promise((resolve) => setTimeout(resolve, 5000));
}
private async logOut(expired: boolean, userId: UserId) {
const activeUserId = await firstValueFrom(
this.accountService.activeAccount$.pipe(map((a) => a?.id)),
);