diff --git a/bitwarden_license/src/app/app.module.ts b/bitwarden_license/src/app/app.module.ts index 7fe8de44..9e0de2af 100644 --- a/bitwarden_license/src/app/app.module.ts +++ b/bitwarden_license/src/app/app.module.ts @@ -5,10 +5,9 @@ import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { RouterModule } from "@angular/router"; import { InfiniteScrollModule } from "ngx-infinite-scroll"; -import { BitwardenToastModule } from "jslib-angular/components/toastr.component"; +import { JslibModule } from "jslib-angular/jslib.module"; import { OssRoutingModule } from "src/app/oss-routing.module"; -import { OssModule } from "src/app/oss.module"; import { ServicesModule } from "src/app/services/services.module"; import { WildcardRoutingModule } from "src/app/wildcard-routing.module"; @@ -20,28 +19,23 @@ import { MaximumVaultTimeoutPolicyComponent } from "./policies/maximum-vault-tim @NgModule({ imports: [ - OssModule, - BrowserAnimationsModule, - FormsModule, - ReactiveFormsModule, - ServicesModule, - BitwardenToastModule.forRoot({ - maxOpened: 5, - autoDismiss: true, - closeButton: true, - }), - InfiniteScrollModule, - DragDropModule, AppRoutingModule, - OssRoutingModule, + BrowserAnimationsModule, + DragDropModule, + FormsModule, + InfiniteScrollModule, + JslibModule, OrganizationsModule, + OssRoutingModule, + ReactiveFormsModule, RouterModule, + ServicesModule, WildcardRoutingModule, // Needs to be last to catch all non-existing routes ], declarations: [ AppComponent, - MaximumVaultTimeoutPolicyComponent, DisablePersonalVaultExportPolicyComponent, + MaximumVaultTimeoutPolicyComponent, ], bootstrap: [AppComponent], }) diff --git a/bitwarden_license/src/app/organizations/organizations.module.ts b/bitwarden_license/src/app/organizations/organizations.module.ts index 838e8d4b..f67a9b7e 100644 --- a/bitwarden_license/src/app/organizations/organizations.module.ts +++ b/bitwarden_license/src/app/organizations/organizations.module.ts @@ -2,7 +2,7 @@ import { CommonModule } from "@angular/common"; import { NgModule } from "@angular/core"; import { FormsModule, ReactiveFormsModule } from "@angular/forms"; -import { OssModule } from "src/app/oss.module"; +import { JslibModule } from "jslib-angular/jslib.module"; import { InputCheckboxComponent } from "./components/input-checkbox.component"; import { InputTextReadOnlyComponent } from "./components/input-text-readonly.component"; @@ -14,7 +14,13 @@ import { OrganizationsRoutingModule } from "./organizations-routing.module"; // Form components are for use in the SSO Configuration Form only and should not be exported for use elsewhere. // They will be deprecated by the Component Library. @NgModule({ - imports: [CommonModule, FormsModule, ReactiveFormsModule, OssModule, OrganizationsRoutingModule], + imports: [ + CommonModule, + FormsModule, + ReactiveFormsModule, + JslibModule, + OrganizationsRoutingModule, + ], declarations: [ InputCheckboxComponent, InputTextComponent, diff --git a/bitwarden_license/src/app/providers/providers.module.ts b/bitwarden_license/src/app/providers/providers.module.ts index 653cd0b2..9f762cf4 100644 --- a/bitwarden_license/src/app/providers/providers.module.ts +++ b/bitwarden_license/src/app/providers/providers.module.ts @@ -2,6 +2,7 @@ import { CommonModule } from "@angular/common"; 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 { OssModule } from "src/app/oss.module"; @@ -27,7 +28,7 @@ import { SetupProviderComponent } from "./setup/setup-provider.component"; import { SetupComponent } from "./setup/setup.component"; @NgModule({ - imports: [CommonModule, FormsModule, OssModule, ProvidersRoutingModule], + imports: [CommonModule, FormsModule, OssModule, JslibModule, ProvidersRoutingModule], declarations: [ AcceptProviderComponent, AccountComponent, diff --git a/jslib b/jslib index 3ec0f697..9950fb42 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 3ec0f6977acc9374b7b379cbd59a2d7d1dbe8beb +Subproject commit 9950fb42a15bad434a4b404419ff4a87af67a27b diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c28278f7..15d5a190 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -4,8 +4,6 @@ import { FormsModule } from "@angular/forms"; import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; import { InfiniteScrollModule } from "ngx-infinite-scroll"; -import { BitwardenToastModule } from "jslib-angular/components/toastr.component"; - import { AppComponent } from "./app.component"; import { OssRoutingModule } from "./oss-routing.module"; import { OssModule } from "./oss.module"; @@ -18,11 +16,6 @@ import { WildcardRoutingModule } from "./wildcard-routing.module"; BrowserAnimationsModule, FormsModule, ServicesModule, - BitwardenToastModule.forRoot({ - maxOpened: 5, - autoDismiss: true, - closeButton: true, - }), InfiniteScrollModule, DragDropModule, OssRoutingModule, diff --git a/src/app/oss.module.ts b/src/app/oss.module.ts index b8eaeb0d..2bc8e55b 100644 --- a/src/app/oss.module.ts +++ b/src/app/oss.module.ts @@ -56,29 +56,7 @@ import { RouterModule } from "@angular/router"; import { InfiniteScrollModule } from "ngx-infinite-scroll"; import { ToastrModule } from "ngx-toastr"; -import { AvatarComponent } from "jslib-angular/components/avatar.component"; -import { CalloutComponent } from "jslib-angular/components/callout.component"; -import { ExportScopeCalloutComponent } from "jslib-angular/components/export-scope-callout.component"; -import { IconComponent } from "jslib-angular/components/icon.component"; -import { VerifyMasterPasswordComponent } from "jslib-angular/components/verify-master-password.component"; -import { A11yInvalidDirective } from "jslib-angular/directives/a11y-invalid.directive"; -import { A11yTitleDirective } from "jslib-angular/directives/a11y-title.directive"; -import { ApiActionDirective } from "jslib-angular/directives/api-action.directive"; -import { AutofocusDirective } from "jslib-angular/directives/autofocus.directive"; -import { BlurClickDirective } from "jslib-angular/directives/blur-click.directive"; -import { BoxRowDirective } from "jslib-angular/directives/box-row.directive"; -import { FallbackSrcDirective } from "jslib-angular/directives/fallback-src.directive"; -import { InputStripSpacesDirective } from "jslib-angular/directives/input-strip-spaces.directive"; -import { InputVerbatimDirective } from "jslib-angular/directives/input-verbatim.directive"; -import { SelectCopyDirective } from "jslib-angular/directives/select-copy.directive"; -import { StopClickDirective } from "jslib-angular/directives/stop-click.directive"; -import { StopPropDirective } from "jslib-angular/directives/stop-prop.directive"; -import { TrueFalseValueDirective } from "jslib-angular/directives/true-false-value.directive"; -import { ColorPasswordPipe } from "jslib-angular/pipes/color-password.pipe"; -import { I18nPipe } from "jslib-angular/pipes/i18n.pipe"; -import { SearchCiphersPipe } from "jslib-angular/pipes/search-ciphers.pipe"; -import { SearchPipe } from "jslib-angular/pipes/search.pipe"; -import { UserNamePipe } from "jslib-angular/pipes/user-name.pipe"; +import { JslibModule } from "jslib-angular/jslib.module"; import { AcceptEmergencyComponent } from "./accounts/accept-emergency.component"; import { AcceptOrganizationComponent } from "./accounts/accept-organization.component"; @@ -286,16 +264,15 @@ registerLocaleData(localeZhTw, "zh-TW"); @NgModule({ imports: [ CommonModule, + DragDropModule, FormsModule, InfiniteScrollModule, - DragDropModule, - ToastrModule, + JslibModule, ReactiveFormsModule, RouterModule, + ToastrModule, ], declarations: [ - A11yTitleDirective, - A11yInvalidDirective, AcceptEmergencyComponent, AcceptOrganizationComponent, AccessComponent, @@ -307,27 +284,20 @@ registerLocaleData(localeZhTw, "zh-TW"); AdjustPaymentComponent, AdjustStorageComponent, AdjustSubscription, - ApiActionDirective, ApiKeyComponent, AttachmentsComponent, - AutofocusDirective, - AvatarComponent, - BlurClickDirective, - BoxRowDirective, BreachReportComponent, BulkActionsComponent, BulkDeleteComponent, BulkMoveComponent, BulkRestoreComponent, BulkShareComponent, - CalloutComponent, ChangeEmailComponent, ChangeKdfComponent, ChangePasswordComponent, ChangePlanComponent, CiphersComponent, CollectionsComponent, - ColorPasswordPipe, CreateOrganizationComponent, DeauthorizeSessionsComponent, DeleteAccountComponent, @@ -343,21 +313,15 @@ registerLocaleData(localeZhTw, "zh-TW"); EmergencyAccessViewComponent, EmergencyAddEditComponent, ExportComponent, - ExportScopeCalloutComponent, ExposedPasswordsReportComponent, - FallbackSrcDirective, FamiliesForEnterpriseSetupComponent, FolderAddEditComponent, FooterComponent, FrontendLayoutComponent, GroupingsComponent, HintComponent, - I18nPipe, - IconComponent, ImportComponent, InactiveTwoFactorReportComponent, - InputStripSpacesDirective, - InputVerbatimDirective, LinkSsoComponent, LockComponent, LoginComponent, @@ -423,9 +387,6 @@ registerLocaleData(localeZhTw, "zh-TW"); RequireSsoPolicyComponent, ResetPasswordPolicyComponent, ReusedPasswordsReportComponent, - SearchCiphersPipe, - SearchPipe, - SelectCopyDirective, SendAddEditComponent, SendComponent, SendEffluxDatesComponent, @@ -437,11 +398,8 @@ registerLocaleData(localeZhTw, "zh-TW"); SponsoredFamiliesComponent, SponsoringOrgRowComponent, SsoComponent, - StopClickDirective, - StopPropDirective, TaxInfoComponent, ToolsComponent, - TrueFalseValueDirective, TwoFactorAuthenticationPolicyComponent, TwoFactorAuthenticatorComponent, TwoFactorComponent, @@ -456,37 +414,20 @@ registerLocaleData(localeZhTw, "zh-TW"); UnsecuredWebsitesReportComponent, UpdateKeyComponent, UpdateLicenseComponent, - UpdateTempPasswordComponent, UpdatePasswordComponent, + UpdateTempPasswordComponent, UserBillingComponent, UserLayoutComponent, - UserNamePipe, UserSubscriptionComponent, VaultComponent, VaultTimeoutInputComponent, VerifyEmailComponent, VerifyEmailTokenComponent, - VerifyMasterPasswordComponent, VerifyRecoverDeleteComponent, WeakPasswordsReportComponent, ], - exports: [ - A11yTitleDirective, - A11yInvalidDirective, - ApiActionDirective, - AvatarComponent, - CalloutComponent, - FooterComponent, - I18nPipe, - InputStripSpacesDirective, - NavbarComponent, - OrganizationPlansComponent, - SearchPipe, - StopClickDirective, - StopPropDirective, - UserNamePipe, - ], - providers: [DatePipe, SearchPipe, UserNamePipe], + exports: [FooterComponent, NavbarComponent, OrganizationPlansComponent], + providers: [DatePipe], bootstrap: [], }) export class OssModule {}