bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-10 13:23:34 +00:00
Code Issues Releases Wiki Activity

fix DI (#17076)

Browse Source
This commit is contained in:
Brandon Treston
2025-10-28 12:25:56 -04:00
committed by GitHub
parent 8d54ad7883
commit c1a988c2ab
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm-dialog.component.ts
View File

@@ -5,11 +5,11 @@ import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
import { firstValueFrom, map, Observable, switchMap } from "rxjs";
import {
DefaultOrganizationUserService,
OrganizationUserApiService,
OrganizationUserBulkConfirmRequest,
OrganizationUserBulkPublicKeyResponse,
OrganizationUserBulkResponse,
OrganizationUserService,
} from "@bitwarden/admin-console/common";
import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums";
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
@@ -53,7 +53,7 @@ export class BulkConfirmDialogComponent extends BaseBulkConfirmComponent {
private organizationUserApiService: OrganizationUserApiService,
protected i18nService: I18nService,
private stateProvider: StateProvider,
private organizationUserService: DefaultOrganizationUserService,
private organizationUserService: OrganizationUserService,
private configService: ConfigService,
) {
super(keyService, encryptService, i18nService);

4
apps/web/src/app/admin-console/organizations/members/services/member-actions/member-actions.service.ts
View File

@@ -2,10 +2,10 @@ import { Injectable } from "@angular/core";
import { firstValueFrom, switchMap, map } from "rxjs";
import {
DefaultOrganizationUserService,
OrganizationUserApiService,
OrganizationUserBulkResponse,
OrganizationUserConfirmRequest,
OrganizationUserService,
} from "@bitwarden/admin-console/common";
import {
OrganizationUserType,
@@ -39,7 +39,7 @@ export class MemberActionsService {
constructor(
private organizationUserApiService: OrganizationUserApiService,
private organizationUserService: DefaultOrganizationUserService,
private organizationUserService: OrganizationUserService,
private keyService: KeyService,
private encryptService: EncryptService,
private configService: ConfigService,

7
libs/admin-console/src/common/auto-confirm/services/default-auto-confirm.service.ts
View File

@@ -11,10 +11,7 @@ import { OrganizationId } from "@bitwarden/common/types/guid";
import { StateProvider } from "@bitwarden/state";
import { UserId } from "@bitwarden/user-core";
import {
DefaultOrganizationUserService,
OrganizationUserApiService,
} from "../../organization-user";
import { OrganizationUserApiService, OrganizationUserService } from "../../organization-user";
import { AutomaticUserConfirmationService } from "../abstractions/auto-confirm.service.abstraction";
import { AUTO_CONFIRM_STATE, AutoConfirmState } from "../models/auto-confirm-state.model";
@@ -22,7 +19,7 @@ export class DefaultAutomaticUserConfirmationService implements AutomaticUserCon
constructor(
private configService: ConfigService,
private apiService: ApiService,
private organizationUserService: DefaultOrganizationUserService,
private organizationUserService: OrganizationUserService,
private stateProvider: StateProvider,
private organizationService: InternalOrganizationServiceAbstraction,
private organizationUserApiService: OrganizationUserApiService,

13
libs/angular/src/services/jslib-services.module.ts
View File

@@ -9,7 +9,9 @@ import {
CollectionService,
DefaultCollectionService,
DefaultOrganizationUserApiService,
DefaultOrganizationUserService,
OrganizationUserApiService,
OrganizationUserService,
} from "@bitwarden/admin-console/common";
import {
ChangePasswordService,
@@ -1121,6 +1123,17 @@ const safeProviders: SafeProvider[] = [
useClass: DefaultOrganizationService,
deps: [StateProvider],
}),
safeProvider({
provide: OrganizationUserService,
useClass: DefaultOrganizationUserService,
deps: [
KeyService,
EncryptService,
OrganizationUserApiService,
AccountService,
I18nServiceAbstraction,
],
}),
safeProvider({
provide: OrganizationServiceAbstraction,
useExisting: InternalOrganizationServiceAbstraction,