mirror of
https://github.com/bitwarden/browser
synced 2025-12-11 22:03:36 +00:00
fix DI (#17076)
This commit is contained in:
@@ -5,11 +5,11 @@ import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
|
|||||||
import { firstValueFrom, map, Observable, switchMap } from "rxjs";
|
import { firstValueFrom, map, Observable, switchMap } from "rxjs";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
DefaultOrganizationUserService,
|
|
||||||
OrganizationUserApiService,
|
OrganizationUserApiService,
|
||||||
OrganizationUserBulkConfirmRequest,
|
OrganizationUserBulkConfirmRequest,
|
||||||
OrganizationUserBulkPublicKeyResponse,
|
OrganizationUserBulkPublicKeyResponse,
|
||||||
OrganizationUserBulkResponse,
|
OrganizationUserBulkResponse,
|
||||||
|
OrganizationUserService,
|
||||||
} from "@bitwarden/admin-console/common";
|
} from "@bitwarden/admin-console/common";
|
||||||
import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums";
|
import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums";
|
||||||
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
|
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
|
||||||
@@ -53,7 +53,7 @@ export class BulkConfirmDialogComponent extends BaseBulkConfirmComponent {
|
|||||||
private organizationUserApiService: OrganizationUserApiService,
|
private organizationUserApiService: OrganizationUserApiService,
|
||||||
protected i18nService: I18nService,
|
protected i18nService: I18nService,
|
||||||
private stateProvider: StateProvider,
|
private stateProvider: StateProvider,
|
||||||
private organizationUserService: DefaultOrganizationUserService,
|
private organizationUserService: OrganizationUserService,
|
||||||
private configService: ConfigService,
|
private configService: ConfigService,
|
||||||
) {
|
) {
|
||||||
super(keyService, encryptService, i18nService);
|
super(keyService, encryptService, i18nService);
|
||||||
|
|||||||
@@ -2,10 +2,10 @@ import { Injectable } from "@angular/core";
|
|||||||
import { firstValueFrom, switchMap, map } from "rxjs";
|
import { firstValueFrom, switchMap, map } from "rxjs";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
DefaultOrganizationUserService,
|
|
||||||
OrganizationUserApiService,
|
OrganizationUserApiService,
|
||||||
OrganizationUserBulkResponse,
|
OrganizationUserBulkResponse,
|
||||||
OrganizationUserConfirmRequest,
|
OrganizationUserConfirmRequest,
|
||||||
|
OrganizationUserService,
|
||||||
} from "@bitwarden/admin-console/common";
|
} from "@bitwarden/admin-console/common";
|
||||||
import {
|
import {
|
||||||
OrganizationUserType,
|
OrganizationUserType,
|
||||||
@@ -39,7 +39,7 @@ export class MemberActionsService {
|
|||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private organizationUserApiService: OrganizationUserApiService,
|
private organizationUserApiService: OrganizationUserApiService,
|
||||||
private organizationUserService: DefaultOrganizationUserService,
|
private organizationUserService: OrganizationUserService,
|
||||||
private keyService: KeyService,
|
private keyService: KeyService,
|
||||||
private encryptService: EncryptService,
|
private encryptService: EncryptService,
|
||||||
private configService: ConfigService,
|
private configService: ConfigService,
|
||||||
|
|||||||
@@ -11,10 +11,7 @@ import { OrganizationId } from "@bitwarden/common/types/guid";
|
|||||||
import { StateProvider } from "@bitwarden/state";
|
import { StateProvider } from "@bitwarden/state";
|
||||||
import { UserId } from "@bitwarden/user-core";
|
import { UserId } from "@bitwarden/user-core";
|
||||||
|
|
||||||
import {
|
import { OrganizationUserApiService, OrganizationUserService } from "../../organization-user";
|
||||||
DefaultOrganizationUserService,
|
|
||||||
OrganizationUserApiService,
|
|
||||||
} from "../../organization-user";
|
|
||||||
import { AutomaticUserConfirmationService } from "../abstractions/auto-confirm.service.abstraction";
|
import { AutomaticUserConfirmationService } from "../abstractions/auto-confirm.service.abstraction";
|
||||||
import { AUTO_CONFIRM_STATE, AutoConfirmState } from "../models/auto-confirm-state.model";
|
import { AUTO_CONFIRM_STATE, AutoConfirmState } from "../models/auto-confirm-state.model";
|
||||||
|
|
||||||
@@ -22,7 +19,7 @@ export class DefaultAutomaticUserConfirmationService implements AutomaticUserCon
|
|||||||
constructor(
|
constructor(
|
||||||
private configService: ConfigService,
|
private configService: ConfigService,
|
||||||
private apiService: ApiService,
|
private apiService: ApiService,
|
||||||
private organizationUserService: DefaultOrganizationUserService,
|
private organizationUserService: OrganizationUserService,
|
||||||
private stateProvider: StateProvider,
|
private stateProvider: StateProvider,
|
||||||
private organizationService: InternalOrganizationServiceAbstraction,
|
private organizationService: InternalOrganizationServiceAbstraction,
|
||||||
private organizationUserApiService: OrganizationUserApiService,
|
private organizationUserApiService: OrganizationUserApiService,
|
||||||
|
|||||||
@@ -9,7 +9,9 @@ import {
|
|||||||
CollectionService,
|
CollectionService,
|
||||||
DefaultCollectionService,
|
DefaultCollectionService,
|
||||||
DefaultOrganizationUserApiService,
|
DefaultOrganizationUserApiService,
|
||||||
|
DefaultOrganizationUserService,
|
||||||
OrganizationUserApiService,
|
OrganizationUserApiService,
|
||||||
|
OrganizationUserService,
|
||||||
} from "@bitwarden/admin-console/common";
|
} from "@bitwarden/admin-console/common";
|
||||||
import {
|
import {
|
||||||
ChangePasswordService,
|
ChangePasswordService,
|
||||||
@@ -1121,6 +1123,17 @@ const safeProviders: SafeProvider[] = [
|
|||||||
useClass: DefaultOrganizationService,
|
useClass: DefaultOrganizationService,
|
||||||
deps: [StateProvider],
|
deps: [StateProvider],
|
||||||
}),
|
}),
|
||||||
|
safeProvider({
|
||||||
|
provide: OrganizationUserService,
|
||||||
|
useClass: DefaultOrganizationUserService,
|
||||||
|
deps: [
|
||||||
|
KeyService,
|
||||||
|
EncryptService,
|
||||||
|
OrganizationUserApiService,
|
||||||
|
AccountService,
|
||||||
|
I18nServiceAbstraction,
|
||||||
|
],
|
||||||
|
}),
|
||||||
safeProvider({
|
safeProvider({
|
||||||
provide: OrganizationServiceAbstraction,
|
provide: OrganizationServiceAbstraction,
|
||||||
useExisting: InternalOrganizationServiceAbstraction,
|
useExisting: InternalOrganizationServiceAbstraction,
|
||||||
|
|||||||
Reference in New Issue
Block a user