Skip to content

Commit 2425cda

Browse files
eliykateliykat
authored
[PM-18356] Reconcile ownership of import export and reporting (bitwarden#13439)
* Move AC import, export and reporting to Tools ownership
1 parent 1bcfcc7 commit 2425cda

12 files changed

+32
-30
lines changed

‎apps/web/src/app/admin-console/organizations/reporting/organization-reporting-routing.module.ts

+7-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ import { RouterModule, Routes } from "@angular/router";
66
import { canAccessReportingTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
77
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
88

9-
import { ExposedPasswordsReportComponent } from "../../../admin-console/organizations/tools/exposed-passwords-report.component";
10-
import { InactiveTwoFactorReportComponent } from "../../../admin-console/organizations/tools/inactive-two-factor-report.component";
11-
import { ReusedPasswordsReportComponent } from "../../../admin-console/organizations/tools/reused-passwords-report.component";
12-
import { UnsecuredWebsitesReportComponent } from "../../../admin-console/organizations/tools/unsecured-websites-report.component";
13-
import { WeakPasswordsReportComponent } from "../../../admin-console/organizations/tools/weak-passwords-report.component";
9+
/* eslint no-restricted-imports: "off" -- Normally prohibited by Tools Team eslint rules but required here */
10+
import { ExposedPasswordsReportComponent } from "../../../tools/reports/pages/organizations/exposed-passwords-report.component";
11+
import { InactiveTwoFactorReportComponent } from "../../../tools/reports/pages/organizations/inactive-two-factor-report.component";
12+
import { ReusedPasswordsReportComponent } from "../../../tools/reports/pages/organizations/reused-passwords-report.component";
13+
import { UnsecuredWebsitesReportComponent } from "../../../tools/reports/pages/organizations/unsecured-websites-report.component";
14+
import { WeakPasswordsReportComponent } from "../../../tools/reports/pages/organizations/weak-passwords-report.component";
15+
/* eslint no-restricted-imports: "error" */
1416
import { isPaidOrgGuard } from "../guards/is-paid-org.guard";
1517
import { organizationPermissionsGuard } from "../guards/org-permissions.guard";
1618
import { organizationRedirectGuard } from "../guards/org-redirect.guard";

‎apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ const routes: Routes = [
5252
{
5353
path: "import",
5454
loadComponent: () =>
55-
import("./org-import.component").then((mod) => mod.OrgImportComponent),
55+
import("../../../tools/import/org-import.component").then(
56+
(mod) => mod.OrgImportComponent,
57+
),
5658
canActivate: [organizationPermissionsGuard((org) => org.canAccessImport)],
5759
data: {
5860
titleId: "importData",
@@ -61,7 +63,7 @@ const routes: Routes = [
6163
{
6264
path: "export",
6365
loadComponent: () =>
64-
import("../tools/vault-export/org-vault-export.component").then(
66+
import("../../../tools/vault-export/org-vault-export.component").then(
6567
(mod) => mod.OrganizationVaultExportComponent,
6668
),
6769
canActivate: [organizationPermissionsGuard((org) => org.canAccessExport)],

‎apps/web/src/app/shared/loose-components.module.ts

+7-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ import { EventsComponent as OrgEventsComponent } from "../admin-console/organiza
1212
import { UserConfirmComponent as OrgUserConfirmComponent } from "../admin-console/organizations/manage/user-confirm.component";
1313
import { VerifyRecoverDeleteOrgComponent } from "../admin-console/organizations/manage/verify-recover-delete-org.component";
1414
import { AcceptFamilySponsorshipComponent } from "../admin-console/organizations/sponsorships/accept-family-sponsorship.component";
15-
import { ExposedPasswordsReportComponent as OrgExposedPasswordsReportComponent } from "../admin-console/organizations/tools/exposed-passwords-report.component";
16-
import { InactiveTwoFactorReportComponent as OrgInactiveTwoFactorReportComponent } from "../admin-console/organizations/tools/inactive-two-factor-report.component";
17-
import { ReusedPasswordsReportComponent as OrgReusedPasswordsReportComponent } from "../admin-console/organizations/tools/reused-passwords-report.component";
18-
import { UnsecuredWebsitesReportComponent as OrgUnsecuredWebsitesReportComponent } from "../admin-console/organizations/tools/unsecured-websites-report.component";
19-
import { WeakPasswordsReportComponent as OrgWeakPasswordsReportComponent } from "../admin-console/organizations/tools/weak-passwords-report.component";
2015
import { HintComponent } from "../auth/hint.component";
2116
import { RecoverDeleteComponent } from "../auth/recover-delete.component";
2217
import { RecoverTwoFactorComponent } from "../auth/recover-two-factor.component";
@@ -65,6 +60,13 @@ import { ProductSwitcherModule } from "../layouts/product-switcher/product-switc
6560
import { UserLayoutComponent } from "../layouts/user-layout.component";
6661
import { DomainRulesComponent } from "../settings/domain-rules.component";
6762
import { PreferencesComponent } from "../settings/preferences.component";
63+
/* eslint no-restricted-imports: "off" -- Temporarily disabled until Tools refactors these out of this module */
64+
import { ExposedPasswordsReportComponent as OrgExposedPasswordsReportComponent } from "../tools/reports/pages/organizations/exposed-passwords-report.component";
65+
import { InactiveTwoFactorReportComponent as OrgInactiveTwoFactorReportComponent } from "../tools/reports/pages/organizations/inactive-two-factor-report.component";
66+
import { ReusedPasswordsReportComponent as OrgReusedPasswordsReportComponent } from "../tools/reports/pages/organizations/reused-passwords-report.component";
67+
import { UnsecuredWebsitesReportComponent as OrgUnsecuredWebsitesReportComponent } from "../tools/reports/pages/organizations/unsecured-websites-report.component";
68+
import { WeakPasswordsReportComponent as OrgWeakPasswordsReportComponent } from "../tools/reports/pages/organizations/weak-passwords-report.component";
69+
/* eslint no-restricted-imports: "error" */
6870
import { AddEditComponent as SendAddEditComponent } from "../tools/send/add-edit.component";
6971
import { PremiumBadgeComponent } from "../vault/components/premium-badge.component";
7072
import { AddEditCustomFieldsComponent } from "../vault/individual-vault/add-edit-custom-fields.component";

‎apps/web/src/app/admin-console/organizations/settings/org-import.component.html ‎apps/web/src/app/tools/import/org-import.component.html

File renamed without changes.

‎apps/web/src/app/admin-console/organizations/settings/org-import.component.ts ‎apps/web/src/app/tools/import/org-import.component.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
1414
import { ImportCollectionServiceAbstraction } from "@bitwarden/importer-core";
1515
import { ImportComponent } from "@bitwarden/importer-ui";
1616

17-
import { LooseComponentsModule, SharedModule } from "../../../shared";
18-
import { ImportCollectionAdminService } from "../../../tools/import/import-collection-admin.service";
17+
import { LooseComponentsModule, SharedModule } from "../../shared";
18+
19+
import { ImportCollectionAdminService } from "./import-collection-admin.service";
1920

2021
@Component({
2122
templateUrl: "org-import.component.html",

‎apps/web/src/app/admin-console/organizations/tools/exposed-passwords-report.component.ts ‎apps/web/src/app/tools/reports/pages/organizations/exposed-passwords-report.component.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@ import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
1919
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
2020
import { PasswordRepromptService } from "@bitwarden/vault";
2121

22-
// eslint-disable-next-line no-restricted-imports
23-
import { ExposedPasswordsReportComponent as BaseExposedPasswordsReportComponent } from "../../../tools/reports/pages/exposed-passwords-report.component";
22+
import { ExposedPasswordsReportComponent as BaseExposedPasswordsReportComponent } from "../exposed-passwords-report.component";
2423

2524
@Component({
2625
selector: "app-org-exposed-passwords-report",
27-
templateUrl: "../../../tools/reports/pages/exposed-passwords-report.component.html",
26+
templateUrl: "../exposed-passwords-report.component.html",
2827
})
2928
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
3029
export class ExposedPasswordsReportComponent

‎apps/web/src/app/admin-console/organizations/tools/inactive-two-factor-report.component.ts ‎apps/web/src/app/tools/reports/pages/organizations/inactive-two-factor-report.component.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.serv
1717
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
1818
import { PasswordRepromptService } from "@bitwarden/vault";
1919

20-
// eslint-disable-next-line no-restricted-imports
21-
import { InactiveTwoFactorReportComponent as BaseInactiveTwoFactorReportComponent } from "../../../tools/reports/pages/inactive-two-factor-report.component";
20+
import { InactiveTwoFactorReportComponent as BaseInactiveTwoFactorReportComponent } from "../inactive-two-factor-report.component";
2221

2322
@Component({
2423
selector: "app-inactive-two-factor-report",
25-
templateUrl: "../../../tools/reports/pages/inactive-two-factor-report.component.html",
24+
templateUrl: "../inactive-two-factor-report.component.html",
2625
})
2726
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
2827
export class InactiveTwoFactorReportComponent

‎apps/web/src/app/admin-console/organizations/tools/reused-passwords-report.component.ts ‎apps/web/src/app/tools/reports/pages/organizations/reused-passwords-report.component.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@ import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
1818
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
1919
import { PasswordRepromptService } from "@bitwarden/vault";
2020

21-
// eslint-disable-next-line no-restricted-imports
22-
import { ReusedPasswordsReportComponent as BaseReusedPasswordsReportComponent } from "../../../tools/reports/pages/reused-passwords-report.component";
21+
import { ReusedPasswordsReportComponent as BaseReusedPasswordsReportComponent } from "../reused-passwords-report.component";
2322

2423
@Component({
2524
selector: "app-reused-passwords-report",
26-
templateUrl: "../../../tools/reports/pages/reused-passwords-report.component.html",
25+
templateUrl: "../reused-passwords-report.component.html",
2726
})
2827
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
2928
export class ReusedPasswordsReportComponent

‎apps/web/src/app/admin-console/organizations/tools/unsecured-websites-report.component.ts ‎apps/web/src/app/tools/reports/pages/organizations/unsecured-websites-report.component.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.serv
1717
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
1818
import { PasswordRepromptService } from "@bitwarden/vault";
1919

20-
// eslint-disable-next-line no-restricted-imports
21-
import { UnsecuredWebsitesReportComponent as BaseUnsecuredWebsitesReportComponent } from "../../../tools/reports/pages/unsecured-websites-report.component";
20+
import { UnsecuredWebsitesReportComponent as BaseUnsecuredWebsitesReportComponent } from "../unsecured-websites-report.component";
2221

2322
@Component({
2423
selector: "app-unsecured-websites-report",
25-
templateUrl: "../../../tools/reports/pages/unsecured-websites-report.component.html",
24+
templateUrl: "../unsecured-websites-report.component.html",
2625
})
2726
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
2827
export class UnsecuredWebsitesReportComponent

‎apps/web/src/app/admin-console/organizations/tools/weak-passwords-report.component.ts ‎apps/web/src/app/tools/reports/pages/organizations/weak-passwords-report.component.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@ import { Cipher } from "@bitwarden/common/vault/models/domain/cipher";
1919
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
2020
import { PasswordRepromptService } from "@bitwarden/vault";
2121

22-
// eslint-disable-next-line no-restricted-imports
23-
import { WeakPasswordsReportComponent as BaseWeakPasswordsReportComponent } from "../../../tools/reports/pages/weak-passwords-report.component";
22+
import { WeakPasswordsReportComponent as BaseWeakPasswordsReportComponent } from "../weak-passwords-report.component";
2423

2524
@Component({
2625
selector: "app-weak-passwords-report",
27-
templateUrl: "../../../tools/reports/pages/weak-passwords-report.component.html",
26+
templateUrl: "../weak-passwords-report.component.html",
2827
})
2928
// eslint-disable-next-line rxjs-angular/prefer-takeuntil
3029
export class WeakPasswordsReportComponent

‎apps/web/src/app/admin-console/organizations/tools/vault-export/org-vault-export.component.html ‎apps/web/src/app/tools/vault-export/org-vault-export.component.html

File renamed without changes.

‎apps/web/src/app/admin-console/organizations/tools/vault-export/org-vault-export.component.ts ‎apps/web/src/app/tools/vault-export/org-vault-export.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { ActivatedRoute } from "@angular/router";
55

66
import { ExportComponent } from "@bitwarden/vault-export-ui";
77

8-
import { LooseComponentsModule, SharedModule } from "../../../../shared";
8+
import { LooseComponentsModule, SharedModule } from "../../shared";
99

1010
@Component({
1111
templateUrl: "org-vault-export.component.html",

0 commit comments

Comments
 (0)