refactor: move organization service and organization-user response to admin-console, refs AC-1202 (#5055)
This commit is contained in:
parent
c241e5e0b9
commit
092a2ba984
|
@ -9,7 +9,7 @@ import {
|
||||||
stateServiceFactory,
|
stateServiceFactory,
|
||||||
StateServiceInitOptions,
|
StateServiceInitOptions,
|
||||||
} from "../../../background/service_factories/state-service.factory";
|
} from "../../../background/service_factories/state-service.factory";
|
||||||
import { BrowserOrganizationService } from "../../../services/browser-organization.service";
|
import { BrowserOrganizationService } from "../../services/browser-organization.service";
|
||||||
|
|
||||||
type OrganizationServiceFactoryOptions = FactoryOptions;
|
type OrganizationServiceFactoryOptions = FactoryOptions;
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ import { BehaviorSubject } from "rxjs";
|
||||||
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
|
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
|
||||||
import { OrganizationService } from "@bitwarden/common/admin-console/services/organization/organization.service";
|
import { OrganizationService } from "@bitwarden/common/admin-console/services/organization/organization.service";
|
||||||
|
|
||||||
import { browserSession, sessionSync } from "../decorators/session-sync-observable";
|
import { browserSession, sessionSync } from "../../decorators/session-sync-observable";
|
||||||
|
|
||||||
@browserSession
|
@browserSession
|
||||||
export class BrowserOrganizationService extends OrganizationService {
|
export class BrowserOrganizationService extends OrganizationService {
|
|
@ -87,6 +87,7 @@ import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder
|
||||||
import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service";
|
import { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service";
|
||||||
import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service";
|
import { SyncService } from "@bitwarden/common/vault/services/sync/sync.service";
|
||||||
|
|
||||||
|
import { BrowserOrganizationService } from "../admin-console/services/browser-organization.service";
|
||||||
import { BrowserPolicyService } from "../admin-console/services/browser-policy.service";
|
import { BrowserPolicyService } from "../admin-console/services/browser-policy.service";
|
||||||
import ContextMenusBackground from "../autofill/background/context-menus.background";
|
import ContextMenusBackground from "../autofill/background/context-menus.background";
|
||||||
import NotificationBackground from "../autofill/background/notification.background";
|
import NotificationBackground from "../autofill/background/notification.background";
|
||||||
|
@ -104,7 +105,6 @@ import { Account } from "../models/account";
|
||||||
import { BrowserStateService as StateServiceAbstraction } from "../services/abstractions/browser-state.service";
|
import { BrowserStateService as StateServiceAbstraction } from "../services/abstractions/browser-state.service";
|
||||||
import { BrowserEnvironmentService } from "../services/browser-environment.service";
|
import { BrowserEnvironmentService } from "../services/browser-environment.service";
|
||||||
import { BrowserI18nService } from "../services/browser-i18n.service";
|
import { BrowserI18nService } from "../services/browser-i18n.service";
|
||||||
import { BrowserOrganizationService } from "../services/browser-organization.service";
|
|
||||||
import { BrowserSettingsService } from "../services/browser-settings.service";
|
import { BrowserSettingsService } from "../services/browser-settings.service";
|
||||||
import { BrowserStateService } from "../services/browser-state.service";
|
import { BrowserStateService } from "../services/browser-state.service";
|
||||||
import { BrowserCryptoService } from "../services/browserCrypto.service";
|
import { BrowserCryptoService } from "../services/browserCrypto.service";
|
||||||
|
|
|
@ -74,6 +74,7 @@ import { PasswordRepromptService as PasswordRepromptServiceAbstraction } from "@
|
||||||
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
|
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
|
||||||
import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service";
|
import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service";
|
||||||
|
|
||||||
|
import { BrowserOrganizationService } from "../../admin-console/services/browser-organization.service";
|
||||||
import { BrowserPolicyService } from "../../admin-console/services/browser-policy.service";
|
import { BrowserPolicyService } from "../../admin-console/services/browser-policy.service";
|
||||||
import { LockGuardService, UnauthGuardService } from "../../auth/popup/services";
|
import { LockGuardService, UnauthGuardService } from "../../auth/popup/services";
|
||||||
import { AutofillService } from "../../autofill/services/abstractions/autofill.service";
|
import { AutofillService } from "../../autofill/services/abstractions/autofill.service";
|
||||||
|
@ -84,7 +85,6 @@ import { BrowserStateService as StateServiceAbstraction } from "../../services/a
|
||||||
import { BrowserConfigService } from "../../services/browser-config.service";
|
import { BrowserConfigService } from "../../services/browser-config.service";
|
||||||
import { BrowserEnvironmentService } from "../../services/browser-environment.service";
|
import { BrowserEnvironmentService } from "../../services/browser-environment.service";
|
||||||
import { BrowserI18nService } from "../../services/browser-i18n.service";
|
import { BrowserI18nService } from "../../services/browser-i18n.service";
|
||||||
import { BrowserOrganizationService } from "../../services/browser-organization.service";
|
|
||||||
import { BrowserSettingsService } from "../../services/browser-settings.service";
|
import { BrowserSettingsService } from "../../services/browser-settings.service";
|
||||||
import { BrowserStateService } from "../../services/browser-state.service";
|
import { BrowserStateService } from "../../services/browser-state.service";
|
||||||
import { BrowserFileDownloadService } from "../../services/browserFileDownloadService";
|
import { BrowserFileDownloadService } from "../../services/browserFileDownloadService";
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type";
|
import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums/organization-user-status-type";
|
||||||
import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type";
|
import { OrganizationUserType } from "@bitwarden/common/admin-console/enums/organization-user-type";
|
||||||
|
|
||||||
import { BaseResponse } from "./base.response";
|
import { BaseResponse } from "../../../models/response/base.response";
|
||||||
|
|
||||||
export class OrganizationUserResponse implements BaseResponse {
|
export class OrganizationUserResponse implements BaseResponse {
|
||||||
object: string;
|
object: string;
|
|
@ -16,10 +16,10 @@ import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folde
|
||||||
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
|
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
|
||||||
|
|
||||||
import { CollectionResponse } from "../admin-console/models/response/collection.response";
|
import { CollectionResponse } from "../admin-console/models/response/collection.response";
|
||||||
|
import { OrganizationUserResponse } from "../admin-console/models/response/organization-user.response";
|
||||||
import { OrganizationResponse } from "../admin-console/models/response/organization.response";
|
import { OrganizationResponse } from "../admin-console/models/response/organization.response";
|
||||||
import { Response } from "../models/response";
|
import { Response } from "../models/response";
|
||||||
import { ListResponse } from "../models/response/list.response";
|
import { ListResponse } from "../models/response/list.response";
|
||||||
import { OrganizationUserResponse } from "../models/response/organization-user.response";
|
|
||||||
import { CliUtils } from "../utils";
|
import { CliUtils } from "../utils";
|
||||||
import { CipherResponse } from "../vault/models/cipher.response";
|
import { CipherResponse } from "../vault/models/cipher.response";
|
||||||
import { FolderResponse } from "../vault/models/folder.response";
|
import { FolderResponse } from "../vault/models/folder.response";
|
||||||
|
|
Loading…
Reference in New Issue