Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove lock and logout settings from Safari Account Settings #12699

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+1 −17
Open

Remove lock and logout settings from Safari Account Settings #12699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8700c3
Removed lock and logout buttons from account security page.
trmartin4 Dec 13, 2024
3c57cf0
Merge branch 'main' into auth/pm-15529/remove-lock-logout-account-set…
trmartin4 Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions apps/browser/src/auth/popup/settings/account-security.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,18 +106,6 @@ <h2 bitTypography="h6">{{ "otherOptions" | i18n }}</h2>
<i slot="end" class="bwi bwi-external-link" aria-hidden="true"></i>
</button>
</bit-item>
<bit-item
*ngIf="
!accountSwitcherEnabled && availableVaultTimeoutActions.includes(VaultTimeoutAction.Lock)
"
>
<button bit-item-content type="button" appStopClick (click)="lock()"></button>
{{ "lockNow" | i18n }}
</bit-item>
<bit-item *ngIf="!accountSwitcherEnabled">
<button bit-item-content type="button" appStopClick (click)="logOut()"></button>
{{ "logOut" | i18n }}
</bit-item>
</bit-section>
</div>
</popup-page>
6 changes: 1 addition & 5 deletions apps/browser/src/auth/popup/settings/account-security.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ import { KeyService, BiometricsService, BiometricStateService } from "@bitwarden

import { BiometricErrors, BiometricErrorTypes } from "../../../models/biometricErrors";
import { BrowserApi } from "../../../platform/browser/browser-api";
import { enableAccountSwitching } from "../../../platform/flags";
import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils";
import { PopOutComponent } from "../../../platform/popup/components/pop-out.component";
import { PopupFooterComponent } from "../../../platform/popup/layout/popup-footer.component";
Expand Down Expand Up @@ -103,7 +102,6 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
hasVaultTimeoutPolicy = false;
supportsBiometric: boolean;
showChangeMasterPass = true;
accountSwitcherEnabled = false;

form = this.formBuilder.group({
vaultTimeout: [null as VaultTimeout | null],
Expand Down Expand Up @@ -136,9 +134,7 @@ export class AccountSecurityComponent implements OnInit, OnDestroy {
private biometricStateService: BiometricStateService,
private toastService: ToastService,
private biometricsService: BiometricsService,
) {
this.accountSwitcherEnabled = enableAccountSwitching();
}
) {}

async ngOnInit() {
const hasMasterPassword = await this.userVerificationService.hasMasterPassword();
Expand Down
Loading