diff --git a/apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts b/apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts index 218dbb9c9d..a67ea9cb4f 100644 --- a/apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts +++ b/apps/web/src/app/accounts/trial-initiation/trial-initiation.module.ts @@ -4,8 +4,8 @@ import { NgModule } from "@angular/core"; import { FormFieldModule } from "@bitwarden/components"; -import { RegisterFormModule } from "../../../auth/register-form/register-form.module"; import { OrganizationCreateModule } from "../../admin-console/organizations/create/organization-create.module"; +import { RegisterFormModule } from "../../auth/register-form/register-form.module"; import { BillingComponent } from "../../billing/accounts/trial-initiation/billing.component"; import { LooseComponentsModule, SharedModule } from "../../shared"; diff --git a/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts b/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts index a89a68298a..9f223d6b71 100644 --- a/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts +++ b/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts @@ -8,12 +8,12 @@ import { StateService } from "@bitwarden/common/abstractions/state.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; -import { TwoFactorDuoComponent } from "../../../../auth/settings/two-factor-duo.component"; -import { TwoFactorSetupComponent as BaseTwoFactorSetupComponent } from "../../../../auth/settings/two-factor-setup.component"; +import { TwoFactorDuoComponent } from "../../../auth/settings/two-factor-duo.component"; +import { TwoFactorSetupComponent as BaseTwoFactorSetupComponent } from "../../../auth/settings/two-factor-setup.component"; @Component({ selector: "app-two-factor-setup", - templateUrl: "../../../../auth/settings/two-factor-setup.component.html", + templateUrl: "../../../auth/settings/two-factor-setup.component.html", }) // eslint-disable-next-line rxjs-angular/prefer-takeuntil export class TwoFactorSetupComponent extends BaseTwoFactorSetupComponent { diff --git a/apps/web/src/auth/accept-emergency.component.html b/apps/web/src/app/auth/accept-emergency.component.html similarity index 100% rename from apps/web/src/auth/accept-emergency.component.html rename to apps/web/src/app/auth/accept-emergency.component.html diff --git a/apps/web/src/auth/accept-emergency.component.ts b/apps/web/src/app/auth/accept-emergency.component.ts similarity index 96% rename from apps/web/src/auth/accept-emergency.component.ts rename to apps/web/src/app/auth/accept-emergency.component.ts index 03c6c9cc8a..802d69ba4b 100644 --- a/apps/web/src/auth/accept-emergency.component.ts +++ b/apps/web/src/app/auth/accept-emergency.component.ts @@ -7,7 +7,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti import { StateService } from "@bitwarden/common/abstractions/state.service"; import { EmergencyAccessAcceptRequest } from "@bitwarden/common/auth/models/request/emergency-access-accept.request"; -import { BaseAcceptComponent } from "../app/common/base.accept.component"; +import { BaseAcceptComponent } from "../common/base.accept.component"; @Component({ selector: "app-accept-emergency", diff --git a/apps/web/src/auth/accept-organization.component.html b/apps/web/src/app/auth/accept-organization.component.html similarity index 100% rename from apps/web/src/auth/accept-organization.component.html rename to apps/web/src/app/auth/accept-organization.component.html diff --git a/apps/web/src/auth/accept-organization.component.ts b/apps/web/src/app/auth/accept-organization.component.ts similarity index 98% rename from apps/web/src/auth/accept-organization.component.ts rename to apps/web/src/app/auth/accept-organization.component.ts index 64f1f8a22f..e4a6e95399 100644 --- a/apps/web/src/auth/accept-organization.component.ts +++ b/apps/web/src/app/auth/accept-organization.component.ts @@ -19,7 +19,7 @@ import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request"; import { Utils } from "@bitwarden/common/misc/utils"; -import { BaseAcceptComponent } from "../app/common/base.accept.component"; +import { BaseAcceptComponent } from "../common/base.accept.component"; @Component({ selector: "app-accept-organization", diff --git a/apps/web/src/auth/hint.component.html b/apps/web/src/app/auth/hint.component.html similarity index 100% rename from apps/web/src/auth/hint.component.html rename to apps/web/src/app/auth/hint.component.html diff --git a/apps/web/src/auth/hint.component.ts b/apps/web/src/app/auth/hint.component.ts similarity index 100% rename from apps/web/src/auth/hint.component.ts rename to apps/web/src/app/auth/hint.component.ts diff --git a/apps/web/src/auth/lock.component.html b/apps/web/src/app/auth/lock.component.html similarity index 100% rename from apps/web/src/auth/lock.component.html rename to apps/web/src/app/auth/lock.component.html diff --git a/apps/web/src/auth/lock.component.ts b/apps/web/src/app/auth/lock.component.ts similarity index 98% rename from apps/web/src/auth/lock.component.ts rename to apps/web/src/app/auth/lock.component.ts index ac68e7ae66..d28bc3cfbb 100644 --- a/apps/web/src/auth/lock.component.ts +++ b/apps/web/src/app/auth/lock.component.ts @@ -18,7 +18,7 @@ import { InternalPolicyService } from "@bitwarden/common/admin-console/abstracti import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; -import { RouterService } from "../app/core"; +import { RouterService } from "../core"; @Component({ selector: "app-lock", diff --git a/apps/web/src/auth/login/login-with-device.component.html b/apps/web/src/app/auth/login/login-with-device.component.html similarity index 100% rename from apps/web/src/auth/login/login-with-device.component.html rename to apps/web/src/app/auth/login/login-with-device.component.html diff --git a/apps/web/src/auth/login/login-with-device.component.ts b/apps/web/src/app/auth/login/login-with-device.component.ts similarity index 98% rename from apps/web/src/auth/login/login-with-device.component.ts rename to apps/web/src/app/auth/login/login-with-device.component.ts index 037c0d95c6..50c583abe2 100644 --- a/apps/web/src/auth/login/login-with-device.component.ts +++ b/apps/web/src/app/auth/login/login-with-device.component.ts @@ -16,7 +16,7 @@ import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; -import { StateService } from "../../app/core"; +import { StateService } from "../../core"; @Component({ selector: "app-login-with-device", diff --git a/apps/web/src/auth/login/login.component.html b/apps/web/src/app/auth/login/login.component.html similarity index 100% rename from apps/web/src/auth/login/login.component.html rename to apps/web/src/app/auth/login/login.component.html diff --git a/apps/web/src/auth/login/login.component.ts b/apps/web/src/app/auth/login/login.component.ts similarity index 98% rename from apps/web/src/auth/login/login.component.ts rename to apps/web/src/app/auth/login/login.component.ts index e249d5af81..54f9bd3646 100644 --- a/apps/web/src/auth/login/login.component.ts +++ b/apps/web/src/app/auth/login/login.component.ts @@ -25,8 +25,8 @@ import { LoginService } from "@bitwarden/common/auth/abstractions/login.service" import { ListResponse } from "@bitwarden/common/models/response/list.response"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; -import { RouterService, StateService } from "../../app/core"; -import { flagEnabled } from "../../utils/flags"; +import { flagEnabled } from "../../../utils/flags"; +import { RouterService, StateService } from "../../core"; @Component({ selector: "app-login", diff --git a/apps/web/src/auth/login/login.module.ts b/apps/web/src/app/auth/login/login.module.ts similarity index 89% rename from apps/web/src/auth/login/login.module.ts rename to apps/web/src/app/auth/login/login.module.ts index 2938241c54..b01fa01588 100644 --- a/apps/web/src/auth/login/login.module.ts +++ b/apps/web/src/app/auth/login/login.module.ts @@ -2,7 +2,7 @@ import { NgModule } from "@angular/core"; import { CheckboxModule } from "@bitwarden/components"; -import { SharedModule } from "../../app/shared"; +import { SharedModule } from "../../../app/shared"; import { LoginWithDeviceComponent } from "./login-with-device.component"; import { LoginComponent } from "./login.component"; diff --git a/apps/web/src/auth/recover-delete.component.html b/apps/web/src/app/auth/recover-delete.component.html similarity index 100% rename from apps/web/src/auth/recover-delete.component.html rename to apps/web/src/app/auth/recover-delete.component.html diff --git a/apps/web/src/auth/recover-delete.component.ts b/apps/web/src/app/auth/recover-delete.component.ts similarity index 100% rename from apps/web/src/auth/recover-delete.component.ts rename to apps/web/src/app/auth/recover-delete.component.ts diff --git a/apps/web/src/auth/recover-two-factor.component.html b/apps/web/src/app/auth/recover-two-factor.component.html similarity index 100% rename from apps/web/src/auth/recover-two-factor.component.html rename to apps/web/src/app/auth/recover-two-factor.component.html diff --git a/apps/web/src/auth/recover-two-factor.component.ts b/apps/web/src/app/auth/recover-two-factor.component.ts similarity index 100% rename from apps/web/src/auth/recover-two-factor.component.ts rename to apps/web/src/app/auth/recover-two-factor.component.ts diff --git a/apps/web/src/auth/register-form/register-form.component.html b/apps/web/src/app/auth/register-form/register-form.component.html similarity index 100% rename from apps/web/src/auth/register-form/register-form.component.html rename to apps/web/src/app/auth/register-form/register-form.component.html diff --git a/apps/web/src/auth/register-form/register-form.component.ts b/apps/web/src/app/auth/register-form/register-form.component.ts similarity index 100% rename from apps/web/src/auth/register-form/register-form.component.ts rename to apps/web/src/app/auth/register-form/register-form.component.ts diff --git a/apps/web/src/auth/register-form/register-form.module.ts b/apps/web/src/app/auth/register-form/register-form.module.ts similarity index 84% rename from apps/web/src/auth/register-form/register-form.module.ts rename to apps/web/src/app/auth/register-form/register-form.module.ts index e2a17e77be..ee0aa91d1a 100644 --- a/apps/web/src/auth/register-form/register-form.module.ts +++ b/apps/web/src/app/auth/register-form/register-form.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { SharedModule } from "../../app/shared"; +import { SharedModule } from "../../shared"; import { RegisterFormComponent } from "./register-form.component"; diff --git a/apps/web/src/auth/remove-password.component.html b/apps/web/src/app/auth/remove-password.component.html similarity index 100% rename from apps/web/src/auth/remove-password.component.html rename to apps/web/src/app/auth/remove-password.component.html diff --git a/apps/web/src/auth/remove-password.component.ts b/apps/web/src/app/auth/remove-password.component.ts similarity index 100% rename from apps/web/src/auth/remove-password.component.ts rename to apps/web/src/app/auth/remove-password.component.ts diff --git a/apps/web/src/auth/set-password.component.html b/apps/web/src/app/auth/set-password.component.html similarity index 100% rename from apps/web/src/auth/set-password.component.html rename to apps/web/src/app/auth/set-password.component.html diff --git a/apps/web/src/auth/set-password.component.ts b/apps/web/src/app/auth/set-password.component.ts similarity index 100% rename from apps/web/src/auth/set-password.component.ts rename to apps/web/src/app/auth/set-password.component.ts diff --git a/apps/web/src/auth/settings/deauthorize-sessions.component.html b/apps/web/src/app/auth/settings/deauthorize-sessions.component.html similarity index 100% rename from apps/web/src/auth/settings/deauthorize-sessions.component.html rename to apps/web/src/app/auth/settings/deauthorize-sessions.component.html diff --git a/apps/web/src/auth/settings/deauthorize-sessions.component.ts b/apps/web/src/app/auth/settings/deauthorize-sessions.component.ts similarity index 100% rename from apps/web/src/auth/settings/deauthorize-sessions.component.ts rename to apps/web/src/app/auth/settings/deauthorize-sessions.component.ts diff --git a/apps/web/src/auth/settings/emergency-access/emergency-access-add-edit.component.html b/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.html similarity index 100% rename from apps/web/src/auth/settings/emergency-access/emergency-access-add-edit.component.html rename to apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.html diff --git a/apps/web/src/auth/settings/emergency-access/emergency-access-add-edit.component.ts b/apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.ts similarity index 100% rename from apps/web/src/auth/settings/emergency-access/emergency-access-add-edit.component.ts rename to apps/web/src/app/auth/settings/emergency-access/emergency-access-add-edit.component.ts diff --git a/apps/web/src/auth/settings/emergency-access/emergency-access-attachments.component.ts b/apps/web/src/app/auth/settings/emergency-access/emergency-access-attachments.component.ts similarity index 95% rename from apps/web/src/auth/settings/emergency-access/emergency-access-attachments.component.ts rename to apps/web/src/app/auth/settings/emergency-access/emergency-access-attachments.component.ts index 82db35e670..c57750cd13 100644 --- a/apps/web/src/auth/settings/emergency-access/emergency-access-attachments.component.ts +++ b/apps/web/src/app/auth/settings/emergency-access/emergency-access-attachments.component.ts @@ -14,7 +14,7 @@ import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.v @Component({ selector: "emergency-access-attachments", - templateUrl: "../../../app/vault/individual-vault/attachments.component.html", + templateUrl: "../../../vault/individual-vault/attachments.component.html", }) export class EmergencyAccessAttachmentsComponent extends BaseAttachmentsComponent { viewOnly = true; diff --git a/apps/web/src/auth/settings/emergency-access/emergency-access-confirm.component.html b/apps/web/src/app/auth/settings/emergency-access/emergency-access-confirm.component.html similarity index 100% rename from apps/web/src/auth/settings/emergency-access/emergency-access-confirm.component.html rename to apps/web/src/app/auth/settings/emergency-access/emergency-access-confirm.component.html diff --git a/apps/web/src/auth/settings/emergency-access/emergency-access-confirm.component.ts b/apps/web/src/app/auth/settings/emergency-access/emergency-access-confirm.component.ts similarity index 100% rename from apps/web/src/auth/settings/emergency-access/emergency-access-confirm.component.ts rename to apps/web/src/app/auth/settings/emergency-access/emergency-access-confirm.component.ts diff --git a/apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.html b/apps/web/src/app/auth/settings/emergency-access/emergency-access-takeover.component.html similarity index 100% rename from apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.html rename to apps/web/src/app/auth/settings/emergency-access/emergency-access-takeover.component.html diff --git a/apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.ts b/apps/web/src/app/auth/settings/emergency-access/emergency-access-takeover.component.ts similarity index 100% rename from apps/web/src/auth/settings/emergency-access/emergency-access-takeover.component.ts rename to apps/web/src/app/auth/settings/emergency-access/emergency-access-takeover.component.ts diff --git a/apps/web/src/auth/settings/emergency-access/emergency-access-view.component.html b/apps/web/src/app/auth/settings/emergency-access/emergency-access-view.component.html similarity index 100% rename from apps/web/src/auth/settings/emergency-access/emergency-access-view.component.html rename to apps/web/src/app/auth/settings/emergency-access/emergency-access-view.component.html diff --git a/apps/web/src/auth/settings/emergency-access/emergency-access-view.component.ts b/apps/web/src/app/auth/settings/emergency-access/emergency-access-view.component.ts similarity index 100% rename from apps/web/src/auth/settings/emergency-access/emergency-access-view.component.ts rename to apps/web/src/app/auth/settings/emergency-access/emergency-access-view.component.ts diff --git a/apps/web/src/auth/settings/emergency-access/emergency-access.component.html b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.html similarity index 100% rename from apps/web/src/auth/settings/emergency-access/emergency-access.component.html rename to apps/web/src/app/auth/settings/emergency-access/emergency-access.component.html diff --git a/apps/web/src/auth/settings/emergency-access/emergency-access.component.ts b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts similarity index 100% rename from apps/web/src/auth/settings/emergency-access/emergency-access.component.ts rename to apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts diff --git a/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts b/apps/web/src/app/auth/settings/emergency-access/emergency-add-edit.component.ts similarity index 96% rename from apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts rename to apps/web/src/app/auth/settings/emergency-access/emergency-add-edit.component.ts index a7517b8ed8..632b42069e 100644 --- a/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts +++ b/apps/web/src/app/auth/settings/emergency-access/emergency-add-edit.component.ts @@ -19,11 +19,11 @@ import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folde import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; -import { AddEditComponent as BaseAddEditComponent } from "../../../app/vault/individual-vault/add-edit.component"; +import { AddEditComponent as BaseAddEditComponent } from "../../../vault/individual-vault/add-edit.component"; @Component({ selector: "app-org-vault-add-edit", - templateUrl: "../../../app/vault/individual-vault/add-edit.component.html", + templateUrl: "../../../vault/individual-vault/add-edit.component.html", }) export class EmergencyAddEditComponent extends BaseAddEditComponent { originalCipher: Cipher = null; diff --git a/apps/web/src/auth/settings/two-factor-authenticator.component.html b/apps/web/src/app/auth/settings/two-factor-authenticator.component.html similarity index 100% rename from apps/web/src/auth/settings/two-factor-authenticator.component.html rename to apps/web/src/app/auth/settings/two-factor-authenticator.component.html diff --git a/apps/web/src/auth/settings/two-factor-authenticator.component.ts b/apps/web/src/app/auth/settings/two-factor-authenticator.component.ts similarity index 100% rename from apps/web/src/auth/settings/two-factor-authenticator.component.ts rename to apps/web/src/app/auth/settings/two-factor-authenticator.component.ts diff --git a/apps/web/src/auth/settings/two-factor-base.component.ts b/apps/web/src/app/auth/settings/two-factor-base.component.ts similarity index 100% rename from apps/web/src/auth/settings/two-factor-base.component.ts rename to apps/web/src/app/auth/settings/two-factor-base.component.ts diff --git a/apps/web/src/auth/settings/two-factor-duo.component.html b/apps/web/src/app/auth/settings/two-factor-duo.component.html similarity index 100% rename from apps/web/src/auth/settings/two-factor-duo.component.html rename to apps/web/src/app/auth/settings/two-factor-duo.component.html diff --git a/apps/web/src/auth/settings/two-factor-duo.component.ts b/apps/web/src/app/auth/settings/two-factor-duo.component.ts similarity index 100% rename from apps/web/src/auth/settings/two-factor-duo.component.ts rename to apps/web/src/app/auth/settings/two-factor-duo.component.ts diff --git a/apps/web/src/auth/settings/two-factor-email.component.html b/apps/web/src/app/auth/settings/two-factor-email.component.html similarity index 100% rename from apps/web/src/auth/settings/two-factor-email.component.html rename to apps/web/src/app/auth/settings/two-factor-email.component.html diff --git a/apps/web/src/auth/settings/two-factor-email.component.ts b/apps/web/src/app/auth/settings/two-factor-email.component.ts similarity index 100% rename from apps/web/src/auth/settings/two-factor-email.component.ts rename to apps/web/src/app/auth/settings/two-factor-email.component.ts diff --git a/apps/web/src/auth/settings/two-factor-recovery.component.html b/apps/web/src/app/auth/settings/two-factor-recovery.component.html similarity index 100% rename from apps/web/src/auth/settings/two-factor-recovery.component.html rename to apps/web/src/app/auth/settings/two-factor-recovery.component.html diff --git a/apps/web/src/auth/settings/two-factor-recovery.component.ts b/apps/web/src/app/auth/settings/two-factor-recovery.component.ts similarity index 100% rename from apps/web/src/auth/settings/two-factor-recovery.component.ts rename to apps/web/src/app/auth/settings/two-factor-recovery.component.ts diff --git a/apps/web/src/auth/settings/two-factor-setup.component.html b/apps/web/src/app/auth/settings/two-factor-setup.component.html similarity index 100% rename from apps/web/src/auth/settings/two-factor-setup.component.html rename to apps/web/src/app/auth/settings/two-factor-setup.component.html diff --git a/apps/web/src/auth/settings/two-factor-setup.component.ts b/apps/web/src/app/auth/settings/two-factor-setup.component.ts similarity index 100% rename from apps/web/src/auth/settings/two-factor-setup.component.ts rename to apps/web/src/app/auth/settings/two-factor-setup.component.ts diff --git a/apps/web/src/auth/settings/two-factor-verify.component.html b/apps/web/src/app/auth/settings/two-factor-verify.component.html similarity index 100% rename from apps/web/src/auth/settings/two-factor-verify.component.html rename to apps/web/src/app/auth/settings/two-factor-verify.component.html diff --git a/apps/web/src/auth/settings/two-factor-verify.component.ts b/apps/web/src/app/auth/settings/two-factor-verify.component.ts similarity index 100% rename from apps/web/src/auth/settings/two-factor-verify.component.ts rename to apps/web/src/app/auth/settings/two-factor-verify.component.ts diff --git a/apps/web/src/auth/settings/two-factor-webauthn.component.html b/apps/web/src/app/auth/settings/two-factor-webauthn.component.html similarity index 100% rename from apps/web/src/auth/settings/two-factor-webauthn.component.html rename to apps/web/src/app/auth/settings/two-factor-webauthn.component.html diff --git a/apps/web/src/auth/settings/two-factor-webauthn.component.ts b/apps/web/src/app/auth/settings/two-factor-webauthn.component.ts similarity index 100% rename from apps/web/src/auth/settings/two-factor-webauthn.component.ts rename to apps/web/src/app/auth/settings/two-factor-webauthn.component.ts diff --git a/apps/web/src/auth/settings/two-factor-yubikey.component.html b/apps/web/src/app/auth/settings/two-factor-yubikey.component.html similarity index 100% rename from apps/web/src/auth/settings/two-factor-yubikey.component.html rename to apps/web/src/app/auth/settings/two-factor-yubikey.component.html diff --git a/apps/web/src/auth/settings/two-factor-yubikey.component.ts b/apps/web/src/app/auth/settings/two-factor-yubikey.component.ts similarity index 100% rename from apps/web/src/auth/settings/two-factor-yubikey.component.ts rename to apps/web/src/app/auth/settings/two-factor-yubikey.component.ts diff --git a/apps/web/src/auth/settings/verify-email.component.html b/apps/web/src/app/auth/settings/verify-email.component.html similarity index 100% rename from apps/web/src/auth/settings/verify-email.component.html rename to apps/web/src/app/auth/settings/verify-email.component.html diff --git a/apps/web/src/auth/settings/verify-email.component.ts b/apps/web/src/app/auth/settings/verify-email.component.ts similarity index 100% rename from apps/web/src/auth/settings/verify-email.component.ts rename to apps/web/src/app/auth/settings/verify-email.component.ts diff --git a/apps/web/src/auth/sso.component.html b/apps/web/src/app/auth/sso.component.html similarity index 100% rename from apps/web/src/auth/sso.component.html rename to apps/web/src/app/auth/sso.component.html diff --git a/apps/web/src/auth/sso.component.ts b/apps/web/src/app/auth/sso.component.ts similarity index 100% rename from apps/web/src/auth/sso.component.ts rename to apps/web/src/app/auth/sso.component.ts diff --git a/apps/web/src/auth/two-factor-options.component.html b/apps/web/src/app/auth/two-factor-options.component.html similarity index 100% rename from apps/web/src/auth/two-factor-options.component.html rename to apps/web/src/app/auth/two-factor-options.component.html diff --git a/apps/web/src/auth/two-factor-options.component.ts b/apps/web/src/app/auth/two-factor-options.component.ts similarity index 100% rename from apps/web/src/auth/two-factor-options.component.ts rename to apps/web/src/app/auth/two-factor-options.component.ts diff --git a/apps/web/src/auth/two-factor.component.html b/apps/web/src/app/auth/two-factor.component.html similarity index 100% rename from apps/web/src/auth/two-factor.component.html rename to apps/web/src/app/auth/two-factor.component.html diff --git a/apps/web/src/auth/two-factor.component.ts b/apps/web/src/app/auth/two-factor.component.ts similarity index 98% rename from apps/web/src/auth/two-factor.component.ts rename to apps/web/src/app/auth/two-factor.component.ts index c2c14dc04e..762a2a5247 100644 --- a/apps/web/src/auth/two-factor.component.ts +++ b/apps/web/src/app/auth/two-factor.component.ts @@ -15,7 +15,7 @@ import { LoginService } from "@bitwarden/common/auth/abstractions/login.service" import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service"; import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; -import { RouterService } from "../app/core"; +import { RouterService } from "../core"; import { TwoFactorOptionsComponent } from "./two-factor-options.component"; diff --git a/apps/web/src/auth/update-password.component.html b/apps/web/src/app/auth/update-password.component.html similarity index 100% rename from apps/web/src/auth/update-password.component.html rename to apps/web/src/app/auth/update-password.component.html diff --git a/apps/web/src/auth/update-password.component.ts b/apps/web/src/app/auth/update-password.component.ts similarity index 100% rename from apps/web/src/auth/update-password.component.ts rename to apps/web/src/app/auth/update-password.component.ts diff --git a/apps/web/src/auth/update-temp-password.component.html b/apps/web/src/app/auth/update-temp-password.component.html similarity index 100% rename from apps/web/src/auth/update-temp-password.component.html rename to apps/web/src/app/auth/update-temp-password.component.html diff --git a/apps/web/src/auth/update-temp-password.component.ts b/apps/web/src/app/auth/update-temp-password.component.ts similarity index 100% rename from apps/web/src/auth/update-temp-password.component.ts rename to apps/web/src/app/auth/update-temp-password.component.ts diff --git a/apps/web/src/auth/verify-email-token.component.html b/apps/web/src/app/auth/verify-email-token.component.html similarity index 100% rename from apps/web/src/auth/verify-email-token.component.html rename to apps/web/src/app/auth/verify-email-token.component.html diff --git a/apps/web/src/auth/verify-email-token.component.ts b/apps/web/src/app/auth/verify-email-token.component.ts similarity index 100% rename from apps/web/src/auth/verify-email-token.component.ts rename to apps/web/src/app/auth/verify-email-token.component.ts diff --git a/apps/web/src/auth/verify-recover-delete.component.html b/apps/web/src/app/auth/verify-recover-delete.component.html similarity index 100% rename from apps/web/src/auth/verify-recover-delete.component.html rename to apps/web/src/app/auth/verify-recover-delete.component.html diff --git a/apps/web/src/auth/verify-recover-delete.component.ts b/apps/web/src/app/auth/verify-recover-delete.component.ts similarity index 100% rename from apps/web/src/auth/verify-recover-delete.component.ts rename to apps/web/src/app/auth/verify-recover-delete.component.ts diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index c4e3ce7a6b..6a7ae61aa8 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -6,24 +6,6 @@ import { LockGuard } from "@bitwarden/angular/auth/guards/lock.guard"; import { UnauthGuard } from "@bitwarden/angular/auth/guards/unauth.guard"; import { SubscriptionRoutingModule } from "../app/billing/settings/subscription-routing.module"; -import { AcceptEmergencyComponent } from "../auth/accept-emergency.component"; -import { AcceptOrganizationComponent } from "../auth/accept-organization.component"; -import { HintComponent } from "../auth/hint.component"; -import { LockComponent } from "../auth/lock.component"; -import { LoginWithDeviceComponent } from "../auth/login/login-with-device.component"; -import { LoginComponent } from "../auth/login/login.component"; -import { RecoverDeleteComponent } from "../auth/recover-delete.component"; -import { RecoverTwoFactorComponent } from "../auth/recover-two-factor.component"; -import { RemovePasswordComponent } from "../auth/remove-password.component"; -import { SetPasswordComponent } from "../auth/set-password.component"; -import { EmergencyAccessViewComponent } from "../auth/settings/emergency-access/emergency-access-view.component"; -import { EmergencyAccessComponent } from "../auth/settings/emergency-access/emergency-access.component"; -import { SsoComponent } from "../auth/sso.component"; -import { TwoFactorComponent } from "../auth/two-factor.component"; -import { UpdatePasswordComponent } from "../auth/update-password.component"; -import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component"; -import { VerifyEmailTokenComponent } from "../auth/verify-email-token.component"; -import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.component"; import { flagEnabled, Flags } from "../utils/flags"; import { TrialInitiationComponent } from "./accounts/trial-initiation/trial-initiation.component"; @@ -32,6 +14,24 @@ import { AcceptFamilySponsorshipComponent } from "./admin-console/organizations/ import { FamiliesForEnterpriseSetupComponent } from "./admin-console/organizations/sponsorships/families-for-enterprise-setup.component"; import { CreateOrganizationComponent } from "./admin-console/settings/create-organization.component"; import { SponsoredFamiliesComponent } from "./admin-console/settings/sponsored-families.component"; +import { AcceptEmergencyComponent } from "./auth/accept-emergency.component"; +import { AcceptOrganizationComponent } from "./auth/accept-organization.component"; +import { HintComponent } from "./auth/hint.component"; +import { LockComponent } from "./auth/lock.component"; +import { LoginWithDeviceComponent } from "./auth/login/login-with-device.component"; +import { LoginComponent } from "./auth/login/login.component"; +import { RecoverDeleteComponent } from "./auth/recover-delete.component"; +import { RecoverTwoFactorComponent } from "./auth/recover-two-factor.component"; +import { RemovePasswordComponent } from "./auth/remove-password.component"; +import { SetPasswordComponent } from "./auth/set-password.component"; +import { EmergencyAccessViewComponent } from "./auth/settings/emergency-access/emergency-access-view.component"; +import { EmergencyAccessComponent } from "./auth/settings/emergency-access/emergency-access.component"; +import { SsoComponent } from "./auth/sso.component"; +import { TwoFactorComponent } from "./auth/two-factor.component"; +import { UpdatePasswordComponent } from "./auth/update-password.component"; +import { UpdateTempPasswordComponent } from "./auth/update-temp-password.component"; +import { VerifyEmailTokenComponent } from "./auth/verify-email-token.component"; +import { VerifyRecoverDeleteComponent } from "./auth/verify-recover-delete.component"; import { HomeGuard } from "./guards/home.guard"; import { FrontendLayoutComponent } from "./layouts/frontend-layout.component"; import { UserLayoutComponent } from "./layouts/user-layout.component"; diff --git a/apps/web/src/app/oss.module.ts b/apps/web/src/app/oss.module.ts index 1f2cefa309..b4e40d446d 100644 --- a/apps/web/src/app/oss.module.ts +++ b/apps/web/src/app/oss.module.ts @@ -1,11 +1,10 @@ import { NgModule } from "@angular/core"; -import { LoginModule } from "../auth/login/login.module"; - import { TrialInitiationModule } from "./accounts/trial-initiation/trial-initiation.module"; import { OrganizationCreateModule } from "./admin-console/organizations/create/organization-create.module"; import { OrganizationManageModule } from "./admin-console/organizations/manage/organization-manage.module"; import { OrganizationUserModule } from "./admin-console/organizations/users/organization-user.module"; +import { LoginModule } from "./auth/login/login.module"; import { LooseComponentsModule, SharedModule } from "./shared"; import { OrganizationBadgeModule } from "./vault/individual-vault/organization-badge/organization-badge.module"; import { VaultFilterModule } from "./vault/individual-vault/vault-filter/vault-filter.module"; diff --git a/apps/web/src/app/settings/account.component.ts b/apps/web/src/app/settings/account.component.ts index d67cd1a80f..af9e5a448b 100644 --- a/apps/web/src/app/settings/account.component.ts +++ b/apps/web/src/app/settings/account.component.ts @@ -5,7 +5,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; -import { DeauthorizeSessionsComponent } from "../../auth/settings/deauthorize-sessions.component"; +import { DeauthorizeSessionsComponent } from "../auth/settings/deauthorize-sessions.component"; import { DeleteAccountComponent } from "./delete-account.component"; import { PurgeVaultComponent } from "./purge-vault.component"; diff --git a/apps/web/src/app/settings/security-routing.module.ts b/apps/web/src/app/settings/security-routing.module.ts index bc28f88add..1d47a0d775 100644 --- a/apps/web/src/app/settings/security-routing.module.ts +++ b/apps/web/src/app/settings/security-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { TwoFactorSetupComponent } from "../../auth/settings/two-factor-setup.component"; +import { TwoFactorSetupComponent } from "../auth/settings/two-factor-setup.component"; import { ChangePasswordComponent } from "./change-password.component"; import { SecurityKeysComponent } from "./security-keys.component"; diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index 5ce93a56a6..a1ba393866 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -1,38 +1,5 @@ import { NgModule } from "@angular/core"; -import { AcceptEmergencyComponent } from "../../auth/accept-emergency.component"; -import { AcceptOrganizationComponent } from "../../auth/accept-organization.component"; -import { HintComponent } from "../../auth/hint.component"; -import { LockComponent } from "../../auth/lock.component"; -import { RecoverDeleteComponent } from "../../auth/recover-delete.component"; -import { RecoverTwoFactorComponent } from "../../auth/recover-two-factor.component"; -import { RegisterFormModule } from "../../auth/register-form/register-form.module"; -import { RemovePasswordComponent } from "../../auth/remove-password.component"; -import { SetPasswordComponent } from "../../auth/set-password.component"; -import { DeauthorizeSessionsComponent } from "../../auth/settings/deauthorize-sessions.component"; -import { EmergencyAccessAddEditComponent } from "../../auth/settings/emergency-access/emergency-access-add-edit.component"; -import { EmergencyAccessAttachmentsComponent } from "../../auth/settings/emergency-access/emergency-access-attachments.component"; -import { EmergencyAccessConfirmComponent } from "../../auth/settings/emergency-access/emergency-access-confirm.component"; -import { EmergencyAccessTakeoverComponent } from "../../auth/settings/emergency-access/emergency-access-takeover.component"; -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 { 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"; -import { TwoFactorRecoveryComponent } from "../../auth/settings/two-factor-recovery.component"; -import { TwoFactorSetupComponent } from "../../auth/settings/two-factor-setup.component"; -import { TwoFactorVerifyComponent } from "../../auth/settings/two-factor-verify.component"; -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 { SsoComponent } from "../../auth/sso.component"; -import { TwoFactorOptionsComponent } from "../../auth/two-factor-options.component"; -import { TwoFactorComponent } from "../../auth/two-factor.component"; -import { UpdatePasswordComponent } from "../../auth/update-password.component"; -import { UpdateTempPasswordComponent } from "../../auth/update-temp-password.component"; -import { VerifyEmailTokenComponent } from "../../auth/verify-email-token.component"; -import { VerifyRecoverDeleteComponent } from "../../auth/verify-recover-delete.component"; import { OrganizationSwitcherComponent } from "../admin-console/components/organization-switcher.component"; import { OrganizationCreateModule } from "../admin-console/organizations/create/organization-create.module"; import { OrganizationLayoutComponent } from "../admin-console/organizations/layouts/organization-layout.component"; @@ -51,6 +18,39 @@ import { ProvidersComponent } from "../admin-console/providers/providers.compone import { CreateOrganizationComponent } from "../admin-console/settings/create-organization.component"; import { SponsoredFamiliesComponent } from "../admin-console/settings/sponsored-families.component"; import { SponsoringOrgRowComponent } from "../admin-console/settings/sponsoring-org-row.component"; +import { AcceptEmergencyComponent } from "../auth/accept-emergency.component"; +import { AcceptOrganizationComponent } from "../auth/accept-organization.component"; +import { HintComponent } from "../auth/hint.component"; +import { LockComponent } from "../auth/lock.component"; +import { RecoverDeleteComponent } from "../auth/recover-delete.component"; +import { RecoverTwoFactorComponent } from "../auth/recover-two-factor.component"; +import { RegisterFormModule } from "../auth/register-form/register-form.module"; +import { RemovePasswordComponent } from "../auth/remove-password.component"; +import { SetPasswordComponent } from "../auth/set-password.component"; +import { DeauthorizeSessionsComponent } from "../auth/settings/deauthorize-sessions.component"; +import { EmergencyAccessAddEditComponent } from "../auth/settings/emergency-access/emergency-access-add-edit.component"; +import { EmergencyAccessAttachmentsComponent } from "../auth/settings/emergency-access/emergency-access-attachments.component"; +import { EmergencyAccessConfirmComponent } from "../auth/settings/emergency-access/emergency-access-confirm.component"; +import { EmergencyAccessTakeoverComponent } from "../auth/settings/emergency-access/emergency-access-takeover.component"; +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 { 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"; +import { TwoFactorRecoveryComponent } from "../auth/settings/two-factor-recovery.component"; +import { TwoFactorSetupComponent } from "../auth/settings/two-factor-setup.component"; +import { TwoFactorVerifyComponent } from "../auth/settings/two-factor-verify.component"; +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 { SsoComponent } from "../auth/sso.component"; +import { TwoFactorOptionsComponent } from "../auth/two-factor-options.component"; +import { TwoFactorComponent } from "../auth/two-factor.component"; +import { UpdatePasswordComponent } from "../auth/update-password.component"; +import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component"; +import { VerifyEmailTokenComponent } from "../auth/verify-email-token.component"; +import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.component"; import { AddCreditComponent } from "../billing/settings/add-credit.component"; import { AdjustPaymentComponent } from "../billing/settings/adjust-payment.component"; import { BillingHistoryViewComponent } from "../billing/settings/billing-history-view.component";