From db687238c3ae45a2be6278b87d7fda09a85f99d2 Mon Sep 17 00:00:00 2001 From: Andreas Coroiu Date: Fri, 5 May 2023 10:01:36 +0200 Subject: [PATCH] [PM-2135] feat: create new user-verification module --- .../src/app/components/user-verification/index.ts | 3 +++ .../user-verification-prompt.component.html | 0 .../user-verification-prompt.component.ts | 0 .../user-verification.component.html | 0 .../user-verification.component.ts | 0 .../user-verification/user-verification.module.ts | 14 ++++++++++++++ apps/web/src/app/shared/loose-components.module.ts | 8 +++----- .../app/tools/import-export/export.component.ts | 2 +- .../access/access-tokens.component.ts | 2 +- .../settings/porting/sm-export.component.ts | 2 +- 10 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 apps/web/src/app/components/user-verification/index.ts rename apps/web/src/app/components/{ => user-verification}/user-verification-prompt.component.html (100%) rename apps/web/src/app/components/{ => user-verification}/user-verification-prompt.component.ts (100%) rename apps/web/src/app/components/{ => user-verification}/user-verification.component.html (100%) rename apps/web/src/app/components/{ => user-verification}/user-verification.component.ts (100%) create mode 100644 apps/web/src/app/components/user-verification/user-verification.module.ts diff --git a/apps/web/src/app/components/user-verification/index.ts b/apps/web/src/app/components/user-verification/index.ts new file mode 100644 index 00000000000..4fde4e67a28 --- /dev/null +++ b/apps/web/src/app/components/user-verification/index.ts @@ -0,0 +1,3 @@ +export * from "./user-verification.module"; +export * from "./user-verification.component"; +export * from "./user-verification-prompt.component"; diff --git a/apps/web/src/app/components/user-verification-prompt.component.html b/apps/web/src/app/components/user-verification/user-verification-prompt.component.html similarity index 100% rename from apps/web/src/app/components/user-verification-prompt.component.html rename to apps/web/src/app/components/user-verification/user-verification-prompt.component.html diff --git a/apps/web/src/app/components/user-verification-prompt.component.ts b/apps/web/src/app/components/user-verification/user-verification-prompt.component.ts similarity index 100% rename from apps/web/src/app/components/user-verification-prompt.component.ts rename to apps/web/src/app/components/user-verification/user-verification-prompt.component.ts diff --git a/apps/web/src/app/components/user-verification.component.html b/apps/web/src/app/components/user-verification/user-verification.component.html similarity index 100% rename from apps/web/src/app/components/user-verification.component.html rename to apps/web/src/app/components/user-verification/user-verification.component.html diff --git a/apps/web/src/app/components/user-verification.component.ts b/apps/web/src/app/components/user-verification/user-verification.component.ts similarity index 100% rename from apps/web/src/app/components/user-verification.component.ts rename to apps/web/src/app/components/user-verification/user-verification.component.ts diff --git a/apps/web/src/app/components/user-verification/user-verification.module.ts b/apps/web/src/app/components/user-verification/user-verification.module.ts new file mode 100644 index 00000000000..a4dda50ecd1 --- /dev/null +++ b/apps/web/src/app/components/user-verification/user-verification.module.ts @@ -0,0 +1,14 @@ +import { NgModule } from "@angular/core"; +import { FormsModule, ReactiveFormsModule } from "@angular/forms"; + +import { SharedModule } from "../../shared/shared.module"; + +import { UserVerificationPromptComponent } from "./user-verification-prompt.component"; +import { UserVerificationComponent } from "./user-verification.component"; + +@NgModule({ + imports: [SharedModule, FormsModule, ReactiveFormsModule], + declarations: [UserVerificationComponent, UserVerificationPromptComponent], + exports: [UserVerificationComponent, UserVerificationPromptComponent], +}) +export class UserVerificationModule {} diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index a1ba393866a..55bf531ca15 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -64,8 +64,7 @@ import { TaxInfoComponent } from "../billing/settings/tax-info.component"; import { UserSubscriptionComponent } from "../billing/settings/user-subscription.component"; import { DynamicAvatarComponent } from "../components/dynamic-avatar.component"; import { SelectableAvatarComponent } from "../components/selectable-avatar.component"; -import { UserVerificationPromptComponent } from "../components/user-verification-prompt.component"; -import { UserVerificationComponent } from "../components/user-verification.component"; +import { UserVerificationModule } from "../components/user-verification"; import { FooterComponent } from "../layouts/footer.component"; import { FrontendLayoutComponent } from "../layouts/frontend-layout.component"; import { NavbarComponent } from "../layouts/navbar.component"; @@ -122,6 +121,7 @@ import { SharedModule } from "./shared.module"; ProductSwitcherModule, ChangeKdfModule, DynamicAvatarComponent, + UserVerificationModule, ], declarations: [ PremiumBadgeComponent, @@ -178,7 +178,6 @@ import { SharedModule } from "./shared.module"; GeneratorComponent, PasswordGeneratorHistoryComponent, PasswordRepromptComponent, - UserVerificationPromptComponent, PaymentComponent, PaymentMethodComponent, PreferencesComponent, @@ -224,7 +223,6 @@ import { SharedModule } from "./shared.module"; BillingHistoryViewComponent, UserLayoutComponent, UserSubscriptionComponent, - UserVerificationComponent, VaultTimeoutInputComponent, VerifyEmailComponent, VerifyEmailTokenComponent, @@ -232,6 +230,7 @@ import { SharedModule } from "./shared.module"; LowKdfComponent, ], exports: [ + UserVerificationModule, PremiumBadgeComponent, AcceptEmergencyComponent, AcceptOrganizationComponent, @@ -330,7 +329,6 @@ import { SharedModule } from "./shared.module"; BillingHistoryViewComponent, UserLayoutComponent, UserSubscriptionComponent, - UserVerificationComponent, VaultTimeoutInputComponent, VerifyEmailComponent, VerifyEmailTokenComponent, diff --git a/apps/web/src/app/tools/import-export/export.component.ts b/apps/web/src/app/tools/import-export/export.component.ts index 0b3982dcb7d..c287d4c8f95 100644 --- a/apps/web/src/app/tools/import-export/export.component.ts +++ b/apps/web/src/app/tools/import-export/export.component.ts @@ -15,7 +15,7 @@ import { PolicyService } from "@bitwarden/common/admin-console/abstractions/poli import { EncryptedExportType } from "@bitwarden/common/enums"; import { VaultExportServiceAbstraction } from "@bitwarden/exporter/vault-export"; -import { UserVerificationPromptComponent } from "../../components/user-verification-prompt.component"; +import { UserVerificationPromptComponent } from "../../components/user-verification"; @Component({ selector: "app-export", diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-tokens.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-tokens.component.ts index b9a8a88b539..e63597d6196 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-tokens.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/access-tokens.component.ts @@ -5,7 +5,7 @@ import { combineLatestWith, Observable, startWith, switchMap } from "rxjs"; import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { UserVerificationPromptComponent } from "@bitwarden/web-vault/app/components/user-verification-prompt.component"; +import { UserVerificationPromptComponent } from "@bitwarden/web-vault/app/components/user-verification"; import { AccessTokenView } from "../models/view/access-token.view"; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts index 74d90c52a6c..c65fcc0caec 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts @@ -9,7 +9,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; -import { UserVerificationPromptComponent } from "@bitwarden/web-vault/app/components/user-verification-prompt.component"; +import { UserVerificationPromptComponent } from "@bitwarden/web-vault/app/components/user-verification"; import { SecretsManagerPortingApiService } from "../services/sm-porting-api.service"; import { SecretsManagerPortingService } from "../services/sm-porting.service";