From 88a6541bd850d154dc163cb244f7c9354e8ef32b Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Tue, 30 Aug 2022 16:11:19 +0200 Subject: [PATCH] Refactorings for vaultTimeoutService/ServiceFactories (#3416) * Move vaultTimeoutAbstraction into it's own folder * Move vaultTimeout service into it's own folder * Added vaultTimeoutServiceFactory and it's missing dependencies --- .../src/background/commands.background.ts | 2 +- .../browser/src/background/idle.background.ts | 2 +- .../browser/src/background/main.background.ts | 4 +- .../collection-service.factory.ts | 34 ++++++++ .../folder-service.factory.ts | 38 +++++++++ .../policy-service.factory.ts | 34 ++++++++ .../search-service.factory.ts | 31 ++++++++ .../vault-timeout-service.factory.ts | 78 +++++++++++++++++++ .../src/popup/accounts/lock.component.ts | 2 +- .../src/popup/accounts/sso.component.ts | 2 +- .../src/popup/services/services.module.ts | 2 +- .../src/popup/settings/settings.component.ts | 2 +- .../vaultTimeout.service.ts | 4 +- apps/cli/src/bw.ts | 2 +- apps/cli/src/commands/lock.command.ts | 2 +- .../src/app/accounts/lock.component.ts | 2 +- .../src/app/accounts/settings.component.ts | 2 +- apps/desktop/src/app/app.component.ts | 2 +- apps/desktop/src/app/services/init.service.ts | 4 +- apps/web/src/app/accounts/lock.component.ts | 2 +- apps/web/src/app/app.component.ts | 2 +- apps/web/src/app/core/init.service.ts | 4 +- .../src/app/settings/preferences.component.ts | 2 +- libs/angular/src/components/lock.component.ts | 2 +- .../src/services/jslib-services.module.ts | 4 +- .../vaultTimeout.service.ts | 0 .../vaultTimeout.service.ts | 30 +++---- 27 files changed, 255 insertions(+), 40 deletions(-) create mode 100644 apps/browser/src/background/service_factories/collection-service.factory.ts create mode 100644 apps/browser/src/background/service_factories/folder-service.factory.ts create mode 100644 apps/browser/src/background/service_factories/policy-service.factory.ts create mode 100644 apps/browser/src/background/service_factories/search-service.factory.ts create mode 100644 apps/browser/src/background/service_factories/vault-timeout-service.factory.ts rename apps/browser/src/services/{ => vaultTimeout}/vaultTimeout.service.ts (88%) rename libs/common/src/abstractions/{ => vaultTimeout}/vaultTimeout.service.ts (100%) rename libs/common/src/services/{ => vaultTimeout}/vaultTimeout.service.ts (86%) diff --git a/apps/browser/src/background/commands.background.ts b/apps/browser/src/background/commands.background.ts index 4d85c91c0bc..05a83c8eb54 100644 --- a/apps/browser/src/background/commands.background.ts +++ b/apps/browser/src/background/commands.background.ts @@ -1,7 +1,7 @@ import { AuthService } from "@bitwarden/common/abstractions/auth.service"; import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; import { BrowserApi } from "../browser/browserApi"; diff --git a/apps/browser/src/background/idle.background.ts b/apps/browser/src/background/idle.background.ts index aecadd31fc3..56e2e2dd7e1 100644 --- a/apps/browser/src/background/idle.background.ts +++ b/apps/browser/src/background/idle.background.ts @@ -1,5 +1,5 @@ import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; -import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { StateService } from "../services/abstractions/state.service"; diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index 8bcfad8b62c..6934b061300 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -34,7 +34,7 @@ import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/comm import { UserVerificationApiServiceAbstraction } from "@bitwarden/common/abstractions/userVerification/userVerification-api.service.abstraction"; import { UserVerificationService as UserVerificationServiceAbstraction } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { UsernameGenerationService as UsernameGenerationServiceAbstraction } from "@bitwarden/common/abstractions/usernameGeneration.service"; -import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; import { CipherRepromptType } from "@bitwarden/common/enums/cipherRepromptType"; import { CipherType } from "@bitwarden/common/enums/cipherType"; @@ -95,7 +95,7 @@ import { KeyGenerationService } from "../services/keyGeneration.service"; import { LocalBackedSessionStorageService } from "../services/localBackedSessionStorage.service"; import { StateService } from "../services/state.service"; import { VaultFilterService } from "../services/vaultFilter.service"; -import VaultTimeoutService from "../services/vaultTimeout.service"; +import VaultTimeoutService from "../services/vaultTimeout/vaultTimeout.service"; import CommandsBackground from "./commands.background"; import ContextMenusBackground from "./contextMenus.background"; diff --git a/apps/browser/src/background/service_factories/collection-service.factory.ts b/apps/browser/src/background/service_factories/collection-service.factory.ts new file mode 100644 index 00000000000..d85e6dd8dcd --- /dev/null +++ b/apps/browser/src/background/service_factories/collection-service.factory.ts @@ -0,0 +1,34 @@ +import { CollectionService as AbstractCollectionService } from "@bitwarden/common/abstractions/collection.service"; +import { CollectionService } from "@bitwarden/common/services/collection.service"; + +import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory"; +import { CachedServices, factory, FactoryOptions } from "./factory-options"; +import { i18nServiceFactory, I18nServiceInitOptions } from "./i18n-service.factory"; +import { + stateServiceFactory as stateServiceFactory, + StateServiceInitOptions, +} from "./state-service.factory"; + +type CollectionServiceFactoryOptions = FactoryOptions; + +export type CollectionServiceInitOptions = CollectionServiceFactoryOptions & + CryptoServiceInitOptions & + I18nServiceInitOptions & + StateServiceInitOptions; + +export function collectionServiceFactory( + cache: { collectionService?: AbstractCollectionService } & CachedServices, + opts: CollectionServiceInitOptions +): Promise { + return factory( + cache, + "collectionService", + opts, + async () => + new CollectionService( + await cryptoServiceFactory(cache, opts), + await i18nServiceFactory(cache, opts), + await stateServiceFactory(cache, opts) + ) + ); +} diff --git a/apps/browser/src/background/service_factories/folder-service.factory.ts b/apps/browser/src/background/service_factories/folder-service.factory.ts new file mode 100644 index 00000000000..a7c90d234b1 --- /dev/null +++ b/apps/browser/src/background/service_factories/folder-service.factory.ts @@ -0,0 +1,38 @@ +import { FolderService as AbstractFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction"; + +import { FolderService } from "../../services/folders/folder.service"; + +import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory"; +import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory"; +import { CachedServices, factory, FactoryOptions } from "./factory-options"; +import { i18nServiceFactory, I18nServiceInitOptions } from "./i18n-service.factory"; +import { + stateServiceFactory as stateServiceFactory, + StateServiceInitOptions, +} from "./state-service.factory"; + +type FolderServiceFactoryOptions = FactoryOptions; + +export type FolderServiceInitOptions = FolderServiceFactoryOptions & + CryptoServiceInitOptions & + CipherServiceInitOptions & + I18nServiceInitOptions & + StateServiceInitOptions; + +export function folderServiceFactory( + cache: { folderService?: AbstractFolderService } & CachedServices, + opts: FolderServiceInitOptions +): Promise { + return factory( + cache, + "folderService", + opts, + async () => + new FolderService( + await cryptoServiceFactory(cache, opts), + await i18nServiceFactory(cache, opts), + await cipherServiceFactory(cache, opts), + await stateServiceFactory(cache, opts) + ) + ); +} diff --git a/apps/browser/src/background/service_factories/policy-service.factory.ts b/apps/browser/src/background/service_factories/policy-service.factory.ts new file mode 100644 index 00000000000..d4940bef259 --- /dev/null +++ b/apps/browser/src/background/service_factories/policy-service.factory.ts @@ -0,0 +1,34 @@ +import { PolicyService as AbstractPolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction"; +import { PolicyService } from "@bitwarden/common/services/policy/policy.service"; + +import { CachedServices, factory, FactoryOptions } from "./factory-options"; +import { + organizationServiceFactory, + OrganizationServiceInitOptions, +} from "./organization-service.factory"; +import { + stateServiceFactory as stateServiceFactory, + StateServiceInitOptions, +} from "./state-service.factory"; + +type PolicyServiceFactoryOptions = FactoryOptions; + +export type PolicyServiceInitOptions = PolicyServiceFactoryOptions & + StateServiceInitOptions & + OrganizationServiceInitOptions; + +export function policyServiceFactory( + cache: { policyService?: AbstractPolicyService } & CachedServices, + opts: PolicyServiceInitOptions +): Promise { + return factory( + cache, + "policyService", + opts, + async () => + new PolicyService( + await stateServiceFactory(cache, opts), + await organizationServiceFactory(cache, opts) + ) + ); +} diff --git a/apps/browser/src/background/service_factories/search-service.factory.ts b/apps/browser/src/background/service_factories/search-service.factory.ts new file mode 100644 index 00000000000..29318c45250 --- /dev/null +++ b/apps/browser/src/background/service_factories/search-service.factory.ts @@ -0,0 +1,31 @@ +import { SearchService as AbstractSearchService } from "@bitwarden/common/abstractions/search.service"; +import { SearchService } from "@bitwarden/common/services/search.service"; + +import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory"; +import { CachedServices, factory, FactoryOptions } from "./factory-options"; +import { i18nServiceFactory, I18nServiceInitOptions } from "./i18n-service.factory"; +import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory"; + +type SearchServiceFactoryOptions = FactoryOptions; + +export type SearchServiceInitOptions = SearchServiceFactoryOptions & + CipherServiceInitOptions & + LogServiceInitOptions & + I18nServiceInitOptions; + +export function searchServiceFactory( + cache: { searchService?: AbstractSearchService } & CachedServices, + opts: SearchServiceInitOptions +): Promise { + return factory( + cache, + "searchService", + opts, + async () => + new SearchService( + await cipherServiceFactory(cache, opts), + await logServiceFactory(cache, opts), + await i18nServiceFactory(cache, opts) + ) + ); +} diff --git a/apps/browser/src/background/service_factories/vault-timeout-service.factory.ts b/apps/browser/src/background/service_factories/vault-timeout-service.factory.ts new file mode 100644 index 00000000000..a6c305f369d --- /dev/null +++ b/apps/browser/src/background/service_factories/vault-timeout-service.factory.ts @@ -0,0 +1,78 @@ +import { VaultTimeoutService as AbstractVaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; + +import VaultTimeoutService from "../../services/vaultTimeout/vaultTimeout.service"; + +import { authServiceFactory, AuthServiceInitOptions } from "./auth-service.factory"; +import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory"; +import { + collectionServiceFactory, + CollectionServiceInitOptions, +} from "./collection-service.factory"; +import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory"; +import { CachedServices, factory, FactoryOptions } from "./factory-options"; +import { folderServiceFactory, FolderServiceInitOptions } from "./folder-service.factory"; +import { + keyConnectorServiceFactory, + KeyConnectorServiceInitOptions, +} from "./key-connector-service.factory"; +import { messagingServiceFactory, MessagingServiceInitOptions } from "./messaging-service.factory"; +import { + platformUtilsServiceFactory, + PlatformUtilsServiceInitOptions, +} from "./platform-utils-service.factory"; +import { policyServiceFactory, PolicyServiceInitOptions } from "./policy-service.factory"; +import { searchServiceFactory, SearchServiceInitOptions } from "./search-service.factory"; +import { + stateServiceFactory as stateServiceFactory, + StateServiceInitOptions, +} from "./state-service.factory"; +import { tokenServiceFactory, TokenServiceInitOptions } from "./token-service.factory"; + +type VaultTimeoutServiceFactoryOptions = FactoryOptions & { + vaultTimeoutServiceOptions: { + lockedCallback: (userId?: string) => Promise; + loggedOutCallback: (expired: boolean, userId?: string) => Promise; + }; +}; + +export type VaultTimeoutServiceInitOptions = VaultTimeoutServiceFactoryOptions & + CipherServiceInitOptions & + FolderServiceInitOptions & + CollectionServiceInitOptions & + CryptoServiceInitOptions & + PlatformUtilsServiceInitOptions & + MessagingServiceInitOptions & + SearchServiceInitOptions & + TokenServiceInitOptions & + PolicyServiceInitOptions & + KeyConnectorServiceInitOptions & + StateServiceInitOptions & + AuthServiceInitOptions; + +export function vaultTimeoutServiceFactory( + cache: { vaultTimeoutService?: AbstractVaultTimeoutService } & CachedServices, + opts: VaultTimeoutServiceInitOptions +): Promise { + return factory( + cache, + "vaultTimeoutService", + opts, + async () => + new VaultTimeoutService( + await cipherServiceFactory(cache, opts), + await folderServiceFactory(cache, opts), + await collectionServiceFactory(cache, opts), + await cryptoServiceFactory(cache, opts), + await platformUtilsServiceFactory(cache, opts), + await messagingServiceFactory(cache, opts), + await searchServiceFactory(cache, opts), + await tokenServiceFactory(cache, opts), + await policyServiceFactory(cache, opts), + await keyConnectorServiceFactory(cache, opts), + await stateServiceFactory(cache, opts), + await authServiceFactory(cache, opts), + opts.vaultTimeoutServiceOptions.lockedCallback, + opts.vaultTimeoutServiceOptions.loggedOutCallback + ) + ); +} diff --git a/apps/browser/src/popup/accounts/lock.component.ts b/apps/browser/src/popup/accounts/lock.component.ts index 00a71f92060..63360da43c3 100644 --- a/apps/browser/src/popup/accounts/lock.component.ts +++ b/apps/browser/src/popup/accounts/lock.component.ts @@ -13,7 +13,7 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; -import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; import { BiometricErrors, BiometricErrorTypes } from "../../models/biometricErrors"; diff --git a/apps/browser/src/popup/accounts/sso.component.ts b/apps/browser/src/popup/accounts/sso.component.ts index 5563dffba8d..7483cc51a27 100644 --- a/apps/browser/src/popup/accounts/sso.component.ts +++ b/apps/browser/src/popup/accounts/sso.component.ts @@ -12,7 +12,7 @@ import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwo import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; -import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; import { BrowserApi } from "../../browser/browserApi"; diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index 102e682c2c5..e4449d964a9 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/apps/browser/src/popup/services/services.module.ts @@ -47,7 +47,7 @@ import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { TwoFactorService } from "@bitwarden/common/abstractions/twoFactor.service"; import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { UsernameGenerationService } from "@bitwarden/common/abstractions/usernameGeneration.service"; -import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { AuthService } from "@bitwarden/common/services/auth.service"; import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; import { SearchService } from "@bitwarden/common/services/search.service"; diff --git a/apps/browser/src/popup/settings/settings.component.ts b/apps/browser/src/popup/settings/settings.component.ts index e91e8e47d4c..a01479c36cb 100644 --- a/apps/browser/src/popup/settings/settings.component.ts +++ b/apps/browser/src/popup/settings/settings.component.ts @@ -11,7 +11,7 @@ import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { DeviceType } from "@bitwarden/common/enums/deviceType"; import { BrowserApi } from "../../browser/browserApi"; diff --git a/apps/browser/src/services/vaultTimeout.service.ts b/apps/browser/src/services/vaultTimeout/vaultTimeout.service.ts similarity index 88% rename from apps/browser/src/services/vaultTimeout.service.ts rename to apps/browser/src/services/vaultTimeout/vaultTimeout.service.ts index 8dc67a494bb..d6f6c3bd178 100644 --- a/apps/browser/src/services/vaultTimeout.service.ts +++ b/apps/browser/src/services/vaultTimeout/vaultTimeout.service.ts @@ -1,6 +1,6 @@ -import { VaultTimeoutService as BaseVaultTimeoutService } from "@bitwarden/common/services/vaultTimeout.service"; +import { VaultTimeoutService as BaseVaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service"; -import { SafariApp } from "../browser/safariApp"; +import { SafariApp } from "../../browser/safariApp"; export default class VaultTimeoutService extends BaseVaultTimeoutService { startCheck() { diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index 47debda0b49..0edc6f34da8 100644 --- a/apps/cli/src/bw.ts +++ b/apps/cli/src/bw.ts @@ -46,7 +46,7 @@ import { TotpService } from "@bitwarden/common/services/totp.service"; import { TwoFactorService } from "@bitwarden/common/services/twoFactor.service"; import { UserVerificationApiService } from "@bitwarden/common/services/userVerification/userVerification-api.service"; import { UserVerificationService } from "@bitwarden/common/services/userVerification/userVerification.service"; -import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout.service"; +import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service"; import { CliPlatformUtilsService } from "@bitwarden/node/cli/services/cliPlatformUtils.service"; import { ConsoleLogService } from "@bitwarden/node/cli/services/consoleLog.service"; import { NodeApiService } from "@bitwarden/node/services/nodeApi.service"; diff --git a/apps/cli/src/commands/lock.command.ts b/apps/cli/src/commands/lock.command.ts index 9a7e807d0fd..ee993376fd8 100644 --- a/apps/cli/src/commands/lock.command.ts +++ b/apps/cli/src/commands/lock.command.ts @@ -1,4 +1,4 @@ -import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { Response } from "@bitwarden/node/cli/models/response"; import { MessageResponse } from "@bitwarden/node/cli/models/response/messageResponse"; diff --git a/apps/desktop/src/app/accounts/lock.component.ts b/apps/desktop/src/app/accounts/lock.component.ts index 346dc6741e1..86940fb430f 100644 --- a/apps/desktop/src/app/accounts/lock.component.ts +++ b/apps/desktop/src/app/accounts/lock.component.ts @@ -14,7 +14,7 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; -import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; const BroadcasterSubscriptionId = "LockComponent"; diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts index 0fd9f99d57e..0a514f42d52 100644 --- a/apps/desktop/src/app/accounts/settings.component.ts +++ b/apps/desktop/src/app/accounts/settings.component.ts @@ -9,7 +9,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { DeviceType } from "@bitwarden/common/enums/deviceType"; import { StorageLocation } from "@bitwarden/common/enums/storageLocation"; import { ThemeType } from "@bitwarden/common/enums/themeType"; diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts index 6a451e0af1e..4365eaf57a7 100644 --- a/apps/desktop/src/app/app.component.ts +++ b/apps/desktop/src/app/app.component.ts @@ -35,7 +35,7 @@ import { SettingsService } from "@bitwarden/common/abstractions/settings.service import { StateService } from "@bitwarden/common/abstractions/state.service"; import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { SystemService } from "@bitwarden/common/abstractions/system.service"; -import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { AuthenticationStatus } from "@bitwarden/common/enums/authenticationStatus"; import { CipherType } from "@bitwarden/common/enums/cipherType"; diff --git a/apps/desktop/src/app/services/init.service.ts b/apps/desktop/src/app/services/init.service.ts index faebf7fffb0..41e6c6a1da9 100644 --- a/apps/desktop/src/app/services/init.service.ts +++ b/apps/desktop/src/app/services/init.service.ts @@ -11,10 +11,10 @@ import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwar import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/abstractions/twoFactor.service"; -import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { ContainerService } from "@bitwarden/common/services/container.service"; import { EventService } from "@bitwarden/common/services/event.service"; -import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout.service"; +import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service"; import { I18nService } from "../../services/i18n.service"; import { NativeMessagingService } from "../../services/nativeMessaging.service"; diff --git a/apps/web/src/app/accounts/lock.component.ts b/apps/web/src/app/accounts/lock.component.ts index 08d69d3316b..8bb65794aad 100644 --- a/apps/web/src/app/accounts/lock.component.ts +++ b/apps/web/src/app/accounts/lock.component.ts @@ -11,7 +11,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { RouterService } from "../core"; diff --git a/apps/web/src/app/app.component.ts b/apps/web/src/app/app.component.ts index 16f955e6ee7..b1700a85513 100644 --- a/apps/web/src/app/app.component.ts +++ b/apps/web/src/app/app.component.ts @@ -24,7 +24,7 @@ import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction"; -import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { PolicyListService, RouterService } from "./core"; import { DisableSendPolicy } from "./organizations/policies/disable-send.component"; diff --git a/apps/web/src/app/core/init.service.ts b/apps/web/src/app/core/init.service.ts index 940ee501685..4915b0a088b 100644 --- a/apps/web/src/app/core/init.service.ts +++ b/apps/web/src/app/core/init.service.ts @@ -12,10 +12,10 @@ import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstrac import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service"; import { StateService as StateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/abstractions/twoFactor.service"; -import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { ContainerService } from "@bitwarden/common/services/container.service"; import { EventService as EventLoggingService } from "@bitwarden/common/services/event.service"; -import { VaultTimeoutService as VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout.service"; +import { VaultTimeoutService as VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service"; import { I18nService } from "./i18n.service"; diff --git a/apps/web/src/app/settings/preferences.component.ts b/apps/web/src/app/settings/preferences.component.ts index 83abd0257ba..a3a314305d3 100644 --- a/apps/web/src/app/settings/preferences.component.ts +++ b/apps/web/src/app/settings/preferences.component.ts @@ -6,7 +6,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { ThemeType } from "@bitwarden/common/enums/themeType"; import { Utils } from "@bitwarden/common/misc/utils"; diff --git a/libs/angular/src/components/lock.component.ts b/libs/angular/src/components/lock.component.ts index 63ed0e9f1d9..6419148737d 100644 --- a/libs/angular/src/components/lock.component.ts +++ b/libs/angular/src/components/lock.component.ts @@ -12,7 +12,7 @@ import { LogService } from "@bitwarden/common/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { HashPurpose } from "@bitwarden/common/enums/hashPurpose"; import { KeySuffixOptions } from "@bitwarden/common/enums/keySuffixOptions"; import { Utils } from "@bitwarden/common/misc/utils"; diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index 6c6fec9526e..d8645d81e68 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/libs/angular/src/services/jslib-services.module.ts @@ -53,7 +53,7 @@ import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/comm import { UserVerificationApiServiceAbstraction } from "@bitwarden/common/abstractions/userVerification/userVerification-api.service.abstraction"; import { UserVerificationService as UserVerificationServiceAbstraction } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction"; import { UsernameGenerationService as UsernameGenerationServiceAbstraction } from "@bitwarden/common/abstractions/usernameGeneration.service"; -import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout.service"; +import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { StateFactory } from "@bitwarden/common/factories/stateFactory"; import { Account } from "@bitwarden/common/models/domain/account"; import { GlobalState } from "@bitwarden/common/models/domain/globalState"; @@ -95,7 +95,7 @@ import { TwoFactorService } from "@bitwarden/common/services/twoFactor.service"; import { UserVerificationApiService } from "@bitwarden/common/services/userVerification/userVerification-api.service"; import { UserVerificationService } from "@bitwarden/common/services/userVerification/userVerification.service"; import { UsernameGenerationService } from "@bitwarden/common/services/usernameGeneration.service"; -import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout.service"; +import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service"; import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service"; import { AuthGuard } from "../guards/auth.guard"; diff --git a/libs/common/src/abstractions/vaultTimeout.service.ts b/libs/common/src/abstractions/vaultTimeout/vaultTimeout.service.ts similarity index 100% rename from libs/common/src/abstractions/vaultTimeout.service.ts rename to libs/common/src/abstractions/vaultTimeout/vaultTimeout.service.ts diff --git a/libs/common/src/services/vaultTimeout.service.ts b/libs/common/src/services/vaultTimeout/vaultTimeout.service.ts similarity index 86% rename from libs/common/src/services/vaultTimeout.service.ts rename to libs/common/src/services/vaultTimeout/vaultTimeout.service.ts index 55e347484dc..3d6f8758a73 100644 --- a/libs/common/src/services/vaultTimeout.service.ts +++ b/libs/common/src/services/vaultTimeout/vaultTimeout.service.ts @@ -1,18 +1,18 @@ -import { AuthService } from "../abstractions/auth.service"; -import { CipherService } from "../abstractions/cipher.service"; -import { CollectionService } from "../abstractions/collection.service"; -import { CryptoService } from "../abstractions/crypto.service"; -import { FolderService } from "../abstractions/folder/folder.service.abstraction"; -import { KeyConnectorService } from "../abstractions/keyConnector.service"; -import { MessagingService } from "../abstractions/messaging.service"; -import { PlatformUtilsService } from "../abstractions/platformUtils.service"; -import { PolicyService } from "../abstractions/policy/policy.service.abstraction"; -import { SearchService } from "../abstractions/search.service"; -import { StateService } from "../abstractions/state.service"; -import { TokenService } from "../abstractions/token.service"; -import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "../abstractions/vaultTimeout.service"; -import { AuthenticationStatus } from "../enums/authenticationStatus"; -import { PolicyType } from "../enums/policyType"; +import { AuthService } from "../../abstractions/auth.service"; +import { CipherService } from "../../abstractions/cipher.service"; +import { CollectionService } from "../../abstractions/collection.service"; +import { CryptoService } from "../../abstractions/crypto.service"; +import { FolderService } from "../../abstractions/folder/folder.service.abstraction"; +import { KeyConnectorService } from "../../abstractions/keyConnector.service"; +import { MessagingService } from "../../abstractions/messaging.service"; +import { PlatformUtilsService } from "../../abstractions/platformUtils.service"; +import { PolicyService } from "../../abstractions/policy/policy.service.abstraction"; +import { SearchService } from "../../abstractions/search.service"; +import { StateService } from "../../abstractions/state.service"; +import { TokenService } from "../../abstractions/token.service"; +import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "../../abstractions/vaultTimeout/vaultTimeout.service"; +import { AuthenticationStatus } from "../../enums/authenticationStatus"; +import { PolicyType } from "../../enums/policyType"; export class VaultTimeoutService implements VaultTimeoutServiceAbstraction { private inited = false;