From 67aad0c5b7684332813f8675e818297fff660690 Mon Sep 17 00:00:00 2001 From: Andreas Coroiu Date: Wed, 8 Feb 2023 16:33:41 +0100 Subject: [PATCH 1/3] [EC-489] chore: remove obsolete `identifier` field (#4575) * [EC-489] chore: remove obsolete `identifier` field * [EC-489] chore: remove identifier from org response --- apps/web/src/app/organizations/settings/account.component.ts | 1 - .../common/src/models/request/organization-update.request.ts | 5 ----- libs/common/src/models/response/organization.response.ts | 2 -- 3 files changed, 8 deletions(-) diff --git a/apps/web/src/app/organizations/settings/account.component.ts b/apps/web/src/app/organizations/settings/account.component.ts index 7e685ea9c81..1f37993d7d2 100644 --- a/apps/web/src/app/organizations/settings/account.component.ts +++ b/apps/web/src/app/organizations/settings/account.component.ts @@ -77,7 +77,6 @@ export class AccountComponent { request.name = this.org.name; request.businessName = this.org.businessName; request.billingEmail = this.org.billingEmail; - request.identifier = this.org.identifier; // Backfill pub/priv key if necessary if (!this.org.hasPublicAndPrivateKeys) { diff --git a/libs/common/src/models/request/organization-update.request.ts b/libs/common/src/models/request/organization-update.request.ts index f7a8491ccbe..98d5d0338bc 100644 --- a/libs/common/src/models/request/organization-update.request.ts +++ b/libs/common/src/models/request/organization-update.request.ts @@ -2,11 +2,6 @@ import { OrganizationKeysRequest } from "./organization-keys.request"; export class OrganizationUpdateRequest { name: string; - /** - * @deprecated 2022-08-03 Moved to OrganizationSsoRequest, left for backwards compatability. - * https://bitwarden.atlassian.net/browse/EC-489 - */ - identifier: string; businessName: string; billingEmail: string; keys: OrganizationKeysRequest; diff --git a/libs/common/src/models/response/organization.response.ts b/libs/common/src/models/response/organization.response.ts index 1723ed7cfbd..ce684e34521 100644 --- a/libs/common/src/models/response/organization.response.ts +++ b/libs/common/src/models/response/organization.response.ts @@ -5,7 +5,6 @@ import { PlanResponse } from "./plan.response"; export class OrganizationResponse extends BaseResponse { id: string; - identifier: string; name: string; businessName: string; businessAddress1: string; @@ -32,7 +31,6 @@ export class OrganizationResponse extends BaseResponse { constructor(response: any) { super(response); this.id = this.getResponseProperty("Id"); - this.identifier = this.getResponseProperty("Identifier"); this.name = this.getResponseProperty("Name"); this.businessName = this.getResponseProperty("BusinessName"); this.businessAddress1 = this.getResponseProperty("BusinessAddress1"); From 18e143b9bb652458806318f0fb2f3e72e6af76e8 Mon Sep 17 00:00:00 2001 From: Robyn MacCallum Date: Wed, 8 Feb 2023 11:39:40 -0500 Subject: [PATCH 2/3] [SG-998] Move org vault to vault team (#4681) * Rename vault folder to org-vault * Move org-vault folder to vault * Rename nested vault folder to individual-vault * Fix vault module imports * Undo desktop imports * Remove extra app folder * Add @bitwarden/team-vault-dev code owners * Update .github/CODEOWNERS Co-authored-by: Matt Gibson * Remove eslint ignore comments --------- Co-authored-by: Matt Gibson --- .github/CODEOWNERS | 9 ++++++ apps/web/src/app/core/core.module.ts | 4 +-- .../organization-routing.module.ts | 3 +- .../vault/collections.component.ts | 4 +-- apps/web/src/app/oss-routing.module.ts | 2 +- apps/web/src/app/oss.module.ts | 4 +-- .../reports/pages/cipher-report.component.ts | 4 +-- .../shared/report-card/report-card.stories.ts | 2 +- .../shared/report-list/report-list.stories.ts | 2 +- .../src/app/shared/loose-components.module.ts | 20 ++++++------- .../emergency-access-attachments.component.ts | 2 +- .../emergency-add-edit.component.ts | 4 +-- .../password-reprompt.component.html | 0 .../components/password-reprompt.component.ts | 0 .../components/premium-badge.component.ts | 0 .../components/premium-badge.stories.ts | 0 .../core/password-reprompt.service.ts | 0 .../add-edit-custom-fields.component.html | 0 .../add-edit-custom-fields.component.ts | 0 .../add-edit.component.html | 0 .../add-edit.component.ts | 0 .../attachments.component.html | 0 .../attachments.component.ts | 0 .../bulk-delete-dialog.component.html | 0 .../bulk-delete-dialog.component.ts | 0 .../bulk-dialogs.module.ts | 2 +- .../bulk-move-dialog.component.html | 0 .../bulk-move-dialog.component.ts | 0 .../bulk-restore-dialog.component.html | 0 .../bulk-restore-dialog.component.ts | 0 .../bulk-share-dialog.component.html | 0 .../bulk-share-dialog.component.ts | 0 .../collections.component.html | 0 .../collections.component.ts | 0 .../folder-add-edit.component.html | 0 .../folder-add-edit.component.ts | 0 .../organization-badge.module.ts | 2 +- .../organization-name-badge.component.html | 0 .../organization-name-badge.component.ts | 0 .../pipes/get-collection-name.pipe.ts | 0 .../pipes/get-group-name.pipe.ts | 2 +- .../pipes/get-organization-name.pipe.ts | 0 .../pipes/pipes.module.ts | 0 .../share.component.html | 0 .../share.component.ts | 0 .../components/link-sso.component.html | 0 .../components/link-sso.component.ts | 0 .../organization-options.component.html | 0 .../organization-options.component.ts | 2 +- .../components/vault-filter.component.html | 0 .../components/vault-filter.component.ts | 0 .../organization-filter.component.html | 0 .../abstractions/vault-filter.service.ts | 0 .../services/vault-filter.service.spec.ts | 0 .../services/vault-filter.service.ts | 2 +- .../vault-filter-section.component.html | 0 .../vault-filter-section.component.ts | 0 .../models/vault-filter-section.type.ts | 0 .../shared/models/vault-filter.model.spec.ts | 0 .../shared/models/vault-filter.model.ts | 0 .../shared/models/vault-filter.type.ts | 2 +- .../shared/vault-filter-shared.module.ts | 4 +-- .../vault-filter/vault-filter.module.ts | 2 +- .../vault-header/vault-header.component.html | 0 .../vault-header/vault-header.component.ts | 0 .../vault-items.component.html | 0 .../vault-items.component.ts | 2 +- .../vault-routing.module.ts | 0 .../vault.component.html | 0 .../vault.component.ts | 2 +- .../vault.module.ts | 6 ++-- .../org-vault}/add-edit.component.ts | 4 +-- .../org-vault}/attachments.component.ts | 4 +-- .../collection-badge.module.ts | 4 +-- .../collection-name-badge.component.html | 0 .../collection-name.badge.component.ts | 0 .../group-badge/group-badge.module.ts | 4 +-- .../group-name-badge.component.html | 0 .../group-badge/group-name-badge.component.ts | 2 +- .../vault-filter/vault-filter.component.ts | 8 +++--- .../vault-filter/vault-filter.module.ts | 4 +-- .../vault-filter/vault-filter.service.ts | 8 +++--- .../vault-header/vault-header.component.html | 0 .../vault-header/vault-header.component.ts | 10 +++---- .../org-vault}/vault-items.component.ts | 28 +++++++++---------- .../org-vault}/vault-routing.module.ts | 2 +- .../org-vault}/vault.component.html | 0 .../org-vault}/vault.component.ts | 8 +++--- .../vault => vault/org-vault}/vault.module.ts | 11 +++++--- 89 files changed, 97 insertions(+), 88 deletions(-) rename apps/web/src/vault/{app => }/components/password-reprompt.component.html (100%) rename apps/web/src/vault/{app => }/components/password-reprompt.component.ts (100%) rename apps/web/src/vault/{app => }/components/premium-badge.component.ts (100%) rename apps/web/src/vault/{app => }/components/premium-badge.stories.ts (100%) rename apps/web/src/vault/{app => }/core/password-reprompt.service.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/add-edit-custom-fields.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/add-edit-custom-fields.component.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/add-edit.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/add-edit.component.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/attachments.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/attachments.component.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/bulk-action-dialogs/bulk-dialogs.module.ts (93%) rename apps/web/src/vault/{app/vault => individual-vault}/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/collections.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/collections.component.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/folder-add-edit.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/folder-add-edit.component.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/organization-badge/organization-badge.module.ts (84%) rename apps/web/src/vault/{app/vault => individual-vault}/organization-badge/organization-name-badge.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/organization-badge/organization-name-badge.component.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/pipes/get-collection-name.pipe.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/pipes/get-group-name.pipe.ts (81%) rename apps/web/src/vault/{app/vault => individual-vault}/pipes/get-organization-name.pipe.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/pipes/pipes.module.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/share.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/share.component.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/components/link-sso.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/components/link-sso.component.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/components/organization-options.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/components/organization-options.component.ts (97%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/components/vault-filter.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/components/vault-filter.component.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/organization-filter/organization-filter.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/services/abstractions/vault-filter.service.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/services/vault-filter.service.spec.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/services/vault-filter.service.ts (99%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/shared/components/vault-filter-section.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/shared/components/vault-filter-section.component.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/shared/models/vault-filter-section.type.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/shared/models/vault-filter.model.spec.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/shared/models/vault-filter.model.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/shared/models/vault-filter.type.ts (89%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/shared/vault-filter-shared.module.ts (67%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-filter/vault-filter.module.ts (87%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-header/vault-header.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-header/vault-header.component.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-items.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-items.component.ts (99%) rename apps/web/src/vault/{app/vault => individual-vault}/vault-routing.module.ts (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault.component.html (100%) rename apps/web/src/vault/{app/vault => individual-vault}/vault.component.ts (99%) rename apps/web/src/vault/{app/vault => individual-vault}/vault.module.ts (78%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/add-edit.component.ts (96%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/attachments.component.ts (95%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/collection-badge/collection-badge.module.ts (71%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/collection-badge/collection-name-badge.component.html (100%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/collection-badge/collection-name.badge.component.ts (100%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/group-badge/group-badge.module.ts (69%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/group-badge/group-name-badge.component.html (100%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/group-badge/group-name-badge.component.ts (92%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/vault-filter/vault-filter.component.ts (85%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/vault-filter/vault-filter.module.ts (71%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/vault-filter/vault-filter.service.ts (89%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/vault-header/vault-header.component.html (100%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/vault-header/vault-header.component.ts (95%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/vault-items.component.ts (93%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/vault-routing.module.ts (85%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/vault.component.html (100%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/vault.component.ts (96%) rename apps/web/src/{app/organizations/vault => vault/org-vault}/vault.module.ts (65%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 48a87a94361..e03192f9404 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2,4 +2,13 @@ # # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners +# Secrets Manager team files bitwarden_license/bit-web/src/app/secrets-manager @bitwarden/pod-sm-dev + +# Password Manager Vault team files +apps/browser/src/vault @bitwarden/team-vault-dev +apps/cli/src/vault @bitwarden/team-vault-dev +apps/desktop/src/vault @bitwarden/team-vault-dev +apps/web/src/vault @bitwarden/team-vault-dev +libs/angular/src/vault @bitwarden/team-vault-dev +libs/common/src/vault @bitwarden/team-vault-dev diff --git a/apps/web/src/app/core/core.module.ts b/apps/web/src/app/core/core.module.ts index 137f6e02dd0..0e5be083081 100644 --- a/apps/web/src/app/core/core.module.ts +++ b/apps/web/src/app/core/core.module.ts @@ -24,9 +24,7 @@ import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; -// TODO refine elsint rule for **/app/core/* -// eslint-disable-next-line no-restricted-imports -import { PasswordRepromptService } from "../../vault/app/core/password-reprompt.service"; +import { PasswordRepromptService } from "../../vault/core/password-reprompt.service"; import { BroadcasterMessagingService } from "./broadcaster-messaging.service"; import { EventService } from "./event.service"; diff --git a/apps/web/src/app/organizations/organization-routing.module.ts b/apps/web/src/app/organizations/organization-routing.module.ts index 2ba5545be05..c29fb69030e 100644 --- a/apps/web/src/app/organizations/organization-routing.module.ts +++ b/apps/web/src/app/organizations/organization-routing.module.ts @@ -12,13 +12,14 @@ import { } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/models/domain/organization"; +import { VaultModule } from "../../vault/org-vault/vault.module"; + import { OrganizationPermissionsGuard } from "./guards/org-permissions.guard"; import { OrganizationRedirectGuard } from "./guards/org-redirect.guard"; import { OrganizationLayoutComponent } from "./layouts/organization-layout.component"; import { CollectionsComponent } from "./manage/collections.component"; import { GroupsComponent } from "./manage/groups.component"; import { ManageComponent } from "./manage/manage.component"; -import { VaultModule } from "./vault/vault.module"; const routes: Routes = [ { diff --git a/apps/web/src/app/organizations/vault/collections.component.ts b/apps/web/src/app/organizations/vault/collections.component.ts index e78f54aa686..de3f51b5f2b 100644 --- a/apps/web/src/app/organizations/vault/collections.component.ts +++ b/apps/web/src/app/organizations/vault/collections.component.ts @@ -11,11 +11,11 @@ import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { CipherCollectionsRequest } from "@bitwarden/common/vault/models/request/cipher-collections.request"; -import { CollectionsComponent as BaseCollectionsComponent } from "../../../vault/app/vault/collections.component"; +import { CollectionsComponent as BaseCollectionsComponent } from "../../../vault/individual-vault/collections.component"; @Component({ selector: "app-org-vault-collections", - templateUrl: "../../../vault/app/vault/collections.component.html", + templateUrl: "../../../vault/individual-vault/collections.component.html", }) export class CollectionsComponent extends BaseCollectionsComponent { organization: Organization; diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts index 5f97828f3c3..85d1e08793d 100644 --- a/apps/web/src/app/oss-routing.module.ts +++ b/apps/web/src/app/oss-routing.module.ts @@ -24,7 +24,7 @@ import { UpdateTempPasswordComponent } from "../auth/update-temp-password.compon import { VerifyEmailTokenComponent } from "../auth/verify-email-token.component"; import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.component"; import { flagEnabled, Flags } from "../utils/flags"; -import { VaultModule } from "../vault/app/vault/vault.module"; +import { VaultModule } from "../vault/individual-vault/vault.module"; import { TrialInitiationComponent } from "./accounts/trial-initiation/trial-initiation.component"; import { HomeGuard } from "./guards/home.guard"; diff --git a/apps/web/src/app/oss.module.ts b/apps/web/src/app/oss.module.ts index 21902bf1fee..e13c32d9678 100644 --- a/apps/web/src/app/oss.module.ts +++ b/apps/web/src/app/oss.module.ts @@ -1,8 +1,8 @@ import { NgModule } from "@angular/core"; import { LoginModule } from "../auth/login/login.module"; -import { OrganizationBadgeModule } from "../vault/app/vault/organization-badge/organization-badge.module"; -import { VaultFilterModule } from "../vault/app/vault/vault-filter/vault-filter.module"; +import { OrganizationBadgeModule } from "../vault/individual-vault/organization-badge/organization-badge.module"; +import { VaultFilterModule } from "../vault/individual-vault/vault-filter/vault-filter.module"; import { TrialInitiationModule } from "./accounts/trial-initiation/trial-initiation.module"; import { OrganizationCreateModule } from "./organizations/create/organization-create.module"; diff --git a/apps/web/src/app/reports/pages/cipher-report.component.ts b/apps/web/src/app/reports/pages/cipher-report.component.ts index 3e987360fc1..0268a96d40a 100644 --- a/apps/web/src/app/reports/pages/cipher-report.component.ts +++ b/apps/web/src/app/reports/pages/cipher-report.component.ts @@ -7,8 +7,8 @@ import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/pa import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -import { AddEditComponent } from "../../../vault/app/vault/add-edit.component"; -import { AddEditComponent as OrgAddEditComponent } from "../../organizations/vault/add-edit.component"; +import { AddEditComponent } from "../../../vault/individual-vault/add-edit.component"; +import { AddEditComponent as OrgAddEditComponent } from "../../../vault/org-vault/add-edit.component"; @Directive() export class CipherReportComponent { diff --git a/apps/web/src/app/reports/shared/report-card/report-card.stories.ts b/apps/web/src/app/reports/shared/report-card/report-card.stories.ts index dc56d818290..88f66ebf324 100644 --- a/apps/web/src/app/reports/shared/report-card/report-card.stories.ts +++ b/apps/web/src/app/reports/shared/report-card/report-card.stories.ts @@ -4,7 +4,7 @@ import { Meta, Story, moduleMetadata } from "@storybook/angular"; import { JslibModule } from "@bitwarden/angular/jslib.module"; import { BadgeModule, IconModule } from "@bitwarden/components"; -import { PremiumBadgeComponent } from "../../../../vault/app/components/premium-badge.component"; +import { PremiumBadgeComponent } from "../../../../vault/components/premium-badge.component"; import { PreloadedEnglishI18nModule } from "../../../tests/preloaded-english-i18n.module"; import { ReportVariant } from "../models/report-variant"; diff --git a/apps/web/src/app/reports/shared/report-list/report-list.stories.ts b/apps/web/src/app/reports/shared/report-list/report-list.stories.ts index e04d423f0e6..3be229bfd69 100644 --- a/apps/web/src/app/reports/shared/report-list/report-list.stories.ts +++ b/apps/web/src/app/reports/shared/report-list/report-list.stories.ts @@ -4,7 +4,7 @@ import { Meta, Story, moduleMetadata } from "@storybook/angular"; import { JslibModule } from "@bitwarden/angular/jslib.module"; import { BadgeModule, IconModule } from "@bitwarden/components"; -import { PremiumBadgeComponent } from "../../../../vault/app/components/premium-badge.component"; +import { PremiumBadgeComponent } from "../../../../vault/components/premium-badge.component"; import { PreloadedEnglishI18nModule } from "../../../tests/preloaded-english-i18n.module"; import { reports } from "../../reports"; import { ReportVariant } from "../models/report-variant"; diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts index ece942b1dee..59847918b47 100644 --- a/apps/web/src/app/shared/loose-components.module.ts +++ b/apps/web/src/app/shared/loose-components.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { PasswordRepromptComponent } from "../../../src/vault/app/components/password-reprompt.component"; +import { PasswordRepromptComponent } from "../../../src/vault/components/password-reprompt.component"; import { AcceptEmergencyComponent } from "../../auth/accept-emergency.component"; import { AcceptOrganizationComponent } from "../../auth/accept-organization.component"; import { HintComponent } from "../../auth/hint.component"; @@ -34,13 +34,15 @@ 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 { PremiumBadgeComponent } from "../../vault/app/components/premium-badge.component"; -import { AddEditCustomFieldsComponent } from "../../vault/app/vault/add-edit-custom-fields.component"; -import { AddEditComponent } from "../../vault/app/vault/add-edit.component"; -import { AttachmentsComponent } from "../../vault/app/vault/attachments.component"; -import { CollectionsComponent } from "../../vault/app/vault/collections.component"; -import { FolderAddEditComponent } from "../../vault/app/vault/folder-add-edit.component"; -import { ShareComponent } from "../../vault/app/vault/share.component"; +import { PremiumBadgeComponent } from "../../vault/components/premium-badge.component"; +import { AddEditCustomFieldsComponent } from "../../vault/individual-vault/add-edit-custom-fields.component"; +import { AddEditComponent } from "../../vault/individual-vault/add-edit.component"; +import { AttachmentsComponent } from "../../vault/individual-vault/attachments.component"; +import { CollectionsComponent } from "../../vault/individual-vault/collections.component"; +import { FolderAddEditComponent } from "../../vault/individual-vault/folder-add-edit.component"; +import { ShareComponent } from "../../vault/individual-vault/share.component"; +import { AddEditComponent as OrgAddEditComponent } from "../../vault/org-vault/add-edit.component"; +import { AttachmentsComponent as OrgAttachmentsComponent } from "../../vault/org-vault/attachments.component"; import { DynamicAvatarComponent } from "../components/dynamic-avatar.component"; import { OrganizationSwitcherComponent } from "../components/organization-switcher.component"; import { SelectableAvatarComponent } from "../components/selectable-avatar.component"; @@ -66,8 +68,6 @@ import { ReusedPasswordsReportComponent as OrgReusedPasswordsReportComponent } f import { ToolsComponent as OrgToolsComponent } from "../organizations/tools/tools.component"; import { UnsecuredWebsitesReportComponent as OrgUnsecuredWebsitesReportComponent } from "../organizations/tools/unsecured-websites-report.component"; import { WeakPasswordsReportComponent as OrgWeakPasswordsReportComponent } from "../organizations/tools/weak-passwords-report.component"; -import { AddEditComponent as OrgAddEditComponent } from "../organizations/vault/add-edit.component"; -import { AttachmentsComponent as OrgAttachmentsComponent } from "../organizations/vault/attachments.component"; import { CollectionsComponent as OrgCollectionsComponent } from "../organizations/vault/collections.component"; import { ProvidersComponent } from "../providers/providers.component"; import { AccessComponent } from "../send/access.component"; diff --git a/apps/web/src/auth/settings/emergency-access/emergency-access-attachments.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-access-attachments.component.ts index 089606b892a..56748eb5f8d 100644 --- a/apps/web/src/auth/settings/emergency-access/emergency-access-attachments.component.ts +++ b/apps/web/src/auth/settings/emergency-access/emergency-access-attachments.component.ts @@ -13,7 +13,7 @@ import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.v @Component({ selector: "emergency-access-attachments", - templateUrl: "../../../vault/app/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-add-edit.component.ts b/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts index 81acbe845aa..0adb78d4cd8 100644 --- a/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts +++ b/apps/web/src/auth/settings/emergency-access/emergency-add-edit.component.ts @@ -17,11 +17,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 "../../../vault/app/vault/add-edit.component"; +import { AddEditComponent as BaseAddEditComponent } from "../../../vault/individual-vault/add-edit.component"; @Component({ selector: "app-org-vault-add-edit", - templateUrl: "../../../vault/app/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/vault/app/components/password-reprompt.component.html b/apps/web/src/vault/components/password-reprompt.component.html similarity index 100% rename from apps/web/src/vault/app/components/password-reprompt.component.html rename to apps/web/src/vault/components/password-reprompt.component.html diff --git a/apps/web/src/vault/app/components/password-reprompt.component.ts b/apps/web/src/vault/components/password-reprompt.component.ts similarity index 100% rename from apps/web/src/vault/app/components/password-reprompt.component.ts rename to apps/web/src/vault/components/password-reprompt.component.ts diff --git a/apps/web/src/vault/app/components/premium-badge.component.ts b/apps/web/src/vault/components/premium-badge.component.ts similarity index 100% rename from apps/web/src/vault/app/components/premium-badge.component.ts rename to apps/web/src/vault/components/premium-badge.component.ts diff --git a/apps/web/src/vault/app/components/premium-badge.stories.ts b/apps/web/src/vault/components/premium-badge.stories.ts similarity index 100% rename from apps/web/src/vault/app/components/premium-badge.stories.ts rename to apps/web/src/vault/components/premium-badge.stories.ts diff --git a/apps/web/src/vault/app/core/password-reprompt.service.ts b/apps/web/src/vault/core/password-reprompt.service.ts similarity index 100% rename from apps/web/src/vault/app/core/password-reprompt.service.ts rename to apps/web/src/vault/core/password-reprompt.service.ts diff --git a/apps/web/src/vault/app/vault/add-edit-custom-fields.component.html b/apps/web/src/vault/individual-vault/add-edit-custom-fields.component.html similarity index 100% rename from apps/web/src/vault/app/vault/add-edit-custom-fields.component.html rename to apps/web/src/vault/individual-vault/add-edit-custom-fields.component.html diff --git a/apps/web/src/vault/app/vault/add-edit-custom-fields.component.ts b/apps/web/src/vault/individual-vault/add-edit-custom-fields.component.ts similarity index 100% rename from apps/web/src/vault/app/vault/add-edit-custom-fields.component.ts rename to apps/web/src/vault/individual-vault/add-edit-custom-fields.component.ts diff --git a/apps/web/src/vault/app/vault/add-edit.component.html b/apps/web/src/vault/individual-vault/add-edit.component.html similarity index 100% rename from apps/web/src/vault/app/vault/add-edit.component.html rename to apps/web/src/vault/individual-vault/add-edit.component.html diff --git a/apps/web/src/vault/app/vault/add-edit.component.ts b/apps/web/src/vault/individual-vault/add-edit.component.ts similarity index 100% rename from apps/web/src/vault/app/vault/add-edit.component.ts rename to apps/web/src/vault/individual-vault/add-edit.component.ts diff --git a/apps/web/src/vault/app/vault/attachments.component.html b/apps/web/src/vault/individual-vault/attachments.component.html similarity index 100% rename from apps/web/src/vault/app/vault/attachments.component.html rename to apps/web/src/vault/individual-vault/attachments.component.html diff --git a/apps/web/src/vault/app/vault/attachments.component.ts b/apps/web/src/vault/individual-vault/attachments.component.ts similarity index 100% rename from apps/web/src/vault/app/vault/attachments.component.ts rename to apps/web/src/vault/individual-vault/attachments.component.ts diff --git a/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.html b/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.html similarity index 100% rename from apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.html rename to apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.html diff --git a/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts b/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts similarity index 100% rename from apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts rename to apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component.ts diff --git a/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-dialogs.module.ts b/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-dialogs.module.ts similarity index 93% rename from apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-dialogs.module.ts rename to apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-dialogs.module.ts index 3fe4979c1c5..b6e1fb5ce5c 100644 --- a/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-dialogs.module.ts +++ b/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-dialogs.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { SharedModule } from "../../../../app/shared"; +import { SharedModule } from "../../../app/shared"; import { BulkDeleteDialogComponent } from "./bulk-delete-dialog/bulk-delete-dialog.component"; import { BulkMoveDialogComponent } from "./bulk-move-dialog/bulk-move-dialog.component"; diff --git a/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.html b/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.html similarity index 100% rename from apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.html rename to apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.html diff --git a/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts b/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts similarity index 100% rename from apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts rename to apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-move-dialog/bulk-move-dialog.component.ts diff --git a/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.html b/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.html similarity index 100% rename from apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.html rename to apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.html diff --git a/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.ts b/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.ts similarity index 100% rename from apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.ts rename to apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-restore-dialog/bulk-restore-dialog.component.ts diff --git a/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.html b/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.html similarity index 100% rename from apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.html rename to apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.html diff --git a/apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts b/apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts similarity index 100% rename from apps/web/src/vault/app/vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts rename to apps/web/src/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts diff --git a/apps/web/src/vault/app/vault/collections.component.html b/apps/web/src/vault/individual-vault/collections.component.html similarity index 100% rename from apps/web/src/vault/app/vault/collections.component.html rename to apps/web/src/vault/individual-vault/collections.component.html diff --git a/apps/web/src/vault/app/vault/collections.component.ts b/apps/web/src/vault/individual-vault/collections.component.ts similarity index 100% rename from apps/web/src/vault/app/vault/collections.component.ts rename to apps/web/src/vault/individual-vault/collections.component.ts diff --git a/apps/web/src/vault/app/vault/folder-add-edit.component.html b/apps/web/src/vault/individual-vault/folder-add-edit.component.html similarity index 100% rename from apps/web/src/vault/app/vault/folder-add-edit.component.html rename to apps/web/src/vault/individual-vault/folder-add-edit.component.html diff --git a/apps/web/src/vault/app/vault/folder-add-edit.component.ts b/apps/web/src/vault/individual-vault/folder-add-edit.component.ts similarity index 100% rename from apps/web/src/vault/app/vault/folder-add-edit.component.ts rename to apps/web/src/vault/individual-vault/folder-add-edit.component.ts diff --git a/apps/web/src/vault/app/vault/organization-badge/organization-badge.module.ts b/apps/web/src/vault/individual-vault/organization-badge/organization-badge.module.ts similarity index 84% rename from apps/web/src/vault/app/vault/organization-badge/organization-badge.module.ts rename to apps/web/src/vault/individual-vault/organization-badge/organization-badge.module.ts index ad4d0b2299f..e06ca1862e0 100644 --- a/apps/web/src/vault/app/vault/organization-badge/organization-badge.module.ts +++ b/apps/web/src/vault/individual-vault/organization-badge/organization-badge.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { SharedModule } from "../../../../app/shared"; +import { SharedModule } from "../../../app/shared"; import { OrganizationNameBadgeComponent } from "./organization-name-badge.component"; diff --git a/apps/web/src/vault/app/vault/organization-badge/organization-name-badge.component.html b/apps/web/src/vault/individual-vault/organization-badge/organization-name-badge.component.html similarity index 100% rename from apps/web/src/vault/app/vault/organization-badge/organization-name-badge.component.html rename to apps/web/src/vault/individual-vault/organization-badge/organization-name-badge.component.html diff --git a/apps/web/src/vault/app/vault/organization-badge/organization-name-badge.component.ts b/apps/web/src/vault/individual-vault/organization-badge/organization-name-badge.component.ts similarity index 100% rename from apps/web/src/vault/app/vault/organization-badge/organization-name-badge.component.ts rename to apps/web/src/vault/individual-vault/organization-badge/organization-name-badge.component.ts diff --git a/apps/web/src/vault/app/vault/pipes/get-collection-name.pipe.ts b/apps/web/src/vault/individual-vault/pipes/get-collection-name.pipe.ts similarity index 100% rename from apps/web/src/vault/app/vault/pipes/get-collection-name.pipe.ts rename to apps/web/src/vault/individual-vault/pipes/get-collection-name.pipe.ts diff --git a/apps/web/src/vault/app/vault/pipes/get-group-name.pipe.ts b/apps/web/src/vault/individual-vault/pipes/get-group-name.pipe.ts similarity index 81% rename from apps/web/src/vault/app/vault/pipes/get-group-name.pipe.ts rename to apps/web/src/vault/individual-vault/pipes/get-group-name.pipe.ts index 45cdaa101ad..b299ae8670c 100644 --- a/apps/web/src/vault/app/vault/pipes/get-group-name.pipe.ts +++ b/apps/web/src/vault/individual-vault/pipes/get-group-name.pipe.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from "@angular/core"; -import { GroupView } from "../../../../app/organizations/core"; +import { GroupView } from "../../../app/organizations/core"; @Pipe({ name: "groupNameFromId", diff --git a/apps/web/src/vault/app/vault/pipes/get-organization-name.pipe.ts b/apps/web/src/vault/individual-vault/pipes/get-organization-name.pipe.ts similarity index 100% rename from apps/web/src/vault/app/vault/pipes/get-organization-name.pipe.ts rename to apps/web/src/vault/individual-vault/pipes/get-organization-name.pipe.ts diff --git a/apps/web/src/vault/app/vault/pipes/pipes.module.ts b/apps/web/src/vault/individual-vault/pipes/pipes.module.ts similarity index 100% rename from apps/web/src/vault/app/vault/pipes/pipes.module.ts rename to apps/web/src/vault/individual-vault/pipes/pipes.module.ts diff --git a/apps/web/src/vault/app/vault/share.component.html b/apps/web/src/vault/individual-vault/share.component.html similarity index 100% rename from apps/web/src/vault/app/vault/share.component.html rename to apps/web/src/vault/individual-vault/share.component.html diff --git a/apps/web/src/vault/app/vault/share.component.ts b/apps/web/src/vault/individual-vault/share.component.ts similarity index 100% rename from apps/web/src/vault/app/vault/share.component.ts rename to apps/web/src/vault/individual-vault/share.component.ts diff --git a/apps/web/src/vault/app/vault/vault-filter/components/link-sso.component.html b/apps/web/src/vault/individual-vault/vault-filter/components/link-sso.component.html similarity index 100% rename from apps/web/src/vault/app/vault/vault-filter/components/link-sso.component.html rename to apps/web/src/vault/individual-vault/vault-filter/components/link-sso.component.html diff --git a/apps/web/src/vault/app/vault/vault-filter/components/link-sso.component.ts b/apps/web/src/vault/individual-vault/vault-filter/components/link-sso.component.ts similarity index 100% rename from apps/web/src/vault/app/vault/vault-filter/components/link-sso.component.ts rename to apps/web/src/vault/individual-vault/vault-filter/components/link-sso.component.ts diff --git a/apps/web/src/vault/app/vault/vault-filter/components/organization-options.component.html b/apps/web/src/vault/individual-vault/vault-filter/components/organization-options.component.html similarity index 100% rename from apps/web/src/vault/app/vault/vault-filter/components/organization-options.component.html rename to apps/web/src/vault/individual-vault/vault-filter/components/organization-options.component.html diff --git a/apps/web/src/vault/app/vault/vault-filter/components/organization-options.component.ts b/apps/web/src/vault/individual-vault/vault-filter/components/organization-options.component.ts similarity index 97% rename from apps/web/src/vault/app/vault/vault-filter/components/organization-options.component.ts rename to apps/web/src/vault/individual-vault/vault-filter/components/organization-options.component.ts index c9e6d2c7267..f287cf7b5d9 100644 --- a/apps/web/src/vault/app/vault/vault-filter/components/organization-options.component.ts +++ b/apps/web/src/vault/individual-vault/vault-filter/components/organization-options.component.ts @@ -15,7 +15,7 @@ import { Organization } from "@bitwarden/common/models/domain/organization"; import { Policy } from "@bitwarden/common/models/domain/policy"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; -import { EnrollMasterPasswordReset } from "../../../../../app/organizations/users/enroll-master-password-reset.component"; +import { EnrollMasterPasswordReset } from "../../../../app/organizations/users/enroll-master-password-reset.component"; import { OptionsInput } from "../shared/components/vault-filter-section.component"; import { OrganizationFilter } from "../shared/models/vault-filter.type"; diff --git a/apps/web/src/vault/app/vault/vault-filter/components/vault-filter.component.html b/apps/web/src/vault/individual-vault/vault-filter/components/vault-filter.component.html similarity index 100% rename from apps/web/src/vault/app/vault/vault-filter/components/vault-filter.component.html rename to apps/web/src/vault/individual-vault/vault-filter/components/vault-filter.component.html diff --git a/apps/web/src/vault/app/vault/vault-filter/components/vault-filter.component.ts b/apps/web/src/vault/individual-vault/vault-filter/components/vault-filter.component.ts similarity index 100% rename from apps/web/src/vault/app/vault/vault-filter/components/vault-filter.component.ts rename to apps/web/src/vault/individual-vault/vault-filter/components/vault-filter.component.ts diff --git a/apps/web/src/vault/app/vault/vault-filter/organization-filter/organization-filter.component.html b/apps/web/src/vault/individual-vault/vault-filter/organization-filter/organization-filter.component.html similarity index 100% rename from apps/web/src/vault/app/vault/vault-filter/organization-filter/organization-filter.component.html rename to apps/web/src/vault/individual-vault/vault-filter/organization-filter/organization-filter.component.html diff --git a/apps/web/src/vault/app/vault/vault-filter/services/abstractions/vault-filter.service.ts b/apps/web/src/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts similarity index 100% rename from apps/web/src/vault/app/vault/vault-filter/services/abstractions/vault-filter.service.ts rename to apps/web/src/vault/individual-vault/vault-filter/services/abstractions/vault-filter.service.ts diff --git a/apps/web/src/vault/app/vault/vault-filter/services/vault-filter.service.spec.ts b/apps/web/src/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts similarity index 100% rename from apps/web/src/vault/app/vault/vault-filter/services/vault-filter.service.spec.ts rename to apps/web/src/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts diff --git a/apps/web/src/vault/app/vault/vault-filter/services/vault-filter.service.ts b/apps/web/src/vault/individual-vault/vault-filter/services/vault-filter.service.ts similarity index 99% rename from apps/web/src/vault/app/vault/vault-filter/services/vault-filter.service.ts rename to apps/web/src/vault/individual-vault/vault-filter/services/vault-filter.service.ts index bae89751b8e..eab891b04b5 100644 --- a/apps/web/src/vault/app/vault/vault-filter/services/vault-filter.service.ts +++ b/apps/web/src/vault/individual-vault/vault-filter/services/vault-filter.service.ts @@ -24,7 +24,7 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; -import { CollectionAdminView } from "../../../../../app/organizations/core"; +import { CollectionAdminView } from "../../../../app/organizations/core"; import { CipherTypeFilter, CollectionFilter, diff --git a/apps/web/src/vault/app/vault/vault-filter/shared/components/vault-filter-section.component.html b/apps/web/src/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.html similarity index 100% rename from apps/web/src/vault/app/vault/vault-filter/shared/components/vault-filter-section.component.html rename to apps/web/src/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.html diff --git a/apps/web/src/vault/app/vault/vault-filter/shared/components/vault-filter-section.component.ts b/apps/web/src/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts similarity index 100% rename from apps/web/src/vault/app/vault/vault-filter/shared/components/vault-filter-section.component.ts rename to apps/web/src/vault/individual-vault/vault-filter/shared/components/vault-filter-section.component.ts diff --git a/apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter-section.type.ts b/apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts similarity index 100% rename from apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter-section.type.ts rename to apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter-section.type.ts diff --git a/apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter.model.spec.ts b/apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts similarity index 100% rename from apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter.model.spec.ts rename to apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter.model.spec.ts diff --git a/apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter.model.ts b/apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts similarity index 100% rename from apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter.model.ts rename to apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter.model.ts diff --git a/apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter.type.ts b/apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts similarity index 89% rename from apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter.type.ts rename to apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts index 4f519517f7e..e9fe0d65e1f 100644 --- a/apps/web/src/vault/app/vault/vault-filter/shared/models/vault-filter.type.ts +++ b/apps/web/src/vault/individual-vault/vault-filter/shared/models/vault-filter.type.ts @@ -3,7 +3,7 @@ import { ITreeNodeObject } from "@bitwarden/common/src/models/domain/tree-node"; import { FolderView } from "@bitwarden/common/src/vault/models/view/folder.view"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; -import { CollectionAdminView } from "../../../../../../app/organizations/core"; +import { CollectionAdminView } from "../../../../../app/organizations/core"; export type CipherStatus = "all" | "favorites" | "trash" | CipherType; diff --git a/apps/web/src/vault/app/vault/vault-filter/shared/vault-filter-shared.module.ts b/apps/web/src/vault/individual-vault/vault-filter/shared/vault-filter-shared.module.ts similarity index 67% rename from apps/web/src/vault/app/vault/vault-filter/shared/vault-filter-shared.module.ts rename to apps/web/src/vault/individual-vault/vault-filter/shared/vault-filter-shared.module.ts index b21a45e097e..1893f10b77c 100644 --- a/apps/web/src/vault/app/vault/vault-filter/shared/vault-filter-shared.module.ts +++ b/apps/web/src/vault/individual-vault/vault-filter/shared/vault-filter-shared.module.ts @@ -1,8 +1,6 @@ import { NgModule } from "@angular/core"; -// TODO refine elsint rule for **/app/shared/* -// eslint-disable-next-line no-restricted-imports -import { SharedModule } from "../../../../../app/shared"; +import { SharedModule } from "../../../../app/shared"; import { VaultFilterSectionComponent } from "./components/vault-filter-section.component"; diff --git a/apps/web/src/vault/app/vault/vault-filter/vault-filter.module.ts b/apps/web/src/vault/individual-vault/vault-filter/vault-filter.module.ts similarity index 87% rename from apps/web/src/vault/app/vault/vault-filter/vault-filter.module.ts rename to apps/web/src/vault/individual-vault/vault-filter/vault-filter.module.ts index d94dec52067..b6edd3e9838 100644 --- a/apps/web/src/vault/app/vault/vault-filter/vault-filter.module.ts +++ b/apps/web/src/vault/individual-vault/vault-filter/vault-filter.module.ts @@ -1,6 +1,6 @@ import { NgModule } from "@angular/core"; -import { VaultFilterSharedModule } from "../../vault/vault-filter/shared/vault-filter-shared.module"; +import { VaultFilterSharedModule } from "../../individual-vault/vault-filter/shared/vault-filter-shared.module"; import { LinkSsoComponent } from "./components/link-sso.component"; import { OrganizationOptionsComponent } from "./components/organization-options.component"; diff --git a/apps/web/src/vault/app/vault/vault-header/vault-header.component.html b/apps/web/src/vault/individual-vault/vault-header/vault-header.component.html similarity index 100% rename from apps/web/src/vault/app/vault/vault-header/vault-header.component.html rename to apps/web/src/vault/individual-vault/vault-header/vault-header.component.html diff --git a/apps/web/src/vault/app/vault/vault-header/vault-header.component.ts b/apps/web/src/vault/individual-vault/vault-header/vault-header.component.ts similarity index 100% rename from apps/web/src/vault/app/vault/vault-header/vault-header.component.ts rename to apps/web/src/vault/individual-vault/vault-header/vault-header.component.ts diff --git a/apps/web/src/vault/app/vault/vault-items.component.html b/apps/web/src/vault/individual-vault/vault-items.component.html similarity index 100% rename from apps/web/src/vault/app/vault/vault-items.component.html rename to apps/web/src/vault/individual-vault/vault-items.component.html diff --git a/apps/web/src/vault/app/vault/vault-items.component.ts b/apps/web/src/vault/individual-vault/vault-items.component.ts similarity index 99% rename from apps/web/src/vault/app/vault/vault-items.component.ts rename to apps/web/src/vault/individual-vault/vault-items.component.ts index b932a948feb..ce2a2972d02 100644 --- a/apps/web/src/vault/app/vault/vault-items.component.ts +++ b/apps/web/src/vault/individual-vault/vault-items.component.ts @@ -23,7 +23,7 @@ import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { DialogService, Icons } from "@bitwarden/components"; -import { CollectionAdminView, GroupView } from "../../../app/organizations/core"; +import { CollectionAdminView, GroupView } from "../../app/organizations/core"; import { BulkDeleteDialogResult, diff --git a/apps/web/src/vault/app/vault/vault-routing.module.ts b/apps/web/src/vault/individual-vault/vault-routing.module.ts similarity index 100% rename from apps/web/src/vault/app/vault/vault-routing.module.ts rename to apps/web/src/vault/individual-vault/vault-routing.module.ts diff --git a/apps/web/src/vault/app/vault/vault.component.html b/apps/web/src/vault/individual-vault/vault.component.html similarity index 100% rename from apps/web/src/vault/app/vault/vault.component.html rename to apps/web/src/vault/individual-vault/vault.component.html diff --git a/apps/web/src/vault/app/vault/vault.component.ts b/apps/web/src/vault/individual-vault/vault.component.ts similarity index 99% rename from apps/web/src/vault/app/vault/vault.component.ts rename to apps/web/src/vault/individual-vault/vault.component.ts index bc702222cf9..50ec3c48bef 100644 --- a/apps/web/src/vault/app/vault/vault.component.ts +++ b/apps/web/src/vault/individual-vault/vault.component.ts @@ -28,7 +28,7 @@ import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/pa import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -import { UpdateKeyComponent } from "../../../app/settings/update-key.component"; +import { UpdateKeyComponent } from "../../app/settings/update-key.component"; import { AddEditComponent } from "./add-edit.component"; import { AttachmentsComponent } from "./attachments.component"; diff --git a/apps/web/src/vault/app/vault/vault.module.ts b/apps/web/src/vault/individual-vault/vault.module.ts similarity index 78% rename from apps/web/src/vault/app/vault/vault.module.ts rename to apps/web/src/vault/individual-vault/vault.module.ts index 8d03a3cc00a..3436a6e9695 100644 --- a/apps/web/src/vault/app/vault/vault.module.ts +++ b/apps/web/src/vault/individual-vault/vault.module.ts @@ -2,9 +2,9 @@ import { NgModule } from "@angular/core"; import { BreadcrumbsModule } from "@bitwarden/components"; -import { CollectionBadgeModule } from "../../../app/organizations/vault/collection-badge/collection-badge.module"; -import { GroupBadgeModule } from "../../../app/organizations/vault/group-badge/group-badge.module"; -import { LooseComponentsModule, SharedModule } from "../../../app/shared"; +import { LooseComponentsModule, SharedModule } from "../../app/shared"; +import { CollectionBadgeModule } from "../org-vault/collection-badge/collection-badge.module"; +import { GroupBadgeModule } from "../org-vault/group-badge/group-badge.module"; import { BulkDialogsModule } from "./bulk-action-dialogs/bulk-dialogs.module"; import { OrganizationBadgeModule } from "./organization-badge/organization-badge.module"; diff --git a/apps/web/src/app/organizations/vault/add-edit.component.ts b/apps/web/src/vault/org-vault/add-edit.component.ts similarity index 96% rename from apps/web/src/app/organizations/vault/add-edit.component.ts rename to apps/web/src/vault/org-vault/add-edit.component.ts index 5f05840c826..ef347f856fb 100644 --- a/apps/web/src/app/organizations/vault/add-edit.component.ts +++ b/apps/web/src/vault/org-vault/add-edit.component.ts @@ -21,11 +21,11 @@ import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { CipherCreateRequest } from "@bitwarden/common/vault/models/request/cipher-create.request"; import { CipherRequest } from "@bitwarden/common/vault/models/request/cipher.request"; -import { AddEditComponent as BaseAddEditComponent } from "../../../vault/app/vault/add-edit.component"; +import { AddEditComponent as BaseAddEditComponent } from "../individual-vault/add-edit.component"; @Component({ selector: "app-org-vault-add-edit", - templateUrl: "../../../vault/app/vault/add-edit.component.html", + templateUrl: "../individual-vault/add-edit.component.html", }) export class AddEditComponent extends BaseAddEditComponent { originalCipher: Cipher = null; diff --git a/apps/web/src/app/organizations/vault/attachments.component.ts b/apps/web/src/vault/org-vault/attachments.component.ts similarity index 95% rename from apps/web/src/app/organizations/vault/attachments.component.ts rename to apps/web/src/vault/org-vault/attachments.component.ts index 720c08bee58..f5f9d5b7328 100644 --- a/apps/web/src/app/organizations/vault/attachments.component.ts +++ b/apps/web/src/vault/org-vault/attachments.component.ts @@ -13,11 +13,11 @@ import { CipherData } from "@bitwarden/common/vault/models/data/cipher.data"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { AttachmentView } from "@bitwarden/common/vault/models/view/attachment.view"; -import { AttachmentsComponent as BaseAttachmentsComponent } from "../../../vault/app/vault/attachments.component"; +import { AttachmentsComponent as BaseAttachmentsComponent } from "../individual-vault/attachments.component"; @Component({ selector: "app-org-vault-attachments", - templateUrl: "../../../vault/app/vault/attachments.component.html", + templateUrl: "../individual-vault/attachments.component.html", }) export class AttachmentsComponent extends BaseAttachmentsComponent { viewOnly = false; diff --git a/apps/web/src/app/organizations/vault/collection-badge/collection-badge.module.ts b/apps/web/src/vault/org-vault/collection-badge/collection-badge.module.ts similarity index 71% rename from apps/web/src/app/organizations/vault/collection-badge/collection-badge.module.ts rename to apps/web/src/vault/org-vault/collection-badge/collection-badge.module.ts index 5f1a21fdc22..0fe8bf337ae 100644 --- a/apps/web/src/app/organizations/vault/collection-badge/collection-badge.module.ts +++ b/apps/web/src/vault/org-vault/collection-badge/collection-badge.module.ts @@ -1,7 +1,7 @@ import { NgModule } from "@angular/core"; -import { PipesModule } from "../../../../vault/app/vault/pipes/pipes.module"; -import { SharedModule } from "../../../shared"; +import { SharedModule } from "../../../app/shared"; +import { PipesModule } from "../../individual-vault/pipes/pipes.module"; import { CollectionNameBadgeComponent } from "./collection-name.badge.component"; diff --git a/apps/web/src/app/organizations/vault/collection-badge/collection-name-badge.component.html b/apps/web/src/vault/org-vault/collection-badge/collection-name-badge.component.html similarity index 100% rename from apps/web/src/app/organizations/vault/collection-badge/collection-name-badge.component.html rename to apps/web/src/vault/org-vault/collection-badge/collection-name-badge.component.html diff --git a/apps/web/src/app/organizations/vault/collection-badge/collection-name.badge.component.ts b/apps/web/src/vault/org-vault/collection-badge/collection-name.badge.component.ts similarity index 100% rename from apps/web/src/app/organizations/vault/collection-badge/collection-name.badge.component.ts rename to apps/web/src/vault/org-vault/collection-badge/collection-name.badge.component.ts diff --git a/apps/web/src/app/organizations/vault/group-badge/group-badge.module.ts b/apps/web/src/vault/org-vault/group-badge/group-badge.module.ts similarity index 69% rename from apps/web/src/app/organizations/vault/group-badge/group-badge.module.ts rename to apps/web/src/vault/org-vault/group-badge/group-badge.module.ts index d243d50efc1..67bb1051dc3 100644 --- a/apps/web/src/app/organizations/vault/group-badge/group-badge.module.ts +++ b/apps/web/src/vault/org-vault/group-badge/group-badge.module.ts @@ -1,7 +1,7 @@ import { NgModule } from "@angular/core"; -import { PipesModule } from "../../../../vault/app/vault/pipes/pipes.module"; -import { SharedModule } from "../../../shared"; +import { SharedModule } from "../../../app/shared"; +import { PipesModule } from "../../individual-vault/pipes/pipes.module"; import { GroupNameBadgeComponent } from "./group-name-badge.component"; diff --git a/apps/web/src/app/organizations/vault/group-badge/group-name-badge.component.html b/apps/web/src/vault/org-vault/group-badge/group-name-badge.component.html similarity index 100% rename from apps/web/src/app/organizations/vault/group-badge/group-name-badge.component.html rename to apps/web/src/vault/org-vault/group-badge/group-name-badge.component.html diff --git a/apps/web/src/app/organizations/vault/group-badge/group-name-badge.component.ts b/apps/web/src/vault/org-vault/group-badge/group-name-badge.component.ts similarity index 92% rename from apps/web/src/app/organizations/vault/group-badge/group-name-badge.component.ts rename to apps/web/src/vault/org-vault/group-badge/group-name-badge.component.ts index f05dfcbdd54..09f0213ab28 100644 --- a/apps/web/src/app/organizations/vault/group-badge/group-name-badge.component.ts +++ b/apps/web/src/vault/org-vault/group-badge/group-name-badge.component.ts @@ -3,7 +3,7 @@ import { Component, Input, OnChanges } from "@angular/core"; import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { SelectionReadOnlyRequest } from "@bitwarden/common/models/request/selection-read-only.request"; -import { GroupView } from "../../core"; +import { GroupView } from "../../../app/organizations/core"; @Component({ selector: "app-group-badge", diff --git a/apps/web/src/app/organizations/vault/vault-filter/vault-filter.component.ts b/apps/web/src/vault/org-vault/vault-filter/vault-filter.component.ts similarity index 85% rename from apps/web/src/app/organizations/vault/vault-filter/vault-filter.component.ts rename to apps/web/src/vault/org-vault/vault-filter/vault-filter.component.ts index 44f53203b31..2dca1c967a0 100644 --- a/apps/web/src/app/organizations/vault/vault-filter/vault-filter.component.ts +++ b/apps/web/src/vault/org-vault/vault-filter/vault-filter.component.ts @@ -5,16 +5,16 @@ import { Organization } from "@bitwarden/common/models/domain/organization"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { CollectionView } from "@bitwarden/common/models/view/collection.view"; -import { VaultFilterComponent as BaseVaultFilterComponent } from "../../../../vault/app/vault/vault-filter/components/vault-filter.component"; +import { VaultFilterComponent as BaseVaultFilterComponent } from "../../individual-vault/vault-filter/components/vault-filter.component"; //../../vault/vault-filter/components/vault-filter.component"; import { VaultFilterList, VaultFilterType, -} from "../../../../vault/app/vault/vault-filter/shared/models/vault-filter-section.type"; -import { CollectionFilter } from "../../../../vault/app/vault/vault-filter/shared/models/vault-filter.type"; +} from "../../individual-vault/vault-filter/shared/models/vault-filter-section.type"; +import { CollectionFilter } from "../../individual-vault/vault-filter/shared/models/vault-filter.type"; @Component({ selector: "app-organization-vault-filter", - templateUrl: "../../../../vault/app/vault/vault-filter/components/vault-filter.component.html", + templateUrl: "../../individual-vault/vault-filter/components/vault-filter.component.html", }) export class VaultFilterComponent extends BaseVaultFilterComponent implements OnInit, OnDestroy { @Input() set organization(value: Organization) { diff --git a/apps/web/src/app/organizations/vault/vault-filter/vault-filter.module.ts b/apps/web/src/vault/org-vault/vault-filter/vault-filter.module.ts similarity index 71% rename from apps/web/src/app/organizations/vault/vault-filter/vault-filter.module.ts rename to apps/web/src/vault/org-vault/vault-filter/vault-filter.module.ts index 9bc5bdb2eea..c276f79fba9 100644 --- a/apps/web/src/app/organizations/vault/vault-filter/vault-filter.module.ts +++ b/apps/web/src/vault/org-vault/vault-filter/vault-filter.module.ts @@ -1,7 +1,7 @@ import { NgModule } from "@angular/core"; -import { VaultFilterService as VaultFilterServiceAbstraction } from "../../../../vault/app/vault/vault-filter/services/abstractions/vault-filter.service"; -import { VaultFilterSharedModule } from "../../../../vault/app/vault/vault-filter/shared/vault-filter-shared.module"; +import { VaultFilterService as VaultFilterServiceAbstraction } from "../../individual-vault/vault-filter/services/abstractions/vault-filter.service"; +import { VaultFilterSharedModule } from "../../individual-vault/vault-filter/shared/vault-filter-shared.module"; import { VaultFilterComponent } from "./vault-filter.component"; import { VaultFilterService } from "./vault-filter.service"; diff --git a/apps/web/src/app/organizations/vault/vault-filter/vault-filter.service.ts b/apps/web/src/vault/org-vault/vault-filter/vault-filter.service.ts similarity index 89% rename from apps/web/src/app/organizations/vault/vault-filter/vault-filter.service.ts rename to apps/web/src/vault/org-vault/vault-filter/vault-filter.service.ts index 49f2c0518e8..1477ccafbfe 100644 --- a/apps/web/src/app/organizations/vault/vault-filter/vault-filter.service.ts +++ b/apps/web/src/vault/org-vault/vault-filter/vault-filter.service.ts @@ -14,10 +14,10 @@ import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; -import { VaultFilterService as BaseVaultFilterService } from "../../../../vault/app/vault/vault-filter/services/vault-filter.service"; -import { CollectionFilter } from "../../../../vault/app/vault/vault-filter/shared/models/vault-filter.type"; -import { CollectionAdminView } from "../../core"; -import { CollectionAdminService } from "../../core/services/collection-admin.service"; +import { CollectionAdminView } from "../../../app/organizations/core"; +import { CollectionAdminService } from "../../../app/organizations/core/services/collection-admin.service"; +import { VaultFilterService as BaseVaultFilterService } from "../../individual-vault/vault-filter/services/vault-filter.service"; +import { CollectionFilter } from "../../individual-vault/vault-filter/shared/models/vault-filter.type"; @Injectable() export class VaultFilterService extends BaseVaultFilterService implements OnDestroy { diff --git a/apps/web/src/app/organizations/vault/vault-header/vault-header.component.html b/apps/web/src/vault/org-vault/vault-header/vault-header.component.html similarity index 100% rename from apps/web/src/app/organizations/vault/vault-header/vault-header.component.html rename to apps/web/src/vault/org-vault/vault-header/vault-header.component.html diff --git a/apps/web/src/app/organizations/vault/vault-header/vault-header.component.ts b/apps/web/src/vault/org-vault/vault-header/vault-header.component.ts similarity index 95% rename from apps/web/src/app/organizations/vault/vault-header/vault-header.component.ts rename to apps/web/src/vault/org-vault/vault-header/vault-header.component.ts index a388f63c41e..c92b1fa3b57 100644 --- a/apps/web/src/app/organizations/vault/vault-header/vault-header.component.ts +++ b/apps/web/src/vault/org-vault/vault-header/vault-header.component.ts @@ -18,15 +18,15 @@ import { SimpleDialogType, } from "@bitwarden/components"; -import { VaultFilterService } from "../../../../vault/app/vault/vault-filter/services/abstractions/vault-filter.service"; -import { VaultFilter } from "../../../../vault/app/vault/vault-filter/shared/models/vault-filter.model"; -import { CollectionFilter } from "../../../../vault/app/vault/vault-filter/shared/models/vault-filter.type"; -import { CollectionAdminService, CollectionAdminView } from "../../core"; +import { CollectionAdminService, CollectionAdminView } from "../../../app/organizations/core"; import { CollectionDialogResult, CollectionDialogTabType, openCollectionDialog, -} from "../../shared"; +} from "../../../app/organizations/shared"; +import { VaultFilterService } from "../../individual-vault/vault-filter/services/abstractions/vault-filter.service"; +import { VaultFilter } from "../../individual-vault/vault-filter/shared/models/vault-filter.model"; +import { CollectionFilter } from "../../individual-vault/vault-filter/shared/models/vault-filter.type"; @Component({ selector: "app-org-vault-header", diff --git a/apps/web/src/app/organizations/vault/vault-items.component.ts b/apps/web/src/vault/org-vault/vault-items.component.ts similarity index 93% rename from apps/web/src/app/organizations/vault/vault-items.component.ts rename to apps/web/src/vault/org-vault/vault-items.component.ts index 4ef2c8f9538..10e5473bf06 100644 --- a/apps/web/src/app/organizations/vault/vault-items.component.ts +++ b/apps/web/src/vault/org-vault/vault-items.component.ts @@ -20,29 +20,29 @@ import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/pa import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { DialogService } from "@bitwarden/components"; -import { - BulkDeleteDialogResult, - openBulkDeleteDialog, -} from "../../../vault/app/vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component"; -import { VaultFilterService } from "../../../vault/app/vault/vault-filter/services/abstractions/vault-filter.service"; -import { CollectionFilter } from "../../../vault/app/vault/vault-filter/shared/models/vault-filter.type"; -import { - VaultItemRow, - VaultItemsComponent as BaseVaultItemsComponent, -} from "../../../vault/app/vault/vault-items.component"; -import { CollectionAdminView } from "../core"; -import { GroupService } from "../core/services/group/group.service"; +import { CollectionAdminView } from "../../app/organizations/core"; +import { GroupService } from "../../app/organizations/core/services/group/group.service"; import { CollectionDialogResult, CollectionDialogTabType, openCollectionDialog, -} from "../shared/components/collection-dialog/collection-dialog.component"; +} from "../../app/organizations/shared/components/collection-dialog/collection-dialog.component"; +import { + BulkDeleteDialogResult, + openBulkDeleteDialog, +} from "../individual-vault/bulk-action-dialogs/bulk-delete-dialog/bulk-delete-dialog.component"; +import { VaultFilterService } from "../individual-vault/vault-filter/services/abstractions/vault-filter.service"; +import { CollectionFilter } from "../individual-vault/vault-filter/shared/models/vault-filter.type"; +import { + VaultItemRow, + VaultItemsComponent as BaseVaultItemsComponent, +} from "../individual-vault/vault-items.component"; const MaxCheckedCount = 500; @Component({ selector: "app-org-vault-items", - templateUrl: "../../../vault/app/vault/vault-items.component.html", + templateUrl: "../individual-vault/vault-items.component.html", }) export class VaultItemsComponent extends BaseVaultItemsComponent implements OnDestroy { @Input() set initOrganization(value: Organization) { diff --git a/apps/web/src/app/organizations/vault/vault-routing.module.ts b/apps/web/src/vault/org-vault/vault-routing.module.ts similarity index 85% rename from apps/web/src/app/organizations/vault/vault-routing.module.ts rename to apps/web/src/vault/org-vault/vault-routing.module.ts index b48c3118e75..a5a900c9762 100644 --- a/apps/web/src/app/organizations/vault/vault-routing.module.ts +++ b/apps/web/src/vault/org-vault/vault-routing.module.ts @@ -3,7 +3,7 @@ import { RouterModule, Routes } from "@angular/router"; import { canAccessVaultTab } from "@bitwarden/common/abstractions/organization/organization.service.abstraction"; -import { OrganizationPermissionsGuard } from "../guards/org-permissions.guard"; +import { OrganizationPermissionsGuard } from "../../app/organizations/guards/org-permissions.guard"; import { VaultComponent } from "./vault.component"; const routes: Routes = [ diff --git a/apps/web/src/app/organizations/vault/vault.component.html b/apps/web/src/vault/org-vault/vault.component.html similarity index 100% rename from apps/web/src/app/organizations/vault/vault.component.html rename to apps/web/src/vault/org-vault/vault.component.html diff --git a/apps/web/src/app/organizations/vault/vault.component.ts b/apps/web/src/vault/org-vault/vault.component.ts similarity index 96% rename from apps/web/src/app/organizations/vault/vault.component.ts rename to apps/web/src/vault/org-vault/vault.component.ts index 6815554d95e..ef58d456dd4 100644 --- a/apps/web/src/app/organizations/vault/vault.component.ts +++ b/apps/web/src/vault/org-vault/vault.component.ts @@ -24,13 +24,13 @@ import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.serv import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { DialogService } from "@bitwarden/components"; -import { VaultFilterService } from "../../../vault/app/vault/vault-filter/services/abstractions/vault-filter.service"; -import { VaultFilter } from "../../../vault/app/vault/vault-filter/shared/models/vault-filter.model"; -import { EntityEventsComponent } from "../manage/entity-events.component"; +import { EntityEventsComponent } from "../../app/organizations/manage/entity-events.component"; +import { CollectionsComponent } from "../../app/organizations/vault/collections.component"; +import { VaultFilterService } from "../../vault/individual-vault/vault-filter/services/abstractions/vault-filter.service"; +import { VaultFilter } from "../../vault/individual-vault/vault-filter/shared/models/vault-filter.model"; import { AddEditComponent } from "./add-edit.component"; import { AttachmentsComponent } from "./attachments.component"; -import { CollectionsComponent } from "./collections.component"; import { VaultFilterComponent } from "./vault-filter/vault-filter.component"; import { VaultItemsComponent } from "./vault-items.component"; diff --git a/apps/web/src/app/organizations/vault/vault.module.ts b/apps/web/src/vault/org-vault/vault.module.ts similarity index 65% rename from apps/web/src/app/organizations/vault/vault.module.ts rename to apps/web/src/vault/org-vault/vault.module.ts index b7a769237ab..05d7c66f7a4 100644 --- a/apps/web/src/app/organizations/vault/vault.module.ts +++ b/apps/web/src/vault/org-vault/vault.module.ts @@ -2,10 +2,13 @@ import { NgModule } from "@angular/core"; import { BreadcrumbsModule } from "@bitwarden/components"; -import { OrganizationBadgeModule } from "../../../vault/app/vault/organization-badge/organization-badge.module"; -import { PipesModule } from "../../../vault/app/vault/pipes/pipes.module"; -import { LooseComponentsModule } from "../../shared/loose-components.module"; -import { SharedModule } from "../../shared/shared.module"; +// TODO refine elsint rule for **/app/shared/* for both of these imports +// eslint-disable-next-line no-restricted-imports +import { LooseComponentsModule } from "../../app/shared/loose-components.module"; +// eslint-disable-next-line no-restricted-imports +import { SharedModule } from "../../app/shared/shared.module"; +import { OrganizationBadgeModule } from "../../vault/individual-vault/organization-badge/organization-badge.module"; +import { PipesModule } from "../../vault/individual-vault/pipes/pipes.module"; import { CollectionBadgeModule } from "./collection-badge/collection-badge.module"; import { GroupBadgeModule } from "./group-badge/group-badge.module"; From 1f3017214e492d1b20e9432c75f23fe23307e449 Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Wed, 8 Feb 2023 14:57:41 -0500 Subject: [PATCH 3/3] Auth/reorg auth (#4694) * PM-74 move desktop hint component * PM-60 move update temp password to auth team * PS-2298 Add auth code owners file --- .github/CODEOWNERS | 18 ++++++++++++++++-- apps/cli/src/auth/commands/login.command.ts | 2 +- apps/desktop/src/app/app-routing.module.ts | 2 +- apps/desktop/src/app/app.module.ts | 2 +- .../{app/accounts => auth}/hint.component.html | 0 .../{app/accounts => auth}/hint.component.ts | 0 .../update-temp-password.component.ts | 2 +- libs/common/src/abstractions/api.service.ts | 2 +- .../request/update-temp-password.request.ts | 2 +- libs/common/src/services/api.service.ts | 2 +- 10 files changed, 23 insertions(+), 9 deletions(-) rename apps/desktop/src/{app/accounts => auth}/hint.component.html (100%) rename apps/desktop/src/{app/accounts => auth}/hint.component.ts (100%) rename libs/common/src/{ => auth}/models/request/update-temp-password.request.ts (53%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e03192f9404..88e5f29d9b5 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2,10 +2,24 @@ # # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners -# Secrets Manager team files +# The following owners will be the default owners for everything in the repo. +# Unless a later match takes precedence +# @bitwarden/team-leads + +## Secrets Manager team files ## bitwarden_license/bit-web/src/app/secrets-manager @bitwarden/pod-sm-dev -# Password Manager Vault team files +## Auth team files ## +apps/browser/src/auth @bitwarden/team-auth-dev +apps/cli/src/auth @bitwarden/team-auth-dev +apps/desktop/src/auth @bitwarden/team-auth-dev +apps/web/src/auth @bitwarden/team-auth-dev +# web connectors used for auth +apps/web/src/connectors @bitwarden/team-auth-dev +libs/angular/src/auth @bitwarden/team-auth-dev +libs/common/src/auth @bitwarden/team-auth-dev + +## Vault team files ## apps/browser/src/vault @bitwarden/team-vault-dev apps/cli/src/vault @bitwarden/team-vault-dev apps/desktop/src/vault @bitwarden/team-vault-dev diff --git a/apps/cli/src/auth/commands/login.command.ts b/apps/cli/src/auth/commands/login.command.ts index fcdd7b0a827..cd038f89e85 100644 --- a/apps/cli/src/auth/commands/login.command.ts +++ b/apps/cli/src/auth/commands/login.command.ts @@ -25,9 +25,9 @@ import { } from "@bitwarden/common/auth/models/domain/log-in-credentials"; import { TokenTwoFactorRequest } from "@bitwarden/common/auth/models/request/identity-token/token-two-factor.request"; import { TwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/two-factor-email.request"; +import { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request/update-temp-password.request"; import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; import { Utils } from "@bitwarden/common/misc/utils"; -import { UpdateTempPasswordRequest } from "@bitwarden/common/models/request/update-temp-password.request"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/desktop/src/app/app-routing.module.ts b/apps/desktop/src/app/app-routing.module.ts index c77b9439714..d9b94fd0cba 100644 --- a/apps/desktop/src/app/app-routing.module.ts +++ b/apps/desktop/src/app/app-routing.module.ts @@ -6,6 +6,7 @@ import { LockGuard } from "@bitwarden/angular/auth/guards/lock.guard"; import { AccessibilityCookieComponent } from "../auth/accessibility-cookie.component"; import { LoginGuard } from "../auth/guards/login.guard"; +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"; @@ -17,7 +18,6 @@ import { TwoFactorComponent } from "../auth/two-factor.component"; import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component"; import { VaultComponent } from "../vault/app/vault/vault.component"; -import { HintComponent } from "./accounts/hint.component"; import { SendComponent } from "./send/send.component"; const routes: Routes = [ diff --git a/apps/desktop/src/app/app.module.ts b/apps/desktop/src/app/app.module.ts index 2e074528bbd..58bcef23f59 100644 --- a/apps/desktop/src/app/app.module.ts +++ b/apps/desktop/src/app/app.module.ts @@ -11,6 +11,7 @@ import { ColorPasswordPipe } from "@bitwarden/angular/pipes/color-password.pipe" import { AccessibilityCookieComponent } from "../auth/accessibility-cookie.component"; import { DeleteAccountComponent } from "../auth/delete-account.component"; import { EnvironmentComponent } from "../auth/environment.component"; +import { HintComponent } from "../auth/hint.component"; import { LockComponent } from "../auth/lock.component"; import { LoginApprovalComponent } from "../auth/login/login-approval.component"; import { LoginModule } from "../auth/login/login.module"; @@ -35,7 +36,6 @@ import { VaultComponent } from "../vault/app/vault/vault.component"; import { ViewCustomFieldsComponent } from "../vault/app/vault/view-custom-fields.component"; import { ViewComponent } from "../vault/app/vault/view.component"; -import { HintComponent } from "./accounts/hint.component"; import { SettingsComponent } from "./accounts/settings.component"; import { VaultTimeoutInputComponent } from "./accounts/vault-timeout-input.component"; import { AppRoutingModule } from "./app-routing.module"; diff --git a/apps/desktop/src/app/accounts/hint.component.html b/apps/desktop/src/auth/hint.component.html similarity index 100% rename from apps/desktop/src/app/accounts/hint.component.html rename to apps/desktop/src/auth/hint.component.html diff --git a/apps/desktop/src/app/accounts/hint.component.ts b/apps/desktop/src/auth/hint.component.ts similarity index 100% rename from apps/desktop/src/app/accounts/hint.component.ts rename to apps/desktop/src/auth/hint.component.ts diff --git a/libs/angular/src/auth/components/update-temp-password.component.ts b/libs/angular/src/auth/components/update-temp-password.component.ts index 49a3b57146a..26e6389e5f9 100644 --- a/libs/angular/src/auth/components/update-temp-password.component.ts +++ b/libs/angular/src/auth/components/update-temp-password.component.ts @@ -9,10 +9,10 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request/update-temp-password.request"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/master-password-policy-options"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { UpdateTempPasswordRequest } from "@bitwarden/common/models/request/update-temp-password.request"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component"; diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts index 6ba5cd44004..4c4dd68d851 100644 --- a/libs/common/src/abstractions/api.service.ts +++ b/libs/common/src/abstractions/api.service.ts @@ -21,6 +21,7 @@ import { TwoFactorEmailRequest } from "../auth/models/request/two-factor-email.r import { TwoFactorProviderRequest } from "../auth/models/request/two-factor-provider.request"; import { TwoFactorRecoveryRequest } from "../auth/models/request/two-factor-recovery.request"; import { UpdateProfileRequest } from "../auth/models/request/update-profile.request"; +import { UpdateTempPasswordRequest } from "../auth/models/request/update-temp-password.request"; import { UpdateTwoFactorAuthenticatorRequest } from "../auth/models/request/update-two-factor-authenticator.request"; import { UpdateTwoFactorDuoRequest } from "../auth/models/request/update-two-factor-duo.request"; import { UpdateTwoFactorEmailRequest } from "../auth/models/request/update-two-factor-email.request"; @@ -87,7 +88,6 @@ import { TaxInfoUpdateRequest } from "../models/request/tax-info-update.request" import { UpdateAvatarRequest } from "../models/request/update-avatar.request"; import { UpdateDomainsRequest } from "../models/request/update-domains.request"; import { UpdateKeyRequest } from "../models/request/update-key.request"; -import { UpdateTempPasswordRequest } from "../models/request/update-temp-password.request"; import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-recover.request"; import { VerifyEmailRequest } from "../models/request/verify-email.request"; import { BillingHistoryResponse } from "../models/response/billing-history.response"; diff --git a/libs/common/src/models/request/update-temp-password.request.ts b/libs/common/src/auth/models/request/update-temp-password.request.ts similarity index 53% rename from libs/common/src/models/request/update-temp-password.request.ts rename to libs/common/src/auth/models/request/update-temp-password.request.ts index fa35e37f9e2..88fd8a5d2b8 100644 --- a/libs/common/src/models/request/update-temp-password.request.ts +++ b/libs/common/src/auth/models/request/update-temp-password.request.ts @@ -1,4 +1,4 @@ -import { OrganizationUserResetPasswordRequest } from "../../abstractions/organization-user/requests"; +import { OrganizationUserResetPasswordRequest } from "../../../abstractions/organization-user/requests"; export class UpdateTempPasswordRequest extends OrganizationUserResetPasswordRequest { masterPasswordHint: string; diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts index 81dce4c854e..26570d53036 100644 --- a/libs/common/src/services/api.service.ts +++ b/libs/common/src/services/api.service.ts @@ -28,6 +28,7 @@ import { TwoFactorEmailRequest } from "../auth/models/request/two-factor-email.r import { TwoFactorProviderRequest } from "../auth/models/request/two-factor-provider.request"; import { TwoFactorRecoveryRequest } from "../auth/models/request/two-factor-recovery.request"; import { UpdateProfileRequest } from "../auth/models/request/update-profile.request"; +import { UpdateTempPasswordRequest } from "../auth/models/request/update-temp-password.request"; import { UpdateTwoFactorAuthenticatorRequest } from "../auth/models/request/update-two-factor-authenticator.request"; import { UpdateTwoFactorDuoRequest } from "../auth/models/request/update-two-factor-duo.request"; import { UpdateTwoFactorEmailRequest } from "../auth/models/request/update-two-factor-email.request"; @@ -96,7 +97,6 @@ import { TaxInfoUpdateRequest } from "../models/request/tax-info-update.request" import { UpdateAvatarRequest } from "../models/request/update-avatar.request"; import { UpdateDomainsRequest } from "../models/request/update-domains.request"; import { UpdateKeyRequest } from "../models/request/update-key.request"; -import { UpdateTempPasswordRequest } from "../models/request/update-temp-password.request"; import { VerifyDeleteRecoverRequest } from "../models/request/verify-delete-recover.request"; import { VerifyEmailRequest } from "../models/request/verify-email.request"; import { BillingHistoryResponse } from "../models/response/billing-history.response";