[AC-1453] Move OrganizationPlansComponent and related components out of LooseComponentsModule (#6230)

* restructure billing folders into individual, organization, and shared
* move components from `LooseComponentsModule`

apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts

@@ -15,15 +15,17 @@ import { ValidationService } from "@bitwarden/common/platform/abstractions/valid
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 import { DialogService } from "@bitwarden/components";
 
-import { OrganizationPlansComponent } from "../../../billing/settings/organization-plans.component";
+import { OrganizationPlansComponent } from "../../../billing";
+import { SharedModule } from "../../../shared";
 import {
   DeleteOrganizationDialogResult,
   openDeleteOrganizationDialog,
 } from "../settings/components";
 
 @Component({
-  selector: "families-for-enterprise-setup",
   templateUrl: "families-for-enterprise-setup.component.html",
+  standalone: true,
+  imports: [SharedModule, OrganizationPlansComponent],
 })
 export class FamiliesForEnterpriseSetupComponent implements OnInit, OnDestroy {
   @ViewChild(OrganizationPlansComponent, { static: false })

apps/web/src/app/admin-console/settings/create-organization.component.ts

@@ -5,11 +5,13 @@ import { first } from "rxjs/operators";
 import { PlanType } from "@bitwarden/common/billing/enums";
 import { ProductType } from "@bitwarden/common/enums";
 
-import { OrganizationPlansComponent } from "../../billing/settings/organization-plans.component";
+import { OrganizationPlansComponent } from "../../billing";
+import { SharedModule } from "../../shared";
 
 @Component({
-  selector: "app-create-organization",
   templateUrl: "create-organization.component.html",
+  standalone: true,
+  imports: [SharedModule, OrganizationPlansComponent],
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class CreateOrganizationComponent implements OnInit {

apps/web/src/app/billing/accounts/trial-initiation/billing.component.ts

@@ -3,7 +3,7 @@ import { FormGroup } from "@angular/forms";
 
 import { ProductType } from "@bitwarden/common/enums";
 
-import { OrganizationPlansComponent } from "../../settings/organization-plans.component";
+import { OrganizationPlansComponent } from "../../organizations";
 
 @Component({
   selector: "app-billing",

apps/web/src/app/billing/index.ts

@@ -0,0 +1,2 @@
+export { OrganizationPlansComponent } from "./organizations";
+export { PaymentComponent, TaxInfoComponent } from "./shared";

apps/web/src/app/billing/individual/billing-history-view.component.ts

@@ -6,7 +6,6 @@ import { BillingHistoryResponse } from "@bitwarden/common/billing/models/respons
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
 @Component({
-  selector: "app-billing-history-view",
   templateUrl: "billing-history-view.component.html",
 })
 export class BillingHistoryViewComponent implements OnInit {

apps/web/src/app/billing/individual/individual-billing-routing.module.ts

@@ -1,12 +1,12 @@
 import { NgModule } from "@angular/core";
 import { RouterModule, Routes } from "@angular/router";
 
-import { BillingHistoryViewComponent } from "../../billing/settings/billing-history-view.component";
-import { PaymentMethodComponent } from "../../billing/settings/payment-method.component";
-import { UserSubscriptionComponent } from "../../billing/settings/user-subscription.component";
-import { PremiumComponent } from "../settings/premium.component";
+import { PaymentMethodComponent } from "../shared";
 
+import { BillingHistoryViewComponent } from "./billing-history-view.component";
+import { PremiumComponent } from "./premium.component";
 import { SubscriptionComponent } from "./subscription.component";
+import { UserSubscriptionComponent } from "./user-subscription.component";
 
 const routes: Routes = [
   {
@@ -43,4 +43,4 @@ const routes: Routes = [
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule],
 })
-export class SubscriptionRoutingModule {}
+export class IndividualBillingRoutingModule {}

apps/web/src/app/billing/individual/individual-billing.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from "@angular/core";
+
+import { BillingSharedModule } from "../shared";
+
+import { BillingHistoryViewComponent } from "./billing-history-view.component";
+import { IndividualBillingRoutingModule } from "./individual-billing-routing.module";
+import { PremiumComponent } from "./premium.component";
+import { SubscriptionComponent } from "./subscription.component";
+import { UserSubscriptionComponent } from "./user-subscription.component";
+
+@NgModule({
+  imports: [IndividualBillingRoutingModule, BillingSharedModule],
+  declarations: [
+    SubscriptionComponent,
+    BillingHistoryViewComponent,
+    UserSubscriptionComponent,
+    PremiumComponent,
+  ],
+})
+export class IndividualBillingModule {}

apps/web/src/app/billing/individual/premium.component.ts

@@ -11,11 +11,9 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
-import { PaymentComponent } from "./payment.component";
-import { TaxInfoComponent } from "./tax-info.component";
+import { PaymentComponent, TaxInfoComponent } from "../shared";
 
 @Component({
-  selector: "app-premium",
   templateUrl: "premium.component.html",
 })
 export class PremiumComponent implements OnInit {

apps/web/src/app/billing/individual/subscription.component.ts

@@ -4,7 +4,6 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
 
 @Component({
-  selector: "app-subscription",
   templateUrl: "subscription.component.html",
 })
 export class SubscriptionComponent {

apps/web/src/app/billing/individual/user-subscription.component.ts

@@ -12,7 +12,6 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv
 import { DialogService } from "@bitwarden/components";
 
 @Component({
-  selector: "app-user-subscription",
   templateUrl: "user-subscription.component.html",
 })
 export class UserSubscriptionComponent implements OnInit {

apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts

@@ -17,7 +17,6 @@ export interface BillingSyncApiModalData {
 }
 
 @Component({
-  selector: "app-billing-sync-api-key",
   templateUrl: "billing-sync-api-key.component.html",
 })
 export class BillingSyncApiKeyComponent {

apps/web/src/app/billing/organizations/billing-sync-key.component.ts

@@ -18,7 +18,6 @@ export interface BillingSyncKeyModalData {
 }
 
 @Component({
-  selector: "app-billing-sync-key",
   templateUrl: "billing-sync-key.component.html",
 })
 export class BillingSyncKeyComponent {

apps/web/src/app/billing/organizations/index.ts

@@ -0,0 +1 @@
+export * from "./organization-plans.component";

apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts

@@ -6,7 +6,6 @@ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-conso
 import { BillingHistoryResponse } from "@bitwarden/common/billing/models/response/billing-history.response";
 
 @Component({
-  selector: "app-org-billing-history-view",
   templateUrl: "organization-billing-history-view.component.html",
 })
 export class OrgBillingHistoryViewComponent implements OnInit, OnDestroy {

apps/web/src/app/billing/organizations/organization-billing-routing.module.ts

@@ -5,8 +5,8 @@ import { canAccessBillingTab } from "@bitwarden/common/admin-console/abstraction
 import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
 
 import { OrganizationPermissionsGuard } from "../../admin-console/organizations/guards/org-permissions.guard";
-import { PaymentMethodComponent } from "../../billing/settings/payment-method.component";
 import { WebPlatformUtilsService } from "../../core/web-platform-utils.service";
+import { PaymentMethodComponent } from "../shared";
 
 import { OrgBillingHistoryViewComponent } from "./organization-billing-history-view.component";
 import { OrganizationBillingTabComponent } from "./organization-billing-tab.component";

apps/web/src/app/billing/organizations/organization-billing-tab.component.ts

@@ -6,7 +6,6 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
 @Component({
-  selector: "app-org-billing-tab",
   templateUrl: "organization-billing-tab.component.html",
 })
 export class OrganizationBillingTabComponent implements OnInit {

apps/web/src/app/billing/organizations/organization-billing.module.ts

@@ -1,37 +1,42 @@
 import { NgModule } from "@angular/core";
 
 import { UserVerificationModule } from "../../auth/shared/components/user-verification";
-import { LooseComponentsModule, SharedModule } from "../../shared";
+import { BillingSharedModule } from "../shared";
 
 import { AdjustSubscription } from "./adjust-subscription.component";
 import { BillingSyncApiKeyComponent } from "./billing-sync-api-key.component";
+import { BillingSyncKeyComponent } from "./billing-sync-key.component";
 import { ChangePlanComponent } from "./change-plan.component";
 import { DownloadLicenseComponent } from "./download-license.component";
 import { OrgBillingHistoryViewComponent } from "./organization-billing-history-view.component";
 import { OrganizationBillingRoutingModule } from "./organization-billing-routing.module";
 import { OrganizationBillingTabComponent } from "./organization-billing-tab.component";
+import { OrganizationPlansComponent } from "./organization-plans.component";
 import { OrganizationSubscriptionCloudComponent } from "./organization-subscription-cloud.component";
 import { OrganizationSubscriptionSelfhostComponent } from "./organization-subscription-selfhost.component";
-import { SecretsManagerBillingModule } from "./secrets-manager/sm-billing.module";
+import { SecretsManagerAdjustSubscriptionComponent } from "./sm-adjust-subscription.component";
+import { SecretsManagerSubscribeStandaloneComponent } from "./sm-subscribe-standalone.component";
 import { SubscriptionHiddenComponent } from "./subscription-hidden.component";
 
 @NgModule({
   imports: [
-    SharedModule,
-    LooseComponentsModule,
     OrganizationBillingRoutingModule,
     UserVerificationModule,
-    SecretsManagerBillingModule,
+    BillingSharedModule,
+    OrganizationPlansComponent,
   ],
   declarations: [
     AdjustSubscription,
     BillingSyncApiKeyComponent,
+    BillingSyncKeyComponent,
     ChangePlanComponent,
     DownloadLicenseComponent,
     OrganizationBillingTabComponent,
-    OrgBillingHistoryViewComponent,
-    OrganizationSubscriptionSelfhostComponent,
     OrganizationSubscriptionCloudComponent,
+    OrganizationSubscriptionSelfhostComponent,
+    OrgBillingHistoryViewComponent,
+    SecretsManagerAdjustSubscriptionComponent,
+    SecretsManagerSubscribeStandaloneComponent,
     SubscriptionHiddenComponent,
   ],
 })

apps/web/src/app/billing/organizations/organization-plans.component.ts

@@ -35,10 +35,10 @@ import {
 } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
 import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
 
-import { secretsManagerSubscribeFormFactory } from "../organizations/secrets-manager/sm-subscribe.component";
-
-import { PaymentComponent } from "./payment.component";
-import { TaxInfoComponent } from "./tax-info.component";
+import { OrganizationCreateModule } from "../../admin-console/organizations/create/organization-create.module";
+import { BillingSharedModule, secretsManagerSubscribeFormFactory } from "../shared";
+import { PaymentComponent } from "../shared/payment.component";
+import { TaxInfoComponent } from "../shared/tax-info.component";
 
 interface OnSuccessArgs {
   organizationId: string;
@@ -47,6 +47,8 @@ interface OnSuccessArgs {
 @Component({
   selector: "app-organization-plans",
   templateUrl: "organization-plans.component.html",
+  standalone: true,
+  imports: [BillingSharedModule, OrganizationCreateModule],
 })
 export class OrganizationPlansComponent implements OnInit, OnDestroy {
   @ViewChild(PaymentComponent) paymentComponent: PaymentComponent;

apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts

@@ -22,10 +22,9 @@ import {
   BillingSyncApiKeyComponent,
   BillingSyncApiModalData,
 } from "./billing-sync-api-key.component";
-import { SecretsManagerSubscriptionOptions } from "./secrets-manager/sm-adjust-subscription.component";
+import { SecretsManagerSubscriptionOptions } from "./sm-adjust-subscription.component";
 
 @Component({
-  selector: "app-org-subscription-cloud",
   templateUrl: "organization-subscription-cloud.component.html",
 })
 export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy {

apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts

@@ -17,10 +17,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
-import {
-  BillingSyncKeyComponent,
-  BillingSyncKeyModalData,
-} from "../../billing/settings/billing-sync-key.component";
+import { BillingSyncKeyComponent, BillingSyncKeyModalData } from "./billing-sync-key.component";
 
 enum LicenseOptions {
   SYNC = 0,
@@ -28,7 +25,6 @@ enum LicenseOptions {
 }
 
 @Component({
-  selector: "app-org-subscription-selfhost",
   templateUrl: "organization-subscription-selfhost.component.html",
 })
 export class OrganizationSubscriptionSelfhostComponent implements OnInit, OnDestroy {

apps/web/src/app/billing/organizations/secrets-manager/index.ts

@@ -1,3 +0,0 @@
-export * from "./sm-billing.module";
-export * from "./sm-subscribe.component";
-export * from "./sm-subscribe-standalone.component";

apps/web/src/app/billing/organizations/secrets-manager/sm-billing.module.ts

@@ -1,22 +0,0 @@
-import { NgModule } from "@angular/core";
-
-import { SharedModule } from "../../../shared";
-
-import { SecretsManagerAdjustSubscriptionComponent } from "./sm-adjust-subscription.component";
-import { SecretsManagerSubscribeStandaloneComponent } from "./sm-subscribe-standalone.component";
-import { SecretsManagerSubscribeComponent } from "./sm-subscribe.component";
-
-@NgModule({
-  imports: [SharedModule],
-  declarations: [
-    SecretsManagerSubscribeComponent,
-    SecretsManagerSubscribeStandaloneComponent,
-    SecretsManagerAdjustSubscriptionComponent,
-  ],
-  exports: [
-    SecretsManagerSubscribeComponent,
-    SecretsManagerSubscribeStandaloneComponent,
-    SecretsManagerAdjustSubscriptionComponent,
-  ],
-})
-export class SecretsManagerBillingModule {}

apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts

@@ -10,7 +10,7 @@ import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.res
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
-import { secretsManagerSubscribeFormFactory } from "./sm-subscribe.component";
+import { secretsManagerSubscribeFormFactory } from "../shared";
 
 @Component({
   selector: "sm-subscribe-standalone",

apps/web/src/app/billing/shared/adjust-storage.component.ts

@@ -9,7 +9,7 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 
-import { PaymentComponent } from "../billing/settings/payment.component";
+import { PaymentComponent } from "./payment.component";
 
 @Component({
   selector: "app-adjust-storage",

apps/web/src/app/billing/shared/billing-shared.module.ts

@@ -0,0 +1,37 @@
+import { NgModule } from "@angular/core";
+
+import { SharedModule } from "../../shared";
+
+import { AddCreditComponent } from "./add-credit.component";
+import { AdjustPaymentComponent } from "./adjust-payment.component";
+import { AdjustStorageComponent } from "./adjust-storage.component";
+import { BillingHistoryComponent } from "./billing-history.component";
+import { PaymentMethodComponent } from "./payment-method.component";
+import { PaymentComponent } from "./payment.component";
+import { SecretsManagerSubscribeComponent } from "./sm-subscribe.component";
+import { TaxInfoComponent } from "./tax-info.component";
+import { UpdateLicenseComponent } from "./update-license.component";
+
+@NgModule({
+  imports: [SharedModule, PaymentComponent, TaxInfoComponent],
+  declarations: [
+    AddCreditComponent,
+    AdjustPaymentComponent,
+    AdjustStorageComponent,
+    BillingHistoryComponent,
+    PaymentMethodComponent,
+    SecretsManagerSubscribeComponent,
+    UpdateLicenseComponent,
+  ],
+  exports: [
+    SharedModule,
+    PaymentComponent,
+    TaxInfoComponent,
+
+    AdjustStorageComponent,
+    BillingHistoryComponent,
+    SecretsManagerSubscribeComponent,
+    UpdateLicenseComponent,
+  ],
+})
+export class BillingSharedModule {}

apps/web/src/app/billing/shared/index.ts

@@ -0,0 +1,5 @@
+export * from "./billing-shared.module";
+export * from "./payment-method.component";
+export * from "./payment.component";
+export * from "./sm-subscribe.component";
+export * from "./tax-info.component";

apps/web/src/app/billing/shared/payment-method.component.ts

@@ -17,7 +17,6 @@ import { DialogService } from "@bitwarden/components";
 import { TaxInfoComponent } from "./tax-info.component";
 
 @Component({
-  selector: "app-payment-method",
   templateUrl: "payment-method.component.html",
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil

apps/web/src/app/billing/shared/payment.component.ts

@@ -6,9 +6,13 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { PaymentMethodType } from "@bitwarden/common/billing/enums";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 
+import { SharedModule } from "../../shared";
+
 @Component({
   selector: "app-payment",
   templateUrl: "payment.component.html",
+  standalone: true,
+  imports: [SharedModule],
 })
 export class PaymentComponent implements OnInit, OnDestroy {
   @Input() showMethods = true;

apps/web/src/app/billing/shared/sm-subscribe.component.ts

@@ -7,7 +7,7 @@ import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.res
 import { ProductType } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 
-import { SecretsManagerLogo } from "../../../layouts/secrets-manager-logo";
+import { SecretsManagerLogo } from "../../layouts/secrets-manager-logo";
 
 export interface SecretsManagerSubscription {
   enabled: boolean;

apps/web/src/app/billing/shared/tax-info.component.ts

@@ -9,6 +9,8 @@ import { TaxInfoResponse } from "@bitwarden/common/billing/models/response/tax-i
 import { TaxRateResponse } from "@bitwarden/common/billing/models/response/tax-rate.response";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
 
+import { SharedModule } from "../../shared";
+
 type TaxInfoView = Omit<TaxInfoResponse, "taxIdType"> & {
   includeTaxId: boolean;
   [key: string]: unknown;
@@ -17,6 +19,8 @@ type TaxInfoView = Omit<TaxInfoResponse, "taxIdType"> & {
 @Component({
   selector: "app-tax-info",
   templateUrl: "tax-info.component.html",
+  standalone: true,
+  imports: [SharedModule],
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class TaxInfoComponent {

apps/web/src/app/oss-routing.module.ts

@@ -11,7 +11,6 @@ import {
 import { canAccessFeature } from "@bitwarden/angular/guard/feature-flag.guard";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 
-import { SubscriptionRoutingModule } from "../app/billing/settings/subscription-routing.module";
 import { flagEnabled, Flags } from "../utils/flags";
 
 import { AcceptFamilySponsorshipComponent } from "./admin-console/organizations/sponsorships/accept-family-sponsorship.component";
@@ -221,7 +220,10 @@ const routes: Routes = [
           },
           {
             path: "subscription",
-            loadChildren: () => SubscriptionRoutingModule,
+            loadChildren: () =>
+              import("./billing/individual/individual-billing.module").then(
+                (m) => m.IndividualBillingModule
+              ),
           },
           {
             path: "emergency-access",

apps/web/src/app/oss.module.ts

@@ -1,6 +1,5 @@
 import { NgModule } from "@angular/core";
 
-import { OrganizationCreateModule } from "./admin-console/organizations/create/organization-create.module";
 import { OrganizationUserModule } from "./admin-console/organizations/users/organization-user.module";
 import { LoginModule } from "./auth/login/login.module";
 import { TrialInitiationModule } from "./auth/trial-initiation/trial-initiation.module";
@@ -16,7 +15,6 @@ import { VaultFilterModule } from "./vault/individual-vault/vault-filter/vault-f
     VaultFilterModule,
     OrganizationBadgeModule,
     OrganizationUserModule,
-    OrganizationCreateModule,
     LoginModule,
   ],
   exports: [

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

@@ -3,12 +3,10 @@ import { NgModule } from "@angular/core";
 import { PasswordCalloutComponent } from "@bitwarden/auth";
 
 import { OrganizationSwitcherComponent } from "../admin-console/components/organization-switcher.component";
-import { OrganizationCreateModule } from "../admin-console/organizations/create/organization-create.module";
 import { OrganizationLayoutComponent } from "../admin-console/organizations/layouts/organization-layout.component";
 import { EventsComponent as OrgEventsComponent } from "../admin-console/organizations/manage/events.component";
 import { UserConfirmComponent as OrgUserConfirmComponent } from "../admin-console/organizations/manage/user-confirm.component";
 import { AcceptFamilySponsorshipComponent } from "../admin-console/organizations/sponsorships/accept-family-sponsorship.component";
-import { FamiliesForEnterpriseSetupComponent } from "../admin-console/organizations/sponsorships/families-for-enterprise-setup.component";
 import { ExposedPasswordsReportComponent as OrgExposedPasswordsReportComponent } from "../admin-console/organizations/tools/exposed-passwords-report.component";
 import { InactiveTwoFactorReportComponent as OrgInactiveTwoFactorReportComponent } from "../admin-console/organizations/tools/inactive-two-factor-report.component";
 import { ReusedPasswordsReportComponent as OrgReusedPasswordsReportComponent } from "../admin-console/organizations/tools/reused-passwords-report.component";
@@ -16,7 +14,6 @@ import { ToolsComponent as OrgToolsComponent } from "../admin-console/organizati
 import { UnsecuredWebsitesReportComponent as OrgUnsecuredWebsitesReportComponent } from "../admin-console/organizations/tools/unsecured-websites-report.component";
 import { WeakPasswordsReportComponent as OrgWeakPasswordsReportComponent } from "../admin-console/organizations/tools/weak-passwords-report.component";
 import { ProvidersComponent } from "../admin-console/providers/providers.component";
-import { CreateOrganizationComponent } from "../admin-console/settings/create-organization.component";
 import { SponsoredFamiliesComponent } from "../admin-console/settings/sponsored-families.component";
 import { SponsoringOrgRowComponent } from "../admin-console/settings/sponsoring-org-row.component";
 import { AcceptEmergencyComponent } from "../auth/accept-emergency.component";
@@ -54,19 +51,7 @@ import { UpdatePasswordComponent } from "../auth/update-password.component";
 import { UpdateTempPasswordComponent } from "../auth/update-temp-password.component";
 import { VerifyEmailTokenComponent } from "../auth/verify-email-token.component";
 import { VerifyRecoverDeleteComponent } from "../auth/verify-recover-delete.component";
-import { SecretsManagerBillingModule } from "../billing/organizations/secrets-manager/sm-billing.module";
-import { AddCreditComponent } from "../billing/settings/add-credit.component";
-import { AdjustPaymentComponent } from "../billing/settings/adjust-payment.component";
-import { BillingHistoryViewComponent } from "../billing/settings/billing-history-view.component";
-import { BillingHistoryComponent } from "../billing/settings/billing-history.component";
-import { BillingSyncKeyComponent } from "../billing/settings/billing-sync-key.component";
-import { OrganizationPlansComponent } from "../billing/settings/organization-plans.component";
-import { PaymentMethodComponent } from "../billing/settings/payment-method.component";
-import { PaymentComponent } from "../billing/settings/payment.component";
-import { PremiumComponent } from "../billing/settings/premium.component";
-import { SubscriptionComponent } from "../billing/settings/subscription.component";
-import { TaxInfoComponent } from "../billing/settings/tax-info.component";
-import { UserSubscriptionComponent } from "../billing/settings/user-subscription.component";
+import { BillingSharedModule } from "../billing/shared";
 import { DynamicAvatarComponent } from "../components/dynamic-avatar.component";
 import { SelectableAvatarComponent } from "../components/selectable-avatar.component";
 import { FooterComponent } from "../layouts/footer.component";
@@ -75,7 +60,6 @@ import { NavbarComponent } from "../layouts/navbar.component";
 import { ProductSwitcherModule } from "../layouts/product-switcher/product-switcher.module";
 import { UserLayoutComponent } from "../layouts/user-layout.component";
 import { AccountComponent } from "../settings/account.component";
-import { AdjustStorageComponent } from "../settings/adjust-storage.component";
 import { ApiKeyComponent } from "../settings/api-key.component";
 import { ChangeAvatarComponent } from "../settings/change-avatar.component";
 import { ChangeEmailComponent } from "../settings/change-email.component";
@@ -89,7 +73,6 @@ import { PurgeVaultComponent } from "../settings/purge-vault.component";
 import { SecurityKeysComponent } from "../settings/security-keys.component";
 import { SecurityComponent } from "../settings/security.component";
 import { SettingsComponent } from "../settings/settings.component";
-import { UpdateLicenseComponent } from "../settings/update-license.component";
 import { VaultTimeoutInputComponent } from "../settings/vault-timeout-input.component";
 import { GeneratorComponent } from "../tools/generator.component";
 import { PasswordGeneratorHistoryComponent } from "../tools/password-generator-history.component";
@@ -117,7 +100,6 @@ import { SharedModule } from "./shared.module";
 @NgModule({
   imports: [
     SharedModule,
-    OrganizationCreateModule,
     RegisterFormModule,
     ProductSwitcherModule,
     UserVerificationModule,
@@ -125,10 +107,12 @@ import { SharedModule } from "./shared.module";
     DynamicAvatarComponent,
     EnvironmentSelectorModule,
     AccountFingerprintComponent,
-
-    // To be removed when OrganizationPlansComponent is moved to its own module (see AC-1453)
-    SecretsManagerBillingModule,
     PasswordCalloutComponent,
+
+    // Temporary export to be removed in AC-1453
+    // Import PaymentComponent and TaxInfoComponent directly into TrialIniationComponent
+    // and remove BillingSharedModule here
+    BillingSharedModule,
   ],
   declarations: [
     AcceptEmergencyComponent,
@@ -136,19 +120,14 @@ import { SharedModule } from "./shared.module";
     AcceptOrganizationComponent,
     AccessComponent,
     AccountComponent,
-    AddCreditComponent,
     AddEditComponent,
     AddEditCustomFieldsComponent,
     AddEditCustomFieldsComponent,
-    AdjustPaymentComponent,
-    AdjustStorageComponent,
     ApiKeyComponent,
     AttachmentsComponent,
-    BillingSyncKeyComponent,
     ChangeEmailComponent,
     ChangePasswordComponent,
     CollectionsComponent,
-    CreateOrganizationComponent,
     DeauthorizeSessionsComponent,
     DeleteAccountComponent,
     DomainRulesComponent,
@@ -159,7 +138,6 @@ import { SharedModule } from "./shared.module";
     EmergencyAccessTakeoverComponent,
     EmergencyAccessViewComponent,
     EmergencyAddEditComponent,
-    FamiliesForEnterpriseSetupComponent,
     FolderAddEditComponent,
     FooterComponent,
     FrontendLayoutComponent,
@@ -169,7 +147,6 @@ import { SharedModule } from "./shared.module";
     OrganizationSwitcherComponent,
     OrgAddEditComponent,
     OrganizationLayoutComponent,
-    OrganizationPlansComponent,
     OrgAttachmentsComponent,
     OrgCollectionsComponent,
     OrgEventsComponent,
@@ -183,11 +160,8 @@ import { SharedModule } from "./shared.module";
     GeneratorComponent,
     PasswordGeneratorHistoryComponent,
     PasswordRepromptComponent,
-    PaymentComponent,
-    PaymentMethodComponent,
     PreferencesComponent,
     PremiumBadgeComponent,
-    PremiumComponent,
     ProfileComponent,
     ChangeAvatarComponent,
     ProvidersComponent,
@@ -205,8 +179,6 @@ import { SharedModule } from "./shared.module";
     SponsoredFamiliesComponent,
     SponsoringOrgRowComponent,
     SsoComponent,
-    SubscriptionComponent,
-    TaxInfoComponent,
     ToolsComponent,
     TwoFactorAuthenticatorComponent,
     TwoFactorComponent,
@@ -218,13 +190,9 @@ import { SharedModule } from "./shared.module";
     TwoFactorVerifyComponent,
     TwoFactorWebAuthnComponent,
     TwoFactorYubiKeyComponent,
-    UpdateLicenseComponent,
     UpdatePasswordComponent,
     UpdateTempPasswordComponent,
-    BillingHistoryComponent,
-    BillingHistoryViewComponent,
     UserLayoutComponent,
-    UserSubscriptionComponent,
     VaultTimeoutInputComponent,
     VerifyEmailComponent,
     VerifyEmailTokenComponent,
@@ -238,18 +206,14 @@ import { SharedModule } from "./shared.module";
     AcceptOrganizationComponent,
     AccessComponent,
     AccountComponent,
-    AddCreditComponent,
     AddEditComponent,
     AddEditCustomFieldsComponent,
     AddEditCustomFieldsComponent,
-    AdjustPaymentComponent,
-    AdjustStorageComponent,
     ApiKeyComponent,
     AttachmentsComponent,
     ChangeEmailComponent,
     ChangePasswordComponent,
     CollectionsComponent,
-    CreateOrganizationComponent,
     DeauthorizeSessionsComponent,
     DeleteAccountComponent,
     DomainRulesComponent,
@@ -261,7 +225,6 @@ import { SharedModule } from "./shared.module";
     EmergencyAccessTakeoverComponent,
     EmergencyAccessViewComponent,
     EmergencyAddEditComponent,
-    FamiliesForEnterpriseSetupComponent,
     FolderAddEditComponent,
     FooterComponent,
     FrontendLayoutComponent,
@@ -271,7 +234,6 @@ import { SharedModule } from "./shared.module";
     OrganizationSwitcherComponent,
     OrgAddEditComponent,
     OrganizationLayoutComponent,
-    OrganizationPlansComponent,
     OrgAttachmentsComponent,
     OrgCollectionsComponent,
     OrgEventsComponent,
@@ -285,11 +247,8 @@ import { SharedModule } from "./shared.module";
     GeneratorComponent,
     PasswordGeneratorHistoryComponent,
     PasswordRepromptComponent,
-    PaymentComponent,
-    PaymentMethodComponent,
     PreferencesComponent,
     PremiumBadgeComponent,
-    PremiumComponent,
     ProfileComponent,
     ChangeAvatarComponent,
     ProvidersComponent,
@@ -307,8 +266,6 @@ import { SharedModule } from "./shared.module";
     SponsoredFamiliesComponent,
     SponsoringOrgRowComponent,
     SsoComponent,
-    SubscriptionComponent,
-    TaxInfoComponent,
     ToolsComponent,
     TwoFactorAuthenticatorComponent,
     TwoFactorComponent,
@@ -320,18 +277,19 @@ import { SharedModule } from "./shared.module";
     TwoFactorVerifyComponent,
     TwoFactorWebAuthnComponent,
     TwoFactorYubiKeyComponent,
-    UpdateLicenseComponent,
     UpdatePasswordComponent,
     UpdateTempPasswordComponent,
-    BillingHistoryComponent,
-    BillingHistoryViewComponent,
     UserLayoutComponent,
-    UserSubscriptionComponent,
     VaultTimeoutInputComponent,
     VerifyEmailComponent,
     VerifyEmailTokenComponent,
     VerifyRecoverDeleteComponent,
     LowKdfComponent,
+
+    // Temporary export to be removed in AC-1453
+    // Import PaymentComponent and TaxInfoComponent directly into TrialIniationComponent
+    // and remove BillingSharedModule here
+    BillingSharedModule,
   ],
 })
 export class LooseComponentsModule {}

bitwarden_license/bit-web/src/app/admin-console/providers/clients/create-organization.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, ViewChild } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 
-import { OrganizationPlansComponent } from "@bitwarden/web-vault/app/billing/settings/organization-plans.component";
+import { OrganizationPlansComponent } from "@bitwarden/web-vault/app/billing";
 
 @Component({
   selector: "app-create-organization",

bitwarden_license/bit-web/src/app/admin-console/providers/providers.module.ts

@@ -5,6 +5,7 @@ import { FormsModule } from "@angular/forms";
 import { JslibModule } from "@bitwarden/angular/jslib.module";
 import { ModalService } from "@bitwarden/angular/services/modal.service";
 import { SearchModule } from "@bitwarden/components";
+import { OrganizationPlansComponent } from "@bitwarden/web-vault/app/billing";
 import { OssModule } from "@bitwarden/web-vault/app/oss.module";
 
 import { AddOrganizationComponent } from "./clients/add-organization.component";
@@ -32,8 +33,9 @@ import { SetupComponent } from "./setup/setup.component";
     FormsModule,
     OssModule,
     JslibModule,
-    SearchModule,
     ProvidersRoutingModule,
+    OrganizationPlansComponent,
+    SearchModule,
   ],
   declarations: [
     AcceptProviderComponent,