From 8a0fa574c71a6d9279f6c53ec5ea2aa67ede0d07 Mon Sep 17 00:00:00 2001 From: Jake Fink Date: Thu, 30 Nov 2023 17:15:06 -0500 Subject: [PATCH] move web settings to auth (#7022) --- .../settings/account.component.ts | 2 +- .../settings/account}/account.component.html | 0 .../settings/account}/account.component.ts | 4 ++-- .../account}/change-avatar.component.html | 0 .../account}/change-avatar.component.ts | 0 .../account}/change-email.component.html | 0 .../account}/change-email.component.ts | 0 .../deauthorize-sessions.component.html | 0 .../deauthorize-sessions.component.ts | 0 .../account}/delete-account.component.html | 0 .../account}/delete-account.component.ts | 0 .../settings/account}/profile.component.html | 0 .../settings/account}/profile.component.ts | 0 .../settings/security}/api-key.component.html | 0 .../settings/security}/api-key.component.ts | 0 .../change-kdf-confirmation.component.html | 0 .../change-kdf-confirmation.component.ts | 0 .../change-kdf/change-kdf.component.html | 0 .../change-kdf/change-kdf.component.ts | 0 .../security}/change-kdf/change-kdf.module.ts | 2 +- .../security}/security-keys.component.html | 0 .../security}/security-keys.component.ts | 0 .../security}/security-routing.module.ts | 4 ++-- .../security}/security.component.html | 0 .../settings/security}/security.component.ts | 0 apps/web/src/app/oss-routing.module.ts | 4 ++-- .../src/app/shared/loose-components.module.ts | 20 +++++++++---------- 27 files changed, 18 insertions(+), 18 deletions(-) rename apps/web/src/app/{settings => auth/settings/account}/account.component.html (100%) rename apps/web/src/app/{settings => auth/settings/account}/account.component.ts (89%) rename apps/web/src/app/{settings => auth/settings/account}/change-avatar.component.html (100%) rename apps/web/src/app/{settings => auth/settings/account}/change-avatar.component.ts (100%) rename apps/web/src/app/{settings => auth/settings/account}/change-email.component.html (100%) rename apps/web/src/app/{settings => auth/settings/account}/change-email.component.ts (100%) rename apps/web/src/app/auth/settings/{ => account}/deauthorize-sessions.component.html (100%) rename apps/web/src/app/auth/settings/{ => account}/deauthorize-sessions.component.ts (100%) rename apps/web/src/app/{settings => auth/settings/account}/delete-account.component.html (100%) rename apps/web/src/app/{settings => auth/settings/account}/delete-account.component.ts (100%) rename apps/web/src/app/{settings => auth/settings/account}/profile.component.html (100%) rename apps/web/src/app/{settings => auth/settings/account}/profile.component.ts (100%) rename apps/web/src/app/{settings => auth/settings/security}/api-key.component.html (100%) rename apps/web/src/app/{settings => auth/settings/security}/api-key.component.ts (100%) rename apps/web/src/app/{settings => auth/settings/security}/change-kdf/change-kdf-confirmation.component.html (100%) rename apps/web/src/app/{settings => auth/settings/security}/change-kdf/change-kdf-confirmation.component.ts (100%) rename apps/web/src/app/{settings => auth/settings/security}/change-kdf/change-kdf.component.html (100%) rename apps/web/src/app/{settings => auth/settings/security}/change-kdf/change-kdf.component.ts (100%) rename apps/web/src/app/{settings => auth/settings/security}/change-kdf/change-kdf.module.ts (90%) rename apps/web/src/app/{settings => auth/settings/security}/security-keys.component.html (100%) rename apps/web/src/app/{settings => auth/settings/security}/security-keys.component.ts (100%) rename apps/web/src/app/{settings => auth/settings/security}/security-routing.module.ts (84%) rename apps/web/src/app/{settings => auth/settings/security}/security.component.html (100%) rename apps/web/src/app/{settings => auth/settings/security}/security.component.ts (100%) diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.ts b/apps/web/src/app/admin-console/organizations/settings/account.component.ts index bb3dd5fed0..4d5117b1be 100644 --- a/apps/web/src/app/admin-console/organizations/settings/account.component.ts +++ b/apps/web/src/app/admin-console/organizations/settings/account.component.ts @@ -18,7 +18,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl import { Utils } from "@bitwarden/common/platform/misc/utils"; import { DialogService } from "@bitwarden/components"; -import { ApiKeyComponent } from "../../../settings/api-key.component"; +import { ApiKeyComponent } from "../../../auth/settings/security/api-key.component"; import { PurgeVaultComponent } from "../../../vault/settings/purge-vault.component"; import { DeleteOrganizationDialogResult, openDeleteOrganizationDialog } from "./components"; diff --git a/apps/web/src/app/settings/account.component.html b/apps/web/src/app/auth/settings/account/account.component.html similarity index 100% rename from apps/web/src/app/settings/account.component.html rename to apps/web/src/app/auth/settings/account/account.component.html diff --git a/apps/web/src/app/settings/account.component.ts b/apps/web/src/app/auth/settings/account/account.component.ts similarity index 89% rename from apps/web/src/app/settings/account.component.ts rename to apps/web/src/app/auth/settings/account/account.component.ts index 4d5659d965..5899e96802 100644 --- a/apps/web/src/app/settings/account.component.ts +++ b/apps/web/src/app/auth/settings/account/account.component.ts @@ -3,9 +3,9 @@ import { Component, ViewChild, ViewContainerRef } from "@angular/core"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; -import { DeauthorizeSessionsComponent } from "../auth/settings/deauthorize-sessions.component"; -import { PurgeVaultComponent } from "../vault/settings/purge-vault.component"; +import { PurgeVaultComponent } from "../../../vault/settings/purge-vault.component"; +import { DeauthorizeSessionsComponent } from "./deauthorize-sessions.component"; import { DeleteAccountComponent } from "./delete-account.component"; @Component({ diff --git a/apps/web/src/app/settings/change-avatar.component.html b/apps/web/src/app/auth/settings/account/change-avatar.component.html similarity index 100% rename from apps/web/src/app/settings/change-avatar.component.html rename to apps/web/src/app/auth/settings/account/change-avatar.component.html diff --git a/apps/web/src/app/settings/change-avatar.component.ts b/apps/web/src/app/auth/settings/account/change-avatar.component.ts similarity index 100% rename from apps/web/src/app/settings/change-avatar.component.ts rename to apps/web/src/app/auth/settings/account/change-avatar.component.ts diff --git a/apps/web/src/app/settings/change-email.component.html b/apps/web/src/app/auth/settings/account/change-email.component.html similarity index 100% rename from apps/web/src/app/settings/change-email.component.html rename to apps/web/src/app/auth/settings/account/change-email.component.html diff --git a/apps/web/src/app/settings/change-email.component.ts b/apps/web/src/app/auth/settings/account/change-email.component.ts similarity index 100% rename from apps/web/src/app/settings/change-email.component.ts rename to apps/web/src/app/auth/settings/account/change-email.component.ts diff --git a/apps/web/src/app/auth/settings/deauthorize-sessions.component.html b/apps/web/src/app/auth/settings/account/deauthorize-sessions.component.html similarity index 100% rename from apps/web/src/app/auth/settings/deauthorize-sessions.component.html rename to apps/web/src/app/auth/settings/account/deauthorize-sessions.component.html diff --git a/apps/web/src/app/auth/settings/deauthorize-sessions.component.ts b/apps/web/src/app/auth/settings/account/deauthorize-sessions.component.ts similarity index 100% rename from apps/web/src/app/auth/settings/deauthorize-sessions.component.ts rename to apps/web/src/app/auth/settings/account/deauthorize-sessions.component.ts diff --git a/apps/web/src/app/settings/delete-account.component.html b/apps/web/src/app/auth/settings/account/delete-account.component.html similarity index 100% rename from apps/web/src/app/settings/delete-account.component.html rename to apps/web/src/app/auth/settings/account/delete-account.component.html diff --git a/apps/web/src/app/settings/delete-account.component.ts b/apps/web/src/app/auth/settings/account/delete-account.component.ts similarity index 100% rename from apps/web/src/app/settings/delete-account.component.ts rename to apps/web/src/app/auth/settings/account/delete-account.component.ts diff --git a/apps/web/src/app/settings/profile.component.html b/apps/web/src/app/auth/settings/account/profile.component.html similarity index 100% rename from apps/web/src/app/settings/profile.component.html rename to apps/web/src/app/auth/settings/account/profile.component.html diff --git a/apps/web/src/app/settings/profile.component.ts b/apps/web/src/app/auth/settings/account/profile.component.ts similarity index 100% rename from apps/web/src/app/settings/profile.component.ts rename to apps/web/src/app/auth/settings/account/profile.component.ts diff --git a/apps/web/src/app/settings/api-key.component.html b/apps/web/src/app/auth/settings/security/api-key.component.html similarity index 100% rename from apps/web/src/app/settings/api-key.component.html rename to apps/web/src/app/auth/settings/security/api-key.component.html diff --git a/apps/web/src/app/settings/api-key.component.ts b/apps/web/src/app/auth/settings/security/api-key.component.ts similarity index 100% rename from apps/web/src/app/settings/api-key.component.ts rename to apps/web/src/app/auth/settings/security/api-key.component.ts diff --git a/apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.html b/apps/web/src/app/auth/settings/security/change-kdf/change-kdf-confirmation.component.html similarity index 100% rename from apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.html rename to apps/web/src/app/auth/settings/security/change-kdf/change-kdf-confirmation.component.html diff --git a/apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.ts b/apps/web/src/app/auth/settings/security/change-kdf/change-kdf-confirmation.component.ts similarity index 100% rename from apps/web/src/app/settings/change-kdf/change-kdf-confirmation.component.ts rename to apps/web/src/app/auth/settings/security/change-kdf/change-kdf-confirmation.component.ts diff --git a/apps/web/src/app/settings/change-kdf/change-kdf.component.html b/apps/web/src/app/auth/settings/security/change-kdf/change-kdf.component.html similarity index 100% rename from apps/web/src/app/settings/change-kdf/change-kdf.component.html rename to apps/web/src/app/auth/settings/security/change-kdf/change-kdf.component.html diff --git a/apps/web/src/app/settings/change-kdf/change-kdf.component.ts b/apps/web/src/app/auth/settings/security/change-kdf/change-kdf.component.ts similarity index 100% rename from apps/web/src/app/settings/change-kdf/change-kdf.component.ts rename to apps/web/src/app/auth/settings/security/change-kdf/change-kdf.component.ts diff --git a/apps/web/src/app/settings/change-kdf/change-kdf.module.ts b/apps/web/src/app/auth/settings/security/change-kdf/change-kdf.module.ts similarity index 90% rename from apps/web/src/app/settings/change-kdf/change-kdf.module.ts rename to apps/web/src/app/auth/settings/security/change-kdf/change-kdf.module.ts index 342ad43e36..3ef1fef03f 100644 --- a/apps/web/src/app/settings/change-kdf/change-kdf.module.ts +++ b/apps/web/src/app/auth/settings/security/change-kdf/change-kdf.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from "@angular/common"; import { NgModule } from "@angular/core"; -import { SharedModule } from "../../shared"; +import { SharedModule } from "../../../../shared"; import { ChangeKdfConfirmationComponent } from "./change-kdf-confirmation.component"; import { ChangeKdfComponent } from "./change-kdf.component"; diff --git a/apps/web/src/app/settings/security-keys.component.html b/apps/web/src/app/auth/settings/security/security-keys.component.html similarity index 100% rename from apps/web/src/app/settings/security-keys.component.html rename to apps/web/src/app/auth/settings/security/security-keys.component.html diff --git a/apps/web/src/app/settings/security-keys.component.ts b/apps/web/src/app/auth/settings/security/security-keys.component.ts similarity index 100% rename from apps/web/src/app/settings/security-keys.component.ts rename to apps/web/src/app/auth/settings/security/security-keys.component.ts diff --git a/apps/web/src/app/settings/security-routing.module.ts b/apps/web/src/app/auth/settings/security/security-routing.module.ts similarity index 84% rename from apps/web/src/app/settings/security-routing.module.ts rename to apps/web/src/app/auth/settings/security/security-routing.module.ts index d08d4be16f..ca1d7c6aa6 100644 --- a/apps/web/src/app/settings/security-routing.module.ts +++ b/apps/web/src/app/auth/settings/security/security-routing.module.ts @@ -1,8 +1,8 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { ChangePasswordComponent } from "../auth/settings/change-password.component"; -import { TwoFactorSetupComponent } from "../auth/settings/two-factor-setup.component"; +import { ChangePasswordComponent } from "../change-password.component"; +import { TwoFactorSetupComponent } from "../two-factor-setup.component"; import { SecurityKeysComponent } from "./security-keys.component"; import { SecurityComponent } from "./security.component"; diff --git a/apps/web/src/app/settings/security.component.html b/apps/web/src/app/auth/settings/security/security.component.html similarity index 100% rename from apps/web/src/app/settings/security.component.html rename to apps/web/src/app/auth/settings/security/security.component.html diff --git a/apps/web/src/app/settings/security.component.ts b/apps/web/src/app/auth/settings/security/security.component.ts similarity index 100% rename from apps/web/src/app/settings/security.component.ts rename to apps/web/src/app/auth/settings/security/security.component.ts diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index 986b0fc32d..40fb39dc58 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -29,8 +29,10 @@ 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 { AccountComponent } from "./auth/settings/account/account.component"; import { EmergencyAccessComponent } from "./auth/settings/emergency-access/emergency-access.component"; import { EmergencyAccessViewComponent } from "./auth/settings/emergency-access/view/emergency-access-view.component"; +import { SecurityRoutingModule } from "./auth/settings/security/security-routing.module"; import { SsoComponent } from "./auth/sso.component"; import { TrialInitiationComponent } from "./auth/trial-initiation/trial-initiation.component"; import { TwoFactorComponent } from "./auth/two-factor.component"; @@ -41,10 +43,8 @@ import { VerifyRecoverDeleteComponent } from "./auth/verify-recover-delete.compo import { FrontendLayoutComponent } from "./layouts/frontend-layout.component"; import { UserLayoutComponent } from "./layouts/user-layout.component"; import { ReportsModule } from "./reports"; -import { AccountComponent } from "./settings/account.component"; import { DomainRulesComponent } from "./settings/domain-rules.component"; import { PreferencesComponent } from "./settings/preferences.component"; -import { SecurityRoutingModule } from "./settings/security-routing.module"; import { SettingsComponent } from "./settings/settings.component"; import { GeneratorComponent } from "./tools/generator.component"; import { AccessComponent } from "./tools/send/access.component"; diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index 2944f88473..604d7dcada 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -24,7 +24,12 @@ 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 { AccountComponent } from "../auth/settings/account/account.component"; +import { ChangeAvatarComponent } from "../auth/settings/account/change-avatar.component"; +import { ChangeEmailComponent } from "../auth/settings/account/change-email.component"; +import { DeauthorizeSessionsComponent } from "../auth/settings/account/deauthorize-sessions.component"; +import { DeleteAccountComponent } from "../auth/settings/account/delete-account.component"; +import { ProfileComponent } from "../auth/settings/account/profile.component"; import { EmergencyAccessAttachmentsComponent } from "../auth/settings/emergency-access/attachments/emergency-access-attachments.component"; import { EmergencyAccessConfirmComponent } from "../auth/settings/emergency-access/confirm/emergency-access-confirm.component"; import { EmergencyAccessAddEditComponent } from "../auth/settings/emergency-access/emergency-access-add-edit.component"; @@ -32,6 +37,10 @@ import { EmergencyAccessComponent } from "../auth/settings/emergency-access/emer import { EmergencyAccessTakeoverComponent } from "../auth/settings/emergency-access/takeover/emergency-access-takeover.component"; import { EmergencyAccessViewComponent } from "../auth/settings/emergency-access/view/emergency-access-view.component"; import { EmergencyAddEditCipherComponent } from "../auth/settings/emergency-access/view/emergency-add-edit-cipher.component"; +import { ApiKeyComponent } from "../auth/settings/security/api-key.component"; +import { ChangeKdfModule } from "../auth/settings/security/change-kdf/change-kdf.module"; +import { SecurityKeysComponent } from "../auth/settings/security/security-keys.component"; +import { SecurityComponent } from "../auth/settings/security/security.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"; @@ -56,18 +65,9 @@ import { FrontendLayoutComponent } from "../layouts/frontend-layout.component"; import { NavbarComponent } from "../layouts/navbar.component"; import { ProductSwitcherModule } from "../layouts/product-switcher/product-switcher.module"; import { UserLayoutComponent } from "../layouts/user-layout.component"; -import { AccountComponent } from "../settings/account.component"; -import { ApiKeyComponent } from "../settings/api-key.component"; -import { ChangeAvatarComponent } from "../settings/change-avatar.component"; -import { ChangeEmailComponent } from "../settings/change-email.component"; -import { ChangeKdfModule } from "../settings/change-kdf/change-kdf.module"; -import { DeleteAccountComponent } from "../settings/delete-account.component"; import { DomainRulesComponent } from "../settings/domain-rules.component"; import { LowKdfComponent } from "../settings/low-kdf.component"; import { PreferencesComponent } from "../settings/preferences.component"; -import { ProfileComponent } from "../settings/profile.component"; -import { SecurityKeysComponent } from "../settings/security-keys.component"; -import { SecurityComponent } from "../settings/security.component"; import { SettingsComponent } from "../settings/settings.component"; import { VaultTimeoutInputComponent } from "../settings/vault-timeout-input.component"; import { GeneratorComponent } from "../tools/generator.component";