-
-
+
+
+
+
+
+
- {{ "vault" | i18n }}
+ {{ "vaultItems" | i18n }}
{
+ this.route.parent.params.subscribe(async (params: any) => {
this.organization = await this.organizationService.get(params.organizationId);
- this.groupingsComponent.organization = this.organization;
+ this.vaultFilterComponent.organization = this.organization;
this.ciphersComponent.organization = this.organization;
this.route.queryParams.pipe(first()).subscribe(async (qParams) => {
- this.ciphersComponent.searchText = this.groupingsComponent.searchText = qParams.search;
+ // this.ciphersComponent.searchText = this.vaultFilterComponent.search = qParams.search;
if (!this.organization.canViewAllCollections) {
await this.syncService.fullSync(false);
this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {
@@ -92,7 +95,11 @@ export class VaultComponent implements OnInit, OnDestroy {
case "syncCompleted":
if (message.successfully) {
await Promise.all([
- this.groupingsComponent.load(),
+ this.vaultFilterComponent.reloadCollectionsAndFolders(
+ new VaultFilter({
+ selectedOrganizationId: this.organization.id,
+ } as Partial)
+ ),
this.ciphersComponent.refresh(),
]);
this.changeDetectorRef.detectChanges();
@@ -102,27 +109,10 @@ export class VaultComponent implements OnInit, OnDestroy {
});
});
}
- await this.groupingsComponent.load();
-
- if (qParams == null) {
- this.groupingsComponent.selectedAll = true;
- await this.ciphersComponent.reload();
- } else {
- if (qParams.deleted) {
- this.groupingsComponent.selectedTrash = true;
- await this.filterDeleted(true);
- } else if (qParams.type) {
- const t = parseInt(qParams.type, null);
- this.groupingsComponent.selectedType = t;
- await this.filterCipherType(t, true);
- } else if (qParams.collectionId) {
- this.groupingsComponent.selectedCollectionId = qParams.collectionId;
- await this.filterCollection(qParams.collectionId, true);
- } else {
- this.groupingsComponent.selectedAll = true;
- await this.ciphersComponent.reload();
- }
- }
+ await this.vaultFilterComponent.reloadCollectionsAndFolders(
+ new VaultFilter({ selectedOrganizationId: this.organization.id } as Partial)
+ );
+ await this.ciphersComponent.reload();
if (qParams.viewEvents != null) {
const cipher = this.ciphersComponent.ciphers.filter((c) => c.id === qParams.viewEvents);
@@ -156,63 +146,47 @@ export class VaultComponent implements OnInit, OnDestroy {
this.broadcasterService.unsubscribe(BroadcasterSubscriptionId);
}
- async clearGroupingFilters() {
- this.ciphersComponent.showAddNew = true;
- this.ciphersComponent.deleted = false;
- this.groupingsComponent.searchPlaceholder = this.i18nService.t("searchVault");
- await this.ciphersComponent.applyFilter();
- this.clearFilters();
+ async applyVaultFilter(vaultFilter: VaultFilter) {
+ this.ciphersComponent.showAddNew = vaultFilter.status !== "trash";
+ this.activeFilter = vaultFilter;
+ await this.ciphersComponent.reload(this.buildFilter(), vaultFilter.status === "trash");
+ this.vaultFilterComponent.searchPlaceholder =
+ this.vaultService.calculateSearchBarLocalizationString(this.activeFilter);
this.go();
}
- async filterCipherType(type: CipherType, load = false) {
- this.ciphersComponent.showAddNew = true;
- this.ciphersComponent.deleted = false;
- this.groupingsComponent.searchPlaceholder = this.i18nService.t("searchType");
- const filter = (c: CipherView) => c.type === type;
- if (load) {
- await this.ciphersComponent.reload(filter);
- } else {
- await this.ciphersComponent.applyFilter(filter);
- }
- this.clearFilters();
- this.type = type;
- this.go();
- }
-
- async filterCollection(collectionId: string, load = false) {
- this.ciphersComponent.showAddNew = true;
- this.ciphersComponent.deleted = false;
- this.groupingsComponent.searchPlaceholder = this.i18nService.t("searchCollection");
- const filter = (c: CipherView) => {
- if (collectionId === "unassigned") {
- return c.collectionIds == null || c.collectionIds.length === 0;
- } else {
- return c.collectionIds != null && c.collectionIds.indexOf(collectionId) > -1;
+ private buildFilter(): (cipher: CipherView) => boolean {
+ return (cipher) => {
+ let cipherPassesFilter = true;
+ if (this.activeFilter.status === "favorites" && cipherPassesFilter) {
+ cipherPassesFilter = cipher.favorite;
}
+ if (this.activeFilter.status === "trash" && cipherPassesFilter) {
+ cipherPassesFilter = cipher.isDeleted;
+ }
+ if (this.activeFilter.cipherType != null && cipherPassesFilter) {
+ cipherPassesFilter = cipher.type === this.activeFilter.cipherType;
+ }
+ if (
+ this.activeFilter.selectedFolderId != null &&
+ this.activeFilter.selectedFolderId != "none" &&
+ cipherPassesFilter
+ ) {
+ cipherPassesFilter = cipher.folderId === this.activeFilter.selectedFolderId;
+ }
+ if (this.activeFilter.selectedCollectionId != null && cipherPassesFilter) {
+ cipherPassesFilter =
+ cipher.collectionIds != null &&
+ cipher.collectionIds.indexOf(this.activeFilter.selectedCollectionId) > -1;
+ }
+ if (this.activeFilter.selectedOrganizationId != null && cipherPassesFilter) {
+ cipherPassesFilter = cipher.organizationId === this.activeFilter.selectedOrganizationId;
+ }
+ if (this.activeFilter.myVaultOnly && cipherPassesFilter) {
+ cipherPassesFilter = cipher.organizationId === null;
+ }
+ return cipherPassesFilter;
};
- if (load) {
- await this.ciphersComponent.reload(filter);
- } else {
- await this.ciphersComponent.applyFilter(filter);
- }
- this.clearFilters();
- this.collectionId = collectionId;
- this.go();
- }
-
- async filterDeleted(load = false) {
- this.ciphersComponent.showAddNew = false;
- this.ciphersComponent.deleted = true;
- this.groupingsComponent.searchPlaceholder = this.i18nService.t("searchTrash");
- if (load) {
- await this.ciphersComponent.reload(null, true);
- } else {
- await this.ciphersComponent.applyFilter(null);
- }
- this.clearFilters();
- this.deleted = true;
- this.go();
}
filterSearchText(searchText: string) {
@@ -254,7 +228,9 @@ export class VaultComponent implements OnInit, OnDestroy {
(comp) => {
if (this.organization.canEditAnyCollection) {
comp.collectionIds = cipher.collectionIds;
- comp.collections = this.groupingsComponent.collections.filter((c) => !c.readOnly);
+ comp.collections = this.vaultFilterComponent.collections.fullList.filter(
+ (c) => !c.readOnly
+ );
}
comp.organization = this.organization;
comp.cipherId = cipher.id;
@@ -271,7 +247,9 @@ export class VaultComponent implements OnInit, OnDestroy {
component.organizationId = this.organization.id;
component.type = this.type;
if (this.organization.canEditAnyCollection) {
- component.collections = this.groupingsComponent.collections.filter((c) => !c.readOnly);
+ component.collections = this.vaultFilterComponent.collections.fullList.filter(
+ (c) => !c.readOnly
+ );
}
if (this.collectionId != null) {
component.collectionIds = [this.collectionId];
@@ -324,7 +302,9 @@ export class VaultComponent implements OnInit, OnDestroy {
component.cloneMode = true;
component.organizationId = this.organization.id;
if (this.organization.canEditAnyCollection) {
- component.collections = this.groupingsComponent.collections.filter((c) => !c.readOnly);
+ component.collections = this.vaultFilterComponent.collections.fullList.filter(
+ (c) => !c.readOnly
+ );
}
// Regardless of Admin state, the collection Ids need to passed manually as they are not assigned value
// in the add-edit componenet
diff --git a/src/app/modules/vault/modules/organization-vault/organization-vault.module.ts b/src/app/modules/vault/modules/organization-vault/organization-vault.module.ts
new file mode 100644
index 0000000000..4566efa998
--- /dev/null
+++ b/src/app/modules/vault/modules/organization-vault/organization-vault.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from "@angular/core";
+
+import { VaultModule } from "../../vault.module";
+
+import { OrganizationVaultRoutingModule } from "./organization-vault-routing.module";
+import { OrganizationVaultComponent } from "./organization-vault.component";
+
+@NgModule({
+ imports: [VaultModule, OrganizationVaultRoutingModule],
+ declarations: [OrganizationVaultComponent],
+ exports: [OrganizationVaultComponent],
+})
+export class OrganizationVaultModule {}
diff --git a/src/app/modules/vault/vault.module.ts b/src/app/modules/vault/vault.module.ts
new file mode 100644
index 0000000000..bd4ab0cb51
--- /dev/null
+++ b/src/app/modules/vault/vault.module.ts
@@ -0,0 +1,19 @@
+import { NgModule } from "@angular/core";
+
+import { LooseComponentsModule } from "../loose-components.module";
+import { SharedModule } from "../shared.module";
+import { VaultFilterModule } from "../vault-filter/vault-filter.module";
+
+import { VaultService } from "./vault.service";
+
+@NgModule({
+ imports: [SharedModule, VaultFilterModule, LooseComponentsModule],
+ exports: [SharedModule, VaultFilterModule, LooseComponentsModule],
+ providers: [
+ {
+ provide: VaultService,
+ useClass: VaultService,
+ },
+ ],
+})
+export class VaultModule {}
diff --git a/src/app/modules/vault/vault.service.ts b/src/app/modules/vault/vault.service.ts
new file mode 100644
index 0000000000..3f8cc17c63
--- /dev/null
+++ b/src/app/modules/vault/vault.service.ts
@@ -0,0 +1,29 @@
+import { VaultFilter } from "jslib-angular/modules/vault-filter/models/vault-filter.model";
+
+export class VaultService {
+ calculateSearchBarLocalizationString(vaultFilter: VaultFilter): string {
+ if (vaultFilter.status === "favorites") {
+ return "searchFavorites";
+ }
+ if (vaultFilter.status === "trash") {
+ return "searchTrash";
+ }
+ if (vaultFilter.cipherType != null) {
+ return "searchType";
+ }
+ if (vaultFilter.selectedFolderId != null && vaultFilter.selectedFolderId != "none") {
+ return "searchFolder";
+ }
+ if (vaultFilter.selectedCollectionId != null) {
+ return "searchCollection";
+ }
+ if (vaultFilter.selectedOrganizationId != null) {
+ return "searchOrganization";
+ }
+ if (vaultFilter.myVaultOnly) {
+ return "searchMyVault";
+ }
+
+ return "searchVault";
+ }
+}
diff --git a/src/app/services/organization-guard.service.ts b/src/app/organizations/guards/permissions.guard.ts
similarity index 75%
rename from src/app/services/organization-guard.service.ts
rename to src/app/organizations/guards/permissions.guard.ts
index 8e883648bd..4ad57895fd 100644
--- a/src/app/services/organization-guard.service.ts
+++ b/src/app/organizations/guards/permissions.guard.ts
@@ -5,14 +5,15 @@ import { I18nService } from "jslib-common/abstractions/i18n.service";
import { OrganizationService } from "jslib-common/abstractions/organization.service";
import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
import { SyncService } from "jslib-common/abstractions/sync.service";
+import { Permissions } from "jslib-common/enums/permissions";
@Injectable()
-export class OrganizationGuardService implements CanActivate {
+export class PermissionsGuard implements CanActivate {
constructor(
private router: Router,
+ private organizationService: OrganizationService,
private platformUtilsService: PlatformUtilsService,
private i18nService: I18nService,
- private organizationService: OrganizationService,
private syncService: SyncService
) {}
@@ -26,6 +27,7 @@ export class OrganizationGuardService implements CanActivate {
if (org == null) {
return this.router.createUrlTree(["/"]);
}
+
if (!org.isOwner && !org.enabled) {
this.platformUtilsService.showToast(
"error",
@@ -35,6 +37,12 @@ export class OrganizationGuardService implements CanActivate {
return this.router.createUrlTree(["/"]);
}
+ const permissions = route.data == null ? [] : (route.data.permissions as Permissions[]);
+ if (permissions != null && !org.hasAnyPermission(permissions)) {
+ this.platformUtilsService.showToast("error", null, this.i18nService.t("accessDenied"));
+ return this.router.createUrlTree(["/"]);
+ }
+
return true;
}
}
diff --git a/src/app/organizations/layouts/organization-layout.component.html b/src/app/organizations/layouts/organization-layout.component.html
new file mode 100644
index 0000000000..cb0e6bba22
--- /dev/null
+++ b/src/app/organizations/layouts/organization-layout.component.html
@@ -0,0 +1,37 @@
+
+
+
+ ;
+
+ // TODO - Make sure to properly split out the billing/invoice and payment method/account during org admin refresh
+
constructor(
- apiService: ApiService,
- i18nService: I18nService,
+ private apiService: ApiService,
+ private i18nService: I18nService,
private route: ActivatedRoute,
- platformUtilsService: PlatformUtilsService,
- logService: LogService
- ) {
- super(apiService, i18nService, platformUtilsService, logService);
- }
+ private platformUtilsService: PlatformUtilsService,
+ private logService: LogService
+ ) {}
async ngOnInit() {
this.route.parent.parent.params.subscribe(async (params) => {
@@ -30,4 +45,110 @@ export class OrganizationBillingComponent extends UserBillingComponent implement
this.firstLoaded = true;
});
}
+
+ async load() {
+ if (this.loading) {
+ return;
+ }
+ this.loading = true;
+ if (this.organizationId != null) {
+ this.billing = await this.apiService.getOrganizationBilling(this.organizationId);
+ }
+ this.loading = false;
+ }
+
+ async verifyBank() {
+ if (this.loading) {
+ return;
+ }
+
+ try {
+ const request = new VerifyBankRequest();
+ request.amount1 = this.verifyAmount1;
+ request.amount2 = this.verifyAmount2;
+ this.verifyBankPromise = this.apiService.postOrganizationVerifyBank(
+ this.organizationId,
+ request
+ );
+ await this.verifyBankPromise;
+ this.platformUtilsService.showToast(
+ "success",
+ null,
+ this.i18nService.t("verifiedBankAccount")
+ );
+ this.load();
+ } catch (e) {
+ this.logService.error(e);
+ }
+ }
+
+ addCredit() {
+ if (this.paymentSourceInApp) {
+ this.platformUtilsService.showDialog(
+ this.i18nService.t("cannotPerformInAppPurchase"),
+ this.i18nService.t("addCredit"),
+ null,
+ null,
+ "warning"
+ );
+ return;
+ }
+ this.showAddCredit = true;
+ }
+
+ closeAddCredit(load: boolean) {
+ this.showAddCredit = false;
+ if (load) {
+ this.load();
+ }
+ }
+
+ changePayment() {
+ if (this.paymentSourceInApp) {
+ this.platformUtilsService.showDialog(
+ this.i18nService.t("cannotPerformInAppPurchase"),
+ this.i18nService.t("changePaymentMethod"),
+ null,
+ null,
+ "warning"
+ );
+ return;
+ }
+ this.showAdjustPayment = true;
+ }
+
+ closePayment(load: boolean) {
+ this.showAdjustPayment = false;
+ if (load) {
+ this.load();
+ }
+ }
+
+ get isCreditBalance() {
+ return this.billing == null || this.billing.balance <= 0;
+ }
+
+ get creditOrBalance() {
+ return Math.abs(this.billing != null ? this.billing.balance : 0);
+ }
+
+ get paymentSource() {
+ return this.billing != null ? this.billing.paymentSource : null;
+ }
+
+ get paymentSourceInApp() {
+ return (
+ this.paymentSource != null &&
+ (this.paymentSource.type === PaymentMethodType.AppleInApp ||
+ this.paymentSource.type === PaymentMethodType.GoogleInApp)
+ );
+ }
+
+ get invoices() {
+ return this.billing != null ? this.billing.invoices : null;
+ }
+
+ get transactions() {
+ return this.billing != null ? this.billing.transactions : null;
+ }
}
diff --git a/src/app/organizations/vault/ciphers.component.ts b/src/app/organizations/vault/ciphers.component.ts
index 6d1c248480..08e4b15894 100644
--- a/src/app/organizations/vault/ciphers.component.ts
+++ b/src/app/organizations/vault/ciphers.component.ts
@@ -5,6 +5,7 @@ import { CipherService } from "jslib-common/abstractions/cipher.service";
import { EventService } from "jslib-common/abstractions/event.service";
import { I18nService } from "jslib-common/abstractions/i18n.service";
import { LogService } from "jslib-common/abstractions/log.service";
+import { OrganizationService } from "jslib-common/abstractions/organization.service";
import { PasswordRepromptService } from "jslib-common/abstractions/passwordReprompt.service";
import { PlatformUtilsService } from "jslib-common/abstractions/platformUtils.service";
import { SearchService } from "jslib-common/abstractions/search.service";
@@ -37,7 +38,8 @@ export class CiphersComponent extends BaseCiphersComponent {
totpService: TotpService,
passwordRepromptService: PasswordRepromptService,
logService: LogService,
- stateService: StateService
+ stateService: StateService,
+ organizationService: OrganizationService
) {
super(
searchService,
@@ -48,7 +50,8 @@ export class CiphersComponent extends BaseCiphersComponent {
totpService,
stateService,
passwordRepromptService,
- logService
+ logService,
+ organizationService
);
}
diff --git a/src/app/organizations/vault/groupings.component.ts b/src/app/organizations/vault/groupings.component.ts
deleted file mode 100644
index b39f5e9a7b..0000000000
--- a/src/app/organizations/vault/groupings.component.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Component } from "@angular/core";
-
-import { ApiService } from "jslib-common/abstractions/api.service";
-import { CollectionService } from "jslib-common/abstractions/collection.service";
-import { FolderService } from "jslib-common/abstractions/folder.service";
-import { I18nService } from "jslib-common/abstractions/i18n.service";
-import { StateService } from "jslib-common/abstractions/state.service";
-import { CollectionData } from "jslib-common/models/data/collectionData";
-import { Collection } from "jslib-common/models/domain/collection";
-import { Organization } from "jslib-common/models/domain/organization";
-import { CollectionDetailsResponse } from "jslib-common/models/response/collectionResponse";
-import { CollectionView } from "jslib-common/models/view/collectionView";
-
-import { GroupingsComponent as BaseGroupingsComponent } from "../../vault/groupings.component";
-
-@Component({
- selector: "app-org-vault-groupings",
- templateUrl: "../../vault/groupings.component.html",
-})
-export class GroupingsComponent extends BaseGroupingsComponent {
- organization: Organization;
-
- constructor(
- collectionService: CollectionService,
- folderService: FolderService,
- stateService: StateService,
- private apiService: ApiService,
- private i18nService: I18nService
- ) {
- super(collectionService, folderService, stateService);
- }
-
- async loadCollections() {
- if (!this.organization.canEditAnyCollection) {
- await super.loadCollections(this.organization.id);
- return;
- }
-
- const collections = await this.apiService.getCollections(this.organization.id);
- if (collections != null && collections.data != null && collections.data.length) {
- const collectionDomains = collections.data.map(
- (r) => new Collection(new CollectionData(r as CollectionDetailsResponse))
- );
- this.collections = await this.collectionService.decryptMany(collectionDomains);
- } else {
- this.collections = [];
- }
-
- const unassignedCollection = new CollectionView();
- unassignedCollection.name = this.i18nService.t("unassigned");
- unassignedCollection.id = "unassigned";
- unassignedCollection.organizationId = this.organization.id;
- unassignedCollection.readOnly = true;
- this.collections.push(unassignedCollection);
- this.nestedCollections = await this.collectionService.getAllNested(this.collections);
- }
-
- async collapse(grouping: CollectionView) {
- await super.collapse(grouping, "org_");
- }
-
- isCollapsed(grouping: CollectionView) {
- return super.isCollapsed(grouping, "org_");
- }
-}
diff --git a/src/app/oss-routing.module.ts b/src/app/oss-routing.module.ts
index 440113bfa6..0eea2fd306 100644
--- a/src/app/oss-routing.module.ts
+++ b/src/app/oss-routing.module.ts
@@ -1,10 +1,9 @@
import { NgModule } from "@angular/core";
import { RouterModule, Routes } from "@angular/router";
-import { AuthGuardService } from "jslib-angular/services/auth-guard.service";
-import { LockGuardService } from "jslib-angular/services/lock-guard.service";
-import { UnauthGuardService } from "jslib-angular/services/unauth-guard.service";
-import { Permissions } from "jslib-common/enums/permissions";
+import { AuthGuard } from "jslib-angular/guards/auth.guard";
+import { LockGuard } from "jslib-angular/guards/lock.guard";
+import { UnauthGuard } from "jslib-angular/guards/unauth.guard";
import { AcceptEmergencyComponent } from "./accounts/accept-emergency.component";
import { AcceptOrganizationComponent } from "./accounts/accept-organization.component";
@@ -24,52 +23,23 @@ import { VerifyEmailTokenComponent } from "./accounts/verify-email-token.compone
import { VerifyRecoverDeleteComponent } from "./accounts/verify-recover-delete.component";
import { HomeGuard } from "./guards/home.guard";
import { FrontendLayoutComponent } from "./layouts/frontend-layout.component";
-import { OrganizationLayoutComponent } from "./layouts/organization-layout.component";
import { UserLayoutComponent } from "./layouts/user-layout.component";
-import { CollectionsComponent as OrgManageCollectionsComponent } from "./organizations/manage/collections.component";
-import { EventsComponent as OrgEventsComponent } from "./organizations/manage/events.component";
-import { GroupsComponent as OrgGroupsComponent } from "./organizations/manage/groups.component";
-import { ManageComponent as OrgManageComponent } from "./organizations/manage/manage.component";
-import { PeopleComponent as OrgPeopleComponent } from "./organizations/manage/people.component";
-import { PoliciesComponent as OrgPoliciesComponent } from "./organizations/manage/policies.component";
-import { AccountComponent as OrgAccountComponent } from "./organizations/settings/account.component";
-import { OrganizationBillingComponent } from "./organizations/settings/organization-billing.component";
-import { OrganizationSubscriptionComponent } from "./organizations/settings/organization-subscription.component";
-import { SettingsComponent as OrgSettingsComponent } from "./organizations/settings/settings.component";
-import { TwoFactorSetupComponent as OrgTwoFactorSetupComponent } from "./organizations/settings/two-factor-setup.component";
import { AcceptFamilySponsorshipComponent } from "./organizations/sponsorships/accept-family-sponsorship.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 { ImportComponent as OrgImportComponent } from "./organizations/tools/import.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 { 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 { VaultComponent as OrgVaultComponent } from "./organizations/vault/vault.component";
import { AccessComponent } from "./send/access.component";
import { SendComponent } from "./send/send.component";
-import { OrganizationGuardService } from "./services/organization-guard.service";
-import { OrganizationTypeGuardService } from "./services/organization-type-guard.service";
import { AccountComponent } from "./settings/account.component";
import { CreateOrganizationComponent } from "./settings/create-organization.component";
import { DomainRulesComponent } from "./settings/domain-rules.component";
import { EmergencyAccessViewComponent } from "./settings/emergency-access-view.component";
import { EmergencyAccessComponent } from "./settings/emergency-access.component";
-import { OptionsComponent } from "./settings/options.component";
-import { OrganizationsComponent } from "./settings/organizations.component";
-import { PremiumComponent } from "./settings/premium.component";
+import { PreferencesComponent } from "./settings/preferences.component";
import { SettingsComponent } from "./settings/settings.component";
import { SponsoredFamiliesComponent } from "./settings/sponsored-families.component";
-import { TwoFactorSetupComponent } from "./settings/two-factor-setup.component";
-import { UserBillingComponent } from "./settings/user-billing.component";
-import { UserSubscriptionComponent } from "./settings/user-subscription.component";
import { ExportComponent } from "./tools/export.component";
import { GeneratorComponent } from "./tools/generator.component";
import { ImportComponent } from "./tools/import.component";
import { ToolsComponent } from "./tools/tools.component";
-import { VaultComponent } from "./vault/vault.component";
const routes: Routes = [
{
@@ -83,18 +53,18 @@ const routes: Routes = [
children: [], // Children lets us have an empty component.
canActivate: [HomeGuard], // Redirects either to vault, login or lock page.
},
- { path: "login", component: LoginComponent, canActivate: [UnauthGuardService] },
- { path: "2fa", component: TwoFactorComponent, canActivate: [UnauthGuardService] },
+ { path: "login", component: LoginComponent, canActivate: [UnauthGuard] },
+ { path: "2fa", component: TwoFactorComponent, canActivate: [UnauthGuard] },
{
path: "register",
component: RegisterComponent,
- canActivate: [UnauthGuardService],
+ canActivate: [UnauthGuard],
data: { titleId: "createAccount" },
},
{
path: "sso",
component: SsoComponent,
- canActivate: [UnauthGuardService],
+ canActivate: [UnauthGuard],
data: { titleId: "enterpriseSingleSignOn" },
},
{
@@ -105,13 +75,13 @@ const routes: Routes = [
{
path: "hint",
component: HintComponent,
- canActivate: [UnauthGuardService],
+ canActivate: [UnauthGuard],
data: { titleId: "passwordHint" },
},
{
path: "lock",
component: LockComponent,
- canActivate: [LockGuardService],
+ canActivate: [LockGuard],
},
{ path: "verify-email", component: VerifyEmailTokenComponent },
{
@@ -133,19 +103,19 @@ const routes: Routes = [
{
path: "recover-2fa",
component: RecoverTwoFactorComponent,
- canActivate: [UnauthGuardService],
+ canActivate: [UnauthGuard],
data: { titleId: "recoverAccountTwoStep" },
},
{
path: "recover-delete",
component: RecoverDeleteComponent,
- canActivate: [UnauthGuardService],
+ canActivate: [UnauthGuard],
data: { titleId: "deleteAccount" },
},
{
path: "verify-recover-delete",
component: VerifyRecoverDeleteComponent,
- canActivate: [UnauthGuardService],
+ canActivate: [UnauthGuard],
data: { titleId: "deleteAccount" },
},
{
@@ -156,19 +126,19 @@ const routes: Routes = [
{
path: "update-temp-password",
component: UpdateTempPasswordComponent,
- canActivate: [AuthGuardService],
+ canActivate: [AuthGuard],
data: { titleId: "updateTempPassword" },
},
{
path: "update-password",
component: UpdatePasswordComponent,
- canActivate: [AuthGuardService],
+ canActivate: [AuthGuard],
data: { titleId: "updatePassword" },
},
{
path: "remove-password",
component: RemovePasswordComponent,
- canActivate: [AuthGuardService],
+ canActivate: [AuthGuard],
data: { titleId: "removeMasterPassword" },
},
],
@@ -176,9 +146,14 @@ const routes: Routes = [
{
path: "",
component: UserLayoutComponent,
- canActivate: [AuthGuardService],
+ canActivate: [AuthGuard],
children: [
- { path: "vault", component: VaultComponent, data: { titleId: "myVault" } },
+ {
+ path: "vault",
+ loadChildren: async () =>
+ (await import("./modules/vault/modules/individual-vault/individual-vault.module"))
+ .IndividualVaultModule,
+ },
{ path: "sends", component: SendComponent, data: { title: "Send" } },
{
path: "settings",
@@ -186,28 +161,25 @@ const routes: Routes = [
children: [
{ path: "", pathMatch: "full", redirectTo: "account" },
{ path: "account", component: AccountComponent, data: { titleId: "myAccount" } },
- { path: "options", component: OptionsComponent, data: { titleId: "options" } },
+ {
+ path: "preferences",
+ component: PreferencesComponent,
+ data: { titleId: "preferences" },
+ },
+ {
+ path: "security",
+ loadChildren: async () =>
+ (await import("./settings/security-routing.module")).SecurityRoutingModule,
+ },
{
path: "domain-rules",
component: DomainRulesComponent,
data: { titleId: "domainRules" },
},
- {
- path: "two-factor",
- component: TwoFactorSetupComponent,
- data: { titleId: "twoStepLogin" },
- },
- { path: "premium", component: PremiumComponent, data: { titleId: "goPremium" } },
- { path: "billing", component: UserBillingComponent, data: { titleId: "billing" } },
{
path: "subscription",
- component: UserSubscriptionComponent,
- data: { titleId: "premiumMembership" },
- },
- {
- path: "organizations",
- component: OrganizationsComponent,
- data: { titleId: "organizations" },
+ loadChildren: async () =>
+ (await import("./settings/subscription-routing.module")).SubscriptionRoutingModule,
},
{
path: "create-organization",
@@ -239,7 +211,7 @@ const routes: Routes = [
{
path: "tools",
component: ToolsComponent,
- canActivate: [AuthGuardService],
+ canActivate: [AuthGuard],
children: [
{ path: "", pathMatch: "full", redirectTo: "generator" },
{ path: "import", component: ImportComponent, data: { titleId: "importData" } },
@@ -253,194 +225,16 @@ const routes: Routes = [
},
{
path: "reports",
- loadChildren: async () => (await import("./reports/reports.module")).ReportsModule,
+ loadChildren: async () =>
+ (await import("./reports/reports-routing.module")).ReportsRoutingModule,
},
{ path: "setup/families-for-enterprise", component: FamiliesForEnterpriseSetupComponent },
- ],
- },
- {
- path: "organizations/:organizationId",
- component: OrganizationLayoutComponent,
- canActivate: [AuthGuardService, OrganizationGuardService],
- children: [
- { path: "", pathMatch: "full", redirectTo: "vault" },
- { path: "vault", component: OrgVaultComponent, data: { titleId: "vault" } },
{
- path: "tools",
- component: OrgToolsComponent,
- canActivate: [OrganizationTypeGuardService],
- data: { permissions: [Permissions.AccessImportExport, Permissions.AccessReports] },
- children: [
- {
- path: "",
- pathMatch: "full",
- redirectTo: "import",
- },
- {
- path: "import",
- component: OrgImportComponent,
- canActivate: [OrganizationTypeGuardService],
- data: {
- titleId: "importData",
- permissions: [Permissions.AccessImportExport],
- },
- },
- {
- path: "export",
- component: OrgExportComponent,
- canActivate: [OrganizationTypeGuardService],
- data: {
- titleId: "exportVault",
- permissions: [Permissions.AccessImportExport],
- },
- },
- {
- path: "exposed-passwords-report",
- component: OrgExposedPasswordsReportComponent,
- canActivate: [OrganizationTypeGuardService],
- data: {
- titleId: "exposedPasswordsReport",
- permissions: [Permissions.AccessReports],
- },
- },
- {
- path: "inactive-two-factor-report",
- component: OrgInactiveTwoFactorReportComponent,
- canActivate: [OrganizationTypeGuardService],
- data: {
- titleId: "inactive2faReport",
- permissions: [Permissions.AccessReports],
- },
- },
- {
- path: "reused-passwords-report",
- component: OrgReusedPasswordsReportComponent,
- canActivate: [OrganizationTypeGuardService],
- data: {
- titleId: "reusedPasswordsReport",
- permissions: [Permissions.AccessReports],
- },
- },
- {
- path: "unsecured-websites-report",
- component: OrgUnsecuredWebsitesReportComponent,
- canActivate: [OrganizationTypeGuardService],
- data: {
- titleId: "unsecuredWebsitesReport",
- permissions: [Permissions.AccessReports],
- },
- },
- {
- path: "weak-passwords-report",
- component: OrgWeakPasswordsReportComponent,
- canActivate: [OrganizationTypeGuardService],
- data: {
- titleId: "weakPasswordsReport",
- permissions: [Permissions.AccessReports],
- },
- },
- ],
- },
- {
- path: "manage",
- component: OrgManageComponent,
- canActivate: [OrganizationTypeGuardService],
- data: {
- permissions: [
- Permissions.CreateNewCollections,
- Permissions.EditAnyCollection,
- Permissions.DeleteAnyCollection,
- Permissions.EditAssignedCollections,
- Permissions.DeleteAssignedCollections,
- Permissions.AccessEventLogs,
- Permissions.ManageGroups,
- Permissions.ManageUsers,
- Permissions.ManagePolicies,
- ],
- },
- children: [
- {
- path: "",
- pathMatch: "full",
- redirectTo: "people",
- },
- {
- path: "collections",
- component: OrgManageCollectionsComponent,
- canActivate: [OrganizationTypeGuardService],
- data: {
- titleId: "collections",
- permissions: [
- Permissions.CreateNewCollections,
- Permissions.EditAnyCollection,
- Permissions.DeleteAnyCollection,
- Permissions.EditAssignedCollections,
- Permissions.DeleteAssignedCollections,
- ],
- },
- },
- {
- path: "events",
- component: OrgEventsComponent,
- canActivate: [OrganizationTypeGuardService],
- data: {
- titleId: "eventLogs",
- permissions: [Permissions.AccessEventLogs],
- },
- },
- {
- path: "groups",
- component: OrgGroupsComponent,
- canActivate: [OrganizationTypeGuardService],
- data: {
- titleId: "groups",
- permissions: [Permissions.ManageGroups],
- },
- },
- {
- path: "people",
- component: OrgPeopleComponent,
- canActivate: [OrganizationTypeGuardService],
- data: {
- titleId: "people",
- permissions: [Permissions.ManageUsers, Permissions.ManageUsersPassword],
- },
- },
- {
- path: "policies",
- component: OrgPoliciesComponent,
- canActivate: [OrganizationTypeGuardService],
- data: {
- titleId: "policies",
- permissions: [Permissions.ManagePolicies],
- },
- },
- ],
- },
- {
- path: "settings",
- component: OrgSettingsComponent,
- canActivate: [OrganizationTypeGuardService],
- data: { permissions: [Permissions.ManageOrganization] },
- children: [
- { path: "", pathMatch: "full", redirectTo: "account" },
- { path: "account", component: OrgAccountComponent, data: { titleId: "myOrganization" } },
- {
- path: "two-factor",
- component: OrgTwoFactorSetupComponent,
- data: { titleId: "twoStepLogin" },
- },
- {
- path: "billing",
- component: OrganizationBillingComponent,
- data: { titleId: "billing" },
- },
- {
- path: "subscription",
- component: OrganizationSubscriptionComponent,
- data: { titleId: "subscription" },
- },
- ],
+ path: "organizations",
+ loadChildren: () =>
+ import("./organizations/organization-routing.module").then(
+ (m) => m.OrganizationsRoutingModule
+ ),
},
],
},
@@ -451,7 +245,7 @@ const routes: Routes = [
RouterModule.forRoot(routes, {
useHash: true,
paramsInheritanceStrategy: "always",
- /*enableTracing: true,*/
+ // enableTracing: true,
}),
],
exports: [RouterModule],
diff --git a/src/app/oss.module.ts b/src/app/oss.module.ts
index 4be1f09486..6f300b4e6a 100644
--- a/src/app/oss.module.ts
+++ b/src/app/oss.module.ts
@@ -1,448 +1,20 @@
-import { DragDropModule } from "@angular/cdk/drag-drop";
-import { DatePipe, registerLocaleData, CommonModule } from "@angular/common";
-import localeAf from "@angular/common/locales/af";
-import localeAz from "@angular/common/locales/az";
-import localeBe from "@angular/common/locales/be";
-import localeBg from "@angular/common/locales/bg";
-import localeBn from "@angular/common/locales/bn";
-import localeBs from "@angular/common/locales/bs";
-import localeCa from "@angular/common/locales/ca";
-import localeCs from "@angular/common/locales/cs";
-import localeDa from "@angular/common/locales/da";
-import localeDe from "@angular/common/locales/de";
-import localeEl from "@angular/common/locales/el";
-import localeEnGb from "@angular/common/locales/en-GB";
-import localeEnIn from "@angular/common/locales/en-IN";
-import localeEo from "@angular/common/locales/eo";
-import localeEs from "@angular/common/locales/es";
-import localeEt from "@angular/common/locales/et";
-import localeFi from "@angular/common/locales/fi";
-import localeFil from "@angular/common/locales/fil";
-import localeFr from "@angular/common/locales/fr";
-import localeHe from "@angular/common/locales/he";
-import localeHi from "@angular/common/locales/hi";
-import localeHr from "@angular/common/locales/hr";
-import localeHu from "@angular/common/locales/hu";
-import localeId from "@angular/common/locales/id";
-import localeIt from "@angular/common/locales/it";
-import localeJa from "@angular/common/locales/ja";
-import localeKa from "@angular/common/locales/ka";
-import localeKm from "@angular/common/locales/km";
-import localeKn from "@angular/common/locales/kn";
-import localeKo from "@angular/common/locales/ko";
-import localeLv from "@angular/common/locales/lv";
-import localeMl from "@angular/common/locales/ml";
-import localeNb from "@angular/common/locales/nb";
-import localeNl from "@angular/common/locales/nl";
-import localeNn from "@angular/common/locales/nn";
-import localePl from "@angular/common/locales/pl";
-import localePtBr from "@angular/common/locales/pt";
-import localePtPt from "@angular/common/locales/pt-PT";
-import localeRo from "@angular/common/locales/ro";
-import localeRu from "@angular/common/locales/ru";
-import localeSi from "@angular/common/locales/si";
-import localeSk from "@angular/common/locales/sk";
-import localeSl from "@angular/common/locales/sl";
-import localeSr from "@angular/common/locales/sr";
-import localeSv from "@angular/common/locales/sv";
-import localeTr from "@angular/common/locales/tr";
-import localeUk from "@angular/common/locales/uk";
-import localeVi from "@angular/common/locales/vi";
-import localeZhCn from "@angular/common/locales/zh-Hans";
-import localeZhTw from "@angular/common/locales/zh-Hant";
import { NgModule } from "@angular/core";
-import { FormsModule, ReactiveFormsModule } from "@angular/forms";
-import { RouterModule } from "@angular/router";
-import { BadgeModule, ButtonModule } from "@bitwarden/components";
-import { InfiniteScrollModule } from "ngx-infinite-scroll";
-import { ToastrModule } from "ngx-toastr";
-import { UserVerificationComponent } from "jslib-angular/components/user-verification.component";
-import { JslibModule } from "jslib-angular/jslib.module";
-
-import { AcceptEmergencyComponent } from "./accounts/accept-emergency.component";
-import { AcceptOrganizationComponent } from "./accounts/accept-organization.component";
-import { HintComponent } from "./accounts/hint.component";
-import { LockComponent } from "./accounts/lock.component";
-import { LoginComponent } from "./accounts/login.component";
-import { RecoverDeleteComponent } from "./accounts/recover-delete.component";
-import { RecoverTwoFactorComponent } from "./accounts/recover-two-factor.component";
-import { RegisterComponent } from "./accounts/register.component";
-import { RemovePasswordComponent } from "./accounts/remove-password.component";
-import { SetPasswordComponent } from "./accounts/set-password.component";
-import { SsoComponent } from "./accounts/sso.component";
-import { TwoFactorOptionsComponent } from "./accounts/two-factor-options.component";
-import { TwoFactorComponent } from "./accounts/two-factor.component";
-import { UpdatePasswordComponent } from "./accounts/update-password.component";
-import { UpdateTempPasswordComponent } from "./accounts/update-temp-password.component";
-import { VerifyEmailTokenComponent } from "./accounts/verify-email-token.component";
-import { VerifyRecoverDeleteComponent } from "./accounts/verify-recover-delete.component";
-import { NestedCheckboxComponent } from "./components/nested-checkbox.component";
-import { PasswordRepromptComponent } from "./components/password-reprompt.component";
-import { PasswordStrengthComponent } from "./components/password-strength.component";
-import { PremiumBadgeComponent } from "./components/premium-badge.component";
-import { FooterComponent } from "./layouts/footer.component";
-import { FrontendLayoutComponent } from "./layouts/frontend-layout.component";
-import { NavbarComponent } from "./layouts/navbar.component";
-import { OrganizationLayoutComponent } from "./layouts/organization-layout.component";
-import { UserLayoutComponent } from "./layouts/user-layout.component";
-import { BulkConfirmComponent as OrgBulkConfirmComponent } from "./organizations/manage/bulk/bulk-confirm.component";
-import { BulkRemoveComponent as OrgBulkRemoveComponent } from "./organizations/manage/bulk/bulk-remove.component";
-import { BulkStatusComponent as OrgBulkStatusComponent } from "./organizations/manage/bulk/bulk-status.component";
-import { CollectionAddEditComponent as OrgCollectionAddEditComponent } from "./organizations/manage/collection-add-edit.component";
-import { CollectionsComponent as OrgManageCollectionsComponent } from "./organizations/manage/collections.component";
-import { EntityEventsComponent as OrgEntityEventsComponent } from "./organizations/manage/entity-events.component";
-import { EntityUsersComponent as OrgEntityUsersComponent } from "./organizations/manage/entity-users.component";
-import { EventsComponent as OrgEventsComponent } from "./organizations/manage/events.component";
-import { GroupAddEditComponent as OrgGroupAddEditComponent } from "./organizations/manage/group-add-edit.component";
-import { GroupsComponent as OrgGroupsComponent } from "./organizations/manage/groups.component";
-import { ManageComponent as OrgManageComponent } from "./organizations/manage/manage.component";
-import { PeopleComponent as OrgPeopleComponent } from "./organizations/manage/people.component";
-import { PoliciesComponent as OrgPoliciesComponent } from "./organizations/manage/policies.component";
-import { PolicyEditComponent as OrgPolicyEditComponent } from "./organizations/manage/policy-edit.component";
-import { ResetPasswordComponent as OrgResetPasswordComponent } from "./organizations/manage/reset-password.component";
-import { UserAddEditComponent as OrgUserAddEditComponent } from "./organizations/manage/user-add-edit.component";
-import { UserConfirmComponent as OrgUserConfirmComponent } from "./organizations/manage/user-confirm.component";
-import { UserGroupsComponent as OrgUserGroupsComponent } from "./organizations/manage/user-groups.component";
-import { DisableSendPolicyComponent } from "./organizations/policies/disable-send.component";
-import { MasterPasswordPolicyComponent } from "./organizations/policies/master-password.component";
-import { PasswordGeneratorPolicyComponent } from "./organizations/policies/password-generator.component";
-import { PersonalOwnershipPolicyComponent } from "./organizations/policies/personal-ownership.component";
-import { RequireSsoPolicyComponent } from "./organizations/policies/require-sso.component";
-import { ResetPasswordPolicyComponent } from "./organizations/policies/reset-password.component";
-import { SendOptionsPolicyComponent } from "./organizations/policies/send-options.component";
-import { SingleOrgPolicyComponent } from "./organizations/policies/single-org.component";
-import { TwoFactorAuthenticationPolicyComponent } from "./organizations/policies/two-factor-authentication.component";
-import { AccountComponent as OrgAccountComponent } from "./organizations/settings/account.component";
-import { AdjustSubscription } from "./organizations/settings/adjust-subscription.component";
-import { ChangePlanComponent } from "./organizations/settings/change-plan.component";
-import { DeleteOrganizationComponent } from "./organizations/settings/delete-organization.component";
-import { DownloadLicenseComponent } from "./organizations/settings/download-license.component";
-import { OrganizationBillingComponent } from "./organizations/settings/organization-billing.component";
-import { OrganizationSubscriptionComponent } from "./organizations/settings/organization-subscription.component";
-import { SettingsComponent as OrgSettingComponent } from "./organizations/settings/settings.component";
-import { TwoFactorSetupComponent as OrgTwoFactorSetupComponent } from "./organizations/settings/two-factor-setup.component";
-import { AcceptFamilySponsorshipComponent } from "./organizations/sponsorships/accept-family-sponsorship.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 { ImportComponent as OrgImportComponent } from "./organizations/tools/import.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 { 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 { CiphersComponent as OrgCiphersComponent } from "./organizations/vault/ciphers.component";
-import { CollectionsComponent as OrgCollectionsComponent } from "./organizations/vault/collections.component";
-import { GroupingsComponent as OrgGroupingsComponent } from "./organizations/vault/groupings.component";
-import { VaultComponent as OrgVaultComponent } from "./organizations/vault/vault.component";
-import { ProvidersComponent } from "./providers/providers.component";
-import { BreachReportComponent } from "./reports/breach-report.component";
-import { ExposedPasswordsReportComponent } from "./reports/exposed-passwords-report.component";
-import { InactiveTwoFactorReportComponent } from "./reports/inactive-two-factor-report.component";
-import { ReportCardComponent } from "./reports/report-card.component";
-import { ReportListComponent } from "./reports/report-list.component";
-import { ReportsComponent } from "./reports/reports.component";
-import { ReusedPasswordsReportComponent } from "./reports/reused-passwords-report.component";
-import { UnsecuredWebsitesReportComponent } from "./reports/unsecured-websites-report.component";
-import { WeakPasswordsReportComponent } from "./reports/weak-passwords-report.component";
-import { AccessComponent } from "./send/access.component";
-import { AddEditComponent as SendAddEditComponent } from "./send/add-edit.component";
-import { EffluxDatesComponent as SendEffluxDatesComponent } from "./send/efflux-dates.component";
-import { SendComponent } from "./send/send.component";
-import { AccountComponent } from "./settings/account.component";
-import { AddCreditComponent } from "./settings/add-credit.component";
-import { AdjustPaymentComponent } from "./settings/adjust-payment.component";
-import { AdjustStorageComponent } from "./settings/adjust-storage.component";
-import { ApiKeyComponent } from "./settings/api-key.component";
-import { ChangeEmailComponent } from "./settings/change-email.component";
-import { ChangeKdfComponent } from "./settings/change-kdf.component";
-import { ChangePasswordComponent } from "./settings/change-password.component";
-import { CreateOrganizationComponent } from "./settings/create-organization.component";
-import { DeauthorizeSessionsComponent } from "./settings/deauthorize-sessions.component";
-import { DeleteAccountComponent } from "./settings/delete-account.component";
-import { DomainRulesComponent } from "./settings/domain-rules.component";
-import { EmergencyAccessAddEditComponent } from "./settings/emergency-access-add-edit.component";
-import { EmergencyAccessAttachmentsComponent } from "./settings/emergency-access-attachments.component";
-import { EmergencyAccessConfirmComponent } from "./settings/emergency-access-confirm.component";
-import { EmergencyAccessTakeoverComponent } from "./settings/emergency-access-takeover.component";
-import { EmergencyAccessViewComponent } from "./settings/emergency-access-view.component";
-import { EmergencyAccessComponent } from "./settings/emergency-access.component";
-import { EmergencyAddEditComponent } from "./settings/emergency-add-edit.component";
-import { LinkSsoComponent } from "./settings/link-sso.component";
-import { OptionsComponent } from "./settings/options.component";
-import { OrganizationPlansComponent } from "./settings/organization-plans.component";
-import { OrganizationsComponent } from "./settings/organizations.component";
-import { PaymentComponent } from "./settings/payment.component";
-import { PremiumComponent } from "./settings/premium.component";
-import { ProfileComponent } from "./settings/profile.component";
-import { PurgeVaultComponent } from "./settings/purge-vault.component";
-import { SettingsComponent } from "./settings/settings.component";
-import { SponsoredFamiliesComponent } from "./settings/sponsored-families.component";
-import { SponsoringOrgRowComponent } from "./settings/sponsoring-org-row.component";
-import { TaxInfoComponent } from "./settings/tax-info.component";
-import { TwoFactorAuthenticatorComponent } from "./settings/two-factor-authenticator.component";
-import { TwoFactorDuoComponent } from "./settings/two-factor-duo.component";
-import { TwoFactorEmailComponent } from "./settings/two-factor-email.component";
-import { TwoFactorRecoveryComponent } from "./settings/two-factor-recovery.component";
-import { TwoFactorSetupComponent } from "./settings/two-factor-setup.component";
-import { TwoFactorVerifyComponent } from "./settings/two-factor-verify.component";
-import { TwoFactorWebAuthnComponent } from "./settings/two-factor-webauthn.component";
-import { TwoFactorYubiKeyComponent } from "./settings/two-factor-yubikey.component";
-import { UpdateKeyComponent } from "./settings/update-key.component";
-import { UpdateLicenseComponent } from "./settings/update-license.component";
-import { UserBillingComponent } from "./settings/user-billing.component";
-import { UserSubscriptionComponent } from "./settings/user-subscription.component";
-import { VaultTimeoutInputComponent } from "./settings/vault-timeout-input.component";
-import { VerifyEmailComponent } from "./settings/verify-email.component";
-import { ExportComponent } from "./tools/export.component";
-import { GeneratorComponent } from "./tools/generator.component";
-import { ImportComponent } from "./tools/import.component";
-import { PasswordGeneratorHistoryComponent } from "./tools/password-generator-history.component";
-import { ToolsComponent } from "./tools/tools.component";
-import { AddEditCustomFieldsComponent } from "./vault/add-edit-custom-fields.component";
-import { AddEditComponent } from "./vault/add-edit.component";
-import { AttachmentsComponent } from "./vault/attachments.component";
-import { BulkActionsComponent } from "./vault/bulk-actions.component";
-import { BulkDeleteComponent } from "./vault/bulk-delete.component";
-import { BulkMoveComponent } from "./vault/bulk-move.component";
-import { BulkRestoreComponent } from "./vault/bulk-restore.component";
-import { BulkShareComponent } from "./vault/bulk-share.component";
-import { CiphersComponent } from "./vault/ciphers.component";
-import { CollectionsComponent } from "./vault/collections.component";
-import { FolderAddEditComponent } from "./vault/folder-add-edit.component";
-import { GroupingsComponent } from "./vault/groupings.component";
-import { ShareComponent } from "./vault/share.component";
-import { VaultComponent } from "./vault/vault.component";
-
-registerLocaleData(localeAf, "af");
-registerLocaleData(localeAz, "az");
-registerLocaleData(localeBe, "be");
-registerLocaleData(localeBg, "bg");
-registerLocaleData(localeBn, "bn");
-registerLocaleData(localeBs, "bs");
-registerLocaleData(localeCa, "ca");
-registerLocaleData(localeCs, "cs");
-registerLocaleData(localeDa, "da");
-registerLocaleData(localeDe, "de");
-registerLocaleData(localeEl, "el");
-registerLocaleData(localeEnGb, "en-GB");
-registerLocaleData(localeEnIn, "en-IN");
-registerLocaleData(localeEo, "eo");
-registerLocaleData(localeEs, "es");
-registerLocaleData(localeEt, "et");
-registerLocaleData(localeFi, "fi");
-registerLocaleData(localeFil, "fil");
-registerLocaleData(localeFr, "fr");
-registerLocaleData(localeHe, "he");
-registerLocaleData(localeHi, "hi");
-registerLocaleData(localeHr, "hr");
-registerLocaleData(localeHu, "hu");
-registerLocaleData(localeId, "id");
-registerLocaleData(localeIt, "it");
-registerLocaleData(localeJa, "ja");
-registerLocaleData(localeKa, "ka");
-registerLocaleData(localeKm, "km");
-registerLocaleData(localeKn, "kn");
-registerLocaleData(localeKo, "ko");
-registerLocaleData(localeLv, "lv");
-registerLocaleData(localeMl, "ml");
-registerLocaleData(localeNb, "nb");
-registerLocaleData(localeNl, "nl");
-registerLocaleData(localeNn, "nn");
-registerLocaleData(localePl, "pl");
-registerLocaleData(localePtBr, "pt-BR");
-registerLocaleData(localePtPt, "pt-PT");
-registerLocaleData(localeRo, "ro");
-registerLocaleData(localeRu, "ru");
-registerLocaleData(localeSi, "si");
-registerLocaleData(localeSk, "sk");
-registerLocaleData(localeSl, "sl");
-registerLocaleData(localeSr, "sr");
-registerLocaleData(localeSv, "sv");
-registerLocaleData(localeTr, "tr");
-registerLocaleData(localeUk, "uk");
-registerLocaleData(localeVi, "vi");
-registerLocaleData(localeZhCn, "zh-CN");
-registerLocaleData(localeZhTw, "zh-TW");
+import { LooseComponentsModule } from "./modules/loose-components.module";
+import { PipesModule } from "./modules/pipes/pipes.module";
+import { SharedModule } from "./modules/shared.module";
+import { VaultFilterModule } from "./modules/vault-filter/vault-filter.module";
+import { OrganizationBadgeModule } from "./modules/vault/modules/organization-badge/organization-badge.module";
@NgModule({
imports: [
- CommonModule,
- DragDropModule,
- FormsModule,
- InfiniteScrollModule,
- JslibModule,
- ReactiveFormsModule,
- RouterModule,
- ToastrModule,
- BadgeModule,
- ButtonModule,
+ SharedModule,
+ LooseComponentsModule,
+ VaultFilterModule,
+ OrganizationBadgeModule,
+ PipesModule,
],
- declarations: [
- PremiumBadgeComponent,
- AcceptEmergencyComponent,
- AcceptFamilySponsorshipComponent,
- AcceptOrganizationComponent,
- AccessComponent,
- AccountComponent,
- AddCreditComponent,
- AddEditComponent,
- AddEditCustomFieldsComponent,
- AddEditCustomFieldsComponent,
- AdjustPaymentComponent,
- AdjustStorageComponent,
- AdjustSubscription,
- ApiKeyComponent,
- AttachmentsComponent,
- BreachReportComponent,
- BulkActionsComponent,
- BulkDeleteComponent,
- BulkMoveComponent,
- BulkRestoreComponent,
- BulkShareComponent,
- ChangeEmailComponent,
- ChangeKdfComponent,
- ChangePasswordComponent,
- ChangePlanComponent,
- CiphersComponent,
- CollectionsComponent,
- CreateOrganizationComponent,
- DeauthorizeSessionsComponent,
- DeleteAccountComponent,
- DeleteOrganizationComponent,
- DisableSendPolicyComponent,
- DomainRulesComponent,
- DownloadLicenseComponent,
- EmergencyAccessAddEditComponent,
- EmergencyAccessAttachmentsComponent,
- EmergencyAccessComponent,
- EmergencyAccessConfirmComponent,
- EmergencyAccessTakeoverComponent,
- EmergencyAccessViewComponent,
- EmergencyAddEditComponent,
- ExportComponent,
- ExposedPasswordsReportComponent,
- FamiliesForEnterpriseSetupComponent,
- FolderAddEditComponent,
- FooterComponent,
- FrontendLayoutComponent,
- GroupingsComponent,
- HintComponent,
- ImportComponent,
- InactiveTwoFactorReportComponent,
- LinkSsoComponent,
- LockComponent,
- LoginComponent,
- MasterPasswordPolicyComponent,
- NavbarComponent,
- NestedCheckboxComponent,
- OptionsComponent,
- OrgAccountComponent,
- OrgAddEditComponent,
- OrganizationBillingComponent,
- OrganizationLayoutComponent,
- OrganizationPlansComponent,
- OrganizationsComponent,
- OrganizationSubscriptionComponent,
- OrgAttachmentsComponent,
- OrgBulkConfirmComponent,
- OrgBulkRemoveComponent,
- OrgBulkStatusComponent,
- OrgCiphersComponent,
- OrgCollectionAddEditComponent,
- OrgCollectionsComponent,
- OrgEntityEventsComponent,
- OrgEntityUsersComponent,
- OrgEventsComponent,
- OrgExportComponent,
- OrgExposedPasswordsReportComponent,
- OrgGroupAddEditComponent,
- OrgGroupingsComponent,
- OrgGroupsComponent,
- OrgImportComponent,
- OrgInactiveTwoFactorReportComponent,
- OrgManageCollectionsComponent,
- OrgManageComponent,
- OrgPeopleComponent,
- OrgPoliciesComponent,
- OrgPolicyEditComponent,
- OrgResetPasswordComponent,
- OrgReusedPasswordsReportComponent,
- OrgSettingComponent,
- OrgToolsComponent,
- OrgTwoFactorSetupComponent,
- OrgUnsecuredWebsitesReportComponent,
- OrgUserAddEditComponent,
- OrgUserConfirmComponent,
- OrgUserGroupsComponent,
- OrgVaultComponent,
- OrgWeakPasswordsReportComponent,
- GeneratorComponent,
- PasswordGeneratorHistoryComponent,
- PasswordGeneratorPolicyComponent,
- PasswordRepromptComponent,
- PasswordStrengthComponent,
- PaymentComponent,
- PersonalOwnershipPolicyComponent,
- PremiumComponent,
- ProfileComponent,
- ProvidersComponent,
- PurgeVaultComponent,
- RecoverDeleteComponent,
- RecoverTwoFactorComponent,
- RegisterComponent,
- RemovePasswordComponent,
- ReportCardComponent,
- ReportListComponent,
- ReportsComponent,
- RequireSsoPolicyComponent,
- ResetPasswordPolicyComponent,
- ReusedPasswordsReportComponent,
- SendAddEditComponent,
- SendComponent,
- SendEffluxDatesComponent,
- SendOptionsPolicyComponent,
- SetPasswordComponent,
- SettingsComponent,
- ShareComponent,
- SingleOrgPolicyComponent,
- SponsoredFamiliesComponent,
- SponsoringOrgRowComponent,
- SsoComponent,
- TaxInfoComponent,
- ToolsComponent,
- TwoFactorAuthenticationPolicyComponent,
- TwoFactorAuthenticatorComponent,
- TwoFactorComponent,
- TwoFactorDuoComponent,
- TwoFactorEmailComponent,
- TwoFactorOptionsComponent,
- TwoFactorRecoveryComponent,
- TwoFactorSetupComponent,
- TwoFactorVerifyComponent,
- TwoFactorWebAuthnComponent,
- TwoFactorYubiKeyComponent,
- UnsecuredWebsitesReportComponent,
- UpdateKeyComponent,
- UpdateLicenseComponent,
- UpdatePasswordComponent,
- UpdateTempPasswordComponent,
- UserBillingComponent,
- UserLayoutComponent,
- UserSubscriptionComponent,
- UserVerificationComponent,
- VaultComponent,
- VaultTimeoutInputComponent,
- VerifyEmailComponent,
- VerifyEmailTokenComponent,
- VerifyRecoverDeleteComponent,
- WeakPasswordsReportComponent,
- ],
- exports: [FooterComponent, NavbarComponent, OrganizationPlansComponent],
- providers: [DatePipe],
+ exports: [LooseComponentsModule, VaultFilterModule, OrganizationBadgeModule, PipesModule],
bootstrap: [],
})
export class OssModule {}
diff --git a/src/app/providers/providers.component.html b/src/app/providers/providers.component.html
index de63e139b5..e91b7cb44e 100644
--- a/src/app/providers/providers.component.html
+++ b/src/app/providers/providers.component.html
@@ -1,58 +1,33 @@
-
+{{ "providers" | i18n }}
+
{{ "loading" | i18n }}
-
+
+
+
+
+
+
+ {{ p.name }}
+
+
+ {{ "providerIsDisabled" | i18n }}
+
+
+
+
+
-
-
- {{ "providers" | i18n }}
-
-
-
- {{ "loading" | i18n }}
-
-
-
-
-
-
-
-
- {{ p.name }}
-
-
- {{ "providerIsDisabled" | i18n }}
-
-
-
-
-
-
-
-
+
+;
diff --git a/src/app/reports/reports.module.ts b/src/app/reports/reports-routing.module.ts
similarity index 93%
rename from src/app/reports/reports.module.ts
rename to src/app/reports/reports-routing.module.ts
index e9abf76529..d97d20550b 100644
--- a/src/app/reports/reports.module.ts
+++ b/src/app/reports/reports-routing.module.ts
@@ -1,7 +1,7 @@
import { NgModule } from "@angular/core";
import { RouterModule, Routes } from "@angular/router";
-import { AuthGuardService } from "jslib-angular/services/auth-guard.service";
+import { AuthGuard } from "jslib-angular/guards/auth.guard";
import { BreachReportComponent } from "./breach-report.component";
import { ExposedPasswordsReportComponent } from "./exposed-passwords-report.component";
@@ -16,7 +16,7 @@ const routes: Routes = [
{
path: "",
component: ReportsComponent,
- canActivate: [AuthGuardService],
+ canActivate: [AuthGuard],
children: [
{ path: "", pathMatch: "full", component: ReportListComponent, data: { homepage: true } },
{
@@ -57,4 +57,4 @@ const routes: Routes = [
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
-export class ReportsModule {}
+export class ReportsRoutingModule {}
diff --git a/src/app/send/send.component.html b/src/app/send/send.component.html
index a27f7d02e5..db38850c79 100644
--- a/src/app/send/send.component.html
+++ b/src/app/send/send.component.html
@@ -19,26 +19,48 @@
autocomplete="off"
appAutofocus
/>
-
- -
-
- {{ "allSends" | i18n }}
-
-
-
- {{ "types" | i18n }}
-
+
+
+
+
+
+ {{ "types" | i18n }}
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
-
-
+
+
+
{{ "providers" | i18n }}
+{{ "loading" | i18n }}
|
+ |
+
+ {{ p.name }}
+ |
+
-
-
-
-
-
-
-
-
- {{ "providers" | i18n }}
-- - {{ "loading" | i18n }} -
-|
- |
-
- {{ p.name }}
- |
-
-
-
- - - {{ "allSends" | i18n }} - - -
{{ "types" | i18n }}
- +
+
+
+
+
+
+
+ {{ "types" | i18n }}
+
-
+
+
+