1
0
mirror of https://github.com/bitwarden/web synced 2025-12-13 23:03:18 +00:00

Compare commits

..

21 Commits

Author SHA1 Message Date
Thomas Rittson
69bf3d7fb7 Remove eager loading of module 2022-06-02 15:41:01 +10:00
Thomas Rittson
97b1d0ece6 Fix prettier 2022-06-02 15:00:31 +10:00
Thomas Rittson
8a52dc3456 Add ManageRoutingModule, lazy loading 2022-06-02 14:44:47 +10:00
Thomas Rittson
68d68b9cc3 Create SettingsRoutingModule, lazy load 2022-06-02 14:38:59 +10:00
Thomas Rittson
1a290c9fea Add Tools routing module, lazy loading 2022-06-02 14:35:41 +10:00
Thomas Rittson
194d1bb9cf Create ToolsModule 2022-06-02 14:27:54 +10:00
Thomas Rittson
44483c2fa4 Create ManageModule 2022-06-02 14:24:01 +10:00
Thomas Rittson
a5da0338ab Create SettingsModule 2022-06-02 14:18:55 +10:00
Thomas Rittson
1f7c2e32b5 Create PoliciesModule 2022-06-02 14:06:54 +10:00
Thomas Rittson
9aba19f3a2 Fix organizationModule imports after merge 2022-06-02 13:53:28 +10:00
Thomas Rittson
547ceb4f0d Merge branch 'master' into refactor/organization-module 2022-06-02 13:41:57 +10:00
Thomas Rittson
eb7d8d3071 Fix linting and style 2022-05-11 13:29:28 +10:00
Thomas Rittson
96bde49aa7 Remove Organization prefix, remove unneeded imports 2022-05-11 13:27:25 +10:00
Thomas Rittson
bb8165555b Use SharedModule and LayoutsModule in ProvidersModule 2022-05-11 13:08:59 +10:00
Thomas Rittson
fda00fce4b Do not import and re-export SharedModule in OssModule 2022-05-11 13:07:56 +10:00
Thomas Rittson
64d7530b36 Use standard pattern for lazy loading modules 2022-05-11 12:55:42 +10:00
Thomas Rittson
b81a83ebd3 Remove exports, tidy up names 2022-05-11 12:08:56 +10:00
Thomas Rittson
7cf50d09db Move org vault into organization-vault module 2022-05-11 11:51:33 +10:00
Thomas Rittson
0c4a1507e0 Rearrange components 2022-05-11 11:18:39 +10:00
Thomas Rittson
9eef75a3d3 Update import names and paths 2022-05-11 10:05:35 +10:00
Thomas Rittson
91a0fb1de1 Create org module file, not connected yet 2022-05-11 09:59:06 +10:00
629 changed files with 587 additions and 489 deletions

View File

4
.gitmodules vendored
View File

@@ -0,0 +1,4 @@
[submodule "jslib"]
path = jslib
url = https://github.com/bitwarden/jslib.git
branch = master

0
apps/web/.husky/pre-commit → .husky/pre-commit Normal file → Executable file
View File

View File

@@ -2,7 +2,7 @@
build build
dist dist
#jslib jslib
# External libraries / auto synced locales # External libraries / auto synced locales
src/locales src/locales

View File

@@ -1,222 +0,0 @@
import { NgModule } from "@angular/core";
import { RouterModule, Routes } from "@angular/router";
import { AuthGuard } from "jslib-angular/guards/auth.guard";
import { Permissions } from "jslib-common/enums/permissions";
import { PermissionsGuard } from "./guards/permissions.guard";
import { OrganizationLayoutComponent } from "./layouts/organization-layout.component";
import { CollectionsComponent } from "./manage/collections.component";
import { EventsComponent } from "./manage/events.component";
import { GroupsComponent } from "./manage/groups.component";
import { ManageComponent } from "./manage/manage.component";
import { PeopleComponent } from "./manage/people.component";
import { PoliciesComponent } from "./manage/policies.component";
import { NavigationPermissionsService } from "./services/navigation-permissions.service";
import { AccountComponent } from "./settings/account.component";
import { OrganizationBillingComponent } from "./settings/organization-billing.component";
import { OrganizationSubscriptionComponent } from "./settings/organization-subscription.component";
import { SettingsComponent } from "./settings/settings.component";
import { TwoFactorSetupComponent } from "./settings/two-factor-setup.component";
import { ExportComponent } from "./tools/export.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 { ReusedPasswordsReportComponent } from "./tools/reused-passwords-report.component";
import { ToolsComponent } from "./tools/tools.component";
import { UnsecuredWebsitesReportComponent } from "./tools/unsecured-websites-report.component";
import { WeakPasswordsReportComponent } from "./tools/weak-passwords-report.component";
const routes: Routes = [
{
path: ":organizationId",
component: OrganizationLayoutComponent,
canActivate: [AuthGuard, PermissionsGuard],
data: {
permissions: NavigationPermissionsService.getPermissions("admin"),
},
children: [
{ path: "", pathMatch: "full", redirectTo: "vault" },
{
path: "vault",
loadChildren: async () =>
(await import("../modules/vault/modules/organization-vault/organization-vault.module"))
.OrganizationVaultModule,
},
{
path: "tools",
component: ToolsComponent,
canActivate: [PermissionsGuard],
data: { permissions: NavigationPermissionsService.getPermissions("tools") },
children: [
{
path: "",
pathMatch: "full",
redirectTo: "import",
},
{
path: "import",
component: ImportComponent,
canActivate: [PermissionsGuard],
data: {
titleId: "importData",
permissions: [Permissions.AccessImportExport],
},
},
{
path: "export",
component: ExportComponent,
canActivate: [PermissionsGuard],
data: {
titleId: "exportVault",
permissions: [Permissions.AccessImportExport],
},
},
{
path: "exposed-passwords-report",
component: ExposedPasswordsReportComponent,
canActivate: [PermissionsGuard],
data: {
titleId: "exposedPasswordsReport",
permissions: [Permissions.AccessReports],
},
},
{
path: "inactive-two-factor-report",
component: InactiveTwoFactorReportComponent,
canActivate: [PermissionsGuard],
data: {
titleId: "inactive2faReport",
permissions: [Permissions.AccessReports],
},
},
{
path: "reused-passwords-report",
component: ReusedPasswordsReportComponent,
canActivate: [PermissionsGuard],
data: {
titleId: "reusedPasswordsReport",
permissions: [Permissions.AccessReports],
},
},
{
path: "unsecured-websites-report",
component: UnsecuredWebsitesReportComponent,
canActivate: [PermissionsGuard],
data: {
titleId: "unsecuredWebsitesReport",
permissions: [Permissions.AccessReports],
},
},
{
path: "weak-passwords-report",
component: WeakPasswordsReportComponent,
canActivate: [PermissionsGuard],
data: {
titleId: "weakPasswordsReport",
permissions: [Permissions.AccessReports],
},
},
],
},
{
path: "manage",
component: ManageComponent,
canActivate: [PermissionsGuard],
data: {
permissions: NavigationPermissionsService.getPermissions("manage"),
},
children: [
{
path: "",
pathMatch: "full",
redirectTo: "people",
},
{
path: "collections",
component: CollectionsComponent,
canActivate: [PermissionsGuard],
data: {
titleId: "collections",
permissions: [
Permissions.CreateNewCollections,
Permissions.EditAnyCollection,
Permissions.DeleteAnyCollection,
Permissions.EditAssignedCollections,
Permissions.DeleteAssignedCollections,
],
},
},
{
path: "events",
component: EventsComponent,
canActivate: [PermissionsGuard],
data: {
titleId: "eventLogs",
permissions: [Permissions.AccessEventLogs],
},
},
{
path: "groups",
component: GroupsComponent,
canActivate: [PermissionsGuard],
data: {
titleId: "groups",
permissions: [Permissions.ManageGroups],
},
},
{
path: "people",
component: PeopleComponent,
canActivate: [PermissionsGuard],
data: {
titleId: "people",
permissions: [Permissions.ManageUsers, Permissions.ManageUsersPassword],
},
},
{
path: "policies",
component: PoliciesComponent,
canActivate: [PermissionsGuard],
data: {
titleId: "policies",
permissions: [Permissions.ManagePolicies],
},
},
],
},
{
path: "settings",
component: SettingsComponent,
canActivate: [PermissionsGuard],
data: { permissions: NavigationPermissionsService.getPermissions("settings") },
children: [
{ path: "", pathMatch: "full", redirectTo: "account" },
{ path: "account", component: AccountComponent, data: { titleId: "myOrganization" } },
{
path: "two-factor",
component: TwoFactorSetupComponent,
data: { titleId: "twoStepLogin" },
},
{
path: "billing",
component: OrganizationBillingComponent,
canActivate: [PermissionsGuard],
data: { titleId: "billing", permissions: [Permissions.ManageBilling] },
},
{
path: "subscription",
component: OrganizationSubscriptionComponent,
data: { titleId: "subscription" },
},
],
},
],
},
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class OrganizationsRoutingModule {}

View File

@@ -1,11 +1,9 @@
import { CommonModule } from "@angular/common";
import { ComponentFactoryResolver, NgModule } from "@angular/core"; import { ComponentFactoryResolver, NgModule } from "@angular/core";
import { FormsModule } from "@angular/forms";
import { JslibModule } from "jslib-angular/jslib.module";
import { ModalService } from "jslib-angular/services/modal.service"; import { ModalService } from "jslib-angular/services/modal.service";
import { OssModule } from "src/app/oss.module"; import { LayoutsModule } from "src/app/layouts/layouts.module";
import { SharedModule } from "src/app/modules/shared.module";
import { AddOrganizationComponent } from "./clients/add-organization.component"; import { AddOrganizationComponent } from "./clients/add-organization.component";
import { ClientsComponent } from "./clients/clients.component"; import { ClientsComponent } from "./clients/clients.component";
@@ -28,7 +26,7 @@ import { SetupProviderComponent } from "./setup/setup-provider.component";
import { SetupComponent } from "./setup/setup.component"; import { SetupComponent } from "./setup/setup.component";
@NgModule({ @NgModule({
imports: [CommonModule, FormsModule, OssModule, JslibModule, ProvidersRoutingModule], imports: [SharedModule, LayoutsModule, ProvidersRoutingModule],
declarations: [ declarations: [
AcceptProviderComponent, AcceptProviderComponent,
AccountComponent, AccountComponent,

View File

@@ -15,4 +15,3 @@ files:
en-GB: en_GB en-GB: en_GB
en-IN: en_IN en-IN: en_IN
sr-CY: sr_CY sr-CY: sr_CY
sr-CS: sr_CS

1
jslib Submodule

Submodule jslib added at 0d658ba26d

Some files were not shown because too many files have changed in this diff Show More