Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-04 18:37:45 +01:00
Code Issues Projects Releases Wiki Activity

Use page header for 2FA setup comp on org settings page to match other org settings pages but use tabbed header class on user account settings > security > Two-step login tab. (#4890)

Browse Source
This commit is contained in:
Jared Snider 2023-03-02 14:42:11 -05:00 committed by GitHub
parent f80e9cfafd
commit 65bedf8d26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/web/src/app/organizations/settings/two-factor-setup.component.ts
View File

@ -17,6 +17,7 @@ import { TwoFactorSetupComponent as BaseTwoFactorSetupComponent } from "../../..
}) })
// eslint-disable-next-line rxjs-angular/prefer-takeuntil // eslint-disable-next-line rxjs-angular/prefer-takeuntil
export class TwoFactorSetupComponent extends BaseTwoFactorSetupComponent { export class TwoFactorSetupComponent extends BaseTwoFactorSetupComponent {
tabbedHeader = false;
constructor( constructor(
apiService: ApiService, apiService: ApiService,
modalService: ModalService, modalService: ModalService,

2
apps/web/src/auth/settings/two-factor-setup.component.html
View File

@ -1,6 +1,6 @@
<!-- Please remove this disable statement when editing this file! --> <!-- Please remove this disable statement when editing this file! -->
<!-- eslint-disable @angular-eslint/template/button-has-type --> <!-- eslint-disable @angular-eslint/template/button-has-type -->
<div class="page-header"> <div [ngClass]="tabbedHeader ? 'tabbed-header' : 'page-header'">
<h1 *ngIf="!organizationId">{{ "twoStepLogin" | i18n }}</h1> <h1 *ngIf="!organizationId">{{ "twoStepLogin" | i18n }}</h1>
<h1 *ngIf="organizationId">{{ "twoStepLoginEnforcement" | i18n }}</h1> <h1 *ngIf="organizationId">{{ "twoStepLoginEnforcement" | i18n }}</h1>
</div> </div>

2
apps/web/src/auth/settings/two-factor-setup.component.ts
View File

@ -43,6 +43,8 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy {
modal: ModalRef; modal: ModalRef;
formPromise: Promise<any>; formPromise: Promise<any>;
tabbedHeader = true;
private destroy$ = new Subject<void>(); private destroy$ = new Subject<void>();
private twoFactorAuthPolicyAppliesToActiveUser: boolean; private twoFactorAuthPolicyAppliesToActiveUser: boolean;