From 7f91e84456e4a74a1bd15666c931bfffd05eaf1a Mon Sep 17 00:00:00 2001 From: Andreas Coroiu Date: Tue, 14 May 2024 16:08:41 +0200 Subject: [PATCH] [PM-6400] Move core FIDO2 code from vault to platform ownership (#8044) * [PM-6400] Move core FIDO2 code from vault to platform ownership - lib/common/vault/abstractions/fido2 -> lib/common/platform/abstractions/fido2 - lib/common/vault/services/fido2 -> lib/common/platform/services/fido2 * [PM-6400] fix: wrong imports --- .../src/autofill/spec/fido2-testing-utils.ts | 2 +- apps/browser/src/background/main.background.ts | 10 +++++----- .../abstractions/fido2.background.ts | 2 +- .../fido2/background/fido2.background.spec.ts | 6 +++--- .../vault/fido2/background/fido2.background.ts | 4 ++-- .../browser-fido2-user-interface.service.ts | 6 +++--- .../vault/fido2/content/content-script.spec.ts | 2 +- .../src/vault/fido2/content/content-script.ts | 2 +- .../vault/fido2/content/messaging/message.ts | 2 +- .../vault/fido2/content/messaging/messenger.ts | 2 +- .../src/vault/fido2/content/page-script.ts | 2 +- apps/browser/src/vault/fido2/webauthn-utils.ts | 4 ++-- .../fido2-authenticator.service.abstraction.ts | 0 .../fido2/fido2-client.service.abstraction.ts | 0 ...fido2-user-interface.service.abstraction.ts | 0 .../{vault => platform}/services/fido2/cbor.ts | 0 .../services/fido2/domain-utils.spec.ts | 0 .../services/fido2/domain-utils.ts | 0 .../services/fido2/ecdsa-utils.spec.ts | 0 .../services/fido2/ecdsa-utils.ts | 0 .../fido2/fido2-authenticator.service.spec.ts | 18 +++++++++--------- .../fido2/fido2-authenticator.service.ts | 16 ++++++++-------- .../fido2/fido2-client.service.spec.ts | 6 +++--- .../services/fido2/fido2-client.service.ts | 8 ++++---- .../services/fido2/fido2-utils.spec.ts | 0 .../services/fido2/fido2-utils.ts | 0 .../services/fido2/guid-utils.ts | 0 .../fido2/noop-fido2-user-interface.service.ts | 0 28 files changed, 46 insertions(+), 46 deletions(-) rename libs/common/src/{vault => platform}/abstractions/fido2/fido2-authenticator.service.abstraction.ts (100%) rename libs/common/src/{vault => platform}/abstractions/fido2/fido2-client.service.abstraction.ts (100%) rename libs/common/src/{vault => platform}/abstractions/fido2/fido2-user-interface.service.abstraction.ts (100%) rename libs/common/src/{vault => platform}/services/fido2/cbor.ts (100%) rename libs/common/src/{vault => platform}/services/fido2/domain-utils.spec.ts (100%) rename libs/common/src/{vault => platform}/services/fido2/domain-utils.ts (100%) rename libs/common/src/{vault => platform}/services/fido2/ecdsa-utils.spec.ts (100%) rename libs/common/src/{vault => platform}/services/fido2/ecdsa-utils.ts (100%) rename libs/common/src/{vault => platform}/services/fido2/fido2-authenticator.service.spec.ts (98%) rename libs/common/src/{vault => platform}/services/fido2/fido2-authenticator.service.ts (96%) rename libs/common/src/{vault => platform}/services/fido2/fido2-client.service.spec.ts (98%) rename libs/common/src/{vault => platform}/services/fido2/fido2-client.service.ts (98%) rename libs/common/src/{vault => platform}/services/fido2/fido2-utils.spec.ts (100%) rename libs/common/src/{vault => platform}/services/fido2/fido2-utils.ts (100%) rename libs/common/src/{vault => platform}/services/fido2/guid-utils.ts (100%) rename libs/common/src/{vault => platform}/services/fido2/noop-fido2-user-interface.service.ts (100%) diff --git a/apps/browser/src/autofill/spec/fido2-testing-utils.ts b/apps/browser/src/autofill/spec/fido2-testing-utils.ts index c9b39c16cc..5c739235dc 100644 --- a/apps/browser/src/autofill/spec/fido2-testing-utils.ts +++ b/apps/browser/src/autofill/spec/fido2-testing-utils.ts @@ -3,7 +3,7 @@ import { mock } from "jest-mock-extended"; import { AssertCredentialResult, CreateCredentialResult, -} from "@bitwarden/common/vault/abstractions/fido2/fido2-client.service.abstraction"; +} from "@bitwarden/common/platform/abstractions/fido2/fido2-client.service.abstraction"; export function createCredentialCreationOptionsMock( customFields: Partial = {}, diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index 004714258e..970b12de50 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -78,6 +78,9 @@ import { ConfigService } from "@bitwarden/common/platform/abstractions/config/co import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto-function.service"; import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto.service"; import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service"; +import { Fido2AuthenticatorService as Fido2AuthenticatorServiceAbstraction } from "@bitwarden/common/platform/abstractions/fido2/fido2-authenticator.service.abstraction"; +import { Fido2ClientService as Fido2ClientServiceAbstraction } from "@bitwarden/common/platform/abstractions/fido2/fido2-client.service.abstraction"; +import { Fido2UserInterfaceService as Fido2UserInterfaceServiceAbstraction } from "@bitwarden/common/platform/abstractions/fido2/fido2-user-interface.service.abstraction"; import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/platform/abstractions/file-upload/file-upload.service"; import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service"; import { KeyGenerationService as KeyGenerationServiceAbstraction } from "@bitwarden/common/platform/abstractions/key-generation.service"; @@ -105,6 +108,8 @@ import { DefaultConfigService } from "@bitwarden/common/platform/services/config import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service"; import { ContainerService } from "@bitwarden/common/platform/services/container.service"; import { EncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/encrypt.service.implementation"; +import { Fido2AuthenticatorService } from "@bitwarden/common/platform/services/fido2/fido2-authenticator.service"; +import { Fido2ClientService } from "@bitwarden/common/platform/services/fido2/fido2-client.service"; import { FileUploadService } from "@bitwarden/common/platform/services/file-upload/file-upload.service"; import { KeyGenerationService } from "@bitwarden/common/platform/services/key-generation.service"; import { MigrationBuilderService } from "@bitwarden/common/platform/services/migration-builder.service"; @@ -157,9 +162,6 @@ import { UserId } from "@bitwarden/common/types/guid"; import { VaultTimeoutStringType } from "@bitwarden/common/types/vault-timeout.type"; import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CollectionService as CollectionServiceAbstraction } from "@bitwarden/common/vault/abstractions/collection.service"; -import { Fido2AuthenticatorService as Fido2AuthenticatorServiceAbstraction } from "@bitwarden/common/vault/abstractions/fido2/fido2-authenticator.service.abstraction"; -import { Fido2ClientService as Fido2ClientServiceAbstraction } from "@bitwarden/common/vault/abstractions/fido2/fido2-client.service.abstraction"; -import { Fido2UserInterfaceService as Fido2UserInterfaceServiceAbstraction } from "@bitwarden/common/vault/abstractions/fido2/fido2-user-interface.service.abstraction"; import { CipherFileUploadService as CipherFileUploadServiceAbstraction } from "@bitwarden/common/vault/abstractions/file-upload/cipher-file-upload.service"; import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; import { InternalFolderService as InternalFolderServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; @@ -170,8 +172,6 @@ import { VaultSettingsService as VaultSettingsServiceAbstraction } from "@bitwar import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { CipherService } from "@bitwarden/common/vault/services/cipher.service"; import { CollectionService } from "@bitwarden/common/vault/services/collection.service"; -import { Fido2AuthenticatorService } from "@bitwarden/common/vault/services/fido2/fido2-authenticator.service"; -import { Fido2ClientService } from "@bitwarden/common/vault/services/fido2/fido2-client.service"; import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service"; import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder-api.service"; import { FolderService } from "@bitwarden/common/vault/services/folder/folder.service"; diff --git a/apps/browser/src/vault/fido2/background/abstractions/fido2.background.ts b/apps/browser/src/vault/fido2/background/abstractions/fido2.background.ts index 49f248c7b8..d77a60d3c7 100644 --- a/apps/browser/src/vault/fido2/background/abstractions/fido2.background.ts +++ b/apps/browser/src/vault/fido2/background/abstractions/fido2.background.ts @@ -3,7 +3,7 @@ import { AssertCredentialResult, CreateCredentialParams, CreateCredentialResult, -} from "@bitwarden/common/vault/abstractions/fido2/fido2-client.service.abstraction"; +} from "@bitwarden/common/platform/abstractions/fido2/fido2-client.service.abstraction"; type SharedFido2ScriptInjectionDetails = { runAt: browser.contentScripts.RegisteredContentScriptOptions["runAt"]; diff --git a/apps/browser/src/vault/fido2/background/fido2.background.spec.ts b/apps/browser/src/vault/fido2/background/fido2.background.spec.ts index 534d8a99c5..5da51618ac 100644 --- a/apps/browser/src/vault/fido2/background/fido2.background.spec.ts +++ b/apps/browser/src/vault/fido2/background/fido2.background.spec.ts @@ -1,13 +1,13 @@ import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject } from "rxjs"; -import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { AssertCredentialParams, CreateCredentialParams, -} from "@bitwarden/common/vault/abstractions/fido2/fido2-client.service.abstraction"; +} from "@bitwarden/common/platform/abstractions/fido2/fido2-client.service.abstraction"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { Fido2ClientService } from "@bitwarden/common/platform/services/fido2/fido2-client.service"; import { VaultSettingsService } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service"; -import { Fido2ClientService } from "@bitwarden/common/vault/services/fido2/fido2-client.service"; import { createPortSpyMock } from "../../../autofill/spec/autofill-mocks"; import { diff --git a/apps/browser/src/vault/fido2/background/fido2.background.ts b/apps/browser/src/vault/fido2/background/fido2.background.ts index 5e51e05d77..0666f804f2 100644 --- a/apps/browser/src/vault/fido2/background/fido2.background.ts +++ b/apps/browser/src/vault/fido2/background/fido2.background.ts @@ -1,14 +1,14 @@ import { firstValueFrom, startWith } from "rxjs"; import { pairwise } from "rxjs/operators"; -import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { AssertCredentialParams, AssertCredentialResult, CreateCredentialParams, CreateCredentialResult, Fido2ClientService, -} from "@bitwarden/common/vault/abstractions/fido2/fido2-client.service.abstraction"; +} from "@bitwarden/common/platform/abstractions/fido2/fido2-client.service.abstraction"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { VaultSettingsService } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service"; import { BrowserApi } from "../../../platform/browser/browser-api"; diff --git a/apps/browser/src/vault/fido2/browser-fido2-user-interface.service.ts b/apps/browser/src/vault/fido2/browser-fido2-user-interface.service.ts index 55bf2468d6..d4ad7209b7 100644 --- a/apps/browser/src/vault/fido2/browser-fido2-user-interface.service.ts +++ b/apps/browser/src/vault/fido2/browser-fido2-user-interface.service.ts @@ -16,14 +16,14 @@ import { import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; -import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { UserRequestedFallbackAbortReason } from "@bitwarden/common/vault/abstractions/fido2/fido2-client.service.abstraction"; +import { UserRequestedFallbackAbortReason } from "@bitwarden/common/platform/abstractions/fido2/fido2-client.service.abstraction"; import { Fido2UserInterfaceService as Fido2UserInterfaceServiceAbstraction, Fido2UserInterfaceSession, NewCredentialParams, PickCredentialParams, -} from "@bitwarden/common/vault/abstractions/fido2/fido2-user-interface.service.abstraction"; +} from "@bitwarden/common/platform/abstractions/fido2/fido2-user-interface.service.abstraction"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { BrowserApi } from "../../platform/browser/browser-api"; import { closeFido2Popout, openFido2Popout } from "../popup/utils/vault-popout-window"; diff --git a/apps/browser/src/vault/fido2/content/content-script.spec.ts b/apps/browser/src/vault/fido2/content/content-script.spec.ts index 0c2a52ed10..c9f970a30c 100644 --- a/apps/browser/src/vault/fido2/content/content-script.spec.ts +++ b/apps/browser/src/vault/fido2/content/content-script.spec.ts @@ -1,6 +1,6 @@ import { mock, MockProxy } from "jest-mock-extended"; -import { CreateCredentialResult } from "@bitwarden/common/vault/abstractions/fido2/fido2-client.service.abstraction"; +import { CreateCredentialResult } from "@bitwarden/common/platform/abstractions/fido2/fido2-client.service.abstraction"; import { createPortSpyMock } from "../../../autofill/spec/autofill-mocks"; import { triggerPortOnDisconnectEvent } from "../../../autofill/spec/testing-utils"; diff --git a/apps/browser/src/vault/fido2/content/content-script.ts b/apps/browser/src/vault/fido2/content/content-script.ts index fe3aafe9fb..ad9f526f6c 100644 --- a/apps/browser/src/vault/fido2/content/content-script.ts +++ b/apps/browser/src/vault/fido2/content/content-script.ts @@ -1,7 +1,7 @@ import { AssertCredentialParams, CreateCredentialParams, -} from "@bitwarden/common/vault/abstractions/fido2/fido2-client.service.abstraction"; +} from "@bitwarden/common/platform/abstractions/fido2/fido2-client.service.abstraction"; import { sendExtensionMessage } from "../../../autofill/utils"; import { Fido2PortName } from "../enums/fido2-port-name.enum"; diff --git a/apps/browser/src/vault/fido2/content/messaging/message.ts b/apps/browser/src/vault/fido2/content/messaging/message.ts index b803b97f92..d42c10a5d8 100644 --- a/apps/browser/src/vault/fido2/content/messaging/message.ts +++ b/apps/browser/src/vault/fido2/content/messaging/message.ts @@ -3,7 +3,7 @@ import { CreateCredentialResult, AssertCredentialParams, AssertCredentialResult, -} from "@bitwarden/common/vault/abstractions/fido2/fido2-client.service.abstraction"; +} from "@bitwarden/common/platform/abstractions/fido2/fido2-client.service.abstraction"; export enum MessageType { CredentialCreationRequest, diff --git a/apps/browser/src/vault/fido2/content/messaging/messenger.ts b/apps/browser/src/vault/fido2/content/messaging/messenger.ts index f05c138eab..ea4049ac64 100644 --- a/apps/browser/src/vault/fido2/content/messaging/messenger.ts +++ b/apps/browser/src/vault/fido2/content/messaging/messenger.ts @@ -1,4 +1,4 @@ -import { FallbackRequestedError } from "@bitwarden/common/vault/abstractions/fido2/fido2-client.service.abstraction"; +import { FallbackRequestedError } from "@bitwarden/common/platform/abstractions/fido2/fido2-client.service.abstraction"; import { Message, MessageType } from "./message"; diff --git a/apps/browser/src/vault/fido2/content/page-script.ts b/apps/browser/src/vault/fido2/content/page-script.ts index 5b04f7c1dd..5898dbd04d 100644 --- a/apps/browser/src/vault/fido2/content/page-script.ts +++ b/apps/browser/src/vault/fido2/content/page-script.ts @@ -1,4 +1,4 @@ -import { FallbackRequestedError } from "@bitwarden/common/vault/abstractions/fido2/fido2-client.service.abstraction"; +import { FallbackRequestedError } from "@bitwarden/common/platform/abstractions/fido2/fido2-client.service.abstraction"; import { WebauthnUtils } from "../webauthn-utils"; diff --git a/apps/browser/src/vault/fido2/webauthn-utils.ts b/apps/browser/src/vault/fido2/webauthn-utils.ts index 6ac7af4ce3..618e692aad 100644 --- a/apps/browser/src/vault/fido2/webauthn-utils.ts +++ b/apps/browser/src/vault/fido2/webauthn-utils.ts @@ -1,8 +1,8 @@ import { CreateCredentialResult, AssertCredentialResult, -} from "@bitwarden/common/vault/abstractions/fido2/fido2-client.service.abstraction"; -import { Fido2Utils } from "@bitwarden/common/vault/services/fido2/fido2-utils"; +} from "@bitwarden/common/platform/abstractions/fido2/fido2-client.service.abstraction"; +import { Fido2Utils } from "@bitwarden/common/platform/services/fido2/fido2-utils"; import { InsecureAssertCredentialParams, diff --git a/libs/common/src/vault/abstractions/fido2/fido2-authenticator.service.abstraction.ts b/libs/common/src/platform/abstractions/fido2/fido2-authenticator.service.abstraction.ts similarity index 100% rename from libs/common/src/vault/abstractions/fido2/fido2-authenticator.service.abstraction.ts rename to libs/common/src/platform/abstractions/fido2/fido2-authenticator.service.abstraction.ts diff --git a/libs/common/src/vault/abstractions/fido2/fido2-client.service.abstraction.ts b/libs/common/src/platform/abstractions/fido2/fido2-client.service.abstraction.ts similarity index 100% rename from libs/common/src/vault/abstractions/fido2/fido2-client.service.abstraction.ts rename to libs/common/src/platform/abstractions/fido2/fido2-client.service.abstraction.ts diff --git a/libs/common/src/vault/abstractions/fido2/fido2-user-interface.service.abstraction.ts b/libs/common/src/platform/abstractions/fido2/fido2-user-interface.service.abstraction.ts similarity index 100% rename from libs/common/src/vault/abstractions/fido2/fido2-user-interface.service.abstraction.ts rename to libs/common/src/platform/abstractions/fido2/fido2-user-interface.service.abstraction.ts diff --git a/libs/common/src/vault/services/fido2/cbor.ts b/libs/common/src/platform/services/fido2/cbor.ts similarity index 100% rename from libs/common/src/vault/services/fido2/cbor.ts rename to libs/common/src/platform/services/fido2/cbor.ts diff --git a/libs/common/src/vault/services/fido2/domain-utils.spec.ts b/libs/common/src/platform/services/fido2/domain-utils.spec.ts similarity index 100% rename from libs/common/src/vault/services/fido2/domain-utils.spec.ts rename to libs/common/src/platform/services/fido2/domain-utils.spec.ts diff --git a/libs/common/src/vault/services/fido2/domain-utils.ts b/libs/common/src/platform/services/fido2/domain-utils.ts similarity index 100% rename from libs/common/src/vault/services/fido2/domain-utils.ts rename to libs/common/src/platform/services/fido2/domain-utils.ts diff --git a/libs/common/src/vault/services/fido2/ecdsa-utils.spec.ts b/libs/common/src/platform/services/fido2/ecdsa-utils.spec.ts similarity index 100% rename from libs/common/src/vault/services/fido2/ecdsa-utils.spec.ts rename to libs/common/src/platform/services/fido2/ecdsa-utils.spec.ts diff --git a/libs/common/src/vault/services/fido2/ecdsa-utils.ts b/libs/common/src/platform/services/fido2/ecdsa-utils.ts similarity index 100% rename from libs/common/src/vault/services/fido2/ecdsa-utils.ts rename to libs/common/src/platform/services/fido2/ecdsa-utils.ts diff --git a/libs/common/src/vault/services/fido2/fido2-authenticator.service.spec.ts b/libs/common/src/platform/services/fido2/fido2-authenticator.service.spec.ts similarity index 98% rename from libs/common/src/vault/services/fido2/fido2-authenticator.service.spec.ts rename to libs/common/src/platform/services/fido2/fido2-authenticator.service.spec.ts index 23027b6c2a..a8690da9e2 100644 --- a/libs/common/src/vault/services/fido2/fido2-authenticator.service.spec.ts +++ b/libs/common/src/platform/services/fido2/fido2-authenticator.service.spec.ts @@ -2,8 +2,14 @@ import { TextEncoder } from "util"; import { mock, MockProxy } from "jest-mock-extended"; -import { Utils } from "../../../platform/misc/utils"; -import { CipherService } from "../../abstractions/cipher.service"; +import { CipherService } from "../../../vault/abstractions/cipher.service"; +import { SyncService } from "../../../vault/abstractions/sync/sync.service.abstraction"; +import { CipherRepromptType } from "../../../vault/enums/cipher-reprompt-type"; +import { CipherType } from "../../../vault/enums/cipher-type"; +import { Cipher } from "../../../vault/models/domain/cipher"; +import { CipherView } from "../../../vault/models/view/cipher.view"; +import { Fido2CredentialView } from "../../../vault/models/view/fido2-credential.view"; +import { LoginView } from "../../../vault/models/view/login.view"; import { Fido2AuthenticatorErrorCode, Fido2AuthenticatorGetAssertionParams, @@ -14,13 +20,7 @@ import { Fido2UserInterfaceSession, NewCredentialParams, } from "../../abstractions/fido2/fido2-user-interface.service.abstraction"; -import { SyncService } from "../../abstractions/sync/sync.service.abstraction"; -import { CipherRepromptType } from "../../enums/cipher-reprompt-type"; -import { CipherType } from "../../enums/cipher-type"; -import { Cipher } from "../../models/domain/cipher"; -import { CipherView } from "../../models/view/cipher.view"; -import { Fido2CredentialView } from "../../models/view/fido2-credential.view"; -import { LoginView } from "../../models/view/login.view"; +import { Utils } from "../../misc/utils"; import { CBOR } from "./cbor"; import { AAGUID, Fido2AuthenticatorService } from "./fido2-authenticator.service"; diff --git a/libs/common/src/vault/services/fido2/fido2-authenticator.service.ts b/libs/common/src/platform/services/fido2/fido2-authenticator.service.ts similarity index 96% rename from libs/common/src/vault/services/fido2/fido2-authenticator.service.ts rename to libs/common/src/platform/services/fido2/fido2-authenticator.service.ts index 43d78f1ddc..6a22f03cf7 100644 --- a/libs/common/src/vault/services/fido2/fido2-authenticator.service.ts +++ b/libs/common/src/platform/services/fido2/fido2-authenticator.service.ts @@ -1,6 +1,9 @@ -import { LogService } from "../../../platform/abstractions/log.service"; -import { Utils } from "../../../platform/misc/utils"; -import { CipherService } from "../../abstractions/cipher.service"; +import { CipherService } from "../../../vault/abstractions/cipher.service"; +import { SyncService } from "../../../vault/abstractions/sync/sync.service.abstraction"; +import { CipherRepromptType } from "../../../vault/enums/cipher-reprompt-type"; +import { CipherType } from "../../../vault/enums/cipher-type"; +import { CipherView } from "../../../vault/models/view/cipher.view"; +import { Fido2CredentialView } from "../../../vault/models/view/fido2-credential.view"; import { Fido2AlgorithmIdentifier, Fido2AuthenticatorError, @@ -13,11 +16,8 @@ import { PublicKeyCredentialDescriptor, } from "../../abstractions/fido2/fido2-authenticator.service.abstraction"; import { Fido2UserInterfaceService } from "../../abstractions/fido2/fido2-user-interface.service.abstraction"; -import { SyncService } from "../../abstractions/sync/sync.service.abstraction"; -import { CipherRepromptType } from "../../enums/cipher-reprompt-type"; -import { CipherType } from "../../enums/cipher-type"; -import { CipherView } from "../../models/view/cipher.view"; -import { Fido2CredentialView } from "../../models/view/fido2-credential.view"; +import { LogService } from "../../abstractions/log.service"; +import { Utils } from "../../misc/utils"; import { CBOR } from "./cbor"; import { p1363ToDer } from "./ecdsa-utils"; diff --git a/libs/common/src/vault/services/fido2/fido2-client.service.spec.ts b/libs/common/src/platform/services/fido2/fido2-client.service.spec.ts similarity index 98% rename from libs/common/src/vault/services/fido2/fido2-client.service.spec.ts rename to libs/common/src/platform/services/fido2/fido2-client.service.spec.ts index 9757e24d8f..13e1d8f282 100644 --- a/libs/common/src/vault/services/fido2/fido2-client.service.spec.ts +++ b/libs/common/src/platform/services/fido2/fido2-client.service.spec.ts @@ -4,8 +4,8 @@ import { of } from "rxjs"; import { AuthService } from "../../../auth/abstractions/auth.service"; import { AuthenticationStatus } from "../../../auth/enums/authentication-status"; import { DomainSettingsService } from "../../../autofill/services/domain-settings.service"; -import { ConfigService } from "../../../platform/abstractions/config/config.service"; -import { Utils } from "../../../platform/misc/utils"; +import { VaultSettingsService } from "../../../vault/abstractions/vault-settings/vault-settings.service"; +import { ConfigService } from "../../abstractions/config/config.service"; import { Fido2AuthenticatorError, Fido2AuthenticatorErrorCode, @@ -17,7 +17,7 @@ import { CreateCredentialParams, FallbackRequestedError, } from "../../abstractions/fido2/fido2-client.service.abstraction"; -import { VaultSettingsService } from "../../abstractions/vault-settings/vault-settings.service"; +import { Utils } from "../../misc/utils"; import { Fido2AuthenticatorService } from "./fido2-authenticator.service"; import { Fido2ClientService } from "./fido2-client.service"; diff --git a/libs/common/src/vault/services/fido2/fido2-client.service.ts b/libs/common/src/platform/services/fido2/fido2-client.service.ts similarity index 98% rename from libs/common/src/vault/services/fido2/fido2-client.service.ts rename to libs/common/src/platform/services/fido2/fido2-client.service.ts index 4e0aab017a..5b6a13bc3f 100644 --- a/libs/common/src/vault/services/fido2/fido2-client.service.ts +++ b/libs/common/src/platform/services/fido2/fido2-client.service.ts @@ -4,9 +4,8 @@ import { parse } from "tldts"; import { AuthService } from "../../../auth/abstractions/auth.service"; import { AuthenticationStatus } from "../../../auth/enums/authentication-status"; import { DomainSettingsService } from "../../../autofill/services/domain-settings.service"; -import { ConfigService } from "../../../platform/abstractions/config/config.service"; -import { LogService } from "../../../platform/abstractions/log.service"; -import { Utils } from "../../../platform/misc/utils"; +import { VaultSettingsService } from "../../../vault/abstractions/vault-settings/vault-settings.service"; +import { ConfigService } from "../../abstractions/config/config.service"; import { Fido2AuthenticatorError, Fido2AuthenticatorErrorCode, @@ -26,7 +25,8 @@ import { UserRequestedFallbackAbortReason, UserVerification, } from "../../abstractions/fido2/fido2-client.service.abstraction"; -import { VaultSettingsService } from "../../abstractions/vault-settings/vault-settings.service"; +import { LogService } from "../../abstractions/log.service"; +import { Utils } from "../../misc/utils"; import { isValidRpId } from "./domain-utils"; import { Fido2Utils } from "./fido2-utils"; diff --git a/libs/common/src/vault/services/fido2/fido2-utils.spec.ts b/libs/common/src/platform/services/fido2/fido2-utils.spec.ts similarity index 100% rename from libs/common/src/vault/services/fido2/fido2-utils.spec.ts rename to libs/common/src/platform/services/fido2/fido2-utils.spec.ts diff --git a/libs/common/src/vault/services/fido2/fido2-utils.ts b/libs/common/src/platform/services/fido2/fido2-utils.ts similarity index 100% rename from libs/common/src/vault/services/fido2/fido2-utils.ts rename to libs/common/src/platform/services/fido2/fido2-utils.ts diff --git a/libs/common/src/vault/services/fido2/guid-utils.ts b/libs/common/src/platform/services/fido2/guid-utils.ts similarity index 100% rename from libs/common/src/vault/services/fido2/guid-utils.ts rename to libs/common/src/platform/services/fido2/guid-utils.ts diff --git a/libs/common/src/vault/services/fido2/noop-fido2-user-interface.service.ts b/libs/common/src/platform/services/fido2/noop-fido2-user-interface.service.ts similarity index 100% rename from libs/common/src/vault/services/fido2/noop-fido2-user-interface.service.ts rename to libs/common/src/platform/services/fido2/noop-fido2-user-interface.service.ts