From 532d3eaefc9f610d481ef9413ef891e1181086e9 Mon Sep 17 00:00:00 2001 From: rr-bw <102181210+rr-bw@users.noreply.github.com> Date: Fri, 13 Sep 2024 14:49:52 -0700 Subject: [PATCH] change old components to V1 --- apps/browser/src/auth/popup/login.component.ts | 4 ++-- apps/browser/src/popup/app-routing.module.ts | 4 ++-- apps/browser/src/popup/app.module.ts | 4 ++-- apps/desktop/src/app/app-routing.module.ts | 6 +++--- apps/desktop/src/auth/login/login.component.ts | 4 ++-- apps/desktop/src/auth/login/login.module.ts | 6 +++--- apps/web/src/app/auth/login/login.component.ts | 4 ++-- apps/web/src/app/auth/login/login.module.ts | 6 +++--- apps/web/src/app/oss-routing.module.ts | 4 ++-- libs/angular/src/auth/components/login.component.ts | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/apps/browser/src/auth/popup/login.component.ts b/apps/browser/src/auth/popup/login.component.ts index ea72fb61f5f..cd8e07ab7c2 100644 --- a/apps/browser/src/auth/popup/login.component.ts +++ b/apps/browser/src/auth/popup/login.component.ts @@ -3,7 +3,7 @@ import { FormBuilder } from "@angular/forms"; import { ActivatedRoute, Router } from "@angular/router"; import { firstValueFrom } from "rxjs"; -import { LoginComponent as BaseLoginComponent } from "@bitwarden/angular/auth/components/login.component"; +import { LoginComponentV1 as BaseLoginComponent } from "@bitwarden/angular/auth/components/login.component"; import { FormValidationErrorsService } from "@bitwarden/angular/platform/abstractions/form-validation-errors.service"; import { LoginStrategyServiceAbstraction, @@ -31,7 +31,7 @@ import { flagEnabled } from "../../platform/flags"; selector: "app-login", templateUrl: "login.component.html", }) -export class LoginComponent extends BaseLoginComponent implements OnInit { +export class LoginComponentV1 extends BaseLoginComponent implements OnInit { showPasswordless = false; constructor( devicesApiService: DevicesApiServiceAbstraction, diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts index b8bdb19aeb8..8102221b633 100644 --- a/apps/browser/src/popup/app-routing.module.ts +++ b/apps/browser/src/popup/app-routing.module.ts @@ -39,7 +39,7 @@ import { HomeComponent } from "../auth/popup/home.component"; import { LockComponent } from "../auth/popup/lock.component"; import { LoginDecryptionOptionsComponent } from "../auth/popup/login-decryption-options/login-decryption-options.component"; import { LoginViaAuthRequestComponent } from "../auth/popup/login-via-auth-request.component"; -import { LoginComponent } from "../auth/popup/login.component"; +import { LoginComponentV1 } from "../auth/popup/login.component"; import { RegisterComponent } from "../auth/popup/register.component"; import { RemovePasswordComponent } from "../auth/popup/remove-password.component"; import { SetPasswordComponent } from "../auth/popup/set-password.component"; @@ -416,7 +416,7 @@ const routes: Routes = [ }, ), ...unauthUiRefreshSwap( - LoginComponent, + LoginComponentV1, ExtensionAnonLayoutWrapperComponent, { path: "login", diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts index f14dafacb70..80391fd2a05 100644 --- a/apps/browser/src/popup/app.module.ts +++ b/apps/browser/src/popup/app.module.ts @@ -26,7 +26,7 @@ import { HomeComponent } from "../auth/popup/home.component"; import { LockComponent } from "../auth/popup/lock.component"; import { LoginDecryptionOptionsComponent } from "../auth/popup/login-decryption-options/login-decryption-options.component"; import { LoginViaAuthRequestComponent } from "../auth/popup/login-via-auth-request.component"; -import { LoginComponent } from "../auth/popup/login.component"; +import { LoginComponentV1 } from "../auth/popup/login.component"; import { RegisterComponent } from "../auth/popup/register.component"; import { RemovePasswordComponent } from "../auth/popup/remove-password.component"; import { SetPasswordComponent } from "../auth/popup/set-password.component"; @@ -156,7 +156,7 @@ import "../platform/popup/locales"; HintComponent, HomeComponent, LockComponent, - LoginComponent, + LoginComponentV1, LoginViaAuthRequestComponent, LoginDecryptionOptionsComponent, NotificationsSettingsV1Component, diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts index fe6bfe41eb9..9e483d9552f 100644 --- a/apps/desktop/src/app/app-routing.module.ts +++ b/apps/desktop/src/app/app-routing.module.ts @@ -33,7 +33,7 @@ import { HintComponent } from "../auth/hint.component"; import { LockComponent } from "../auth/lock.component"; import { LoginDecryptionOptionsComponent } from "../auth/login/login-decryption-options/login-decryption-options.component"; import { LoginViaAuthRequestComponent } from "../auth/login/login-via-auth-request.component"; -import { LoginComponent } from "../auth/login/login.component"; +import { LoginComponentV1 } from "../auth/login/login.component"; import { RegisterComponent } from "../auth/register.component"; import { RemovePasswordComponent } from "../auth/remove-password.component"; import { SetPasswordComponent } from "../auth/set-password.component"; @@ -149,11 +149,11 @@ const routes: Routes = [ }, ), ...unauthUiRefreshSwap( - LoginComponent, + LoginComponentV1, AnonLayoutWrapperComponent, { path: "login", - component: LoginComponent, + component: LoginComponentV1, canActivate: [maxAccountsGuardFn()], }, { diff --git a/apps/desktop/src/auth/login/login.component.ts b/apps/desktop/src/auth/login/login.component.ts index 2b5910baa96..1cde6414704 100644 --- a/apps/desktop/src/auth/login/login.component.ts +++ b/apps/desktop/src/auth/login/login.component.ts @@ -3,7 +3,7 @@ import { FormBuilder } from "@angular/forms"; import { ActivatedRoute, Router } from "@angular/router"; import { Subject, takeUntil } from "rxjs"; -import { LoginComponent as BaseLoginComponent } from "@bitwarden/angular/auth/components/login.component"; +import { LoginComponentV1 as BaseLoginComponent } from "@bitwarden/angular/auth/components/login.component"; import { FormValidationErrorsService } from "@bitwarden/angular/platform/abstractions/form-validation-errors.service"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { @@ -36,7 +36,7 @@ const BroadcasterSubscriptionId = "LoginComponent"; selector: "app-login", templateUrl: "login.component.html", }) -export class LoginComponent extends BaseLoginComponent implements OnInit, OnDestroy { +export class LoginComponentV1 extends BaseLoginComponent implements OnInit, OnDestroy { @ViewChild("environment", { read: ViewContainerRef, static: true }) environmentModal: ViewContainerRef; diff --git a/apps/desktop/src/auth/login/login.module.ts b/apps/desktop/src/auth/login/login.module.ts index 1b926e57af5..6a4affdfd2b 100644 --- a/apps/desktop/src/auth/login/login.module.ts +++ b/apps/desktop/src/auth/login/login.module.ts @@ -7,16 +7,16 @@ import { SharedModule } from "../../app/shared/shared.module"; import { LoginDecryptionOptionsComponent } from "./login-decryption-options/login-decryption-options.component"; import { LoginViaAuthRequestComponent } from "./login-via-auth-request.component"; -import { LoginComponent } from "./login.component"; +import { LoginComponentV1 } from "./login.component"; @NgModule({ imports: [SharedModule, RouterModule], declarations: [ - LoginComponent, + LoginComponentV1, LoginViaAuthRequestComponent, EnvironmentSelectorComponent, LoginDecryptionOptionsComponent, ], - exports: [LoginComponent, LoginViaAuthRequestComponent], + exports: [LoginComponentV1, LoginViaAuthRequestComponent], }) export class LoginModule {} diff --git a/apps/web/src/app/auth/login/login.component.ts b/apps/web/src/app/auth/login/login.component.ts index 653782d3de9..954fe5e9881 100644 --- a/apps/web/src/app/auth/login/login.component.ts +++ b/apps/web/src/app/auth/login/login.component.ts @@ -4,7 +4,7 @@ import { ActivatedRoute, Router } from "@angular/router"; import { firstValueFrom, takeUntil } from "rxjs"; import { first } from "rxjs/operators"; -import { LoginComponent as BaseLoginComponent } from "@bitwarden/angular/auth/components/login.component"; +import { LoginComponentV1 as BaseLoginComponent } from "@bitwarden/angular/auth/components/login.component"; import { FormValidationErrorsService } from "@bitwarden/angular/platform/abstractions/form-validation-errors.service"; import { LoginStrategyServiceAbstraction, @@ -42,7 +42,7 @@ import { OrganizationInvite } from "../organization-invite/organization-invite"; templateUrl: "login.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil -export class LoginComponent extends BaseLoginComponent implements OnInit { +export class LoginComponentV1 extends BaseLoginComponent implements OnInit { showResetPasswordAutoEnrollWarning = false; enforcedPasswordPolicyOptions: MasterPasswordPolicyOptions; policies: Policy[]; diff --git a/apps/web/src/app/auth/login/login.module.ts b/apps/web/src/app/auth/login/login.module.ts index ee3af10109a..d1374530339 100644 --- a/apps/web/src/app/auth/login/login.module.ts +++ b/apps/web/src/app/auth/login/login.module.ts @@ -7,18 +7,18 @@ import { SharedModule } from "../../../app/shared"; import { LoginDecryptionOptionsComponent } from "./login-decryption-options/login-decryption-options.component"; import { LoginViaAuthRequestComponent } from "./login-via-auth-request.component"; import { LoginViaWebAuthnComponent } from "./login-via-webauthn/login-via-webauthn.component"; -import { LoginComponent } from "./login.component"; +import { LoginComponentV1 } from "./login.component"; @NgModule({ imports: [SharedModule, CheckboxModule], declarations: [ - LoginComponent, + LoginComponentV1, LoginViaAuthRequestComponent, LoginDecryptionOptionsComponent, LoginViaWebAuthnComponent, ], exports: [ - LoginComponent, + LoginComponentV1, LoginViaAuthRequestComponent, LoginDecryptionOptionsComponent, LoginViaWebAuthnComponent, diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index e8f9b12c2de..90d87dfb4ce 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -41,7 +41,7 @@ import { LockComponent } from "./auth/lock.component"; import { LoginDecryptionOptionsComponent } from "./auth/login/login-decryption-options/login-decryption-options.component"; import { LoginViaAuthRequestComponent } from "./auth/login/login-via-auth-request.component"; import { LoginViaWebAuthnComponent } from "./auth/login/login-via-webauthn/login-via-webauthn.component"; -import { LoginComponent } from "./auth/login/login.component"; +import { LoginComponentV1 } from "./auth/login/login.component"; import { AcceptOrganizationComponent } from "./auth/organization-invite/accept-organization.component"; import { RecoverDeleteComponent } from "./auth/recover-delete.component"; import { RecoverTwoFactorComponent } from "./auth/recover-two-factor.component"; @@ -181,7 +181,7 @@ const routes: Routes = [ children: [ { path: "", - component: LoginComponent, + component: LoginComponentV1, }, { path: "", diff --git a/libs/angular/src/auth/components/login.component.ts b/libs/angular/src/auth/components/login.component.ts index 3d02e2cfb77..f5fc0d4288b 100644 --- a/libs/angular/src/auth/components/login.component.ts +++ b/libs/angular/src/auth/components/login.component.ts @@ -35,7 +35,7 @@ import { import { CaptchaProtectedComponent } from "./captcha-protected.component"; @Directive() -export class LoginComponent extends CaptchaProtectedComponent implements OnInit, OnDestroy { +export class LoginComponentV1 extends CaptchaProtectedComponent implements OnInit, OnDestroy { @ViewChild("masterPasswordInput", { static: true }) masterPasswordInput: ElementRef; showPassword = false;