From 30f0c408b3b36e0e212b5817f4b66daaf4f06d9e Mon Sep 17 00:00:00 2001 From: Andreas Coroiu Date: Mon, 8 May 2023 09:47:32 +0200 Subject: [PATCH] [PM-2014] chore: move fido2-login-settings to auth module --- apps/web/src/app/auth/auth.module.ts | 7 +++++-- .../create-credential-dialog.component.html | 0 .../create-credential-dialog.component.ts | 4 ++-- .../create-credential-dialog/create-passkey-failed.icon.ts | 0 .../create-credential-dialog/create-passkey.icon.ts | 0 .../fido2-login-settings.component.html | 0 .../fido2-login-settings/fido2-login-settings.component.ts | 4 ++-- .../fido2-login-settings/fido2-login-settings.module.ts | 2 +- .../src/app/auth/settings/fido2-login-settings/index.ts | 1 + apps/web/src/app/shared/loose-components.module.ts | 4 ++-- 10 files changed, 13 insertions(+), 9 deletions(-) rename apps/web/src/app/{ => auth}/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.html (100%) rename apps/web/src/app/{ => auth}/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.ts (95%) rename apps/web/src/app/{ => auth}/settings/fido2-login-settings/create-credential-dialog/create-passkey-failed.icon.ts (100%) rename apps/web/src/app/{ => auth}/settings/fido2-login-settings/create-credential-dialog/create-passkey.icon.ts (100%) rename apps/web/src/app/{ => auth}/settings/fido2-login-settings/fido2-login-settings.component.html (100%) rename apps/web/src/app/{ => auth}/settings/fido2-login-settings/fido2-login-settings.component.ts (81%) rename apps/web/src/app/{ => auth}/settings/fido2-login-settings/fido2-login-settings.module.ts (89%) create mode 100644 apps/web/src/app/auth/settings/fido2-login-settings/index.ts diff --git a/apps/web/src/app/auth/auth.module.ts b/apps/web/src/app/auth/auth.module.ts index f154175e40e..ed9b388ba54 100644 --- a/apps/web/src/app/auth/auth.module.ts +++ b/apps/web/src/app/auth/auth.module.ts @@ -1,11 +1,14 @@ import { NgModule } from "@angular/core"; import { CoreAuthModule } from "./core/core.module"; +import { Fido2LoginSettingsModule } from "./settings/fido2-login-settings"; @NgModule({ - imports: [CoreAuthModule], + imports: [CoreAuthModule, Fido2LoginSettingsModule], declarations: [], providers: [], - exports: [], + exports: [ + Fido2LoginSettingsModule, // TODO: Remove when `app/settings/change-password.component.ts` has been moved to `app/auth/settings/.` + ], }) export class AuthModule {} diff --git a/apps/web/src/app/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.html b/apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.html similarity index 100% rename from apps/web/src/app/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.html rename to apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.html diff --git a/apps/web/src/app/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.ts b/apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.ts similarity index 95% rename from apps/web/src/app/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.ts rename to apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.ts index d959de1ebb9..64d5636f682 100644 --- a/apps/web/src/app/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.ts +++ b/apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-credential-dialog.component.ts @@ -2,7 +2,7 @@ import { DialogConfig, DialogRef } from "@angular/cdk/dialog"; import { Component } from "@angular/core"; import { FormBuilder, Validators } from "@angular/forms"; -import { DialogService } from "@bitwarden/components"; +import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { CreatePasskeyFailedIcon } from "./create-passkey-failed.icon"; import { CreatePasskeyIcon } from "./create-passkey.icon"; @@ -82,7 +82,7 @@ export class CreateCredentialDialogComponent { * @param config Configuration for the dialog */ export const openCreateCredentialDialog = ( - dialogService: DialogService, + dialogService: DialogServiceAbstraction, config: DialogConfig ) => { return dialogService.open( diff --git a/apps/web/src/app/settings/fido2-login-settings/create-credential-dialog/create-passkey-failed.icon.ts b/apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-passkey-failed.icon.ts similarity index 100% rename from apps/web/src/app/settings/fido2-login-settings/create-credential-dialog/create-passkey-failed.icon.ts rename to apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-passkey-failed.icon.ts diff --git a/apps/web/src/app/settings/fido2-login-settings/create-credential-dialog/create-passkey.icon.ts b/apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-passkey.icon.ts similarity index 100% rename from apps/web/src/app/settings/fido2-login-settings/create-credential-dialog/create-passkey.icon.ts rename to apps/web/src/app/auth/settings/fido2-login-settings/create-credential-dialog/create-passkey.icon.ts diff --git a/apps/web/src/app/settings/fido2-login-settings/fido2-login-settings.component.html b/apps/web/src/app/auth/settings/fido2-login-settings/fido2-login-settings.component.html similarity index 100% rename from apps/web/src/app/settings/fido2-login-settings/fido2-login-settings.component.html rename to apps/web/src/app/auth/settings/fido2-login-settings/fido2-login-settings.component.html diff --git a/apps/web/src/app/settings/fido2-login-settings/fido2-login-settings.component.ts b/apps/web/src/app/auth/settings/fido2-login-settings/fido2-login-settings.component.ts similarity index 81% rename from apps/web/src/app/settings/fido2-login-settings/fido2-login-settings.component.ts rename to apps/web/src/app/auth/settings/fido2-login-settings/fido2-login-settings.component.ts index 7b05f56975e..012dd42db69 100644 --- a/apps/web/src/app/settings/fido2-login-settings/fido2-login-settings.component.ts +++ b/apps/web/src/app/auth/settings/fido2-login-settings/fido2-login-settings.component.ts @@ -1,7 +1,7 @@ import { Component } from "@angular/core"; import { firstValueFrom } from "rxjs"; -import { DialogService } from "@bitwarden/components"; +import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { CreateCredentialDialogResult, @@ -13,7 +13,7 @@ import { templateUrl: "fido2-login-settings.component.html", }) export class Fido2LoginSettingsComponent { - constructor(private dialogService: DialogService) {} + constructor(private dialogService: DialogServiceAbstraction) {} protected async createCredential() { const dialogRef = openCreateCredentialDialog(this.dialogService, {}); diff --git a/apps/web/src/app/settings/fido2-login-settings/fido2-login-settings.module.ts b/apps/web/src/app/auth/settings/fido2-login-settings/fido2-login-settings.module.ts similarity index 89% rename from apps/web/src/app/settings/fido2-login-settings/fido2-login-settings.module.ts rename to apps/web/src/app/auth/settings/fido2-login-settings/fido2-login-settings.module.ts index 76d6cb23418..e6325415d9d 100644 --- a/apps/web/src/app/settings/fido2-login-settings/fido2-login-settings.module.ts +++ b/apps/web/src/app/auth/settings/fido2-login-settings/fido2-login-settings.module.ts @@ -1,7 +1,7 @@ import { NgModule } from "@angular/core"; import { FormsModule, ReactiveFormsModule } from "@angular/forms"; -import { SharedModule } from "../../shared/shared.module"; +import { SharedModule } from "../../../shared/shared.module"; import { CreateCredentialDialogComponent } from "./create-credential-dialog/create-credential-dialog.component"; import { Fido2LoginSettingsComponent } from "./fido2-login-settings.component"; diff --git a/apps/web/src/app/auth/settings/fido2-login-settings/index.ts b/apps/web/src/app/auth/settings/fido2-login-settings/index.ts new file mode 100644 index 00000000000..76941437654 --- /dev/null +++ b/apps/web/src/app/auth/settings/fido2-login-settings/index.ts @@ -0,0 +1 @@ +export * from "./fido2-login-settings.module"; diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index d6857fc2b65..df080bc71b2 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -35,6 +35,7 @@ import { EmergencyAccessTakeoverComponent } from "../auth/settings/emergency-acc import { EmergencyAccessViewComponent } from "../auth/settings/emergency-access/emergency-access-view.component"; import { EmergencyAccessComponent } from "../auth/settings/emergency-access/emergency-access.component"; import { EmergencyAddEditComponent } from "../auth/settings/emergency-access/emergency-add-edit.component"; +import { Fido2LoginSettingsModule } from "../auth/settings/fido2-login-settings"; import { TwoFactorAuthenticatorComponent } from "../auth/settings/two-factor-authenticator.component"; import { TwoFactorDuoComponent } from "../auth/settings/two-factor-duo.component"; import { TwoFactorEmailComponent } from "../auth/settings/two-factor-email.component"; @@ -80,7 +81,6 @@ import { ChangeKdfModule } from "../settings/change-kdf/change-kdf.module"; import { ChangePasswordComponent } from "../settings/change-password.component"; import { DeleteAccountComponent } from "../settings/delete-account.component"; import { DomainRulesComponent } from "../settings/domain-rules.component"; -import { Fido2LoginSettingsModule } from "../settings/fido2-login-settings/fido2-login-settings.module"; import { LowKdfComponent } from "../settings/low-kdf.component"; import { PreferencesComponent } from "../settings/preferences.component"; import { PremiumComponent } from "../settings/premium.component"; @@ -123,7 +123,7 @@ import { SharedModule } from "./shared.module"; ProductSwitcherModule, ChangeKdfModule, DynamicAvatarComponent, - Fido2LoginSettingsModule, // TODO: Move to AuthModule when it is created + Fido2LoginSettingsModule, // TODO: Remove when `app/settings/change-password.component.ts` has been moved to `app/auth/settings/.` ], declarations: [ PremiumBadgeComponent,