diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index 15fb6b5f78a..23eae1c4113 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -21,11 +21,11 @@ import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/ import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service"; import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service"; import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service"; -import { vNextInternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { InternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { InternalPolicyService as InternalPolicyServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { ProviderService as ProviderServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider.service"; -import { DefaultvNextOrganizationService } from "@bitwarden/common/admin-console/services/organization/default-vnext-organization.service"; +import { DefaultOrganizationService } from "@bitwarden/common/admin-console/services/organization/default-organization.service"; import { PolicyApiService } from "@bitwarden/common/admin-console/services/policy/policy-api.service"; import { PolicyService } from "@bitwarden/common/admin-console/services/policy/policy.service"; import { ProviderService } from "@bitwarden/common/admin-console/services/provider.service"; @@ -328,7 +328,7 @@ export default class MainBackground { sendStateProvider: SendStateProvider; fileUploadService: FileUploadServiceAbstraction; cipherFileUploadService: CipherFileUploadServiceAbstraction; - organizationService: vNextInternalOrganizationServiceAbstraction; + organizationService: InternalOrganizationServiceAbstraction; providerService: ProviderServiceAbstraction; keyConnectorService: KeyConnectorServiceAbstraction; userVerificationService: UserVerificationServiceAbstraction; @@ -668,7 +668,7 @@ export default class MainBackground { this.appIdService = new AppIdService(this.storageService, this.logService); this.userDecryptionOptionsService = new UserDecryptionOptionsService(this.stateProvider); - this.organizationService = new DefaultvNextOrganizationService(this.stateProvider); + this.organizationService = new DefaultOrganizationService(this.stateProvider); this.policyService = new PolicyService(this.stateProvider, this.organizationService); this.vaultTimeoutSettingsService = new VaultTimeoutSettingsService( diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index cfee2fe6fe6..7f32f3338a5 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/apps/browser/src/popup/services/services.module.ts @@ -33,7 +33,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; -import { DefaultvNextOrganizationService } from "@bitwarden/common/admin-console/services/organization/default-vnext-organization.service"; +import { DefaultOrganizationService } from "@bitwarden/common/admin-console/services/organization/default-organization.service"; import { AccountService, AccountService as AccountServiceAbstraction, @@ -376,7 +376,7 @@ const safeProviders: SafeProvider[] = [ provide: VaultFilterService, useClass: VaultFilterService, deps: [ - DefaultvNextOrganizationService, + DefaultOrganizationService, FolderServiceAbstraction, CipherService, CollectionService, diff --git a/apps/browser/src/services/families-policy.service.spec.ts b/apps/browser/src/services/families-policy.service.spec.ts index 29beb3eb8af..65a861038bf 100644 --- a/apps/browser/src/services/families-policy.service.spec.ts +++ b/apps/browser/src/services/families-policy.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from "@angular/core/testing"; import { mock, MockProxy } from "jest-mock-extended"; import { firstValueFrom, of } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; @@ -15,20 +15,20 @@ import { FamiliesPolicyService } from "./families-policy.service"; // Adjust the describe("FamiliesPolicyService", () => { let service: FamiliesPolicyService; - let organizationService: MockProxy; + let organizationService: MockProxy; let policyService: MockProxy; let accountService: FakeAccountService; const userId = Utils.newGuid() as UserId; beforeEach(() => { - organizationService = mock(); + organizationService = mock(); policyService = mock(); accountService = mockAccountServiceWith(userId); TestBed.configureTestingModule({ providers: [ FamiliesPolicyService, - { provide: vNextOrganizationService, useValue: organizationService }, + { provide: OrganizationService, useValue: organizationService }, { provide: PolicyService, useValue: policyService }, { provide: AccountService, useValue: accountService }, ], diff --git a/apps/browser/src/services/families-policy.service.ts b/apps/browser/src/services/families-policy.service.ts index 0fdf931c133..887e8836953 100644 --- a/apps/browser/src/services/families-policy.service.ts +++ b/apps/browser/src/services/families-policy.service.ts @@ -1,7 +1,7 @@ import { Injectable } from "@angular/core"; import { map, Observable, of, switchMap } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -11,7 +11,7 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service"; export class FamiliesPolicyService { constructor( private policyService: PolicyService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, ) {} diff --git a/apps/browser/src/tools/popup/settings/about-page/more-from-bitwarden-page-v2.component.ts b/apps/browser/src/tools/popup/settings/about-page/more-from-bitwarden-page-v2.component.ts index 8b420d5f2e0..388214746b5 100644 --- a/apps/browser/src/tools/popup/settings/about-page/more-from-bitwarden-page-v2.component.ts +++ b/apps/browser/src/tools/popup/settings/about-page/more-from-bitwarden-page-v2.component.ts @@ -4,7 +4,7 @@ import { RouterModule } from "@angular/router"; import { Observable, firstValueFrom, switchMap } from "rxjs"; import { JslibModule } from "@bitwarden/angular/jslib.module"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service"; @@ -40,7 +40,7 @@ export class MoreFromBitwardenPageV2Component { private dialogService: DialogService, billingAccountProfileStateService: BillingAccountProfileStateService, private environmentService: EnvironmentService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private familiesPolicyService: FamiliesPolicyService, ) { diff --git a/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.spec.ts index b9c977c95de..a7f1e8436ae 100644 --- a/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.spec.ts +++ b/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.spec.ts @@ -3,7 +3,7 @@ import { Router } from "@angular/router"; import { RouterTestingModule } from "@angular/router/testing"; import { BehaviorSubject, of } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions"; @@ -81,7 +81,7 @@ describe("OpenAttachmentsComponent", () => { useValue: { showToast }, }, { - provide: vNextOrganizationService, + provide: OrganizationService, useValue: { organizations$ }, }, { diff --git a/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.ts b/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.ts index 2cb39018834..6f97166e95c 100644 --- a/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.ts +++ b/apps/browser/src/vault/popup/components/vault-v2/attachments/open-attachments/open-attachments.component.ts @@ -9,8 +9,8 @@ import { firstValueFrom, map } from "rxjs"; import { JslibModule } from "@bitwarden/angular/jslib.module"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions"; @@ -52,7 +52,7 @@ export class OpenAttachmentsComponent implements OnInit { private router: Router, private billingAccountProfileStateService: BillingAccountProfileStateService, private cipherService: CipherService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private toastService: ToastService, private i18nService: I18nService, private filePopoutUtilsService: FilePopoutUtilsService, diff --git a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts index 8cb571663c0..8634d680052 100644 --- a/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts +++ b/apps/browser/src/vault/popup/components/vault-v2/item-more-options/item-more-options.component.ts @@ -7,7 +7,7 @@ import { BehaviorSubject, firstValueFrom, map, switchMap } from "rxjs"; import { filter } from "rxjs/operators"; import { JslibModule } from "@bitwarden/angular/jslib.module"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -84,7 +84,7 @@ export class ItemMoreOptionsComponent implements OnInit { private i18nService: I18nService, private vaultPopupAutofillService: VaultPopupAutofillService, private accountService: AccountService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private cipherAuthorizationService: CipherAuthorizationService, ) {} diff --git a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts index eccaac56bbe..38ec6056d19 100644 --- a/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts +++ b/apps/browser/src/vault/popup/components/vault-v2/vault-header/vault-header-v2.component.spec.ts @@ -8,7 +8,7 @@ import { BehaviorSubject, Subject } from "rxjs"; import { CollectionService } from "@bitwarden/admin-console/common"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -63,7 +63,7 @@ describe("VaultHeaderV2Component", () => { }, { provide: VaultSettingsService, useValue: mock() }, { provide: FolderService, useValue: mock() }, - { provide: vNextOrganizationService, useValue: mock() }, + { provide: OrganizationService, useValue: mock() }, { provide: CollectionService, useValue: mock() }, { provide: PolicyService, useValue: mock() }, { provide: SearchService, useValue: mock() }, diff --git a/apps/browser/src/vault/popup/components/vault/add-edit.component.ts b/apps/browser/src/vault/popup/components/vault/add-edit.component.ts index 7256d968afd..39414217b0d 100644 --- a/apps/browser/src/vault/popup/components/vault/add-edit.component.ts +++ b/apps/browser/src/vault/popup/components/vault/add-edit.component.ts @@ -11,7 +11,7 @@ import { CollectionService } from "@bitwarden/admin-console/common"; import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/vault/components/add-edit.component"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/autofill-settings.service"; @@ -66,7 +66,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit { eventCollectionService: EventCollectionService, policyService: PolicyService, private popupCloseWarningService: PopupCloseWarningService, - organizationService: vNextOrganizationService, + organizationService: OrganizationService, passwordRepromptService: PasswordRepromptService, logService: LogService, dialogService: DialogService, diff --git a/apps/browser/src/vault/popup/components/vault/collections.component.ts b/apps/browser/src/vault/popup/components/vault/collections.component.ts index fbe92e8e81a..407f87e996c 100644 --- a/apps/browser/src/vault/popup/components/vault/collections.component.ts +++ b/apps/browser/src/vault/popup/components/vault/collections.component.ts @@ -5,7 +5,7 @@ import { first } from "rxjs/operators"; import { CollectionService } from "@bitwarden/admin-console/common"; import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/admin-console/components/collections.component"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; @@ -24,7 +24,7 @@ export class CollectionsComponent extends BaseCollectionsComponent implements On platformUtilsService: PlatformUtilsService, i18nService: I18nService, cipherService: CipherService, - organizationService: vNextOrganizationService, + organizationService: OrganizationService, private route: ActivatedRoute, private location: Location, logService: LogService, diff --git a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts index 03cbd95225a..b2955ad1d48 100644 --- a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts +++ b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts @@ -6,7 +6,7 @@ import { Subject, firstValueFrom, from, Subscription } from "rxjs"; import { debounceTime, switchMap, takeUntil } from "rxjs/operators"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { AutofillOverlayVisibility } from "@bitwarden/common/autofill/constants"; @@ -72,7 +72,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy { private searchService: SearchService, private autofillSettingsService: AutofillSettingsServiceAbstraction, private passwordRepromptService: PasswordRepromptService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private vaultFilterService: VaultFilterService, private vaultSettingsService: VaultSettingsService, diff --git a/apps/browser/src/vault/popup/components/vault/share.component.ts b/apps/browser/src/vault/popup/components/vault/share.component.ts index 0260587efd7..8e061665b73 100644 --- a/apps/browser/src/vault/popup/components/vault/share.component.ts +++ b/apps/browser/src/vault/popup/components/vault/share.component.ts @@ -4,7 +4,7 @@ import { first } from "rxjs/operators"; import { CollectionService } from "@bitwarden/admin-console/common"; import { ShareComponent as BaseShareComponent } from "@bitwarden/angular/components/share.component"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; @@ -25,7 +25,7 @@ export class ShareComponent extends BaseShareComponent implements OnInit { cipherService: CipherService, private route: ActivatedRoute, private router: Router, - organizationService: vNextOrganizationService, + organizationService: OrganizationService, accountService: AccountService, ) { super( diff --git a/apps/browser/src/vault/popup/components/vault/vault-items.component.ts b/apps/browser/src/vault/popup/components/vault/vault-items.component.ts index 7125eec887f..69e7a4efcf0 100644 --- a/apps/browser/src/vault/popup/components/vault/vault-items.component.ts +++ b/apps/browser/src/vault/popup/components/vault/vault-items.component.ts @@ -10,7 +10,7 @@ import { CollectionService, CollectionView } from "@bitwarden/admin-console/comm import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angular/vault/components/vault-items.component"; import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; @@ -56,7 +56,7 @@ export class VaultItemsComponent extends BaseVaultItemsComponent implements OnIn constructor( searchService: SearchService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private route: ActivatedRoute, private router: Router, diff --git a/apps/browser/src/vault/popup/components/vault/vault-select.component.ts b/apps/browser/src/vault/popup/components/vault/vault-select.component.ts index b14a38c44d9..0cb7b614ee2 100644 --- a/apps/browser/src/vault/popup/components/vault/vault-select.component.ts +++ b/apps/browser/src/vault/popup/components/vault/vault-select.component.ts @@ -27,7 +27,7 @@ import { takeUntil, } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -103,7 +103,7 @@ export class VaultSelectComponent implements OnInit, OnDestroy { private overlay: Overlay, private viewContainerRef: ViewContainerRef, private platformUtilsService: PlatformUtilsService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private policyService: PolicyService, ) {} diff --git a/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts b/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts index b10eda6427f..9a408402b06 100644 --- a/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts +++ b/apps/browser/src/vault/popup/services/vault-popup-items.service.spec.ts @@ -4,7 +4,7 @@ import { BehaviorSubject, firstValueFrom, timeout } from "rxjs"; import { CollectionService, CollectionView } from "@bitwarden/admin-console/common"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { ProductTierType } from "@bitwarden/common/billing/enums"; @@ -36,7 +36,7 @@ describe("VaultPopupItemsService", () => { const cipherServiceMock = mock(); const vaultSettingsServiceMock = mock(); - const organizationServiceMock = mock(); + const organizationServiceMock = mock(); const vaultPopupListFiltersServiceMock = mock(); const searchService = mock(); const collectionService = mock(); @@ -111,7 +111,7 @@ describe("VaultPopupItemsService", () => { { provide: CipherService, useValue: cipherServiceMock }, { provide: VaultSettingsService, useValue: vaultSettingsServiceMock }, { provide: SearchService, useValue: searchService }, - { provide: vNextOrganizationService, useValue: organizationServiceMock }, + { provide: OrganizationService, useValue: organizationServiceMock }, { provide: AccountService, useValue: accountServiceMock }, { provide: VaultPopupListFiltersService, useValue: vaultPopupListFiltersServiceMock }, { provide: CollectionService, useValue: collectionService }, diff --git a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts index 00c690c75d5..354430bf33b 100644 --- a/apps/browser/src/vault/popup/services/vault-popup-items.service.ts +++ b/apps/browser/src/vault/popup/services/vault-popup-items.service.ts @@ -23,7 +23,7 @@ import { import { CollectionService } from "@bitwarden/admin-console/common"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { SyncService } from "@bitwarden/common/platform/sync"; @@ -260,7 +260,7 @@ export class VaultPopupItemsService { private cipherService: CipherService, private vaultSettingsService: VaultSettingsService, private vaultPopupListFiltersService: VaultPopupListFiltersService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private searchService: SearchService, private collectionService: CollectionService, private vaultPopupAutofillService: VaultPopupAutofillService, diff --git a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts index 16d057882f7..3c3417435fa 100644 --- a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts +++ b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.spec.ts @@ -3,7 +3,7 @@ import { FormBuilder } from "@angular/forms"; import { BehaviorSubject, skipWhile } from "rxjs"; import { CollectionService, Collection, CollectionView } from "@bitwarden/admin-console/common"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -48,7 +48,7 @@ describe("VaultPopupListFiltersService", () => { const organizationService = { memberOrganizations$, organizations$, - } as unknown as vNextOrganizationService; + } as unknown as OrganizationService; const i18nService = { t: (key: string) => key, @@ -82,7 +82,7 @@ describe("VaultPopupListFiltersService", () => { useValue: cipherService, }, { - provide: vNextOrganizationService, + provide: OrganizationService, useValue: organizationService, }, { diff --git a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts index f35849919ca..b4370b9622c 100644 --- a/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts +++ b/apps/browser/src/vault/popup/services/vault-popup-list-filters.service.ts @@ -16,7 +16,7 @@ import { import { CollectionService, Collection, CollectionView } from "@bitwarden/admin-console/common"; import { DynamicTreeNode } from "@bitwarden/angular/vault/vault-filter/models/dynamic-tree-node.model"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -106,7 +106,7 @@ export class VaultPopupListFiltersService { constructor( private folderService: FolderService, private cipherService: CipherService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private i18nService: I18nService, private collectionService: CollectionService, private formBuilder: FormBuilder, diff --git a/apps/browser/src/vault/services/vault-filter.service.ts b/apps/browser/src/vault/services/vault-filter.service.ts index d2f423ae613..f8b22f2f88f 100644 --- a/apps/browser/src/vault/services/vault-filter.service.ts +++ b/apps/browser/src/vault/services/vault-filter.service.ts @@ -3,7 +3,7 @@ import { CollectionService } from "@bitwarden/admin-console/common"; import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model"; import { VaultFilterService as BaseVaultFilterService } from "@bitwarden/angular/vault/vault-filter/services/vault-filter.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { StateProvider } from "@bitwarden/common/platform/state"; @@ -18,7 +18,7 @@ export class VaultFilterService extends BaseVaultFilterService { myVault = "myVault"; constructor( - organizationService: vNextOrganizationService, + organizationService: OrganizationService, folderService: FolderService, cipherService: CipherService, collectionService: CollectionService, diff --git a/apps/cli/src/auth/commands/login.command.ts b/apps/cli/src/auth/commands/login.command.ts index a0abaa4ceec..2a3d5d85408 100644 --- a/apps/cli/src/auth/commands/login.command.ts +++ b/apps/cli/src/auth/commands/login.command.ts @@ -14,7 +14,7 @@ import { UserApiLoginCredentials, } from "@bitwarden/auth/common"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -68,7 +68,7 @@ export class LoginCommand { protected syncService: SyncService, protected keyConnectorService: KeyConnectorService, protected policyApiService: PolicyApiServiceAbstraction, - protected orgService: vNextOrganizationService, + protected orgService: OrganizationService, protected logoutCallback: () => Promise, protected kdfConfigService: KdfConfigService, ) {} diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts index d2e6fef850e..b15700a2081 100644 --- a/apps/cli/src/commands/get.command.ts +++ b/apps/cli/src/commands/get.command.ts @@ -7,7 +7,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -62,7 +62,7 @@ export class GetCommand extends DownloadCommand { encryptService: EncryptService, private searchService: SearchService, protected apiService: ApiService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private eventCollectionService: EventCollectionService, private accountProfileService: BillingAccountProfileStateService, private accountService: AccountService, diff --git a/apps/cli/src/commands/list.command.ts b/apps/cli/src/commands/list.command.ts index 3263cf7f7fe..65406cd8c8f 100644 --- a/apps/cli/src/commands/list.command.ts +++ b/apps/cli/src/commands/list.command.ts @@ -11,7 +11,7 @@ import { import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { EventType } from "@bitwarden/common/enums"; @@ -35,7 +35,7 @@ export class ListCommand { private cipherService: CipherService, private folderService: FolderService, private collectionService: CollectionService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private searchService: SearchService, private organizationUserApiService: OrganizationUserApiService, private apiService: ApiService, diff --git a/apps/cli/src/service-container/service-container.ts b/apps/cli/src/service-container/service-container.ts index 2fa1501be27..9c5ee3e2e21 100644 --- a/apps/cli/src/service-container/service-container.ts +++ b/apps/cli/src/service-container/service-container.ts @@ -25,7 +25,7 @@ import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/ import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction"; -import { DefaultvNextOrganizationService } from "@bitwarden/common/admin-console/services/organization/default-vnext-organization.service"; +import { DefaultOrganizationService } from "@bitwarden/common/admin-console/services/organization/default-organization.service"; import { OrganizationApiService } from "@bitwarden/common/admin-console/services/organization/organization-api.service"; import { PolicyApiService } from "@bitwarden/common/admin-console/services/policy/policy-api.service"; import { PolicyService } from "@bitwarden/common/admin-console/services/policy/policy.service"; @@ -240,8 +240,8 @@ export class ServiceContainer { stateService: StateService; autofillSettingsService: AutofillSettingsServiceAbstraction; domainSettingsService: DomainSettingsService; - organizationService: DefaultvNextOrganizationService; - defaultvNextOrganizationService: DefaultvNextOrganizationService; + organizationService: DefaultOrganizationService; + DefaultOrganizationService: DefaultOrganizationService; providerService: ProviderService; twoFactorService: TwoFactorService; folderApiService: FolderApiService; @@ -453,7 +453,7 @@ export class ServiceContainer { this.biometricStateService = new DefaultBiometricStateService(this.stateProvider); this.userDecryptionOptionsService = new UserDecryptionOptionsService(this.stateProvider); - this.organizationService = new DefaultvNextOrganizationService(this.stateProvider); + this.organizationService = new DefaultOrganizationService(this.stateProvider); this.policyService = new PolicyService(this.stateProvider, this.organizationService); this.vaultTimeoutSettingsService = new VaultTimeoutSettingsService( diff --git a/apps/cli/src/tools/import.command.ts b/apps/cli/src/tools/import.command.ts index 9087db01d68..f826cb24b7d 100644 --- a/apps/cli/src/tools/import.command.ts +++ b/apps/cli/src/tools/import.command.ts @@ -4,7 +4,7 @@ import { OptionValues } from "commander"; import * as inquirer from "inquirer"; import { firstValueFrom, map } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { ImportServiceAbstraction, ImportType } from "@bitwarden/importer/core"; @@ -16,7 +16,7 @@ import { CliUtils } from "../utils"; export class ImportCommand { constructor( private importService: ImportServiceAbstraction, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private syncService: SyncService, private accountService: AccountService, ) {} diff --git a/apps/cli/src/vault/create.command.ts b/apps/cli/src/vault/create.command.ts index 26754eff168..ef1bc9ab3da 100644 --- a/apps/cli/src/vault/create.command.ts +++ b/apps/cli/src/vault/create.command.ts @@ -7,7 +7,7 @@ import { firstValueFrom, map } from "rxjs"; import { CollectionRequest } from "@bitwarden/admin-console/common"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service"; @@ -38,7 +38,7 @@ export class CreateCommand { private apiService: ApiService, private folderApiService: FolderApiServiceAbstraction, private accountProfileService: BillingAccountProfileStateService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, ) {} diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts index 5e0c30713d1..fcba1c73019 100644 --- a/apps/desktop/src/app/app.component.ts +++ b/apps/desktop/src/app/app.component.ts @@ -23,7 +23,7 @@ import { NotificationsService } from "@bitwarden/common/abstractions/notificatio import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; @@ -155,7 +155,7 @@ export class AppComponent implements OnInit, OnDestroy { private biometricStateService: BiometricStateService, private stateEventRunnerService: StateEventRunnerService, private accountService: AccountService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, ) {} ngOnInit() { diff --git a/apps/desktop/src/vault/app/vault/add-edit.component.ts b/apps/desktop/src/vault/app/vault/add-edit.component.ts index 138a0fd86f5..a798e61aa88 100644 --- a/apps/desktop/src/vault/app/vault/add-edit.component.ts +++ b/apps/desktop/src/vault/app/vault/add-edit.component.ts @@ -10,7 +10,7 @@ import { CollectionService } from "@bitwarden/admin-console/common"; import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/vault/components/add-edit.component"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; @@ -52,7 +52,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit, On private broadcasterService: BroadcasterService, private ngZone: NgZone, logService: LogService, - organizationService: vNextOrganizationService, + organizationService: OrganizationService, dialogService: DialogService, datePipe: DatePipe, configService: ConfigService, diff --git a/apps/desktop/src/vault/app/vault/collections.component.ts b/apps/desktop/src/vault/app/vault/collections.component.ts index e85073b4d2e..e7684c3c07a 100644 --- a/apps/desktop/src/vault/app/vault/collections.component.ts +++ b/apps/desktop/src/vault/app/vault/collections.component.ts @@ -2,7 +2,7 @@ import { Component } from "@angular/core"; import { CollectionService } from "@bitwarden/admin-console/common"; import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/admin-console/components/collections.component"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; @@ -20,7 +20,7 @@ export class CollectionsComponent extends BaseCollectionsComponent { i18nService: I18nService, collectionService: CollectionService, platformUtilsService: PlatformUtilsService, - organizationService: vNextOrganizationService, + organizationService: OrganizationService, logService: LogService, accountService: AccountService, toastService: ToastService, diff --git a/apps/desktop/src/vault/app/vault/share.component.ts b/apps/desktop/src/vault/app/vault/share.component.ts index 23a8d293a75..6926e7e2abf 100644 --- a/apps/desktop/src/vault/app/vault/share.component.ts +++ b/apps/desktop/src/vault/app/vault/share.component.ts @@ -3,7 +3,7 @@ import { Component } from "@angular/core"; import { CollectionService } from "@bitwarden/admin-console/common"; import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref"; import { ShareComponent as BaseShareComponent } from "@bitwarden/angular/components/share.component"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; @@ -21,7 +21,7 @@ export class ShareComponent extends BaseShareComponent { collectionService: CollectionService, platformUtilsService: PlatformUtilsService, logService: LogService, - organizationService: vNextOrganizationService, + organizationService: OrganizationService, accountService: AccountService, private modalRef: ModalRef, ) { diff --git a/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.spec.ts b/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.spec.ts index 531e2dcc1e8..f5fce0e5e42 100644 --- a/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.spec.ts +++ b/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.spec.ts @@ -7,7 +7,7 @@ import { RouterTestingHarness } from "@angular/router/testing"; import { MockProxy, any, mock } from "jest-mock-extended"; import { of } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationUserType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -46,20 +46,20 @@ const orgFactory = (props: Partial = {}) => ); describe("Is Enterprise Org Guard", () => { - let organizationService: MockProxy; + let organizationService: MockProxy; let dialogService: MockProxy; let routerHarness: RouterTestingHarness; let accountService: FakeAccountService; const userId = Utils.newGuid() as UserId; beforeEach(async () => { - organizationService = mock(); + organizationService = mock(); dialogService = mock(); accountService = mockAccountServiceWith(userId); TestBed.configureTestingModule({ providers: [ - { provide: vNextOrganizationService, useValue: organizationService }, + { provide: OrganizationService, useValue: organizationService }, { provide: DialogService, useValue: dialogService }, { provide: AccountService, useValue: accountService }, provideRouter([ diff --git a/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.ts b/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.ts index 9e52bdecd64..c79abed583c 100644 --- a/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.ts +++ b/apps/web/src/app/admin-console/organizations/guards/is-enterprise-org.guard.ts @@ -11,8 +11,8 @@ import { firstValueFrom, map } from "rxjs"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { ProductTierType } from "@bitwarden/common/billing/enums"; import { DialogService } from "@bitwarden/components"; @@ -27,7 +27,7 @@ import { DialogService } from "@bitwarden/components"; export function isEnterpriseOrgGuard(showError: boolean = true): CanActivateFn { return async (route: ActivatedRouteSnapshot, _state: RouterStateSnapshot) => { const router = inject(Router); - const organizationService = inject(vNextOrganizationService); + const organizationService = inject(OrganizationService); const accountService = inject(AccountService); const dialogService = inject(DialogService); diff --git a/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.spec.ts b/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.spec.ts index c4ec4ae032c..8efed8cefa2 100644 --- a/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.spec.ts +++ b/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.spec.ts @@ -7,7 +7,7 @@ import { RouterTestingHarness } from "@angular/router/testing"; import { MockProxy, any, mock } from "jest-mock-extended"; import { of } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationUserType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -45,20 +45,20 @@ const orgFactory = (props: Partial = {}) => ); describe("Is Paid Org Guard", () => { - let organizationService: MockProxy; + let organizationService: MockProxy; let dialogService: MockProxy; let routerHarness: RouterTestingHarness; let accountService: FakeAccountService; const userId = Utils.newGuid() as UserId; beforeEach(async () => { - organizationService = mock(); + organizationService = mock(); dialogService = mock(); accountService = mockAccountServiceWith(userId); TestBed.configureTestingModule({ providers: [ - { provide: vNextOrganizationService, useValue: organizationService }, + { provide: OrganizationService, useValue: organizationService }, { provide: DialogService, useValue: dialogService }, { provide: AccountService, useValue: accountService }, provideRouter([ diff --git a/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.ts b/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.ts index 9e6ac5348c9..9a59c884ee7 100644 --- a/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.ts +++ b/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.ts @@ -11,8 +11,8 @@ import { firstValueFrom, map } from "rxjs"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { DialogService } from "@bitwarden/components"; @@ -26,7 +26,7 @@ import { DialogService } from "@bitwarden/components"; export function isPaidOrgGuard(): CanActivateFn { return async (route: ActivatedRouteSnapshot, _state: RouterStateSnapshot) => { const router = inject(Router); - const organizationService = inject(vNextOrganizationService); + const organizationService = inject(OrganizationService); const accountService = inject(AccountService); const dialogService = inject(DialogService); diff --git a/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.spec.ts b/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.spec.ts index dd94181b9f1..619b9cc4424 100644 --- a/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.spec.ts +++ b/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.spec.ts @@ -10,7 +10,7 @@ import { import { mock, MockProxy } from "jest-mock-extended"; import { of } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationUserType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -36,7 +36,7 @@ const orgFactory = (props: Partial = {}) => describe("Organization Permissions Guard", () => { let router: MockProxy; - let organizationService: MockProxy; + let organizationService: MockProxy; let state: MockProxy; let route: MockProxy; let accountService: FakeAccountService; @@ -44,7 +44,7 @@ describe("Organization Permissions Guard", () => { beforeEach(() => { router = mock(); - organizationService = mock(); + organizationService = mock(); accountService = mockAccountServiceWith(userId); state = mock(); route = mock({ @@ -57,7 +57,7 @@ describe("Organization Permissions Guard", () => { providers: [ { provide: Router, useValue: router }, { provide: AccountService, useValue: accountService }, - { provide: vNextOrganizationService, useValue: organizationService }, + { provide: OrganizationService, useValue: organizationService }, { provide: ToastService, useValue: mock() }, { provide: I18nService, useValue: mock() }, { provide: SyncService, useValue: mock() }, diff --git a/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.ts b/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.ts index 1412c55bb2c..ea9bfad3893 100644 --- a/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.ts +++ b/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.ts @@ -11,8 +11,8 @@ import { firstValueFrom, map } from "rxjs"; import { canAccessOrgAdmin, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -44,7 +44,7 @@ export function organizationPermissionsGuard( ): CanActivateFn { return async (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => { const router = inject(Router); - const organizationService = inject(vNextOrganizationService); + const organizationService = inject(OrganizationService); const toastService = inject(ToastService); const i18nService = inject(I18nService); const syncService = inject(SyncService); diff --git a/apps/web/src/app/admin-console/organizations/guards/org-redirect.guard.spec.ts b/apps/web/src/app/admin-console/organizations/guards/org-redirect.guard.spec.ts index 64e83bf600d..fa348867a86 100644 --- a/apps/web/src/app/admin-console/organizations/guards/org-redirect.guard.spec.ts +++ b/apps/web/src/app/admin-console/organizations/guards/org-redirect.guard.spec.ts @@ -7,7 +7,7 @@ import { RouterTestingHarness } from "@angular/router/testing"; import { MockProxy, mock } from "jest-mock-extended"; import { of } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationUserType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -44,18 +44,18 @@ const orgFactory = (props: Partial = {}) => ); describe("Organization Redirect Guard", () => { - let organizationService: MockProxy; + let organizationService: MockProxy; let routerHarness: RouterTestingHarness; let accountService: FakeAccountService; const userId = Utils.newGuid() as UserId; beforeEach(async () => { - organizationService = mock(); + organizationService = mock(); accountService = mockAccountServiceWith(userId); TestBed.configureTestingModule({ providers: [ - { provide: vNextOrganizationService, useValue: organizationService }, + { provide: OrganizationService, useValue: organizationService }, { provide: AccountService, useValue: accountService }, provideRouter([ { diff --git a/apps/web/src/app/admin-console/organizations/guards/org-redirect.guard.ts b/apps/web/src/app/admin-console/organizations/guards/org-redirect.guard.ts index 9f0f3c39c71..d0352586efa 100644 --- a/apps/web/src/app/admin-console/organizations/guards/org-redirect.guard.ts +++ b/apps/web/src/app/admin-console/organizations/guards/org-redirect.guard.ts @@ -9,8 +9,8 @@ import { firstValueFrom, map } from "rxjs"; import { canAccessOrgAdmin, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -26,7 +26,7 @@ export function organizationRedirectGuard( ): CanActivateFn { return async (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => { const router = inject(Router); - const organizationService = inject(vNextOrganizationService); + const organizationService = inject(OrganizationService); const accountService = inject(AccountService); const userId = await firstValueFrom(accountService.activeAccount$.pipe(map((a) => a?.id))); diff --git a/apps/web/src/app/admin-console/organizations/integrations/integrations.component.ts b/apps/web/src/app/admin-console/organizations/integrations/integrations.component.ts index d2227a2a1e4..cbd3fab4191 100644 --- a/apps/web/src/app/admin-console/organizations/integrations/integrations.component.ts +++ b/apps/web/src/app/admin-console/organizations/integrations/integrations.component.ts @@ -6,8 +6,8 @@ import { Observable, switchMap } from "rxjs"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { IntegrationType } from "@bitwarden/common/enums"; @@ -50,7 +50,7 @@ export class AdminConsoleIntegrationsComponent implements OnInit { constructor( private route: ActivatedRoute, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, ) { this.integrationsList = [ diff --git a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts index 1698858538f..6114124f43b 100644 --- a/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts +++ b/apps/web/src/app/admin-console/organizations/layouts/organization-layout.component.ts @@ -14,8 +14,8 @@ import { canAccessReportingTab, canAccessSettingsTab, canAccessVaultTab, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { PolicyType, ProviderStatusType } from "@bitwarden/common/admin-console/enums"; @@ -63,7 +63,7 @@ export class OrganizationLayoutComponent implements OnInit { constructor( private route: ActivatedRoute, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private platformUtilsService: PlatformUtilsService, private configService: ConfigService, private policyService: PolicyService, diff --git a/apps/web/src/app/admin-console/organizations/manage/events.component.ts b/apps/web/src/app/admin-console/organizations/manage/events.component.ts index 307c8a48baa..574fef7173e 100644 --- a/apps/web/src/app/admin-console/organizations/manage/events.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/events.component.ts @@ -9,8 +9,8 @@ import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -55,7 +55,7 @@ export class EventsComponent extends BaseEventsComponent implements OnInit, OnDe private router: Router, logService: LogService, private userNamePipe: UserNamePipe, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private organizationUserApiService: OrganizationUserApiService, private providerService: ProviderService, fileDownloadService: FileDownloadService, diff --git a/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts index d6960ea3197..330ffe86f0b 100644 --- a/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts @@ -25,8 +25,8 @@ import { import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; @@ -227,7 +227,7 @@ export class GroupAddEditComponent implements OnInit, OnDestroy { private formBuilder: FormBuilder, private changeDetectorRef: ChangeDetectorRef, private dialogService: DialogService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private collectionAdminService: CollectionAdminService, private toastService: ToastService, diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts index b38489bd288..9d3dbe4eeea 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts @@ -24,8 +24,8 @@ import { } from "@bitwarden/admin-console/common"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationUserStatusType, OrganizationUserType, @@ -154,7 +154,7 @@ export class MemberDialogComponent implements OnDestroy { private organizationUserApiService: OrganizationUserApiService, private dialogService: DialogService, private accountService: AccountService, - organizationService: vNextOrganizationService, + organizationService: OrganizationService, private toastService: ToastService, private configService: ConfigService, ) { diff --git a/apps/web/src/app/admin-console/organizations/members/members-routing.module.ts b/apps/web/src/app/admin-console/organizations/members/members-routing.module.ts index cb9330db58f..5220ea1ef39 100644 --- a/apps/web/src/app/admin-console/organizations/members/members-routing.module.ts +++ b/apps/web/src/app/admin-console/organizations/members/members-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { canAccessMembersTab } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { canAccessMembersTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { organizationPermissionsGuard } from "../guards/org-permissions.guard"; diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.ts b/apps/web/src/app/admin-console/organizations/members/members.component.ts index cde52a57171..646e80b0e5a 100644 --- a/apps/web/src/app/admin-console/organizations/members/members.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/members.component.ts @@ -30,8 +30,8 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationManagementPreferencesService } from "@bitwarden/common/admin-console/abstractions/organization-management-preferences/organization-management-preferences.service"; import { PolicyApiServiceAbstraction as PolicyApiService } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; @@ -125,7 +125,7 @@ export class MembersComponent extends BaseMembersComponent private policyApiService: PolicyApiService, private route: ActivatedRoute, private syncService: SyncService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private organizationApiService: OrganizationApiServiceAbstraction, private organizationUserApiService: OrganizationUserApiService, diff --git a/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.spec.ts b/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.spec.ts index 50bb2bd5163..9b595859b21 100644 --- a/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.spec.ts +++ b/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.spec.ts @@ -7,7 +7,7 @@ import { OrganizationUserApiService, OrganizationUserResetPasswordDetailsResponse, } from "@bitwarden/admin-console/common"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { OrganizationKeysResponse } from "@bitwarden/common/admin-console/models/response/organization-keys.response"; import { OrganizationApiService } from "@bitwarden/common/admin-console/services/organization/organization-api.service"; @@ -28,7 +28,7 @@ describe("OrganizationUserResetPasswordService", () => { let keyService: MockProxy; let encryptService: MockProxy; - let organizationService: MockProxy; + let organizationService: MockProxy; let organizationUserApiService: MockProxy; let organizationApiService: MockProxy; let i18nService: MockProxy; @@ -36,7 +36,7 @@ describe("OrganizationUserResetPasswordService", () => { beforeAll(() => { keyService = mock(); encryptService = mock(); - organizationService = mock(); + organizationService = mock(); organizationUserApiService = mock(); organizationApiService = mock(); i18nService = mock(); diff --git a/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.ts b/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.ts index 21b6cc19eb4..0fe9b75aa98 100644 --- a/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.ts +++ b/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.ts @@ -9,7 +9,7 @@ import { OrganizationUserResetPasswordWithIdRequest, } from "@bitwarden/admin-console/common"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; @@ -35,7 +35,7 @@ export class OrganizationUserResetPasswordService constructor( private keyService: KeyService, private encryptService: EncryptService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private organizationUserApiService: OrganizationUserApiService, private organizationApiService: OrganizationApiServiceAbstraction, private i18nService: I18nService, diff --git a/apps/web/src/app/admin-console/organizations/organization-routing.module.ts b/apps/web/src/app/admin-console/organizations/organization-routing.module.ts index ec5bb0a255a..f7720598284 100644 --- a/apps/web/src/app/admin-console/organizations/organization-routing.module.ts +++ b/apps/web/src/app/admin-console/organizations/organization-routing.module.ts @@ -12,7 +12,7 @@ import { canAccessVaultTab, canAccessReportingTab, canAccessSettingsTab, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; diff --git a/apps/web/src/app/admin-console/organizations/policies/master-password.component.ts b/apps/web/src/app/admin-console/organizations/policies/master-password.component.ts index 69003697430..328989df66b 100644 --- a/apps/web/src/app/admin-console/organizations/policies/master-password.component.ts +++ b/apps/web/src/app/admin-console/organizations/policies/master-password.component.ts @@ -7,8 +7,8 @@ import { firstValueFrom } from "rxjs"; import { ControlsOf } from "@bitwarden/angular/types/controls-of"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -48,7 +48,7 @@ export class MasterPasswordPolicyComponent extends BasePolicyComponent implement constructor( private formBuilder: FormBuilder, i18nService: I18nService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, ) { super(); diff --git a/apps/web/src/app/admin-console/organizations/policies/policies.component.ts b/apps/web/src/app/admin-console/organizations/policies/policies.component.ts index 09571de712f..3354c7c5e11 100644 --- a/apps/web/src/app/admin-console/organizations/policies/policies.component.ts +++ b/apps/web/src/app/admin-console/organizations/policies/policies.component.ts @@ -7,8 +7,8 @@ import { first, map } from "rxjs/operators"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -40,7 +40,7 @@ export class PoliciesComponent implements OnInit { constructor( private route: ActivatedRoute, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private policyApiService: PolicyApiServiceAbstraction, private policyListService: PolicyListService, diff --git a/apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts b/apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts index 36257a59bd2..80e4e5254ff 100644 --- a/apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts +++ b/apps/web/src/app/admin-console/organizations/policies/reset-password.component.ts @@ -4,8 +4,8 @@ import { firstValueFrom } from "rxjs"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -36,7 +36,7 @@ export class ResetPasswordPolicyComponent extends BasePolicyComponent implements constructor( private formBuilder: FormBuilder, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, ) { super(); diff --git a/apps/web/src/app/admin-console/organizations/reporting/organization-reporting-routing.module.ts b/apps/web/src/app/admin-console/organizations/reporting/organization-reporting-routing.module.ts index 6d749f8245a..d6c7bdd97cd 100644 --- a/apps/web/src/app/admin-console/organizations/reporting/organization-reporting-routing.module.ts +++ b/apps/web/src/app/admin-console/organizations/reporting/organization-reporting-routing.module.ts @@ -3,7 +3,7 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { canAccessReportingTab } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { canAccessReportingTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { ExposedPasswordsReportComponent } from "../../../admin-console/organizations/tools/exposed-passwords-report.component"; diff --git a/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts b/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts index c58ecc474f2..6090396293f 100644 --- a/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts +++ b/apps/web/src/app/admin-console/organizations/reporting/reports-home.component.ts @@ -6,8 +6,8 @@ import { filter, map, Observable, startWith, concatMap, firstValueFrom } from "r import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { ProductTierType } from "@bitwarden/common/billing/enums"; @@ -24,7 +24,7 @@ export class ReportsHomeComponent implements OnInit { constructor( private route: ActivatedRoute, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private router: Router, ) {} diff --git a/apps/web/src/app/admin-console/organizations/settings/account.component.ts b/apps/web/src/app/admin-console/organizations/settings/account.component.ts index 1e82842fd78..0cc0f85a008 100644 --- a/apps/web/src/app/admin-console/organizations/settings/account.component.ts +++ b/apps/web/src/app/admin-console/organizations/settings/account.component.ts @@ -18,8 +18,8 @@ import { ModalService } from "@bitwarden/angular/services/modal.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationCollectionManagementUpdateRequest } from "@bitwarden/common/admin-console/models/request/organization-collection-management-update.request"; import { OrganizationKeysRequest } from "@bitwarden/common/admin-console/models/request/organization-keys.request"; import { OrganizationUpdateRequest } from "@bitwarden/common/admin-console/models/request/organization-update.request"; @@ -92,7 +92,7 @@ export class AccountComponent implements OnInit, OnDestroy { private keyService: KeyService, private router: Router, private accountService: AccountService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private organizationApiService: OrganizationApiServiceAbstraction, private dialogService: DialogService, private formBuilder: FormBuilder, diff --git a/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts b/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts index 8f44edeefe9..2f801ac7772 100644 --- a/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts +++ b/apps/web/src/app/admin-console/organizations/settings/components/delete-organization-dialog.component.ts @@ -8,8 +8,8 @@ import { combineLatest, firstValueFrom, Subject, takeUntil } from "rxjs"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; @@ -98,7 +98,7 @@ export class DeleteOrganizationDialogComponent implements OnInit, OnDestroy { private platformUtilsService: PlatformUtilsService, private userVerificationService: UserVerificationService, private cipherService: CipherService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private organizationApiService: OrganizationApiServiceAbstraction, private formBuilder: FormBuilder, diff --git a/apps/web/src/app/admin-console/organizations/settings/org-import.component.ts b/apps/web/src/app/admin-console/organizations/settings/org-import.component.ts index 27e68ae59c0..5ea7e2ab52d 100644 --- a/apps/web/src/app/admin-console/organizations/settings/org-import.component.ts +++ b/apps/web/src/app/admin-console/organizations/settings/org-import.component.ts @@ -7,8 +7,8 @@ import { firstValueFrom, map } from "rxjs"; import { CollectionAdminService } from "@bitwarden/admin-console/common"; import { canAccessVaultTab, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { ImportCollectionServiceAbstraction } from "@bitwarden/importer/core"; @@ -36,7 +36,7 @@ export class OrgImportComponent implements OnInit { constructor( private route: ActivatedRoute, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private router: Router, private accountService: AccountService, ) {} diff --git a/apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts b/apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts index 52305f54d2c..ac2c7448b0a 100644 --- a/apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts +++ b/apps/web/src/app/admin-console/organizations/settings/organization-settings-routing.module.ts @@ -4,7 +4,7 @@ import { inject, NgModule } from "@angular/core"; import { CanMatchFn, RouterModule, Routes } from "@angular/router"; import { map } from "rxjs"; -import { canAccessSettingsTab } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { canAccessSettingsTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; diff --git a/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts b/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts index 6105546a494..26eada7450b 100644 --- a/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts +++ b/apps/web/src/app/admin-console/organizations/settings/two-factor-setup.component.ts @@ -10,8 +10,8 @@ import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; @@ -40,7 +40,7 @@ export class TwoFactorSetupComponent extends BaseTwoFactorSetupComponent impleme messagingService: MessagingService, policyService: PolicyService, private route: ActivatedRoute, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, billingAccountProfileStateService: BillingAccountProfileStateService, ) { diff --git a/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts index 6651c10d116..dc983e6d446 100644 --- a/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts +++ b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.ts @@ -7,7 +7,7 @@ import { firstValueFrom, lastValueFrom, Observable, Subject } from "rxjs"; import { first, map, takeUntil } from "rxjs/operators"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationUserType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { OrganizationSponsorshipRedeemRequest } from "@bitwarden/common/admin-console/models/request/organization/organization-sponsorship-redeem.request"; @@ -71,7 +71,7 @@ export class FamiliesForEnterpriseSetupComponent implements OnInit, OnDestroy { private apiService: ApiService, private syncService: SyncService, private validationService: ValidationService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private dialogService: DialogService, private formBuilder: FormBuilder, diff --git a/apps/web/src/app/admin-console/organizations/tools/exposed-passwords-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/exposed-passwords-report.component.ts index d133beb04d0..2a972198cc5 100644 --- a/apps/web/src/app/admin-console/organizations/tools/exposed-passwords-report.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/exposed-passwords-report.component.ts @@ -8,8 +8,8 @@ import { ModalService } from "@bitwarden/angular/services/modal.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @@ -36,7 +36,7 @@ export class ExposedPasswordsReportComponent cipherService: CipherService, auditService: AuditService, modalService: ModalService, - organizationService: vNextOrganizationService, + organizationService: OrganizationService, protected accountService: AccountService, private route: ActivatedRoute, passwordRepromptService: PasswordRepromptService, diff --git a/apps/web/src/app/admin-console/organizations/tools/inactive-two-factor-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/inactive-two-factor-report.component.ts index 1880b0c09be..4ddbd58efc3 100644 --- a/apps/web/src/app/admin-console/organizations/tools/inactive-two-factor-report.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/inactive-two-factor-report.component.ts @@ -7,8 +7,8 @@ import { firstValueFrom, map } from "rxjs"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; @@ -35,7 +35,7 @@ export class InactiveTwoFactorReportComponent private route: ActivatedRoute, logService: LogService, passwordRepromptService: PasswordRepromptService, - organizationService: vNextOrganizationService, + organizationService: OrganizationService, accountService: AccountService, i18nService: I18nService, syncService: SyncService, diff --git a/apps/web/src/app/admin-console/organizations/tools/reused-passwords-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/reused-passwords-report.component.ts index 3a75f348cab..3609a9fe146 100644 --- a/apps/web/src/app/admin-console/organizations/tools/reused-passwords-report.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/reused-passwords-report.component.ts @@ -7,8 +7,8 @@ import { firstValueFrom, map } from "rxjs"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @@ -35,7 +35,7 @@ export class ReusedPasswordsReportComponent cipherService: CipherService, modalService: ModalService, private route: ActivatedRoute, - organizationService: vNextOrganizationService, + organizationService: OrganizationService, protected accountService: AccountService, passwordRepromptService: PasswordRepromptService, i18nService: I18nService, diff --git a/apps/web/src/app/admin-console/organizations/tools/unsecured-websites-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/unsecured-websites-report.component.ts index ad955799dcf..f6c1f9cff6d 100644 --- a/apps/web/src/app/admin-console/organizations/tools/unsecured-websites-report.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/unsecured-websites-report.component.ts @@ -8,8 +8,8 @@ import { CollectionService } from "@bitwarden/admin-console/common"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @@ -33,7 +33,7 @@ export class UnsecuredWebsitesReportComponent cipherService: CipherService, modalService: ModalService, private route: ActivatedRoute, - organizationService: vNextOrganizationService, + organizationService: OrganizationService, protected accountService: AccountService, passwordRepromptService: PasswordRepromptService, i18nService: I18nService, diff --git a/apps/web/src/app/admin-console/organizations/tools/weak-passwords-report.component.ts b/apps/web/src/app/admin-console/organizations/tools/weak-passwords-report.component.ts index 6d396a2a4f7..2bd6285d4f3 100644 --- a/apps/web/src/app/admin-console/organizations/tools/weak-passwords-report.component.ts +++ b/apps/web/src/app/admin-console/organizations/tools/weak-passwords-report.component.ts @@ -7,8 +7,8 @@ import { firstValueFrom, map } from "rxjs"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength"; @@ -37,7 +37,7 @@ export class WeakPasswordsReportComponent passwordStrengthService: PasswordStrengthServiceAbstraction, modalService: ModalService, private route: ActivatedRoute, - organizationService: vNextOrganizationService, + organizationService: OrganizationService, passwordRepromptService: PasswordRepromptService, i18nService: I18nService, syncService: SyncService, diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts index 57022153202..1c6709162c7 100644 --- a/apps/web/src/app/app.component.ts +++ b/apps/web/src/app/app.component.ts @@ -11,7 +11,7 @@ import { EventUploadService } from "@bitwarden/common/abstractions/event/event-u import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout.service"; -import { vNextInternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { InternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; @@ -87,7 +87,7 @@ export class AppComponent implements OnDestroy, OnInit { private dialogService: DialogService, private biometricStateService: BiometricStateService, private stateEventRunnerService: StateEventRunnerService, - private organizationService: vNextInternalOrganizationServiceAbstraction, + private organizationService: InternalOrganizationServiceAbstraction, private accountService: AccountService, private processReloadService: ProcessReloadServiceAbstraction, ) {} diff --git a/apps/web/src/app/auth/settings/account/account.component.ts b/apps/web/src/app/auth/settings/account/account.component.ts index 36bcf1be50d..012fa0ff014 100644 --- a/apps/web/src/app/auth/settings/account/account.component.ts +++ b/apps/web/src/app/auth/settings/account/account.component.ts @@ -4,7 +4,7 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core"; import { combineLatest, firstValueFrom, from, lastValueFrom, map, Observable } from "rxjs"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -34,7 +34,7 @@ export class AccountComponent implements OnInit { private dialogService: DialogService, private userVerificationService: UserVerificationService, private configService: ConfigService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, ) {} diff --git a/apps/web/src/app/auth/settings/account/profile.component.ts b/apps/web/src/app/auth/settings/account/profile.component.ts index 32c78cb5623..72731363806 100644 --- a/apps/web/src/app/auth/settings/account/profile.component.ts +++ b/apps/web/src/app/auth/settings/account/profile.component.ts @@ -5,7 +5,7 @@ import { FormControl, FormGroup } from "@angular/forms"; import { firstValueFrom, map, Observable, of, Subject, switchMap, takeUntil } from "rxjs"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { UpdateProfileRequest } from "@bitwarden/common/auth/models/request/update-profile.request"; @@ -41,7 +41,7 @@ export class ProfileComponent implements OnInit, OnDestroy { private dialogService: DialogService, private toastService: ToastService, private configService: ConfigService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, ) {} async ngOnInit() { diff --git a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts index 5db07019744..b8ca90f56fa 100644 --- a/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts +++ b/apps/web/src/app/auth/settings/emergency-access/emergency-access.component.ts @@ -4,7 +4,7 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from "@angular/core"; import { lastValueFrom, Observable, firstValueFrom } from "rxjs"; import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationManagementPreferencesService } from "@bitwarden/common/admin-console/abstractions/organization-management-preferences/organization-management-preferences.service"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -66,7 +66,7 @@ export class EmergencyAccessComponent implements OnInit { private userNamePipe: UserNamePipe, private logService: LogService, private stateService: StateService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, protected dialogService: DialogService, billingAccountProfileStateService: BillingAccountProfileStateService, diff --git a/apps/web/src/app/auth/settings/emergency-access/view/emergency-add-edit-cipher.component.ts b/apps/web/src/app/auth/settings/emergency-access/view/emergency-add-edit-cipher.component.ts index b0327b182a9..59228431e65 100644 --- a/apps/web/src/app/auth/settings/emergency-access/view/emergency-add-edit-cipher.component.ts +++ b/apps/web/src/app/auth/settings/emergency-access/view/emergency-add-edit-cipher.component.ts @@ -6,7 +6,7 @@ import { Component, OnInit } from "@angular/core"; import { CollectionService } from "@bitwarden/admin-console/common"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service"; @@ -49,7 +49,7 @@ export class EmergencyAddEditCipherComponent extends BaseAddEditComponent implem eventCollectionService: EventCollectionService, policyService: PolicyService, passwordRepromptService: PasswordRepromptService, - organizationService: vNextOrganizationService, + organizationService: OrganizationService, logService: LogService, dialogService: DialogService, datePipe: DatePipe, diff --git a/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.spec.ts b/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.spec.ts index 3200170d73d..6fe7611dc27 100644 --- a/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.spec.ts +++ b/apps/web/src/app/auth/settings/emergency-access/view/emergency-view-dialog.component.spec.ts @@ -5,7 +5,7 @@ import { NoopAnimationsModule } from "@angular/platform-browser/animations"; import { mock } from "jest-mock-extended"; import { CollectionService } from "@bitwarden/admin-console/common"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; @@ -42,7 +42,7 @@ describe("EmergencyViewDialogComponent", () => { await TestBed.configureTestingModule({ imports: [EmergencyViewDialogComponent, NoopAnimationsModule], providers: [ - { provide: vNextOrganizationService, useValue: mock() }, + { provide: OrganizationService, useValue: mock() }, { provide: AccountService, useValue: mockAccountServiceWith(userId) }, { provide: CollectionService, useValue: mock() }, { provide: FolderService, useValue: mock() }, diff --git a/apps/web/src/app/billing/guards/organization-is-unmanaged.guard.ts b/apps/web/src/app/billing/guards/organization-is-unmanaged.guard.ts index 7e389138723..75054d78db1 100644 --- a/apps/web/src/app/billing/guards/organization-is-unmanaged.guard.ts +++ b/apps/web/src/app/billing/guards/organization-is-unmanaged.guard.ts @@ -4,14 +4,14 @@ import { firstValueFrom, map } from "rxjs"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { ProviderStatusType } from "@bitwarden/common/admin-console/enums"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; export const organizationIsUnmanaged: CanActivateFn = async (route: ActivatedRouteSnapshot) => { - const organizationService = inject(vNextOrganizationService); + const organizationService = inject(OrganizationService); const providerService = inject(ProviderService); const accountService = inject(AccountService); diff --git a/apps/web/src/app/billing/organizations/adjust-subscription.component.ts b/apps/web/src/app/billing/organizations/adjust-subscription.component.ts index 85029d8c2f5..786c25c8d4c 100644 --- a/apps/web/src/app/billing/organizations/adjust-subscription.component.ts +++ b/apps/web/src/app/billing/organizations/adjust-subscription.component.ts @@ -7,8 +7,8 @@ import { Subject, firstValueFrom, takeUntil } from "rxjs"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { getOrganizationById, - vNextInternalOrganizationServiceAbstraction, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + InternalOrganizationServiceAbstraction, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationData } from "@bitwarden/common/admin-console/models/data/organization.data"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -41,7 +41,7 @@ export class AdjustSubscription implements OnInit, OnDestroy { private organizationApiService: OrganizationApiServiceAbstraction, private formBuilder: FormBuilder, private toastService: ToastService, - private internalOrganizationService: vNextInternalOrganizationServiceAbstraction, + private internalOrganizationService: InternalOrganizationServiceAbstraction, private accountService: AccountService, ) {} diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts index a408559c356..49400271f28 100644 --- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts +++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts @@ -20,8 +20,8 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -193,7 +193,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy { private router: Router, private syncService: SyncService, private policyService: PolicyService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private messagingService: MessagingService, private formBuilder: FormBuilder, private organizationApiService: OrganizationApiServiceAbstraction, diff --git a/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts b/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts index c0b752c3d70..3d4c8dd3870 100644 --- a/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts +++ b/apps/web/src/app/billing/organizations/organization-billing-routing.module.ts @@ -2,7 +2,7 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; import { featureFlaggedRoute } from "@bitwarden/angular/platform/utils/feature-flagged-route"; -import { canAccessBillingTab } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { canAccessBillingTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; import { organizationPermissionsGuard } from "../../admin-console/organizations/guards/org-permissions.guard"; diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.ts b/apps/web/src/app/billing/organizations/organization-plans.component.ts index db2aed65152..358e336c7de 100644 --- a/apps/web/src/app/billing/organizations/organization-plans.component.ts +++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts @@ -19,8 +19,8 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; @@ -174,7 +174,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { private router: Router, private syncService: SyncService, private policyService: PolicyService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private messagingService: MessagingService, private formBuilder: FormBuilder, private organizationApiService: OrganizationApiServiceAbstraction, diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts index 8d0e5e72bfc..9ea4b0c27b1 100644 --- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts +++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts @@ -8,8 +8,8 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationApiKeyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -77,7 +77,7 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy private apiService: ApiService, private i18nService: I18nService, private logService: LogService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private organizationApiService: OrganizationApiServiceAbstraction, private route: ActivatedRoute, diff --git a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts index 5f149bb5032..e6854a5216b 100644 --- a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts +++ b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts @@ -9,8 +9,8 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationConnectionType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { OrganizationConnectionResponse } from "@bitwarden/common/admin-console/models/response/organization-connection.response"; @@ -84,7 +84,7 @@ export class OrganizationSubscriptionSelfhostComponent implements OnInit, OnDest constructor( private messagingService: MessagingService, private apiService: ApiService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private route: ActivatedRoute, private organizationApiService: OrganizationApiServiceAbstraction, diff --git a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts index f7b1cead5fe..a5b18d9edbf 100644 --- a/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts +++ b/apps/web/src/app/billing/organizations/payment-method/organization-payment-method.component.ts @@ -9,8 +9,8 @@ import { firstValueFrom, from, lastValueFrom, map, switchMap } from "rxjs"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions"; @@ -63,7 +63,7 @@ export class OrganizationPaymentMethodComponent implements OnDestroy { private toastService: ToastService, private location: Location, private trialFlowService: TrialFlowService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, protected syncService: SyncService, ) { diff --git a/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.ts b/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.ts index 93c0924eb90..c10c9abc9b6 100644 --- a/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.ts +++ b/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.ts @@ -7,8 +7,8 @@ import { Subject, firstValueFrom, takeUntil } from "rxjs"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { getOrganizationById, - vNextInternalOrganizationServiceAbstraction, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + InternalOrganizationServiceAbstraction, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationData } from "@bitwarden/common/admin-console/models/data/organization.data"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -111,7 +111,7 @@ export class SecretsManagerAdjustSubscriptionComponent implements OnInit, OnDest private i18nService: I18nService, private platformUtilsService: PlatformUtilsService, private toastService: ToastService, - private internalOrganizationService: vNextInternalOrganizationServiceAbstraction, + private internalOrganizationService: InternalOrganizationServiceAbstraction, private accountService: AccountService, ) {} diff --git a/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts b/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts index 51d8d45b9c5..617b68abb37 100644 --- a/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts +++ b/apps/web/src/app/billing/organizations/sm-subscribe-standalone.component.ts @@ -6,7 +6,7 @@ import { firstValueFrom } from "rxjs"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; -import { vNextInternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { InternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationData } from "@bitwarden/common/admin-console/models/data/organization.data"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -38,7 +38,7 @@ export class SecretsManagerSubscribeStandaloneComponent { private platformUtilsService: PlatformUtilsService, private i18nService: I18nService, private organizationApiService: OrganizationApiServiceAbstraction, - private organizationService: vNextInternalOrganizationServiceAbstraction, + private organizationService: InternalOrganizationServiceAbstraction, private toastService: ToastService, private accountService: AccountService, ) {} diff --git a/apps/web/src/app/billing/services/free-families-policy.service.ts b/apps/web/src/app/billing/services/free-families-policy.service.ts index f6f44a0308d..c148bd007be 100644 --- a/apps/web/src/app/billing/services/free-families-policy.service.ts +++ b/apps/web/src/app/billing/services/free-families-policy.service.ts @@ -1,7 +1,7 @@ import { Injectable } from "@angular/core"; import { combineLatest, filter, from, map, Observable, of, switchMap } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -25,7 +25,7 @@ export class FreeFamiliesPolicyService { constructor( private policyService: PolicyService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private configService: ConfigService, ) {} diff --git a/apps/web/src/app/billing/settings/sponsored-families.component.ts b/apps/web/src/app/billing/settings/sponsored-families.component.ts index 3a714f05770..b9f70dd3085 100644 --- a/apps/web/src/app/billing/settings/sponsored-families.component.ts +++ b/apps/web/src/app/billing/settings/sponsored-families.component.ts @@ -14,7 +14,7 @@ import { Router } from "@angular/router"; import { combineLatest, firstValueFrom, map, Observable, Subject, takeUntil } from "rxjs"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -60,7 +60,7 @@ export class SponsoredFamiliesComponent implements OnInit, OnDestroy { private i18nService: I18nService, private platformUtilsService: PlatformUtilsService, private syncService: SyncService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private formBuilder: FormBuilder, private accountService: AccountService, private toastService: ToastService, diff --git a/apps/web/src/app/billing/shared/add-credit-dialog.component.ts b/apps/web/src/app/billing/shared/add-credit-dialog.component.ts index 8074d14cff7..7860d456685 100644 --- a/apps/web/src/app/billing/shared/add-credit-dialog.component.ts +++ b/apps/web/src/app/billing/shared/add-credit-dialog.component.ts @@ -8,8 +8,8 @@ import { firstValueFrom, map } from "rxjs"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { PaymentMethodType } from "@bitwarden/common/billing/enums"; import { BitPayInvoiceRequest } from "@bitwarden/common/billing/models/request/bit-pay-invoice.request"; @@ -64,7 +64,7 @@ export class AddCreditDialogComponent implements OnInit { private accountService: AccountService, private apiService: ApiService, private platformUtilsService: PlatformUtilsService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private logService: LogService, private configService: ConfigService, ) { diff --git a/apps/web/src/app/billing/shared/payment-method.component.ts b/apps/web/src/app/billing/shared/payment-method.component.ts index 675d7060ba1..4a53e503e4e 100644 --- a/apps/web/src/app/billing/shared/payment-method.component.ts +++ b/apps/web/src/app/billing/shared/payment-method.component.ts @@ -10,8 +10,8 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { PaymentMethodType } from "@bitwarden/common/billing/enums"; @@ -76,7 +76,7 @@ export class PaymentMethodComponent implements OnInit, OnDestroy { private dialogService: DialogService, private toastService: ToastService, private trialFlowService: TrialFlowService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, protected syncService: SyncService, ) { diff --git a/apps/web/src/app/layouts/org-switcher/org-switcher.component.ts b/apps/web/src/app/layouts/org-switcher/org-switcher.component.ts index 7d9ad341908..d64e1b817c1 100644 --- a/apps/web/src/app/layouts/org-switcher/org-switcher.component.ts +++ b/apps/web/src/app/layouts/org-switcher/org-switcher.component.ts @@ -6,7 +6,7 @@ import { ActivatedRoute } from "@angular/router"; import { combineLatest, map, Observable, switchMap } from "rxjs"; import { JslibModule } from "@bitwarden/angular/jslib.module"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import type { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { BillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/billing-api.service.abstraction"; @@ -64,7 +64,7 @@ export class OrgSwitcherComponent { constructor( private route: ActivatedRoute, protected dialogService: DialogService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private trialFlowService: TrialFlowService, protected billingApiService: BillingApiServiceAbstraction, private accountService: AccountService, diff --git a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts index 7d6e1251040..0d845629eac 100644 --- a/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts +++ b/apps/web/src/app/layouts/product-switcher/navigation-switcher/navigation-switcher.stories.ts @@ -4,7 +4,7 @@ import { applicationConfig, Meta, moduleMetadata, StoryObj } from "@storybook/an import { BehaviorSubject, firstValueFrom, Observable, of } from "rxjs"; import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { Provider } from "@bitwarden/common/admin-console/models/domain/provider"; @@ -22,7 +22,7 @@ import { NavigationProductSwitcherComponent } from "./navigation-switcher.compon @Directive({ selector: "[mockOrgs]", }) -class MockOrganizationService implements Partial { +class MockOrganizationService implements Partial { private static _orgs = new BehaviorSubject([]); organizations$(): Observable { @@ -99,7 +99,7 @@ export default { ], imports: [NavigationModule, RouterModule, LayoutComponent], providers: [ - { provide: vNextOrganizationService, useClass: MockOrganizationService }, + { provide: OrganizationService, useClass: MockOrganizationService }, { provide: AccountService, useClass: MockAccountService }, { provide: ProviderService, useClass: MockProviderService }, { provide: SyncService, useClass: MockSyncService }, diff --git a/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts b/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts index d386594e0ae..160aa481ac8 100644 --- a/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts +++ b/apps/web/src/app/layouts/product-switcher/product-switcher.stories.ts @@ -4,7 +4,7 @@ import { applicationConfig, Meta, moduleMetadata, StoryObj } from "@storybook/an import { BehaviorSubject, firstValueFrom, Observable, of } from "rxjs"; import { JslibModule } from "@bitwarden/angular/jslib.module"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { Provider } from "@bitwarden/common/admin-console/models/domain/provider"; @@ -22,7 +22,7 @@ import { ProductSwitcherService } from "./shared/product-switcher.service"; @Directive({ selector: "[mockOrgs]", }) -class MockOrganizationService implements Partial { +class MockOrganizationService implements Partial { private static _orgs = new BehaviorSubject([]); organizations$(): Observable { @@ -94,7 +94,7 @@ export default { providers: [ { provide: AccountService, useClass: MockAccountService }, MockAccountService, - { provide: vNextOrganizationService, useClass: MockOrganizationService }, + { provide: OrganizationService, useClass: MockOrganizationService }, MockOrganizationService, { provide: ProviderService, useClass: MockProviderService }, MockProviderService, diff --git a/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts b/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts index 736a79005c9..5dc5a4e3c9f 100644 --- a/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts +++ b/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.spec.ts @@ -6,7 +6,7 @@ import { mock, MockProxy } from "jest-mock-extended"; import { Observable, firstValueFrom, of } from "rxjs"; import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { Provider } from "@bitwarden/common/admin-console/models/domain/provider"; @@ -21,7 +21,7 @@ import { ProductSwitcherService } from "./product-switcher.service"; describe("ProductSwitcherService", () => { let service: ProductSwitcherService; let router: { url: string; events: Observable }; - let organizationService: MockProxy; + let organizationService: MockProxy; let providerService: MockProxy; let accountService: FakeAccountService; let activeRouteParams = convertToParamMap({ organizationId: "1234" }); @@ -40,7 +40,7 @@ describe("ProductSwitcherService", () => { jest.useFakeTimers(); getLastSync.mockResolvedValue(new Date("2024-05-14")); router = mock(); - organizationService = mock(); + organizationService = mock(); providerService = mock(); accountService = mockAccountServiceWith(userId); @@ -52,7 +52,7 @@ describe("ProductSwitcherService", () => { TestBed.configureTestingModule({ providers: [ { provide: Router, useValue: router }, - { provide: vNextOrganizationService, useValue: organizationService }, + { provide: OrganizationService, useValue: organizationService }, { provide: ProviderService, useValue: providerService }, { provide: AccountService, useValue: accountService }, { diff --git a/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.ts b/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.ts index d6c20cedd37..f962879d61a 100644 --- a/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.ts +++ b/apps/web/src/app/layouts/product-switcher/shared/product-switcher.service.ts @@ -16,8 +16,8 @@ import { import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe"; import { canAccessOrgAdmin, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -94,7 +94,7 @@ export class ProductSwitcherService { ]).pipe(map(() => null)); constructor( - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private providerService: ProviderService, private route: ActivatedRoute, private router: Router, diff --git a/apps/web/src/app/secrets-manager/secrets-manager-landing/request-sm-access.component.ts b/apps/web/src/app/secrets-manager/secrets-manager-landing/request-sm-access.component.ts index 103d3667316..d1ab7689cfe 100644 --- a/apps/web/src/app/secrets-manager/secrets-manager-landing/request-sm-access.component.ts +++ b/apps/web/src/app/secrets-manager/secrets-manager-landing/request-sm-access.component.ts @@ -5,7 +5,7 @@ import { FormControl, FormGroup, Validators } from "@angular/forms"; import { Router } from "@angular/router"; import { firstValueFrom } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -39,7 +39,7 @@ export class RequestSMAccessComponent implements OnInit { constructor( private router: Router, private i18nService: I18nService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private smLandingApiService: SmLandingApiService, private toastService: ToastService, private accountService: AccountService, diff --git a/apps/web/src/app/secrets-manager/secrets-manager-landing/sm-landing.component.ts b/apps/web/src/app/secrets-manager/secrets-manager-landing/sm-landing.component.ts index 6d6b60621e8..4d9dceab34a 100644 --- a/apps/web/src/app/secrets-manager/secrets-manager-landing/sm-landing.component.ts +++ b/apps/web/src/app/secrets-manager/secrets-manager-landing/sm-landing.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit } from "@angular/core"; import { firstValueFrom } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -26,7 +26,7 @@ export class SMLandingComponent implements OnInit { showGiveMembersAccessInstructions: boolean = false; constructor( - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, ) {} diff --git a/apps/web/src/app/tools/reports/pages/cipher-report.component.ts b/apps/web/src/app/tools/reports/pages/cipher-report.component.ts index 28380006058..f78b2920410 100644 --- a/apps/web/src/app/tools/reports/pages/cipher-report.component.ts +++ b/apps/web/src/app/tools/reports/pages/cipher-report.component.ts @@ -4,7 +4,7 @@ import { Directive, ViewChild, ViewContainerRef, OnDestroy } from "@angular/core import { BehaviorSubject, Observable, Subject, switchMap, takeUntil } from "rxjs"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -45,7 +45,7 @@ export class CipherReportComponent implements OnDestroy { protected cipherService: CipherService, private modalService: ModalService, protected passwordRepromptService: PasswordRepromptService, - protected organizationService: vNextOrganizationService, + protected organizationService: OrganizationService, protected accountService: AccountService, protected i18nService: I18nService, private syncService: SyncService, diff --git a/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.spec.ts b/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.spec.ts index 09ffed01ea3..16541bdc109 100644 --- a/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.spec.ts +++ b/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.spec.ts @@ -6,7 +6,7 @@ import { of } from "rxjs"; import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; @@ -23,7 +23,7 @@ describe("ExposedPasswordsReportComponent", () => { let component: ExposedPasswordsReportComponent; let fixture: ComponentFixture; let auditService: MockProxy; - let organizationService: MockProxy; + let organizationService: MockProxy; let syncServiceMock: MockProxy; let accountService: FakeAccountService; const userId = Utils.newGuid() as UserId; @@ -31,7 +31,7 @@ describe("ExposedPasswordsReportComponent", () => { beforeEach(() => { syncServiceMock = mock(); auditService = mock(); - organizationService = mock(); + organizationService = mock(); organizationService.organizations$.mockReturnValue(of([])); accountService = mockAccountServiceWith(userId); // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling. @@ -48,7 +48,7 @@ describe("ExposedPasswordsReportComponent", () => { useValue: auditService, }, { - provide: vNextOrganizationService, + provide: OrganizationService, useValue: organizationService, }, { diff --git a/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.ts b/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.ts index fc07d19c92b..1a0d4043b74 100644 --- a/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.ts +++ b/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from "@angular/core"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @@ -25,7 +25,7 @@ export class ExposedPasswordsReportComponent extends CipherReportComponent imple constructor( protected cipherService: CipherService, protected auditService: AuditService, - protected organizationService: vNextOrganizationService, + protected organizationService: OrganizationService, accountService: AccountService, modalService: ModalService, passwordRepromptService: PasswordRepromptService, diff --git a/apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.spec.ts b/apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.spec.ts index e6b13cc566f..385bda03f28 100644 --- a/apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.spec.ts +++ b/apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.spec.ts @@ -5,7 +5,7 @@ import { of } from "rxjs"; import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; @@ -22,13 +22,13 @@ import { cipherData } from "./reports-ciphers.mock"; describe("InactiveTwoFactorReportComponent", () => { let component: InactiveTwoFactorReportComponent; let fixture: ComponentFixture; - let organizationService: MockProxy; + let organizationService: MockProxy; let syncServiceMock: MockProxy; let accountService: FakeAccountService; const userId = Utils.newGuid() as UserId; beforeEach(() => { - organizationService = mock(); + organizationService = mock(); organizationService.organizations$.mockReturnValue(of([])); syncServiceMock = mock(); accountService = mockAccountServiceWith(userId); @@ -42,7 +42,7 @@ describe("InactiveTwoFactorReportComponent", () => { useValue: mock(), }, { - provide: vNextOrganizationService, + provide: OrganizationService, useValue: organizationService, }, { diff --git a/apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.ts b/apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.ts index cf432867150..52c52041c9d 100644 --- a/apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.ts +++ b/apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit } from "@angular/core"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; @@ -27,7 +27,7 @@ export class InactiveTwoFactorReportComponent extends CipherReportComponent impl constructor( protected cipherService: CipherService, - protected organizationService: vNextOrganizationService, + protected organizationService: OrganizationService, accountService: AccountService, modalService: ModalService, private logService: LogService, diff --git a/apps/web/src/app/tools/reports/pages/reused-passwords-report.component.spec.ts b/apps/web/src/app/tools/reports/pages/reused-passwords-report.component.spec.ts index e70142c3c1b..6a26cd24fe5 100644 --- a/apps/web/src/app/tools/reports/pages/reused-passwords-report.component.spec.ts +++ b/apps/web/src/app/tools/reports/pages/reused-passwords-report.component.spec.ts @@ -5,7 +5,7 @@ import { of } from "rxjs"; import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; @@ -21,13 +21,13 @@ import { ReusedPasswordsReportComponent } from "./reused-passwords-report.compon describe("ReusedPasswordsReportComponent", () => { let component: ReusedPasswordsReportComponent; let fixture: ComponentFixture; - let organizationService: MockProxy; + let organizationService: MockProxy; let syncServiceMock: MockProxy; let accountService: FakeAccountService; const userId = Utils.newGuid() as UserId; beforeEach(() => { - organizationService = mock(); + organizationService = mock(); organizationService.organizations$.mockReturnValue(of([])); syncServiceMock = mock(); accountService = mockAccountServiceWith(userId); @@ -42,7 +42,7 @@ describe("ReusedPasswordsReportComponent", () => { useValue: mock(), }, { - provide: vNextOrganizationService, + provide: OrganizationService, useValue: organizationService, }, { diff --git a/apps/web/src/app/tools/reports/pages/reused-passwords-report.component.ts b/apps/web/src/app/tools/reports/pages/reused-passwords-report.component.ts index 7eb14081e92..a5c1c65560b 100644 --- a/apps/web/src/app/tools/reports/pages/reused-passwords-report.component.ts +++ b/apps/web/src/app/tools/reports/pages/reused-passwords-report.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit } from "@angular/core"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @@ -24,7 +24,7 @@ export class ReusedPasswordsReportComponent extends CipherReportComponent implem constructor( protected cipherService: CipherService, - protected organizationService: vNextOrganizationService, + protected organizationService: OrganizationService, accountService: AccountService, modalService: ModalService, passwordRepromptService: PasswordRepromptService, diff --git a/apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.spec.ts b/apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.spec.ts index cda334f2694..7cd159108b8 100644 --- a/apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.spec.ts +++ b/apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.spec.ts @@ -6,7 +6,7 @@ import { of } from "rxjs"; import { CollectionService } from "@bitwarden/admin-console/common"; import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; @@ -22,14 +22,14 @@ import { UnsecuredWebsitesReportComponent } from "./unsecured-websites-report.co describe("UnsecuredWebsitesReportComponent", () => { let component: UnsecuredWebsitesReportComponent; let fixture: ComponentFixture; - let organizationService: MockProxy; + let organizationService: MockProxy; let syncServiceMock: MockProxy; let collectionService: MockProxy; let accountService: FakeAccountService; const userId = Utils.newGuid() as UserId; beforeEach(() => { - organizationService = mock(); + organizationService = mock(); organizationService.organizations$.mockReturnValue(of([])); syncServiceMock = mock(); collectionService = mock(); @@ -44,7 +44,7 @@ describe("UnsecuredWebsitesReportComponent", () => { useValue: mock(), }, { - provide: vNextOrganizationService, + provide: OrganizationService, useValue: organizationService, }, { diff --git a/apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.ts b/apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.ts index fdb6f3ebf1a..350e5c03980 100644 --- a/apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.ts +++ b/apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from "@angular/core"; import { CollectionService, Collection } from "@bitwarden/admin-console/common"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @@ -22,7 +22,7 @@ export class UnsecuredWebsitesReportComponent extends CipherReportComponent impl constructor( protected cipherService: CipherService, - protected organizationService: vNextOrganizationService, + protected organizationService: OrganizationService, accountService: AccountService, modalService: ModalService, passwordRepromptService: PasswordRepromptService, diff --git a/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.spec.ts b/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.spec.ts index 9e76ef8bb0b..578c220f396 100644 --- a/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.spec.ts +++ b/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.spec.ts @@ -5,7 +5,7 @@ import { of } from "rxjs"; import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; @@ -23,7 +23,7 @@ describe("WeakPasswordsReportComponent", () => { let component: WeakPasswordsReportComponent; let fixture: ComponentFixture; let passwordStrengthService: MockProxy; - let organizationService: MockProxy; + let organizationService: MockProxy; let syncServiceMock: MockProxy; let accountService: FakeAccountService; const userId = Utils.newGuid() as UserId; @@ -31,7 +31,7 @@ describe("WeakPasswordsReportComponent", () => { beforeEach(() => { syncServiceMock = mock(); passwordStrengthService = mock(); - organizationService = mock(); + organizationService = mock(); organizationService.organizations$.mockReturnValue(of([])); accountService = mockAccountServiceWith(userId); // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling. @@ -48,7 +48,7 @@ describe("WeakPasswordsReportComponent", () => { useValue: passwordStrengthService, }, { - provide: vNextOrganizationService, + provide: OrganizationService, useValue: organizationService, }, { diff --git a/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.ts b/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.ts index 9149e63b744..c374ecd0e4a 100644 --- a/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.ts +++ b/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.ts @@ -3,7 +3,7 @@ import { Component, OnInit } from "@angular/core"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; @@ -32,7 +32,7 @@ export class WeakPasswordsReportComponent extends CipherReportComponent implemen constructor( protected cipherService: CipherService, protected passwordStrengthService: PasswordStrengthServiceAbstraction, - protected organizationService: vNextOrganizationService, + protected organizationService: OrganizationService, protected accountService: AccountService, modalService: ModalService, passwordRepromptService: PasswordRepromptService, diff --git a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts b/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts index fced6ff8f9f..3ab8081c821 100644 --- a/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts +++ b/apps/web/src/app/vault/components/collection-dialog/collection-dialog.component.ts @@ -27,8 +27,8 @@ import { } from "@bitwarden/admin-console/common"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -108,7 +108,7 @@ export class CollectionDialogComponent implements OnInit, OnDestroy { @Inject(DIALOG_DATA) private params: CollectionDialogParams, private formBuilder: FormBuilder, private dialogRef: DialogRef, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private groupService: GroupApiService, private collectionAdminService: CollectionAdminService, private i18nService: I18nService, diff --git a/apps/web/src/app/vault/individual-vault/add-edit-v2.component.spec.ts b/apps/web/src/app/vault/individual-vault/add-edit-v2.component.spec.ts index ef79c7752df..b4f0e44a2f9 100644 --- a/apps/web/src/app/vault/individual-vault/add-edit-v2.component.spec.ts +++ b/apps/web/src/app/vault/individual-vault/add-edit-v2.component.spec.ts @@ -5,7 +5,7 @@ import { mock, MockProxy } from "jest-mock-extended"; import { of } from "rxjs"; import { CollectionService } from "@bitwarden/admin-console/common"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -24,7 +24,7 @@ import { AddEditComponentV2 } from "./add-edit-v2.component"; describe("AddEditComponentV2", () => { let component: AddEditComponentV2; let fixture: ComponentFixture; - let organizationService: MockProxy; + let organizationService: MockProxy; let policyService: MockProxy; let billingAccountProfileStateService: MockProxy; let activatedRoute: MockProxy; @@ -46,7 +46,7 @@ describe("AddEditComponentV2", () => { name: "Test Organization", } as Organization; - organizationService = mock(); + organizationService = mock(); organizationService.organizations$.mockReturnValue(of([mockOrganization])); policyService = mock(); @@ -84,7 +84,7 @@ describe("AddEditComponentV2", () => { { provide: DialogService, useValue: dialogService }, { provide: CipherService, useValue: cipherService }, { provide: MessagingService, useValue: messagingService }, - { provide: vNextOrganizationService, useValue: organizationService }, + { provide: OrganizationService, useValue: organizationService }, { provide: Router, useValue: mock() }, { provide: ActivatedRoute, useValue: activatedRoute }, { provide: CollectionService, useValue: collectionService }, diff --git a/apps/web/src/app/vault/individual-vault/add-edit.component.ts b/apps/web/src/app/vault/individual-vault/add-edit.component.ts index b5b2d9fa9c1..7038ffb898a 100644 --- a/apps/web/src/app/vault/individual-vault/add-edit.component.ts +++ b/apps/web/src/app/vault/individual-vault/add-edit.component.ts @@ -8,7 +8,7 @@ import { CollectionService } from "@bitwarden/admin-console/common"; import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/vault/components/add-edit.component"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { isCardExpired } from "@bitwarden/common/autofill/utils"; @@ -65,7 +65,7 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit, On protected messagingService: MessagingService, eventCollectionService: EventCollectionService, protected policyService: PolicyService, - organizationService: vNextOrganizationService, + organizationService: OrganizationService, logService: LogService, passwordRepromptService: PasswordRepromptService, dialogService: DialogService, diff --git a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts index 2bbf2333137..01ea98889ac 100644 --- a/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts +++ b/apps/web/src/app/vault/individual-vault/bulk-action-dialogs/bulk-share-dialog/bulk-share-dialog.component.ts @@ -5,7 +5,7 @@ import { Component, Inject, OnDestroy, OnInit } from "@angular/core"; import { firstValueFrom, map } from "rxjs"; import { CollectionService, CollectionView } from "@bitwarden/admin-console/common"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -63,7 +63,7 @@ export class BulkShareDialogComponent implements OnInit, OnDestroy { private platformUtilsService: PlatformUtilsService, private i18nService: I18nService, private collectionService: CollectionService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private logService: LogService, private accountService: AccountService, ) { diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts b/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts index 3a0bcedcc17..43c1c806f6c 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/components/organization-options.component.ts @@ -19,7 +19,7 @@ import { import { UserDecryptionOptionsServiceAbstraction } from "@bitwarden/auth/common"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -70,7 +70,7 @@ export class OrganizationOptionsComponent implements OnInit, OnDestroy { private userVerificationService: UserVerificationService, private toastService: ToastService, private configService: ConfigService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, ) {} diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts index 3e791f7477b..d6ae06f5e21 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.spec.ts @@ -8,7 +8,7 @@ import { mock, MockProxy } from "jest-mock-extended"; import { firstValueFrom, ReplaySubject } from "rxjs"; import { CollectionService, CollectionView } from "@bitwarden/admin-console/common"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -27,7 +27,7 @@ import { VaultFilterService } from "./vault-filter.service"; describe("vault filter service", () => { let vaultFilterService: VaultFilterService; - let organizationService: MockProxy; + let organizationService: MockProxy; let folderService: MockProxy; let cipherService: MockProxy; let policyService: MockProxy; @@ -46,7 +46,7 @@ describe("vault filter service", () => { let collapsedGroupingsState: FakeActiveUserState; beforeEach(() => { - organizationService = mock(); + organizationService = mock(); folderService = mock(); cipherService = mock(); policyService = mock(); diff --git a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts index 7ed46ee0115..e8ddfae23a8 100644 --- a/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts +++ b/apps/web/src/app/vault/individual-vault/vault-filter/services/vault-filter.service.ts @@ -17,7 +17,7 @@ import { CollectionService, CollectionView, } from "@bitwarden/admin-console/common"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -93,7 +93,7 @@ export class VaultFilterService implements VaultFilterServiceAbstraction { this.collapsedGroupingsState.state$.pipe(map((c) => new Set(c))); constructor( - protected organizationService: vNextOrganizationService, + protected organizationService: OrganizationService, protected folderService: FolderService, protected cipherService: CipherService, protected policyService: PolicyService, diff --git a/apps/web/src/app/vault/individual-vault/vault.component.ts b/apps/web/src/app/vault/individual-vault/vault.component.ts index ea955bbe886..a99428f9ef8 100644 --- a/apps/web/src/app/vault/individual-vault/vault.component.ts +++ b/apps/web/src/app/vault/individual-vault/vault.component.ts @@ -48,8 +48,8 @@ import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { OrganizationBillingServiceAbstraction } from "@bitwarden/common/billing/abstractions"; @@ -262,7 +262,7 @@ export class VaultComponent implements OnInit, OnDestroy { private platformUtilsService: PlatformUtilsService, private broadcasterService: BroadcasterService, private ngZone: NgZone, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private vaultFilterService: VaultFilterService, private routedVaultFilterService: RoutedVaultFilterService, private routedVaultFilterBridgeService: RoutedVaultFilterBridgeService, diff --git a/apps/web/src/app/vault/individual-vault/view.component.spec.ts b/apps/web/src/app/vault/individual-vault/view.component.spec.ts index 23733c5a71f..16f1c224a76 100644 --- a/apps/web/src/app/vault/individual-vault/view.component.spec.ts +++ b/apps/web/src/app/vault/individual-vault/view.component.spec.ts @@ -4,7 +4,7 @@ import { mock } from "jest-mock-extended"; import { of } from "rxjs"; import { CollectionService } from "@bitwarden/admin-console/common"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service"; @@ -63,7 +63,7 @@ describe("ViewComponent", () => { }, { provide: LogService, useValue: mock() }, { - provide: vNextOrganizationService, + provide: OrganizationService, useValue: { organizations$: jest.fn().mockReturnValue(of([mockOrganization])) }, }, { provide: CollectionService, useValue: mock() }, diff --git a/apps/web/src/app/vault/individual-vault/view.component.ts b/apps/web/src/app/vault/individual-vault/view.component.ts index 072cab53fe1..32480739353 100644 --- a/apps/web/src/app/vault/individual-vault/view.component.ts +++ b/apps/web/src/app/vault/individual-vault/view.component.ts @@ -6,7 +6,7 @@ import { Component, EventEmitter, Inject, OnInit } from "@angular/core"; import { Observable, firstValueFrom, map } from "rxjs"; import { CollectionView } from "@bitwarden/admin-console/common"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -94,7 +94,7 @@ export class ViewComponent implements OnInit { private logService: LogService, private cipherService: CipherService, private toastService: ToastService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private cipherAuthorizationService: CipherAuthorizationService, private accountService: AccountService, ) {} diff --git a/apps/web/src/app/vault/org-vault/add-edit.component.ts b/apps/web/src/app/vault/org-vault/add-edit.component.ts index a6d70394529..135db7f46f4 100644 --- a/apps/web/src/app/vault/org-vault/add-edit.component.ts +++ b/apps/web/src/app/vault/org-vault/add-edit.component.ts @@ -7,7 +7,7 @@ import { CollectionService } from "@bitwarden/admin-console/common"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service"; @@ -53,7 +53,7 @@ export class AddEditComponent extends BaseAddEditComponent { policyService: PolicyService, logService: LogService, passwordRepromptService: PasswordRepromptService, - organizationService: vNextOrganizationService, + organizationService: OrganizationService, dialogService: DialogService, datePipe: DatePipe, configService: ConfigService, diff --git a/apps/web/src/app/vault/org-vault/bulk-collections-dialog/bulk-collections-dialog.component.ts b/apps/web/src/app/vault/org-vault/bulk-collections-dialog/bulk-collections-dialog.component.ts index f6526e881db..fb69ad7feb1 100644 --- a/apps/web/src/app/vault/org-vault/bulk-collections-dialog/bulk-collections-dialog.component.ts +++ b/apps/web/src/app/vault/org-vault/bulk-collections-dialog/bulk-collections-dialog.component.ts @@ -12,8 +12,8 @@ import { } from "@bitwarden/admin-console/common"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -66,7 +66,7 @@ export class BulkCollectionsDialogComponent implements OnDestroy { @Inject(DIALOG_DATA) private params: BulkCollectionsDialogParams, private dialogRef: DialogRef, private formBuilder: FormBuilder, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private groupService: GroupApiService, private organizationUserApiService: OrganizationUserApiService, diff --git a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts index 77e2af27f57..c318e7389a2 100644 --- a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts +++ b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.spec.ts @@ -3,7 +3,7 @@ import { BehaviorSubject } from "rxjs"; import { CollectionAdminService, CollectionAdminView } from "@bitwarden/admin-console/common"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -66,7 +66,7 @@ describe("AdminConsoleCipherFormConfigService", () => { TestBed.configureTestingModule({ providers: [ AdminConsoleCipherFormConfigService, - { provide: vNextOrganizationService, useValue: { organizations$: () => orgs$ } }, + { provide: OrganizationService, useValue: { organizations$: () => orgs$ } }, { provide: CollectionAdminService, useValue: { getAll: () => Promise.resolve([collection, collection2]) }, diff --git a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts index c80b7dfd9eb..e3519d8fa32 100644 --- a/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts +++ b/apps/web/src/app/vault/org-vault/services/admin-console-cipher-form-config.service.ts @@ -5,7 +5,7 @@ import { combineLatest, filter, firstValueFrom, map, switchMap } from "rxjs"; import { CollectionAdminService } from "@bitwarden/admin-console/common"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { OrganizationUserStatusType, PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -27,7 +27,7 @@ import { RoutedVaultFilterService } from "../../individual-vault/vault-filter/se @Injectable() export class AdminConsoleCipherFormConfigService implements CipherFormConfigService { private policyService: PolicyService = inject(PolicyService); - private organizationService: vNextOrganizationService = inject(vNextOrganizationService); + private organizationService: OrganizationService = inject(OrganizationService); private routedVaultFilterService: RoutedVaultFilterService = inject(RoutedVaultFilterService); private collectionAdminService: CollectionAdminService = inject(CollectionAdminService); private cipherService: CipherService = inject(CipherService); diff --git a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts index d4497378019..e2d713649f5 100644 --- a/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts +++ b/apps/web/src/app/vault/org-vault/vault-filter/vault-filter.service.ts @@ -2,7 +2,7 @@ import { Injectable, OnDestroy } from "@angular/core"; import { map, Observable, ReplaySubject, Subject } from "rxjs"; import { CollectionAdminView, CollectionService } from "@bitwarden/admin-console/common"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -26,7 +26,7 @@ export class VaultFilterService extends BaseVaultFilterService implements OnDest ); constructor( - organizationService: vNextOrganizationService, + organizationService: OrganizationService, folderService: FolderService, cipherService: CipherService, policyService: PolicyService, diff --git a/apps/web/src/app/vault/org-vault/vault-routing.module.ts b/apps/web/src/app/vault/org-vault/vault-routing.module.ts index 68d2290f544..4c2ed048bd1 100644 --- a/apps/web/src/app/vault/org-vault/vault-routing.module.ts +++ b/apps/web/src/app/vault/org-vault/vault-routing.module.ts @@ -1,7 +1,7 @@ import { NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; -import { canAccessVaultTab } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { canAccessVaultTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { organizationPermissionsGuard } from "../../admin-console/organizations/guards/org-permissions.guard"; diff --git a/apps/web/src/app/vault/org-vault/vault.component.ts b/apps/web/src/app/vault/org-vault/vault.component.ts index b9064f3edf5..e5700f25cb1 100644 --- a/apps/web/src/app/vault/org-vault/vault.component.ts +++ b/apps/web/src/app/vault/org-vault/vault.component.ts @@ -48,7 +48,7 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { OrganizationBillingServiceAbstraction } from "@bitwarden/common/billing/abstractions"; @@ -239,7 +239,7 @@ export class VaultComponent implements OnInit, OnDestroy { constructor( private route: ActivatedRoute, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, protected vaultFilterService: VaultFilterService, private routedVaultFilterBridgeService: RoutedVaultFilterBridgeService, private routedVaultFilterService: RoutedVaultFilterService, diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/approve-all.command.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/approve-all.command.ts index 590a537e95c..dc78ebf7cd0 100644 --- a/bitwarden_license/bit-cli/src/admin-console/device-approval/approve-all.command.ts +++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/approve-all.command.ts @@ -5,7 +5,7 @@ import { firstValueFrom, map } from "rxjs"; import { OrganizationAuthRequestService } from "@bitwarden/bit-common/admin-console/auth-requests"; import { Response } from "@bitwarden/cli/models/response"; import { MessageResponse } from "@bitwarden/cli/models/response/message.response"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; @@ -15,7 +15,7 @@ import { ServiceContainer } from "../../service-container"; export class ApproveAllCommand { constructor( private organizationAuthRequestService: OrganizationAuthRequestService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, ) {} diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/approve.command.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/approve.command.ts index 632a40c686b..2180d904ea6 100644 --- a/bitwarden_license/bit-cli/src/admin-console/device-approval/approve.command.ts +++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/approve.command.ts @@ -1,7 +1,7 @@ import { firstValueFrom, map } from "rxjs"; import { Response } from "@bitwarden/cli/models/response"; -import { DefaultvNextOrganizationService } from "@bitwarden/common/admin-console/services/organization/default-vnext-organization.service"; +import { DefaultOrganizationService } from "@bitwarden/common/admin-console/services/organization/default-organization.service"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; @@ -11,7 +11,7 @@ import { ServiceContainer } from "../../service-container"; export class ApproveCommand { constructor( - private organizationService: DefaultvNextOrganizationService, + private organizationService: DefaultOrganizationService, private organizationAuthRequestService: OrganizationAuthRequestService, private accountService: AccountService, ) {} diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/deny-all.command.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/deny-all.command.ts index 7eabd259b29..f39ef1a1a4c 100644 --- a/bitwarden_license/bit-cli/src/admin-console/device-approval/deny-all.command.ts +++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/deny-all.command.ts @@ -4,7 +4,7 @@ import { firstValueFrom, map } from "rxjs"; import { Response } from "@bitwarden/cli/models/response"; import { MessageResponse } from "@bitwarden/cli/models/response/message.response"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; @@ -14,7 +14,7 @@ import { ServiceContainer } from "../../service-container"; export class DenyAllCommand { constructor( - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private organizationAuthRequestService: OrganizationAuthRequestService, private accountService: AccountService, ) {} diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/deny.command.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/deny.command.ts index a6b26b60d51..469990a4574 100644 --- a/bitwarden_license/bit-cli/src/admin-console/device-approval/deny.command.ts +++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/deny.command.ts @@ -1,7 +1,7 @@ import { firstValueFrom, map } from "rxjs"; import { Response } from "@bitwarden/cli/models/response"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; @@ -10,7 +10,7 @@ import { ServiceContainer } from "../../service-container"; export class DenyCommand { constructor( - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private organizationAuthRequestService: OrganizationAuthRequestService, private accountServcie: AccountService, ) {} diff --git a/bitwarden_license/bit-cli/src/admin-console/device-approval/list.command.ts b/bitwarden_license/bit-cli/src/admin-console/device-approval/list.command.ts index 2f7f25811cc..31a0e748175 100644 --- a/bitwarden_license/bit-cli/src/admin-console/device-approval/list.command.ts +++ b/bitwarden_license/bit-cli/src/admin-console/device-approval/list.command.ts @@ -3,7 +3,7 @@ import { firstValueFrom, map } from "rxjs"; import { OrganizationAuthRequestService } from "@bitwarden/bit-common/admin-console/auth-requests"; import { Response } from "@bitwarden/cli/models/response"; import { ListResponse } from "@bitwarden/cli/models/response/list.response"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; @@ -15,7 +15,7 @@ import { PendingAuthRequestResponse } from "./pending-auth-request.response"; export class ListCommand { constructor( private organizationAuthRequestService: OrganizationAuthRequestService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, ) {} diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts index d81cebc4f2b..c585e9dacd0 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/organizations-routing.module.ts @@ -2,7 +2,7 @@ import { inject, NgModule } from "@angular/core"; import { RouterModule, Routes } from "@angular/router"; import { authGuard } from "@bitwarden/angular/auth/guards"; -import { canAccessSettingsTab } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { canAccessSettingsTab } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { isEnterpriseOrgGuard } from "@bitwarden/web-vault/app/admin-console/organizations/guards/is-enterprise-org.guard"; diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts index ba3faa82fda..44ae74aafb2 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.ts @@ -8,7 +8,7 @@ import { switchMap, takeUntil } from "rxjs/operators"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { ProviderStatusType, ProviderUserType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -46,7 +46,7 @@ export class ClientsComponent extends BaseClientsComponent implements OnInit, On private router: Router, private providerService: ProviderService, private apiService: ApiService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private organizationApiService: OrganizationApiServiceAbstraction, private accountService: AccountService, activatedRoute: ActivatedRoute, diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/vnext-clients.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/vnext-clients.component.ts index 0185ae6a5a9..bbeba1a0ff5 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/vnext-clients.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/vnext-clients.component.ts @@ -9,7 +9,7 @@ import { debounceTime, first, switchMap } from "rxjs/operators"; import { JslibModule } from "@bitwarden/angular/jslib.module"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { ProviderStatusType, ProviderUserType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -68,7 +68,7 @@ export class vNextClientsComponent { private router: Router, private providerService: ProviderService, private apiService: ApiService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private organizationApiService: OrganizationApiServiceAbstraction, private activatedRoute: ActivatedRoute, diff --git a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts index ae4c15c92d5..779cb96146c 100644 --- a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts +++ b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts @@ -16,8 +16,8 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { @@ -199,7 +199,7 @@ export class SsoComponent implements OnInit, OnDestroy { private apiService: ApiService, private platformUtilsService: PlatformUtilsService, private i18nService: I18nService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private organizationApiService: OrganizationApiServiceAbstraction, private configService: ConfigService, diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/guards/sm-org-enabled.guard.ts b/bitwarden_license/bit-web/src/app/secrets-manager/guards/sm-org-enabled.guard.ts index 2d542672e07..d042c4d904e 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/guards/sm-org-enabled.guard.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/guards/sm-org-enabled.guard.ts @@ -4,8 +4,8 @@ import { firstValueFrom } from "rxjs"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @@ -15,7 +15,7 @@ import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.serv */ export const organizationEnabledGuard: CanActivateFn = async (route: ActivatedRouteSnapshot) => { const syncService = inject(SyncService); - const orgService = inject(vNextOrganizationService); + const orgService = inject(OrganizationService); const accountService = inject(AccountService); /** Workaround to avoid service initialization race condition. */ diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/guards/sm.guard.ts b/bitwarden_license/bit-web/src/app/secrets-manager/guards/sm.guard.ts index 46f3693128d..39576bc8dc6 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/guards/sm.guard.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/guards/sm.guard.ts @@ -7,7 +7,7 @@ import { } from "@angular/router"; import { firstValueFrom } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @@ -20,7 +20,7 @@ export const canActivateSM: CanActivateFn = async ( state: RouterStateSnapshot, ) => { const syncService = inject(SyncService); - const orgService = inject(vNextOrganizationService); + const orgService = inject(OrganizationService); const accountService = inject(AccountService); /** Workaround to avoid service initialization race condition. */ diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts index e4e98ca791f..6594b71a14c 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/layout/navigation.component.ts @@ -17,8 +17,8 @@ import { import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -45,7 +45,7 @@ export class NavigationComponent implements OnInit, OnDestroy { constructor( protected route: ActivatedRoute, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private countService: CountService, private projectService: ProjectService, diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts index 45d32daba29..cb3f6016766 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/overview/overview.component.ts @@ -22,8 +22,8 @@ import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -116,7 +116,7 @@ export class OverviewComponent implements OnInit, OnDestroy { private secretService: SecretService, private serviceAccountService: ServiceAccountService, private dialogService: DialogService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private platformUtilsService: PlatformUtilsService, private i18nService: I18nService, diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/guards/project-access.guard.spec.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/guards/project-access.guard.spec.ts index a9cc10e24d4..7c8660eee56 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/guards/project-access.guard.spec.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/guards/project-access.guard.spec.ts @@ -5,7 +5,7 @@ import { RouterTestingModule } from "@angular/router/testing"; import { MockProxy, mock } from "jest-mock-extended"; import { of } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -31,7 +31,7 @@ export class GuardedRouteTestComponent {} export class RedirectTestComponent {} describe("Project Redirect Guard", () => { - let organizationService: MockProxy; + let organizationService: MockProxy; let routerService: MockProxy; let projectServiceMock: MockProxy; let i18nServiceMock: MockProxy; @@ -52,7 +52,7 @@ describe("Project Redirect Guard", () => { } as ProjectView; beforeEach(async () => { - organizationService = mock(); + organizationService = mock(); routerService = mock(); projectServiceMock = mock(); i18nServiceMock = mock(); @@ -78,7 +78,7 @@ describe("Project Redirect Guard", () => { ]), ], providers: [ - { provide: vNextOrganizationService, useValue: organizationService }, + { provide: OrganizationService, useValue: organizationService }, { provide: AccountService, useValue: accountService }, { provide: RouterService, useValue: routerService }, { provide: ProjectService, useValue: projectServiceMock }, diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.ts index 78abeb31a65..f4950bf53f2 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project-secrets.component.ts @@ -14,8 +14,8 @@ import { import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -61,7 +61,7 @@ export class ProjectSecretsComponent implements OnInit { private dialogService: DialogService, private platformUtilsService: PlatformUtilsService, private i18nService: I18nService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private logService: LogService, ) {} diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.ts index 4628813477c..9e60cf0535c 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project/project.component.ts @@ -16,8 +16,8 @@ import { import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { DialogService } from "@bitwarden/components"; @@ -53,7 +53,7 @@ export class ProjectComponent implements OnInit, OnDestroy { private secretService: SecretService, private accessPolicyService: AccessPolicyService, private dialogService: DialogService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private countService: CountService, ) {} diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts index 9c6447fc7e6..e09aaea6e2b 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts @@ -13,8 +13,8 @@ import { import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { DialogService } from "@bitwarden/components"; @@ -52,7 +52,7 @@ export class ProjectsComponent implements OnInit { private route: ActivatedRoute, private projectService: ProjectService, private dialogService: DialogService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, ) {} diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.ts index f68464887c8..680dda72af3 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/dialog/secret-dialog.component.ts @@ -7,8 +7,8 @@ import { firstValueFrom, lastValueFrom, Subject, takeUntil } from "rxjs"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -101,7 +101,7 @@ export class SecretDialogComponent implements OnInit, OnDestroy { private platformUtilsService: PlatformUtilsService, private projectService: ProjectService, private dialogService: DialogService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private accessPolicyService: AccessPolicyService, private accessPolicySelectorService: AccessPolicySelectorService, diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts index 40bc41d6a0f..b58173a1cc0 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secrets.component.ts @@ -6,8 +6,8 @@ import { combineLatestWith, firstValueFrom, Observable, startWith, switchMap } f import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -50,7 +50,7 @@ export class SecretsComponent implements OnInit { private dialogService: DialogService, private platformUtilsService: PlatformUtilsService, private i18nService: I18nService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private logService: LogService, ) {} diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.spec.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.spec.ts index 592ffbb80cb..b96956d19d0 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.spec.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.spec.ts @@ -5,7 +5,7 @@ import { RouterTestingModule } from "@angular/router/testing"; import { MockProxy, mock } from "jest-mock-extended"; import { of } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -31,7 +31,7 @@ export class GuardedRouteTestComponent {} export class RedirectTestComponent {} describe("Service account Redirect Guard", () => { - let organizationService: MockProxy; + let organizationService: MockProxy; let routerService: MockProxy; let serviceAccountServiceMock: MockProxy; let i18nServiceMock: MockProxy; @@ -48,7 +48,7 @@ describe("Service account Redirect Guard", () => { } as ServiceAccountView; beforeEach(async () => { - organizationService = mock(); + organizationService = mock(); routerService = mock(); serviceAccountServiceMock = mock(); i18nServiceMock = mock(); @@ -74,7 +74,7 @@ describe("Service account Redirect Guard", () => { ]), ], providers: [ - { provide: vNextOrganizationService, useValue: organizationService }, + { provide: OrganizationService, useValue: organizationService }, { provide: AccountService, useValue: accountService }, { provide: RouterService, useValue: routerService }, { provide: ServiceAccountService, useValue: serviceAccountServiceMock }, diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts index 7d58bd70f5f..7deaefae823 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts.component.ts @@ -6,8 +6,8 @@ import { combineLatest, firstValueFrom, Observable, startWith, switchMap } from import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { DialogService } from "@bitwarden/components"; @@ -43,7 +43,7 @@ export class ServiceAccountsComponent implements OnInit { private route: ActivatedRoute, private dialogService: DialogService, private serviceAccountService: ServiceAccountService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, ) {} diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts index 626f9cc2008..266962c8268 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-export.component.ts @@ -7,8 +7,8 @@ import { firstValueFrom, Subject, switchMap, takeUntil } from "rxjs"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service"; @@ -44,7 +44,7 @@ export class SecretsManagerExportComponent implements OnInit, OnDestroy { constructor( private route: ActivatedRoute, private i18nService: I18nService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private platformUtilsService: PlatformUtilsService, private smPortingService: SecretsManagerPortingService, diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy-selector/access-policy-selector.service.spec.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy-selector/access-policy-selector.service.spec.ts index b54f8062145..9e3ca522bc7 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy-selector/access-policy-selector.service.spec.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy-selector/access-policy-selector.service.spec.ts @@ -1,7 +1,7 @@ import { mock, MockProxy } from "jest-mock-extended"; import { of } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationUserType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -16,14 +16,14 @@ import { ApItemEnum } from "./models/enums/ap-item.enum"; import { ApPermissionEnum } from "./models/enums/ap-permission.enum"; describe("AccessPolicySelectorService", () => { - let organizationService: MockProxy; + let organizationService: MockProxy; let accountService: FakeAccountService; const userId = Utils.newGuid() as UserId; let sut: AccessPolicySelectorService; beforeEach(() => { - organizationService = mock(); + organizationService = mock(); accountService = mockAccountServiceWith(userId); sut = new AccessPolicySelectorService(organizationService, accountService as AccountService); diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy-selector/access-policy-selector.service.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy-selector/access-policy-selector.service.ts index bd028092425..7fbf2bc01a2 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy-selector/access-policy-selector.service.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/access-policy-selector/access-policy-selector.service.ts @@ -3,8 +3,8 @@ import { firstValueFrom } from "rxjs"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -18,7 +18,7 @@ import { ApPermissionEnum } from "./models/enums/ap-permission.enum"; }) export class AccessPolicySelectorService { constructor( - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountServcie: AccountService, ) {} diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts index 1307f6d18fb..b0a481d077d 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts @@ -6,8 +6,8 @@ import { Subject, takeUntil, concatMap, firstValueFrom } from "rxjs"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { DialogService } from "@bitwarden/components"; @@ -37,7 +37,7 @@ export class NewMenuComponent implements OnInit, OnDestroy { constructor( private route: ActivatedRoute, private dialogService: DialogService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, ) {} diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts index 0112f18c965..2eb9d6017b7 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts @@ -4,8 +4,8 @@ import { map, concatMap, firstValueFrom } from "rxjs"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { Icon, Icons } from "@bitwarden/components"; @@ -15,7 +15,7 @@ import { Icon, Icons } from "@bitwarden/components"; }) export class OrgSuspendedComponent { constructor( - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, private route: ActivatedRoute, ) {} diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts index 6b4c9939400..cbb444c4aeb 100644 --- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts +++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/all-applications.component.ts @@ -14,8 +14,8 @@ import { } from "@bitwarden/bit-common/tools/reports/risk-insights/models/password-health"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -112,7 +112,7 @@ export class AllApplicationsComponent implements OnInit, OnDestroy { protected toastService: ToastService, protected configService: ConfigService, protected dataService: RiskInsightsDataService, - protected organizationService: vNextOrganizationService, + protected organizationService: OrganizationService, protected reportService: RiskInsightsReportService, private accountService: AccountService, ) { diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members-uri.component.spec.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members-uri.component.spec.ts index eccf4abbb18..852e9adafb3 100644 --- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members-uri.component.spec.ts +++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members-uri.component.spec.ts @@ -9,7 +9,7 @@ import { } from "@bitwarden/bit-common/tools/reports/risk-insights"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; @@ -40,7 +40,7 @@ describe("PasswordHealthMembersUriComponent", () => { { provide: CipherService, useValue: cipherServiceMock }, { provide: I18nService, useValue: mock() }, { provide: AuditService, useValue: mock() }, - { provide: vNextOrganizationService, useValue: mock() }, + { provide: OrganizationService, useValue: mock() }, { provide: AccountService, useValue: mockAccountServiceWith(userId) }, { provide: PasswordStrengthServiceAbstraction, diff --git a/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members-uri.component.ts b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members-uri.component.ts index 2b2a1476df2..89597685799 100644 --- a/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members-uri.component.ts +++ b/bitwarden_license/bit-web/src/app/tools/access-intelligence/password-health-members-uri.component.ts @@ -12,7 +12,7 @@ import { PasswordHealthService, } from "@bitwarden/bit-common/tools/reports/risk-insights"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { PasswordStrengthServiceAbstraction } from "@bitwarden/common/tools/password-strength"; @@ -68,7 +68,7 @@ export class PasswordHealthMembersURIComponent implements OnInit { constructor( protected cipherService: CipherService, protected passwordStrengthService: PasswordStrengthServiceAbstraction, - protected organizationService: vNextOrganizationService, + protected organizationService: OrganizationService, protected auditService: AuditService, protected i18nService: I18nService, protected activatedRoute: ActivatedRoute, diff --git a/libs/angular/src/admin-console/components/collections.component.ts b/libs/angular/src/admin-console/components/collections.component.ts index ec26dc0bea5..52a22ac2946 100644 --- a/libs/angular/src/admin-console/components/collections.component.ts +++ b/libs/angular/src/admin-console/components/collections.component.ts @@ -4,7 +4,7 @@ import { Directive, EventEmitter, Input, OnInit, Output } from "@angular/core"; import { firstValueFrom, map } from "rxjs"; import { CollectionService, CollectionView } from "@bitwarden/admin-console/common"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @@ -34,7 +34,7 @@ export class CollectionsComponent implements OnInit { protected platformUtilsService: PlatformUtilsService, protected i18nService: I18nService, protected cipherService: CipherService, - protected organizationService: vNextOrganizationService, + protected organizationService: OrganizationService, private logService: LogService, private accountService: AccountService, private toastService: ToastService, diff --git a/libs/angular/src/billing/components/add-account-credit-dialog/add-account-credit-dialog.component.ts b/libs/angular/src/billing/components/add-account-credit-dialog/add-account-credit-dialog.component.ts index 1a65f2e78ca..edb233cc76e 100644 --- a/libs/angular/src/billing/components/add-account-credit-dialog/add-account-credit-dialog.component.ts +++ b/libs/angular/src/billing/components/add-account-credit-dialog/add-account-credit-dialog.component.ts @@ -6,7 +6,7 @@ import { FormControl, FormGroup, Validators } from "@angular/forms"; import { firstValueFrom, map } from "rxjs"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { Provider } from "@bitwarden/common/admin-console/models/domain/provider"; @@ -67,7 +67,7 @@ export class AddAccountCreditDialogComponent implements OnInit { private configService: ConfigService, @Inject(DIALOG_DATA) private dialogParams: AddAccountCreditDialogParams, private dialogRef: DialogRef, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private platformUtilsService: PlatformUtilsService, private providerService: ProviderService, ) { diff --git a/libs/angular/src/components/share.component.ts b/libs/angular/src/components/share.component.ts index f618ed515e7..534a1337eda 100644 --- a/libs/angular/src/components/share.component.ts +++ b/libs/angular/src/components/share.component.ts @@ -4,7 +4,7 @@ import { Directive, EventEmitter, Input, OnDestroy, OnInit, Output } from "@angu import { firstValueFrom, map, Observable, Subject, takeUntil } from "rxjs"; import { CollectionService, CollectionView } from "@bitwarden/admin-console/common"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -37,7 +37,7 @@ export class ShareComponent implements OnInit, OnDestroy { protected i18nService: I18nService, protected cipherService: CipherService, private logService: LogService, - protected organizationService: vNextOrganizationService, + protected organizationService: OrganizationService, protected accountService: AccountService, ) {} diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index 3f9b6779bbe..03500a686c8 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/libs/angular/src/services/jslib-services.module.ts @@ -50,9 +50,9 @@ import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { - vNextInternalOrganizationServiceAbstraction, - vNextOrganizationService as vNextOrganizationServiceAbstraction, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + InternalOrganizationServiceAbstraction, + OrganizationService as OrganizationServiceAbstraction, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrgDomainApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization-domain/org-domain-api.service.abstraction"; import { OrgDomainInternalServiceAbstraction, @@ -66,7 +66,7 @@ import { } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { ProviderApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider/provider-api.service.abstraction"; import { ProviderService as ProviderServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/provider.service"; -import { DefaultvNextOrganizationService } from "@bitwarden/common/admin-console/services/organization/default-vnext-organization.service"; +import { DefaultOrganizationService } from "@bitwarden/common/admin-console/services/organization/default-organization.service"; import { OrganizationApiService } from "@bitwarden/common/admin-console/services/organization/organization-api.service"; import { OrgDomainApiService } from "@bitwarden/common/admin-console/services/organization-domain/org-domain-api.service"; import { OrgDomainService } from "@bitwarden/common/admin-console/services/organization-domain/org-domain.service"; @@ -725,7 +725,7 @@ const safeProviders: SafeProvider[] = [ StateServiceAbstraction, ProviderServiceAbstraction, FolderApiServiceAbstraction, - vNextInternalOrganizationServiceAbstraction, + InternalOrganizationServiceAbstraction, SendApiServiceAbstraction, UserDecryptionOptionsServiceAbstraction, AvatarServiceAbstraction, @@ -914,7 +914,7 @@ const safeProviders: SafeProvider[] = [ deps: [ CipherServiceAbstraction, StateProvider, - vNextOrganizationServiceAbstraction, + OrganizationServiceAbstraction, EventUploadServiceAbstraction, AuthServiceAbstraction, AccountServiceAbstraction, @@ -923,7 +923,7 @@ const safeProviders: SafeProvider[] = [ safeProvider({ provide: InternalPolicyService, useClass: PolicyService, - deps: [StateProvider, vNextOrganizationServiceAbstraction], + deps: [StateProvider, OrganizationServiceAbstraction], }), safeProvider({ provide: PolicyServiceAbstraction, @@ -959,7 +959,7 @@ const safeProviders: SafeProvider[] = [ ApiServiceAbstraction, TokenServiceAbstraction, LogService, - vNextOrganizationServiceAbstraction, + OrganizationServiceAbstraction, KeyGenerationServiceAbstraction, LOGOUT_CALLBACK, StateProvider, @@ -983,13 +983,13 @@ const safeProviders: SafeProvider[] = [ ], }), safeProvider({ - provide: vNextInternalOrganizationServiceAbstraction, - useClass: DefaultvNextOrganizationService, + provide: InternalOrganizationServiceAbstraction, + useClass: DefaultOrganizationService, deps: [StateProvider], }), safeProvider({ - provide: vNextOrganizationServiceAbstraction, - useExisting: vNextInternalOrganizationServiceAbstraction, + provide: OrganizationServiceAbstraction, + useExisting: InternalOrganizationServiceAbstraction, }), safeProvider({ @@ -1397,7 +1397,7 @@ const safeProviders: SafeProvider[] = [ safeProvider({ provide: CipherAuthorizationService, useClass: DefaultCipherAuthorizationService, - deps: [CollectionService, vNextOrganizationServiceAbstraction, AccountServiceAbstraction], + deps: [CollectionService, OrganizationServiceAbstraction, AccountServiceAbstraction], }), safeProvider({ provide: AuthRequestApiService, diff --git a/libs/angular/src/vault/components/add-edit.component.ts b/libs/angular/src/vault/components/add-edit.component.ts index 772c0b7de5e..a7e33db4d09 100644 --- a/libs/angular/src/vault/components/add-edit.component.ts +++ b/libs/angular/src/vault/components/add-edit.component.ts @@ -7,7 +7,7 @@ import { concatMap, firstValueFrom, map, Observable, Subject, takeUntil } from " import { CollectionService, CollectionView } from "@bitwarden/admin-console/common"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { OrganizationUserStatusType, PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -121,7 +121,7 @@ export class AddEditComponent implements OnInit, OnDestroy { protected policyService: PolicyService, protected logService: LogService, protected passwordRepromptService: PasswordRepromptService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, protected dialogService: DialogService, protected win: Window, protected datePipe: DatePipe, diff --git a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts index 39b6cb5dce5..77922da011f 100644 --- a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts +++ b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts @@ -4,7 +4,7 @@ import { Injectable } from "@angular/core"; import { firstValueFrom, from, map, mergeMap, Observable } from "rxjs"; import { CollectionService, CollectionView } from "@bitwarden/admin-console/common"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -32,7 +32,7 @@ export class VaultFilterService implements DeprecatedVaultFilterServiceAbstracti this.collapsedGroupingsState.state$.pipe(map((c) => new Set(c))); constructor( - protected organizationService: vNextOrganizationService, + protected organizationService: OrganizationService, protected folderService: FolderService, protected cipherService: CipherService, protected collectionService: CollectionService, diff --git a/libs/common/src/admin-console/abstractions/organization/vnext.organization.service.abstraction.ts b/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts similarity index 96% rename from libs/common/src/admin-console/abstractions/organization/vnext.organization.service.abstraction.ts rename to libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts index b5c0f6291fc..64baf610b44 100644 --- a/libs/common/src/admin-console/abstractions/organization/vnext.organization.service.abstraction.ts +++ b/libs/common/src/admin-console/abstractions/organization/organization.service.abstraction.ts @@ -63,7 +63,7 @@ export function getOrganizationById(id: string) { * Risky operations like updates are isolated to the * internal extension `InternalOrganizationServiceAbstraction`. */ -export abstract class vNextOrganizationService { +export abstract class OrganizationService { /** * Publishes state for all organizations under the specified user. * @returns An observable list of organizations @@ -90,7 +90,7 @@ export abstract class vNextOrganizationService { * `OrganizationService` for easy access to `get` calls. * @internal */ -export abstract class vNextInternalOrganizationServiceAbstraction extends vNextOrganizationService { +export abstract class InternalOrganizationServiceAbstraction extends OrganizationService { /** * Replaces state for the provided organization, or creates it if not found. * @param organization The organization state being saved. diff --git a/libs/common/src/admin-console/models/data/organization.data.spec.ts b/libs/common/src/admin-console/models/data/organization.data.spec.ts index 8cdc97fb3f6..8a49109f343 100644 --- a/libs/common/src/admin-console/models/data/organization.data.spec.ts +++ b/libs/common/src/admin-console/models/data/organization.data.spec.ts @@ -1,6 +1,6 @@ import { ProductTierType } from "../../../billing/enums/product-tier-type.enum"; import { OrganizationUserStatusType, OrganizationUserType } from "../../enums"; -import { ORGANIZATIONS } from "../../services/organization/vnext-organization.state"; +import { ORGANIZATIONS } from "../../services/organization/organization.state"; import { OrganizationData } from "./organization.data"; diff --git a/libs/common/src/admin-console/services/organization/default-vnext-organization.service.spec.ts b/libs/common/src/admin-console/services/organization/default-organization.service.spec.ts similarity index 96% rename from libs/common/src/admin-console/services/organization/default-vnext-organization.service.spec.ts rename to libs/common/src/admin-console/services/organization/default-organization.service.spec.ts index 9e2ea3a4599..41c89c0e41a 100644 --- a/libs/common/src/admin-console/services/organization/default-vnext-organization.service.spec.ts +++ b/libs/common/src/admin-console/services/organization/default-organization.service.spec.ts @@ -6,11 +6,11 @@ import { OrganizationId, UserId } from "../../../types/guid"; import { OrganizationData } from "../../models/data/organization.data"; import { Organization } from "../../models/domain/organization"; -import { DefaultvNextOrganizationService } from "./default-vnext-organization.service"; -import { ORGANIZATIONS } from "./vnext-organization.state"; +import { DefaultOrganizationService } from "./default-organization.service"; +import { ORGANIZATIONS } from "./organization.state"; describe("OrganizationService", () => { - let organizationService: DefaultvNextOrganizationService; + let organizationService: DefaultOrganizationService; const fakeUserId = Utils.newGuid() as UserId; let fakeStateProvider: FakeStateProvider; @@ -86,7 +86,7 @@ describe("OrganizationService", () => { beforeEach(async () => { fakeStateProvider = new FakeStateProvider(mockAccountServiceWith(fakeUserId)); - organizationService = new DefaultvNextOrganizationService(fakeStateProvider); + organizationService = new DefaultOrganizationService(fakeStateProvider); }); describe("canManageSponsorships", () => { diff --git a/libs/common/src/admin-console/services/organization/default-vnext-organization.service.ts b/libs/common/src/admin-console/services/organization/default-organization.service.ts similarity index 92% rename from libs/common/src/admin-console/services/organization/default-vnext-organization.service.ts rename to libs/common/src/admin-console/services/organization/default-organization.service.ts index e1956b864d3..e78136455fd 100644 --- a/libs/common/src/admin-console/services/organization/default-vnext-organization.service.ts +++ b/libs/common/src/admin-console/services/organization/default-organization.service.ts @@ -4,11 +4,11 @@ import { map, Observable } from "rxjs"; import { StateProvider } from "../../../platform/state"; import { UserId } from "../../../types/guid"; -import { vNextInternalOrganizationServiceAbstraction } from "../../abstractions/organization/vnext.organization.service.abstraction"; +import { InternalOrganizationServiceAbstraction } from "../../abstractions/organization/organization.service.abstraction"; import { OrganizationData } from "../../models/data/organization.data"; import { Organization } from "../../models/domain/organization"; -import { ORGANIZATIONS } from "./vnext-organization.state"; +import { ORGANIZATIONS } from "./organization.state"; /** * Filter out organizations from an observable that __do not__ offer a @@ -41,9 +41,7 @@ function mapToBooleanHasAnyOrganizations() { return map((orgs) => orgs.length > 0); } -export class DefaultvNextOrganizationService - implements vNextInternalOrganizationServiceAbstraction -{ +export class DefaultOrganizationService implements InternalOrganizationServiceAbstraction { memberOrganizations$(userId: UserId): Observable { return this.organizations$(userId).pipe(mapToExcludeProviderOrganizations()); } diff --git a/libs/common/src/admin-console/services/organization/vnext-organization.state.ts b/libs/common/src/admin-console/services/organization/organization.state.ts similarity index 100% rename from libs/common/src/admin-console/services/organization/vnext-organization.state.ts rename to libs/common/src/admin-console/services/organization/organization.state.ts diff --git a/libs/common/src/admin-console/services/policy/policy.service.spec.ts b/libs/common/src/admin-console/services/policy/policy.service.spec.ts index e946093ca82..f0ebfddf66e 100644 --- a/libs/common/src/admin-console/services/policy/policy.service.spec.ts +++ b/libs/common/src/admin-console/services/policy/policy.service.spec.ts @@ -17,12 +17,12 @@ import { Policy } from "../../../admin-console/models/domain/policy"; import { ResetPasswordPolicyOptions } from "../../../admin-console/models/domain/reset-password-policy-options"; import { POLICIES, PolicyService } from "../../../admin-console/services/policy/policy.service"; import { PolicyId, UserId } from "../../../types/guid"; -import { vNextOrganizationService } from "../../abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "../../abstractions/organization/organization.service.abstraction"; describe("PolicyService", () => { const userId = "userId" as UserId; let stateProvider: FakeStateProvider; - let organizationService: MockProxy; + let organizationService: MockProxy; let activeUserState: FakeActiveUserState>; let policyService: PolicyService; @@ -30,7 +30,7 @@ describe("PolicyService", () => { beforeEach(() => { const accountService = mockAccountServiceWith(userId); stateProvider = new FakeStateProvider(accountService); - organizationService = mock(); + organizationService = mock(); activeUserState = stateProvider.activeUser.getFake(POLICIES); diff --git a/libs/common/src/admin-console/services/policy/policy.service.ts b/libs/common/src/admin-console/services/policy/policy.service.ts index 26544a4be07..bf99b9ce721 100644 --- a/libs/common/src/admin-console/services/policy/policy.service.ts +++ b/libs/common/src/admin-console/services/policy/policy.service.ts @@ -4,7 +4,7 @@ import { combineLatest, firstValueFrom, map, Observable, of, switchMap } from "r import { UserKeyDefinition, POLICIES_DISK, StateProvider } from "../../../platform/state"; import { PolicyId, UserId } from "../../../types/guid"; -import { vNextOrganizationService } from "../../abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "../../abstractions/organization/organization.service.abstraction"; import { InternalPolicyService as InternalPolicyServiceAbstraction } from "../../abstractions/policy/policy.service.abstraction"; import { OrganizationUserStatusType, PolicyType } from "../../enums"; import { PolicyData } from "../../models/data/policy.data"; @@ -31,7 +31,7 @@ export class PolicyService implements InternalPolicyServiceAbstraction { constructor( private stateProvider: StateProvider, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, ) {} get$(policyType: PolicyType): Observable { diff --git a/libs/common/src/auth/services/key-connector.service.spec.ts b/libs/common/src/auth/services/key-connector.service.spec.ts index 9038f81612f..61e1902cf07 100644 --- a/libs/common/src/auth/services/key-connector.service.spec.ts +++ b/libs/common/src/auth/services/key-connector.service.spec.ts @@ -1,7 +1,7 @@ import { mock } from "jest-mock-extended"; import { of } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { KeyService } from "../../../../key-management/src/abstractions/key.service"; import { FakeAccountService, FakeStateProvider, mockAccountServiceWith } from "../../../spec"; @@ -33,7 +33,7 @@ describe("KeyConnectorService", () => { const apiService = mock(); const tokenService = mock(); const logService = mock(); - const organizationService = mock(); + const organizationService = mock(); const keyGenerationService = mock(); let stateProvider: FakeStateProvider; diff --git a/libs/common/src/auth/services/key-connector.service.ts b/libs/common/src/auth/services/key-connector.service.ts index 7711c685ef8..f6f76579ee5 100644 --- a/libs/common/src/auth/services/key-connector.service.ts +++ b/libs/common/src/auth/services/key-connector.service.ts @@ -3,7 +3,7 @@ import { firstValueFrom } from "rxjs"; import { LogoutReason } from "@bitwarden/auth/common"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { Argon2KdfConfig, @@ -64,7 +64,7 @@ export class KeyConnectorService implements KeyConnectorServiceAbstraction { private apiService: ApiService, private tokenService: TokenService, private logService: LogService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private keyGenerationService: KeyGenerationService, private logoutCallback: (logoutReason: LogoutReason, userId?: string) => Promise, private stateProvider: StateProvider, diff --git a/libs/common/src/platform/sync/default-sync.service.ts b/libs/common/src/platform/sync/default-sync.service.ts index ebef2100085..604245e889b 100644 --- a/libs/common/src/platform/sync/default-sync.service.ts +++ b/libs/common/src/platform/sync/default-sync.service.ts @@ -8,11 +8,11 @@ import { CollectionDetailsResponse, } from "@bitwarden/admin-console/common"; -import { vNextInternalOrganizationServiceAbstraction } from "../..//admin-console/abstractions/organization/vnext.organization.service.abstraction"; import { UserDecryptionOptionsServiceAbstraction } from "../../../../auth/src/common/abstractions"; import { LogoutReason } from "../../../../auth/src/common/types"; import { KeyService } from "../../../../key-management/src/abstractions/key.service"; import { ApiService } from "../../abstractions/api.service"; +import { InternalOrganizationServiceAbstraction } from "../../admin-console/abstractions/organization/organization.service.abstraction"; import { InternalPolicyService } from "../../admin-console/abstractions/policy/policy.service.abstraction"; import { ProviderService } from "../../admin-console/abstractions/provider.service"; import { OrganizationUserType } from "../../admin-console/enums"; @@ -73,7 +73,7 @@ export class DefaultSyncService extends CoreSyncService { stateService: StateService, private providerService: ProviderService, folderApiService: FolderApiServiceAbstraction, - private organizationService: vNextInternalOrganizationServiceAbstraction, + private organizationService: InternalOrganizationServiceAbstraction, sendApiService: SendApiService, private userDecryptionOptionsService: UserDecryptionOptionsServiceAbstraction, private avatarService: AvatarService, diff --git a/libs/common/src/services/event/event-collection.service.ts b/libs/common/src/services/event/event-collection.service.ts index d7cf9b95d22..da38ca5bfff 100644 --- a/libs/common/src/services/event/event-collection.service.ts +++ b/libs/common/src/services/event/event-collection.service.ts @@ -2,7 +2,7 @@ // @ts-strict-ignore import { firstValueFrom, map, from, zip } from "rxjs"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -23,7 +23,7 @@ export class EventCollectionService implements EventCollectionServiceAbstraction constructor( private cipherService: CipherService, private stateProvider: StateProvider, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private eventUploadService: EventUploadService, private authService: AuthService, private accountService: AccountService, diff --git a/libs/common/src/vault/services/cipher-authorization.service.spec.ts b/libs/common/src/vault/services/cipher-authorization.service.spec.ts index 192fccae9d0..37ddfdeaeeb 100644 --- a/libs/common/src/vault/services/cipher-authorization.service.spec.ts +++ b/libs/common/src/vault/services/cipher-authorization.service.spec.ts @@ -2,7 +2,7 @@ import { mock } from "jest-mock-extended"; import { Observable, firstValueFrom, of } from "rxjs"; import { CollectionService, CollectionView } from "@bitwarden/admin-console/common"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CollectionId, UserId } from "@bitwarden/common/types/guid"; @@ -19,7 +19,7 @@ describe("CipherAuthorizationService", () => { let cipherAuthorizationService: CipherAuthorizationService; const mockCollectionService = mock(); - const mockOrganizationService = mock(); + const mockOrganizationService = mock(); const mockUserId = Utils.newGuid() as UserId; let mockAccountService: FakeAccountService; diff --git a/libs/common/src/vault/services/cipher-authorization.service.ts b/libs/common/src/vault/services/cipher-authorization.service.ts index 8d8a3b598bb..fbee3ed8622 100644 --- a/libs/common/src/vault/services/cipher-authorization.service.ts +++ b/libs/common/src/vault/services/cipher-authorization.service.ts @@ -3,7 +3,7 @@ import { map, Observable, of, shareReplay, switchMap } from "rxjs"; import { CollectionService } from "@bitwarden/admin-console/common"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { CollectionId } from "@bitwarden/common/types/guid"; @@ -51,7 +51,7 @@ export abstract class CipherAuthorizationService { export class DefaultCipherAuthorizationService implements CipherAuthorizationService { constructor( private collectionService: CollectionService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private accountService: AccountService, ) {} diff --git a/libs/importer/src/components/import.component.ts b/libs/importer/src/components/import.component.ts index c5df44bb00d..b2190b752f6 100644 --- a/libs/importer/src/components/import.component.ts +++ b/libs/importer/src/components/import.component.ts @@ -25,8 +25,8 @@ import { PinServiceAbstraction } from "@bitwarden/auth/common"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -209,7 +209,7 @@ export class ImportComponent implements OnInit, OnDestroy, AfterViewInit { protected syncService: SyncService, protected dialogService: DialogService, protected folderService: FolderService, - protected organizationService: vNextOrganizationService, + protected organizationService: OrganizationService, private accountService: AccountService, protected collectionService: CollectionService, protected formBuilder: FormBuilder, diff --git a/libs/tools/export/vault-export/vault-export-ui/src/components/export-scope-callout.component.ts b/libs/tools/export/vault-export/vault-export-ui/src/components/export-scope-callout.component.ts index 77d22df394b..76b5a893841 100644 --- a/libs/tools/export/vault-export/vault-export-ui/src/components/export-scope-callout.component.ts +++ b/libs/tools/export/vault-export/vault-export-ui/src/components/export-scope-callout.component.ts @@ -7,8 +7,8 @@ import { firstValueFrom, map } from "rxjs"; import { JslibModule } from "@bitwarden/angular/jslib.module"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { CalloutModule } from "@bitwarden/components"; @@ -41,7 +41,7 @@ export class ExportScopeCalloutComponent implements OnInit { } constructor( - protected organizationService: vNextOrganizationService, + protected organizationService: OrganizationService, protected accountService: AccountService, ) {} diff --git a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts index 735a48078e9..934c35f8060 100644 --- a/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts +++ b/libs/tools/export/vault-export/vault-export-ui/src/components/export.component.ts @@ -31,8 +31,8 @@ import { UserVerificationDialogComponent } from "@bitwarden/auth/angular"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; @@ -188,7 +188,7 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit { private formBuilder: UntypedFormBuilder, protected fileDownloadService: FileDownloadService, protected dialogService: DialogService, - protected organizationService: vNextOrganizationService, + protected organizationService: OrganizationService, private accountService: AccountService, private collectionService: CollectionService, ) {} diff --git a/libs/vault/src/cipher-form/services/default-cipher-form-config.service.ts b/libs/vault/src/cipher-form/services/default-cipher-form-config.service.ts index a0239e10176..1bce091f1b0 100644 --- a/libs/vault/src/cipher-form/services/default-cipher-form-config.service.ts +++ b/libs/vault/src/cipher-form/services/default-cipher-form-config.service.ts @@ -4,7 +4,7 @@ import { inject, Injectable } from "@angular/core"; import { combineLatest, filter, firstValueFrom, map, switchMap } from "rxjs"; import { CollectionService } from "@bitwarden/admin-console/common"; -import { vNextOrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; +import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { OrganizationUserStatusType, PolicyType } from "@bitwarden/common/admin-console/enums"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -29,7 +29,7 @@ import { @Injectable() export class DefaultCipherFormConfigService implements CipherFormConfigService { private policyService: PolicyService = inject(PolicyService); - private organizationService: vNextOrganizationService = inject(vNextOrganizationService); + private organizationService: OrganizationService = inject(OrganizationService); private cipherService: CipherService = inject(CipherService); private folderService: FolderService = inject(FolderService); private collectionService: CollectionService = inject(CollectionService); diff --git a/libs/vault/src/cipher-view/cipher-view.component.ts b/libs/vault/src/cipher-view/cipher-view.component.ts index acc2e39ff9b..57d58f04b3b 100644 --- a/libs/vault/src/cipher-view/cipher-view.component.ts +++ b/libs/vault/src/cipher-view/cipher-view.component.ts @@ -6,8 +6,8 @@ import { CollectionService, CollectionView } from "@bitwarden/admin-console/comm import { JslibModule } from "@bitwarden/angular/jslib.module"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; @@ -68,7 +68,7 @@ export class CipherViewComponent implements OnChanges, OnDestroy { cardIsExpired: boolean = false; constructor( - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private collectionService: CollectionService, private folderService: FolderService, private accountService: AccountService, diff --git a/libs/vault/src/components/assign-collections.component.ts b/libs/vault/src/components/assign-collections.component.ts index 64bf595ab34..c950187edb8 100644 --- a/libs/vault/src/components/assign-collections.component.ts +++ b/libs/vault/src/components/assign-collections.component.ts @@ -28,8 +28,8 @@ import { CollectionService, CollectionView } from "@bitwarden/admin-console/comm import { JslibModule } from "@bitwarden/angular/jslib.module"; import { getOrganizationById, - vNextOrganizationService, -} from "@bitwarden/common/admin-console/abstractions/organization/vnext.organization.service.abstraction"; + OrganizationService, +} from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; @@ -185,7 +185,7 @@ export class AssignCollectionsComponent implements OnInit, OnDestroy, AfterViewI constructor( private cipherService: CipherService, private i18nService: I18nService, - private organizationService: vNextOrganizationService, + private organizationService: OrganizationService, private collectionService: CollectionService, private formBuilder: FormBuilder, private toastService: ToastService,