[SM-44] Lazy loaded import and exporters (#2918)

This commit is contained in:
Oscar Hinton 2022-06-28 22:24:21 +02:00 committed by GitHub
parent 74a3b05a0f
commit db3e1a51e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 189 additions and 77 deletions

View File

@ -69,9 +69,7 @@ import { SettingsComponent as OrgSettingComponent } from "../organizations/setti
import { TwoFactorSetupComponent as OrgTwoFactorSetupComponent } from "../organizations/settings/two-factor-setup.component"; import { TwoFactorSetupComponent as OrgTwoFactorSetupComponent } from "../organizations/settings/two-factor-setup.component";
import { AcceptFamilySponsorshipComponent } from "../organizations/sponsorships/accept-family-sponsorship.component"; import { AcceptFamilySponsorshipComponent } from "../organizations/sponsorships/accept-family-sponsorship.component";
import { FamiliesForEnterpriseSetupComponent } from "../organizations/sponsorships/families-for-enterprise-setup.component"; import { FamiliesForEnterpriseSetupComponent } from "../organizations/sponsorships/families-for-enterprise-setup.component";
import { ExportComponent as OrgExportComponent } from "../organizations/tools/export.component";
import { ExposedPasswordsReportComponent as OrgExposedPasswordsReportComponent } from "../organizations/tools/exposed-passwords-report.component"; import { ExposedPasswordsReportComponent as OrgExposedPasswordsReportComponent } from "../organizations/tools/exposed-passwords-report.component";
import { ImportComponent as OrgImportComponent } from "../organizations/tools/import.component";
import { InactiveTwoFactorReportComponent as OrgInactiveTwoFactorReportComponent } from "../organizations/tools/inactive-two-factor-report.component"; import { InactiveTwoFactorReportComponent as OrgInactiveTwoFactorReportComponent } from "../organizations/tools/inactive-two-factor-report.component";
import { ReusedPasswordsReportComponent as OrgReusedPasswordsReportComponent } from "../organizations/tools/reused-passwords-report.component"; import { ReusedPasswordsReportComponent as OrgReusedPasswordsReportComponent } from "../organizations/tools/reused-passwords-report.component";
import { ToolsComponent as OrgToolsComponent } from "../organizations/tools/tools.component"; import { ToolsComponent as OrgToolsComponent } from "../organizations/tools/tools.component";
@ -143,9 +141,7 @@ import { UserBillingHistoryComponent } from "../settings/user-billing-history.co
import { UserSubscriptionComponent } from "../settings/user-subscription.component"; import { UserSubscriptionComponent } from "../settings/user-subscription.component";
import { VaultTimeoutInputComponent } from "../settings/vault-timeout-input.component"; import { VaultTimeoutInputComponent } from "../settings/vault-timeout-input.component";
import { VerifyEmailComponent } from "../settings/verify-email.component"; import { VerifyEmailComponent } from "../settings/verify-email.component";
import { ExportComponent } from "../tools/export.component";
import { GeneratorComponent } from "../tools/generator.component"; import { GeneratorComponent } from "../tools/generator.component";
import { ImportComponent } from "../tools/import.component";
import { PasswordGeneratorHistoryComponent } from "../tools/password-generator-history.component"; import { PasswordGeneratorHistoryComponent } from "../tools/password-generator-history.component";
import { ToolsComponent } from "../tools/tools.component"; import { ToolsComponent } from "../tools/tools.component";
import { AddEditCustomFieldsComponent } from "../vault/add-edit-custom-fields.component"; import { AddEditCustomFieldsComponent } from "../vault/add-edit-custom-fields.component";
@ -214,14 +210,12 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
EmergencyAccessTakeoverComponent, EmergencyAccessTakeoverComponent,
EmergencyAccessViewComponent, EmergencyAccessViewComponent,
EmergencyAddEditComponent, EmergencyAddEditComponent,
ExportComponent,
ExposedPasswordsReportComponent, ExposedPasswordsReportComponent,
FamiliesForEnterpriseSetupComponent, FamiliesForEnterpriseSetupComponent,
FolderAddEditComponent, FolderAddEditComponent,
FooterComponent, FooterComponent,
FrontendLayoutComponent, FrontendLayoutComponent,
HintComponent, HintComponent,
ImportComponent,
InactiveTwoFactorReportComponent, InactiveTwoFactorReportComponent,
LockComponent, LockComponent,
LoginComponent, LoginComponent,
@ -245,11 +239,9 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
OrgCollectionsComponent, OrgCollectionsComponent,
OrgEntityEventsComponent, OrgEntityEventsComponent,
OrgEventsComponent, OrgEventsComponent,
OrgExportComponent,
OrgExposedPasswordsReportComponent, OrgExposedPasswordsReportComponent,
OrgGroupAddEditComponent, OrgGroupAddEditComponent,
OrgGroupsComponent, OrgGroupsComponent,
OrgImportComponent,
OrgInactiveTwoFactorReportComponent, OrgInactiveTwoFactorReportComponent,
OrgManageCollectionsComponent, OrgManageCollectionsComponent,
OrgManageComponent, OrgManageComponent,
@ -374,14 +366,12 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
EmergencyAccessTakeoverComponent, EmergencyAccessTakeoverComponent,
EmergencyAccessViewComponent, EmergencyAccessViewComponent,
EmergencyAddEditComponent, EmergencyAddEditComponent,
ExportComponent,
ExposedPasswordsReportComponent, ExposedPasswordsReportComponent,
FamiliesForEnterpriseSetupComponent, FamiliesForEnterpriseSetupComponent,
FolderAddEditComponent, FolderAddEditComponent,
FooterComponent, FooterComponent,
FrontendLayoutComponent, FrontendLayoutComponent,
HintComponent, HintComponent,
ImportComponent,
InactiveTwoFactorReportComponent, InactiveTwoFactorReportComponent,
LockComponent, LockComponent,
LoginComponent, LoginComponent,
@ -405,11 +395,9 @@ import { OrganizationBadgeModule } from "./vault/modules/organization-badge/orga
OrgCollectionsComponent, OrgCollectionsComponent,
OrgEntityEventsComponent, OrgEntityEventsComponent,
OrgEventsComponent, OrgEventsComponent,
OrgExportComponent,
OrgExposedPasswordsReportComponent, OrgExposedPasswordsReportComponent,
OrgGroupAddEditComponent, OrgGroupAddEditComponent,
OrgGroupsComponent, OrgGroupsComponent,
OrgImportComponent,
OrgInactiveTwoFactorReportComponent, OrgInactiveTwoFactorReportComponent,
OrgManageCollectionsComponent, OrgManageCollectionsComponent,
OrgManageComponent, OrgManageComponent,

View File

@ -4,6 +4,8 @@ import { RouterModule, Routes } from "@angular/router";
import { AuthGuard } from "@bitwarden/angular/guards/auth.guard"; import { AuthGuard } from "@bitwarden/angular/guards/auth.guard";
import { Permissions } from "@bitwarden/common/enums/permissions"; import { Permissions } from "@bitwarden/common/enums/permissions";
import { OrganizationVaultModule } from "../modules/vault/modules/organization-vault/organization-vault.module";
import { PermissionsGuard } from "./guards/permissions.guard"; import { PermissionsGuard } from "./guards/permissions.guard";
import { OrganizationLayoutComponent } from "./layouts/organization-layout.component"; import { OrganizationLayoutComponent } from "./layouts/organization-layout.component";
import { CollectionsComponent } from "./manage/collections.component"; import { CollectionsComponent } from "./manage/collections.component";
@ -18,9 +20,7 @@ import { OrganizationBillingComponent } from "./settings/organization-billing.co
import { OrganizationSubscriptionComponent } from "./settings/organization-subscription.component"; import { OrganizationSubscriptionComponent } from "./settings/organization-subscription.component";
import { SettingsComponent } from "./settings/settings.component"; import { SettingsComponent } from "./settings/settings.component";
import { TwoFactorSetupComponent } from "./settings/two-factor-setup.component"; import { TwoFactorSetupComponent } from "./settings/two-factor-setup.component";
import { ExportComponent } from "./tools/export.component";
import { ExposedPasswordsReportComponent } from "./tools/exposed-passwords-report.component"; import { ExposedPasswordsReportComponent } from "./tools/exposed-passwords-report.component";
import { ImportComponent } from "./tools/import.component";
import { InactiveTwoFactorReportComponent } from "./tools/inactive-two-factor-report.component"; import { InactiveTwoFactorReportComponent } from "./tools/inactive-two-factor-report.component";
import { ReusedPasswordsReportComponent } from "./tools/reused-passwords-report.component"; import { ReusedPasswordsReportComponent } from "./tools/reused-passwords-report.component";
import { ToolsComponent } from "./tools/tools.component"; import { ToolsComponent } from "./tools/tools.component";
@ -39,9 +39,7 @@ const routes: Routes = [
{ path: "", pathMatch: "full", redirectTo: "vault" }, { path: "", pathMatch: "full", redirectTo: "vault" },
{ {
path: "vault", path: "vault",
loadChildren: async () => loadChildren: () => OrganizationVaultModule,
(await import("../modules/vault/modules/organization-vault/organization-vault.module"))
.OrganizationVaultModule,
}, },
{ {
path: "tools", path: "tools",
@ -55,22 +53,11 @@ const routes: Routes = [
redirectTo: "import", redirectTo: "import",
}, },
{ {
path: "import", path: "",
component: ImportComponent, loadChildren: () =>
canActivate: [PermissionsGuard], import("./tools/import-export/org-import-export.module").then(
data: { (m) => m.OrganizationImportExportModule
titleId: "importData", ),
permissions: [Permissions.AccessImportExport],
},
},
{
path: "export",
component: ExportComponent,
canActivate: [PermissionsGuard],
data: {
titleId: "exportVault",
permissions: [Permissions.AccessImportExport],
},
}, },
{ {
path: "exposed-passwords-report", path: "exposed-passwords-report",

View File

@ -11,13 +11,13 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; import { PolicyService } from "@bitwarden/common/abstractions/policy.service";
import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification.service";
import { ExportComponent as BaseExportComponent } from "../../tools/export.component"; import { ExportComponent } from "../../../tools/import-export/export.component";
@Component({ @Component({
selector: "app-org-export", selector: "app-org-export",
templateUrl: "../../tools/export.component.html", templateUrl: "../../../tools/import-export/export.component.html",
}) })
export class ExportComponent extends BaseExportComponent { export class OrganizationExportComponent extends ExportComponent {
constructor( constructor(
cryptoService: CryptoService, cryptoService: CryptoService,
i18nService: I18nService, i18nService: I18nService,

View File

@ -0,0 +1,35 @@
import { NgModule } from "@angular/core";
import { RouterModule, Routes } from "@angular/router";
import { Permissions } from "@bitwarden/common/enums/permissions";
import { PermissionsGuard } from "../../guards/permissions.guard";
import { OrganizationExportComponent } from "./org-export.component";
import { OrganizationImportComponent } from "./org-import.component";
const routes: Routes = [
{
path: "import",
component: OrganizationImportComponent,
canActivate: [PermissionsGuard],
data: {
titleId: "importData",
permissions: [Permissions.AccessImportExport],
},
},
{
path: "export",
component: OrganizationExportComponent,
canActivate: [PermissionsGuard],
data: {
titleId: "exportVault",
permissions: [Permissions.AccessImportExport],
},
},
];
@NgModule({
imports: [RouterModule.forChild(routes)],
})
export class OrganizationImportExportRoutingModule {}

View File

@ -0,0 +1,48 @@
import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
import { FolderService } from "@bitwarden/common/abstractions/folder.service";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { ImportService as ImportServiceAbstraction } from "@bitwarden/common/abstractions/import.service";
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
import { ImportService } from "@bitwarden/common/services/import.service";
import { LooseComponentsModule } from "../../../modules/loose-components.module";
import { OrganizationExportComponent } from "./org-export.component";
import { OrganizationImportExportRoutingModule } from "./org-import-export-routing.module";
import { OrganizationImportComponent } from "./org-import.component";
@NgModule({
imports: [
CommonModule,
JslibModule,
LooseComponentsModule,
FormsModule,
ReactiveFormsModule,
OrganizationImportExportRoutingModule,
],
declarations: [OrganizationImportComponent, OrganizationExportComponent],
providers: [
{
provide: ImportServiceAbstraction,
useClass: ImportService,
deps: [
CipherService,
FolderService,
ApiService,
I18nService,
CollectionService,
PlatformUtilsService,
CryptoService,
],
},
],
})
export class OrganizationImportExportModule {}

View File

@ -8,13 +8,13 @@ import { OrganizationService } from "@bitwarden/common/abstractions/organization
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
import { PolicyService } from "@bitwarden/common/abstractions/policy.service"; import { PolicyService } from "@bitwarden/common/abstractions/policy.service";
import { ImportComponent as BaseImportComponent } from "../../tools/import.component"; import { ImportComponent } from "../../../tools/import-export/import.component";
@Component({ @Component({
selector: "app-org-import", selector: "app-org-import",
templateUrl: "../../tools/import.component.html", templateUrl: "../../../tools/import-export/import.component.html",
}) })
export class ImportComponent extends BaseImportComponent { export class OrganizationImportComponent extends ImportComponent {
organizationName: string; organizationName: string;
constructor( constructor(

View File

@ -24,8 +24,11 @@ import { VerifyRecoverDeleteComponent } from "./accounts/verify-recover-delete.c
import { HomeGuard } from "./guards/home.guard"; import { HomeGuard } from "./guards/home.guard";
import { FrontendLayoutComponent } from "./layouts/frontend-layout.component"; import { FrontendLayoutComponent } from "./layouts/frontend-layout.component";
import { UserLayoutComponent } from "./layouts/user-layout.component"; import { UserLayoutComponent } from "./layouts/user-layout.component";
import { IndividualVaultModule } from "./modules/vault/modules/individual-vault/individual-vault.module";
import { OrganizationsRoutingModule } from "./organizations/organization-routing.module";
import { AcceptFamilySponsorshipComponent } from "./organizations/sponsorships/accept-family-sponsorship.component"; import { AcceptFamilySponsorshipComponent } from "./organizations/sponsorships/accept-family-sponsorship.component";
import { FamiliesForEnterpriseSetupComponent } from "./organizations/sponsorships/families-for-enterprise-setup.component"; import { FamiliesForEnterpriseSetupComponent } from "./organizations/sponsorships/families-for-enterprise-setup.component";
import { ReportsRoutingModule } from "./reports/reports-routing.module";
import { AccessComponent } from "./send/access.component"; import { AccessComponent } from "./send/access.component";
import { SendComponent } from "./send/send.component"; import { SendComponent } from "./send/send.component";
import { AccountComponent } from "./settings/account.component"; import { AccountComponent } from "./settings/account.component";
@ -34,11 +37,11 @@ import { DomainRulesComponent } from "./settings/domain-rules.component";
import { EmergencyAccessViewComponent } from "./settings/emergency-access-view.component"; import { EmergencyAccessViewComponent } from "./settings/emergency-access-view.component";
import { EmergencyAccessComponent } from "./settings/emergency-access.component"; import { EmergencyAccessComponent } from "./settings/emergency-access.component";
import { PreferencesComponent } from "./settings/preferences.component"; import { PreferencesComponent } from "./settings/preferences.component";
import { SecurityRoutingModule } from "./settings/security-routing.module";
import { SettingsComponent } from "./settings/settings.component"; import { SettingsComponent } from "./settings/settings.component";
import { SponsoredFamiliesComponent } from "./settings/sponsored-families.component"; import { SponsoredFamiliesComponent } from "./settings/sponsored-families.component";
import { ExportComponent } from "./tools/export.component"; import { SubscriptionRoutingModule } from "./settings/subscription-routing.module";
import { GeneratorComponent } from "./tools/generator.component"; import { GeneratorComponent } from "./tools/generator.component";
import { ImportComponent } from "./tools/import.component";
import { ToolsComponent } from "./tools/tools.component"; import { ToolsComponent } from "./tools/tools.component";
const routes: Routes = [ const routes: Routes = [
@ -150,9 +153,7 @@ const routes: Routes = [
children: [ children: [
{ {
path: "vault", path: "vault",
loadChildren: async () => loadChildren: () => IndividualVaultModule,
(await import("./modules/vault/modules/individual-vault/individual-vault.module"))
.IndividualVaultModule,
}, },
{ path: "sends", component: SendComponent, data: { title: "Send" } }, { path: "sends", component: SendComponent, data: { title: "Send" } },
{ {
@ -173,8 +174,7 @@ const routes: Routes = [
}, },
{ {
path: "security", path: "security",
loadChildren: async () => loadChildren: () => SecurityRoutingModule,
(await import("./settings/security-routing.module")).SecurityRoutingModule,
}, },
{ {
path: "domain-rules", path: "domain-rules",
@ -183,8 +183,7 @@ const routes: Routes = [
}, },
{ {
path: "subscription", path: "subscription",
loadChildren: async () => loadChildren: () => SubscriptionRoutingModule,
(await import("./settings/subscription-routing.module")).SubscriptionRoutingModule,
}, },
{ {
path: "emergency-access", path: "emergency-access",
@ -214,8 +213,13 @@ const routes: Routes = [
canActivate: [AuthGuard], canActivate: [AuthGuard],
children: [ children: [
{ path: "", pathMatch: "full", redirectTo: "generator" }, { path: "", pathMatch: "full", redirectTo: "generator" },
{ path: "import", component: ImportComponent, data: { titleId: "importData" } }, {
{ path: "export", component: ExportComponent, data: { titleId: "exportVault" } }, path: "",
loadChildren: () =>
import("./tools/import-export/import-export.module").then(
(m) => m.ImportExportModule
),
},
{ {
path: "generator", path: "generator",
component: GeneratorComponent, component: GeneratorComponent,
@ -225,18 +229,14 @@ const routes: Routes = [
}, },
{ {
path: "reports", path: "reports",
loadChildren: async () => loadChildren: () => ReportsRoutingModule,
(await import("./reports/reports-routing.module")).ReportsRoutingModule,
}, },
{ path: "setup/families-for-enterprise", component: FamiliesForEnterpriseSetupComponent }, { path: "setup/families-for-enterprise", component: FamiliesForEnterpriseSetupComponent },
], ],
}, },
{ {
path: "organizations", path: "organizations",
loadChildren: () => loadChildren: () => OrganizationsRoutingModule,
import("./organizations/organization-routing.module").then(
(m) => m.OrganizationsRoutingModule
),
}, },
]; ];

View File

@ -11,13 +11,7 @@ import {
MEMORY_STORAGE, MEMORY_STORAGE,
} from "@bitwarden/angular/services/jslib-services.module"; } from "@bitwarden/angular/services/jslib-services.module";
import { ModalService as ModalServiceAbstraction } from "@bitwarden/angular/services/modal.service"; import { ModalService as ModalServiceAbstraction } from "@bitwarden/angular/services/modal.service";
import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstractions/api.service";
import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/abstractions/cipher.service";
import { CollectionService as CollectionServiceAbstraction } from "@bitwarden/common/abstractions/collection.service";
import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service";
import { FolderService as FolderServiceAbstraction } from "@bitwarden/common/abstractions/folder.service";
import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service"; import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service";
import { ImportService as ImportServiceAbstraction } from "@bitwarden/common/abstractions/import.service";
import { LogService } from "@bitwarden/common/abstractions/log.service"; import { LogService } from "@bitwarden/common/abstractions/log.service";
import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service"; import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service";
import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.service"; import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@bitwarden/common/abstractions/passwordReprompt.service";
@ -26,7 +20,6 @@ import { StateService as BaseStateServiceAbstraction } from "@bitwarden/common/a
import { StateMigrationService as StateMigrationServiceAbstraction } from "@bitwarden/common/abstractions/stateMigration.service"; import { StateMigrationService as StateMigrationServiceAbstraction } from "@bitwarden/common/abstractions/stateMigration.service";
import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service"; import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service";
import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { StateFactory } from "@bitwarden/common/factories/stateFactory";
import { ImportService } from "@bitwarden/common/services/import.service";
import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
import { StateService as StateServiceAbstraction } from "../../abstractions/state.service"; import { StateService as StateServiceAbstraction } from "../../abstractions/state.service";
@ -95,19 +88,6 @@ import { RouterService } from "./router.service";
}, },
{ provide: MessagingServiceAbstraction, useClass: BroadcasterMessagingService }, { provide: MessagingServiceAbstraction, useClass: BroadcasterMessagingService },
{ provide: ModalServiceAbstraction, useClass: ModalService }, { provide: ModalServiceAbstraction, useClass: ModalService },
{
provide: ImportServiceAbstraction,
useClass: ImportService,
deps: [
CipherServiceAbstraction,
FolderServiceAbstraction,
ApiServiceAbstraction,
I18nServiceAbstraction,
CollectionServiceAbstraction,
PlatformUtilsServiceAbstraction,
CryptoServiceAbstraction,
],
},
{ {
provide: StateMigrationServiceAbstraction, provide: StateMigrationServiceAbstraction,
useClass: StateMigrationService, useClass: StateMigrationService,

View File

@ -0,0 +1,23 @@
import { NgModule } from "@angular/core";
import { RouterModule, Routes } from "@angular/router";
import { ExportComponent } from "./export.component";
import { ImportComponent } from "./import.component";
const routes: Routes = [
{
path: "import",
component: ImportComponent,
data: { titleId: "importData" },
},
{
path: "export",
component: ExportComponent,
data: { titleId: "exportVault" },
},
];
@NgModule({
imports: [RouterModule.forChild(routes)],
})
export class ImportExportRoutingModule {}

View File

@ -0,0 +1,48 @@
import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { FormsModule, ReactiveFormsModule } from "@angular/forms";
import { JslibModule } from "@bitwarden/angular/jslib.module";
import { ApiService } from "@bitwarden/common/abstractions/api.service";
import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
import { CryptoService } from "@bitwarden/common/abstractions/crypto.service";
import { FolderService } from "@bitwarden/common/abstractions/folder.service";
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
import { ImportService as ImportServiceAbstraction } from "@bitwarden/common/abstractions/import.service";
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
import { ImportService } from "@bitwarden/common/services/import.service";
import { LooseComponentsModule } from "../../modules/loose-components.module";
import { ExportComponent } from "./export.component";
import { ImportExportRoutingModule } from "./import-export-routing.module";
import { ImportComponent } from "./import.component";
@NgModule({
imports: [
CommonModule,
JslibModule,
LooseComponentsModule,
FormsModule,
ReactiveFormsModule,
ImportExportRoutingModule,
],
declarations: [ImportComponent, ExportComponent],
providers: [
{
provide: ImportServiceAbstraction,
useClass: ImportService,
deps: [
CipherService,
FolderService,
ApiService,
I18nService,
CollectionService,
PlatformUtilsService,
CryptoService,
],
},
],
})
export class ImportExportModule {}

View File

@ -2,6 +2,7 @@
"extends": "../../libs/shared/tsconfig", "extends": "../../libs/shared/tsconfig",
"compilerOptions": { "compilerOptions": {
"baseUrl": ".", "baseUrl": ".",
"module": "ES2020",
"paths": { "paths": {
"tldjs": ["../../libs/common/src/misc/tldjs.noop"], "tldjs": ["../../libs/common/src/misc/tldjs.noop"],
"src/*": ["src/*"], "src/*": ["src/*"],

View File

@ -1,10 +1,12 @@
import { NgModule } from "@angular/core"; import { NgModule } from "@angular/core";
import { RouterModule, Routes } from "@angular/router"; import { RouterModule, Routes } from "@angular/router";
import { ProvidersModule } from "./providers/providers.module";
const routes: Routes = [ const routes: Routes = [
{ {
path: "providers", path: "providers",
loadChildren: async () => (await import("./providers/providers.module")).ProvidersModule, loadChildren: () => ProvidersModule,
}, },
]; ];