bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-01-31 16:53:27 +00:00
Code Issues Releases Wiki Activity

remove messaging service

Browse Source
This commit is contained in:
William Martin
2025-11-25 09:04:34 -05:00
parent 704919005b
commit 3c0aa05e6b
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/web/src/app/layouts/header/account-menu.component.html
View File

@@ -1,11 +1,10 @@
@let account = account$ | async;
@if (account) {
@if (account()) {
<button
type="button"
[bitMenuTriggerFor]="accountMenu"
class="tw-border-0 tw-bg-transparent tw-p-0 tw-shrink-0"
>
<dynamic-avatar [id]="account.id" [text]="account | userName"></dynamic-avatar>
<dynamic-avatar [id]="account().id" [text]="account() | userName"></dynamic-avatar>
</button>
<bit-menu #accountMenu>
@@ -14,11 +13,11 @@
class="tw-flex tw-items-center tw-px-4 tw-py-1 tw-leading-tight tw-text-muted"
appStopProp
>
<dynamic-avatar [id]="account.id" [text]="account | userName"></dynamic-avatar>
<dynamic-avatar [id]="account().id" [text]="account() | userName"></dynamic-avatar>
<div class="tw-ml-2 tw-block tw-overflow-hidden tw-whitespace-nowrap">
<span>{{ "loggedInAs" | i18n }}</span>
<small class="tw-block tw-overflow-hidden tw-whitespace-nowrap">
{{ account | userName }}
{{ account() | userName }}
</small>
</div>
</div>

25
apps/web/src/app/layouts/header/account-menu.component.ts
View File

@@ -1,12 +1,13 @@
import { ChangeDetectionStrategy, Component, inject } from "@angular/core";
import { toSignal } from "@angular/core/rxjs-interop";
import { map, Observable } from "rxjs";
import { Account, AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { LockService, LogoutService } from "@bitwarden/auth/common";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import {
VaultTimeoutAction,
VaultTimeoutSettingsService,
} from "@bitwarden/common/key-management/vault-timeout";
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
import { DynamicAvatarComponent } from "../../components/dynamic-avatar.component";
@@ -21,21 +22,29 @@ import { SharedModule } from "../../shared";
export class AccountMenuComponent {
private readonly platformUtilsService = inject(PlatformUtilsService);
private readonly vaultTimeoutSettingsService = inject(VaultTimeoutSettingsService);
private readonly messagingService = inject(MessagingService);
private readonly accountService = inject(AccountService);
private readonly logoutService = inject(LogoutService);
private readonly lockService = inject(LockService);
protected readonly account = toSignal(this.accountService.activeAccount$);
protected readonly account$: Observable<Account | null> = this.accountService.activeAccount$;
protected readonly canLock$: Observable<boolean> = this.vaultTimeoutSettingsService
.availableVaultTimeoutActions$()
.pipe(map((actions) => actions.includes(VaultTimeoutAction.Lock)));
protected readonly selfHosted = this.platformUtilsService.isSelfHost();
protected readonly hostname = globalThis.location.hostname;
protected lock() {
this.messagingService.send("lockVault");
protected async lock() {
const userId = this.account()?.id;
if (userId) {
await this.lockService.lock(userId);
}
}
protected logout() {
this.messagingService.send("logout");
protected async logout() {
const userId = this.account()?.id;
if (userId) {
await this.logoutService.logout(userId);
}
}
}