diff --git a/apps/web/src/app/components/user-verification/index.ts b/apps/web/src/app/auth/shared/components/user-verification/index.ts similarity index 100% rename from apps/web/src/app/components/user-verification/index.ts rename to apps/web/src/app/auth/shared/components/user-verification/index.ts diff --git a/apps/web/src/app/components/user-verification/user-verification-prompt.component.html b/apps/web/src/app/auth/shared/components/user-verification/user-verification-prompt.component.html similarity index 100% rename from apps/web/src/app/components/user-verification/user-verification-prompt.component.html rename to apps/web/src/app/auth/shared/components/user-verification/user-verification-prompt.component.html diff --git a/apps/web/src/app/components/user-verification/user-verification-prompt.component.ts b/apps/web/src/app/auth/shared/components/user-verification/user-verification-prompt.component.ts similarity index 95% rename from apps/web/src/app/components/user-verification/user-verification-prompt.component.ts rename to apps/web/src/app/auth/shared/components/user-verification/user-verification-prompt.component.ts index eb8d3f5caf5..b14ed7eb3e0 100644 --- a/apps/web/src/app/components/user-verification/user-verification-prompt.component.ts +++ b/apps/web/src/app/auth/shared/components/user-verification/user-verification-prompt.component.ts @@ -3,13 +3,12 @@ import { Component, Inject } from "@angular/core"; import { FormBuilder } from "@angular/forms"; import { UserVerificationPromptComponent as BaseUserVerificationPrompt } from "@bitwarden/angular/auth/components/user-verification-prompt.component"; +import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { ModalConfig } from "@bitwarden/angular/services/modal.service"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; -import { DialogServiceAbstraction } from "../../../../../../libs/angular/src/services/dialog"; - export interface UserVerificationPromptParams { confirmDescription: string; confirmButtonText: string; diff --git a/apps/web/src/app/components/user-verification/user-verification.component.html b/apps/web/src/app/auth/shared/components/user-verification/user-verification.component.html similarity index 100% rename from apps/web/src/app/components/user-verification/user-verification.component.html rename to apps/web/src/app/auth/shared/components/user-verification/user-verification.component.html diff --git a/apps/web/src/app/components/user-verification/user-verification.component.ts b/apps/web/src/app/auth/shared/components/user-verification/user-verification.component.ts similarity index 100% rename from apps/web/src/app/components/user-verification/user-verification.component.ts rename to apps/web/src/app/auth/shared/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/auth/shared/components/user-verification/user-verification.module.ts similarity index 89% rename from apps/web/src/app/components/user-verification/user-verification.module.ts rename to apps/web/src/app/auth/shared/components/user-verification/user-verification.module.ts index a4dda50ecd1..2287b76ae55 100644 --- a/apps/web/src/app/components/user-verification/user-verification.module.ts +++ b/apps/web/src/app/auth/shared/components/user-verification/user-verification.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 { UserVerificationPromptComponent } from "./user-verification-prompt.component"; import { UserVerificationComponent } from "./user-verification.component"; diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index 55bf531ca15..cba67d4655c 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -44,6 +44,7 @@ import { TwoFactorVerifyComponent } from "../auth/settings/two-factor-verify.com import { TwoFactorWebAuthnComponent } from "../auth/settings/two-factor-webauthn.component"; import { TwoFactorYubiKeyComponent } from "../auth/settings/two-factor-yubikey.component"; import { VerifyEmailComponent } from "../auth/settings/verify-email.component"; +import { UserVerificationModule } from "../auth/shared/components/user-verification"; import { SsoComponent } from "../auth/sso.component"; import { TwoFactorOptionsComponent } from "../auth/two-factor-options.component"; import { TwoFactorComponent } from "../auth/two-factor.component"; @@ -64,7 +65,6 @@ 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 { UserVerificationModule } from "../components/user-verification"; import { FooterComponent } from "../layouts/footer.component"; import { FrontendLayoutComponent } from "../layouts/frontend-layout.component"; import { NavbarComponent } from "../layouts/navbar.component"; 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 89796ca0af1..cfe6d2d223b 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 { openUserVerificationPrompt } from "../../components/user-verification"; +import { openUserVerificationPrompt } from "../../auth/shared/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 10cb97a6362..1ea2f6ad35c 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 @@ -4,7 +4,7 @@ import { combineLatestWith, firstValueFrom, Observable, startWith, switchMap } f import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { openUserVerificationPrompt } from "@bitwarden/web-vault/app/components/user-verification"; +import { openUserVerificationPrompt } from "@bitwarden/web-vault/app/auth/shared/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 db956fc52de..bfbb8cf5e64 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 { openUserVerificationPrompt } from "@bitwarden/web-vault/app/components/user-verification"; +import { openUserVerificationPrompt } from "@bitwarden/web-vault/app/auth/shared/components/user-verification"; import { SecretsManagerPortingApiService } from "../services/sm-porting-api.service"; import { SecretsManagerPortingService } from "../services/sm-porting.service";