mirror of
https://github.com/bitwarden/browser
synced 2025-12-20 02:03:39 +00:00
refactor(auth): [PM-9722] remove deprecated LoginDecryptionOptionsComponent
- Remove LoginDecryptionOptionsComponentV1 - Clean up orphaned translation messages - Remove unused styles - Clean up related dependencies Closes PM-9722
This commit is contained in:
Alec Rippberger
GitHub
@@ -3302,12 +3302,6 @@
|
||||
"loginWithMasterPassword": {
|
||||
"message": "Log in with master password"
|
||||
},
|
||||
"loggingInAs": {
|
||||
"message": "Logging in as"
|
||||
},
|
||||
"notYou": {
|
||||
"message": "Not you?"
|
||||
},
|
||||
"newAroundHere": {
|
||||
"message": "New around here?"
|
||||
},
|
||||
@@ -3470,9 +3464,6 @@
|
||||
"requestAdminApproval": {
|
||||
"message": "Request admin approval"
|
||||
},
|
||||
"approveWithMasterPassword": {
|
||||
"message": "Approve with master password"
|
||||
},
|
||||
"ssoIdentifierRequired": {
|
||||
"message": "Organization SSO identifier is required."
|
||||
},
|
||||
|
||||
@@ -1,111 +0,0 @@
|
||||
<div id="login-initiated">
|
||||
<app-header>
|
||||
<div class="left">
|
||||
<app-pop-out></app-pop-out>
|
||||
</div>
|
||||
<h1 class="center">
|
||||
<span class="title">{{ "loginInitiated" | i18n }}</span>
|
||||
</h1>
|
||||
<div class="right"></div>
|
||||
</app-header>
|
||||
<div class="content login-page">
|
||||
<div class="full-loading-spinner" *ngIf="loading">
|
||||
<i class="bwi bwi-spinner bwi-spin bwi-3x" aria-hidden="true"></i>
|
||||
</div>
|
||||
|
||||
<ng-container *ngIf="!loading">
|
||||
<ng-container *ngIf="data.state == State.ExistingUserUntrustedDevice">
|
||||
<div class="standard-x-margin">
|
||||
<p class="lead">{{ "loginInitiated" | i18n }}</p>
|
||||
<h6 class="mb-20px">{{ "deviceApprovalRequired" | i18n }}</h6>
|
||||
</div>
|
||||
|
||||
<form
|
||||
id="rememberDeviceForm"
|
||||
class="mb-20px standard-x-margin"
|
||||
[formGroup]="rememberDeviceForm"
|
||||
>
|
||||
<div>
|
||||
<input
|
||||
type="checkbox"
|
||||
id="rememberDevice"
|
||||
name="rememberDevice"
|
||||
formControlName="rememberDevice"
|
||||
/>
|
||||
<label for="rememberDevice">
|
||||
{{ "rememberThisDevice" | i18n }}
|
||||
</label>
|
||||
<p id="rememberThisDeviceHintText">{{ "uncheckIfPublicDevice" | i18n }}</p>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<div class="box mb-20px">
|
||||
<button
|
||||
*ngIf="data.showApproveFromOtherDeviceBtn"
|
||||
(click)="approveFromOtherDevice()"
|
||||
type="button"
|
||||
class="btn primary block"
|
||||
>
|
||||
<b>{{ "approveFromYourOtherDevice" | i18n }}</b>
|
||||
</button>
|
||||
<button
|
||||
*ngIf="data.showReqAdminApprovalBtn"
|
||||
(click)="requestAdminApproval()"
|
||||
type="button"
|
||||
class="btn block btn-top-margin"
|
||||
>
|
||||
{{ "requestAdminApproval" | i18n }}
|
||||
</button>
|
||||
<button
|
||||
*ngIf="data.showApproveWithMasterPasswordBtn"
|
||||
type="button"
|
||||
class="btn block btn-top-margin"
|
||||
(click)="approveWithMasterPassword()"
|
||||
>
|
||||
{{ "approveWithMasterPassword" | i18n }}
|
||||
</button>
|
||||
</div>
|
||||
</ng-container>
|
||||
|
||||
<ng-container *ngIf="data.state == State.NewUser">
|
||||
<div class="standard-x-margin">
|
||||
<p class="lead">{{ "loginInitiated" | i18n }}</p>
|
||||
</div>
|
||||
|
||||
<form
|
||||
id="rememberDeviceForm"
|
||||
class="mb-20px standard-x-margin"
|
||||
[formGroup]="rememberDeviceForm"
|
||||
>
|
||||
<div>
|
||||
<input
|
||||
type="checkbox"
|
||||
id="rememberDevice"
|
||||
name="rememberDevice"
|
||||
formControlName="rememberDevice"
|
||||
/>
|
||||
<label for="rememberDevice">
|
||||
{{ "rememberThisDevice" | i18n }}
|
||||
</label>
|
||||
<p id="rememberThisDeviceHintText">{{ "uncheckIfPublicDevice" | i18n }}</p>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<div class="box mb-20px">
|
||||
<button (click)="createUser()" type="button" class="btn primary block">
|
||||
<b>{{ "continue" | i18n }}</b>
|
||||
</button>
|
||||
</div>
|
||||
</ng-container>
|
||||
|
||||
<hr class="muted-hr mx-5px mb-20px" />
|
||||
|
||||
<div class="small mx-5px">
|
||||
<p class="no-margin">{{ "loggingInAs" | i18n }} {{ data.userEmail }}</p>
|
||||
<a tabindex="0" role="button" style="cursor: pointer" (click)="logOut()">{{
|
||||
"notYou" | i18n
|
||||
}}</a>
|
||||
</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,39 +0,0 @@
|
||||
import { Component } from "@angular/core";
|
||||
import { firstValueFrom } from "rxjs";
|
||||
|
||||
import { BaseLoginDecryptionOptionsComponentV1 } from "@bitwarden/angular/auth/components/base-login-decryption-options-v1.component";
|
||||
|
||||
import { postLogoutMessageListener$ } from "../utils/post-logout-message-listener";
|
||||
|
||||
@Component({
|
||||
selector: "browser-login-decryption-options",
|
||||
templateUrl: "login-decryption-options-v1.component.html",
|
||||
})
|
||||
export class LoginDecryptionOptionsComponentV1 extends BaseLoginDecryptionOptionsComponentV1 {
|
||||
override async createUser(): Promise<void> {
|
||||
try {
|
||||
await super.createUser();
|
||||
await this.router.navigate(["/tabs/vault"]);
|
||||
} catch (error) {
|
||||
this.validationService.showError(error);
|
||||
}
|
||||
}
|
||||
|
||||
override async logOut(): Promise<void> {
|
||||
// start listening for "switchAccountFinish" or "doneLoggingOut"
|
||||
const messagePromise = firstValueFrom(postLogoutMessageListener$);
|
||||
super.logOut();
|
||||
// wait for messages
|
||||
const command = await messagePromise;
|
||||
|
||||
// We should be routed/routing very soon but just in case, turn loading back off.
|
||||
this.loading = false;
|
||||
|
||||
// doneLoggingOut already has a message handler that will navigate us
|
||||
if (command === "switchAccountFinish") {
|
||||
// FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
|
||||
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
||||
this.router.navigate(["/"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -20,7 +20,6 @@ import { AvatarModule, ButtonModule, FormFieldModule, ToastModule } from "@bitwa
|
||||
import { AccountComponent } from "../auth/popup/account-switching/account.component";
|
||||
import { CurrentAccountComponent } from "../auth/popup/account-switching/current-account.component";
|
||||
import { ExtensionAnonLayoutWrapperComponent } from "../auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component";
|
||||
import { LoginDecryptionOptionsComponentV1 } from "../auth/popup/login-decryption-options/login-decryption-options-v1.component";
|
||||
import { RemovePasswordComponent } from "../auth/popup/remove-password.component";
|
||||
import { SetPasswordComponent } from "../auth/popup/set-password.component";
|
||||
import { AccountSecurityComponent } from "../auth/popup/settings/account-security.component";
|
||||
@@ -91,7 +90,6 @@ import "../platform/popup/locales";
|
||||
AppComponent,
|
||||
ColorPasswordPipe,
|
||||
ColorPasswordCountPipe,
|
||||
LoginDecryptionOptionsComponentV1,
|
||||
SetPasswordComponent,
|
||||
SsoComponentV1,
|
||||
TabsV2Component,
|
||||
|
||||
@@ -447,37 +447,3 @@ main:not(popup-page main) {
|
||||
.cdk-virtual-scroll-content-wrapper {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#login-initiated {
|
||||
.margin-auto {
|
||||
margin: auto;
|
||||
}
|
||||
.mb-20px {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.mx-5px {
|
||||
margin-left: 5px !important;
|
||||
margin-right: 5px !important;
|
||||
}
|
||||
|
||||
.muted-hr {
|
||||
margin-top: 1rem;
|
||||
margin-bottom: 1rem;
|
||||
border-top: 1px solid rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.standard-x-margin {
|
||||
margin-left: 5px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
.btn-top-margin {
|
||||
margin-top: 12px;
|
||||
}
|
||||
|
||||
#rememberThisDeviceHintText {
|
||||
font-size: $font-size-small;
|
||||
color: $text-muted;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user