[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

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<CredentialCreationOptions> = {},

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";

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"];

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 {

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";

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/platform/abstractions/fido2/fido2-client.service.abstraction";
-import { UserRequestedFallbackAbortReason } from "@bitwarden/common/vault/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";

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";

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";

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,

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";
 

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";
 

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";
+} from "@bitwarden/common/platform/abstractions/fido2/fido2-client.service.abstraction";
-import { Fido2Utils } from "@bitwarden/common/vault/services/fido2/fido2-utils";
+import { Fido2Utils } from "@bitwarden/common/platform/services/fido2/fido2-utils";
 
 import {
   InsecureAssertCredentialParams,

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 "../../../vault/abstractions/cipher.service";
-import { CipherService } from "../../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 { Utils } from "../../misc/utils";
-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 { CBOR } from "./cbor";
 import { AAGUID, Fido2AuthenticatorService } from "./fido2-authenticator.service";

libs/common/src/platform/services/fido2/fido2-authenticator.service.ts

@@ -1,6 +1,9 @@
-import { LogService } from "../../../platform/abstractions/log.service";
+import { CipherService } from "../../../vault/abstractions/cipher.service";
-import { Utils } from "../../../platform/misc/utils";
+import { SyncService } from "../../../vault/abstractions/sync/sync.service.abstraction";
-import { CipherService } from "../../abstractions/cipher.service";
+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 { LogService } from "../../abstractions/log.service";
-import { CipherRepromptType } from "../../enums/cipher-reprompt-type";
+import { Utils } from "../../misc/utils";
-import { CipherType } from "../../enums/cipher-type";
-import { CipherView } from "../../models/view/cipher.view";
-import { Fido2CredentialView } from "../../models/view/fido2-credential.view";
 
 import { CBOR } from "./cbor";
 import { p1363ToDer } from "./ecdsa-utils";

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 { VaultSettingsService } from "../../../vault/abstractions/vault-settings/vault-settings.service";
-import { Utils } from "../../../platform/misc/utils";
+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";

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 { VaultSettingsService } from "../../../vault/abstractions/vault-settings/vault-settings.service";
-import { LogService } from "../../../platform/abstractions/log.service";
+import { ConfigService } from "../../abstractions/config/config.service";
-import { Utils } from "../../../platform/misc/utils";
 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";