bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-18 01:03:35 +00:00
Code Issues Releases Wiki Activity

[PM-1975] Move FIDO2 files into vault folder (#5496)

Browse Source 
* Moved fido2 models to vault in libs

* Moved fido2 models to vault in libs

* Moved fido2 services and abstractions to vault folder in libs

* Moved fido2 popup to vault folder on the browser

* Updated import path after moving files to the vault folder

* Moved authenticator abstraction and service to the vault folder

* Updated content and page script path

* Added content script, page script and background messaging to vault

* fixed lint issue

* Updated reference paths

* Added missing fallbacksupported property in test files

* Added missing fallbacksupported to the newSession method
This commit is contained in:
SmithThe4th
2023-06-07 12:46:52 -04:00
committed by GitHub
parent 1b0d84ff0f
commit a3c902d25a
41 changed files with 74 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/browser/src/background/main.background.ts
View File

@@ -46,11 +46,6 @@ import { TwoFactorService } from "@bitwarden/common/auth/services/two-factor.ser
import { UserVerificationApiService } from "@bitwarden/common/auth/services/user-verification/user-verification-api.service";
import { UserVerificationService } from "@bitwarden/common/auth/services/user-verification/user-verification.service";
import { StateFactory } from "@bitwarden/common/factories/stateFactory";
import { Fido2AuthenticatorService as Fido2AuthenticatorServiceAbstraction } from "@bitwarden/common/fido2/abstractions/fido2-authenticator.service.abstraction";
import { Fido2ClientService as Fido2ClientServiceAbstraction } from "@bitwarden/common/fido2/abstractions/fido2-client.service.abstraction";
import { Fido2UserInterfaceService as Fido2UserInterfaceServiceAbstraction } from "@bitwarden/common/fido2/abstractions/fido2-user-interface.service.abstraction";
import { Fido2AuthenticatorService } from "@bitwarden/common/fido2/services/fido2-authenticator.service";
import { Fido2ClientService } from "@bitwarden/common/fido2/services/fido2-client.service";
import { GlobalState } from "@bitwarden/common/models/domain/global-state";
import { AvatarUpdateService } from "@bitwarden/common/services/account/avatar-update.service";
import { ApiService } from "@bitwarden/common/services/api.service";
@@ -85,6 +80,9 @@ import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.s
import { SendApiService as SendApiServiceAbstraction } from "@bitwarden/common/tools/send/services/send-api.service.abstraction";
import { InternalSendService as InternalSendServiceAbstraction } from "@bitwarden/common/tools/send/services/send.service.abstraction";
import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vault/abstractions/cipher.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";
@@ -92,6 +90,8 @@ import { SyncNotifierService as SyncNotifierServiceAbstraction } from "@bitwarde
import { SyncService as SyncServiceAbstraction } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import { CipherService } from "@bitwarden/common/vault/services/cipher.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 { SyncNotifierService } from "@bitwarden/common/vault/services/sync/sync-notifier.service";

4
apps/browser/src/browser/webauthn-utils.ts
View File

@@ -3,8 +3,8 @@ import {
CreateCredentialResult,
AssertCredentialParams,
AssertCredentialResult,
} from "@bitwarden/common/fido2/abstractions/fido2-client.service.abstraction";
import { Fido2Utils } from "@bitwarden/common/fido2/abstractions/fido2-utils";
} from "@bitwarden/common/vault/abstractions/fido2/fido2-client.service.abstraction";
import { Fido2Utils } from "@bitwarden/common/vault/services/fido2/fido2-utils";
export class WebauthnUtils {
static mapCredentialCreationOptions(

2
apps/browser/src/popup/app-routing.module.ts
View File

@@ -18,13 +18,13 @@ import { SsoComponent } from "../auth/popup/sso.component";
import { TwoFactorOptionsComponent } from "../auth/popup/two-factor-options.component";
import { TwoFactorComponent } from "../auth/popup/two-factor.component";
import { UpdateTempPasswordComponent } from "../auth/popup/update-temp-password.component";
import { Fido2Component } from "../fido2/popup/fido2/fido2.component";
import { GeneratorComponent } from "../tools/popup/generator/generator.component";
import { PasswordGeneratorHistoryComponent } from "../tools/popup/generator/password-generator-history.component";
import { SendAddEditComponent } from "../tools/popup/send/send-add-edit.component";
import { SendGroupingsComponent } from "../tools/popup/send/send-groupings.component";
import { SendTypeComponent } from "../tools/popup/send/send-type.component";
import { ExportComponent } from "../tools/popup/settings/export.component";
import { Fido2Component } from "../vault/popup/components/fido2/fido2.component";
import { AddEditComponent } from "../vault/popup/components/vault/add-edit.component";
import { AttachmentsComponent } from "../vault/popup/components/vault/attachments.component";
import { CollectionsComponent } from "../vault/popup/components/vault/collections.component";

2
apps/browser/src/popup/app.module.ts
View File

@@ -29,7 +29,6 @@ import { SsoComponent } from "../auth/popup/sso.component";
import { TwoFactorOptionsComponent } from "../auth/popup/two-factor-options.component";
import { TwoFactorComponent } from "../auth/popup/two-factor.component";
import { UpdateTempPasswordComponent } from "../auth/popup/update-temp-password.component";
import { Fido2Component } from "../fido2/popup/fido2/fido2.component";
import { GeneratorComponent } from "../tools/popup/generator/generator.component";
import { PasswordGeneratorHistoryComponent } from "../tools/popup/generator/password-generator-history.component";
import { SendListComponent } from "../tools/popup/send/components/send-list.component";
@@ -40,6 +39,7 @@ import { SendTypeComponent } from "../tools/popup/send/send-type.component";
import { ExportComponent } from "../tools/popup/settings/export.component";
import { ActionButtonsComponent } from "../vault/popup/components/action-buttons.component";
import { CipherRowComponent } from "../vault/popup/components/cipher-row.component";
import { Fido2Component } from "../vault/popup/components/fido2/fido2.component";
import { PasswordRepromptComponent } from "../vault/popup/components/password-reprompt.component";
import { AddEditCustomFieldsComponent } from "../vault/popup/components/vault/add-edit-custom-fields.component";
import { AddEditComponent } from "../vault/popup/components/vault/add-edit.component";

6
apps/browser/src/services/fido2/browser-fido2-user-interface.service.ts
View File

@@ -10,14 +10,14 @@ import {
takeUntil,
} from "rxjs";
import { UserRequestedFallbackAbortReason } from "@bitwarden/common/fido2/abstractions/fido2-client.service.abstraction";
import { Utils } from "@bitwarden/common/misc/utils";
import { UserRequestedFallbackAbortReason } from "@bitwarden/common/vault/abstractions/fido2/fido2-client.service.abstraction";
import {
Fido2UserInterfaceService as Fido2UserInterfaceServiceAbstraction,
Fido2UserInterfaceSession,
NewCredentialParams,
PickCredentialParams,
} from "@bitwarden/common/fido2/abstractions/fido2-user-interface.service.abstraction";
import { Utils } from "@bitwarden/common/misc/utils";
} from "@bitwarden/common/vault/abstractions/fido2/fido2-user-interface.service.abstraction";
import { BrowserApi } from "../../browser/browserApi";
import { Popout, PopupUtilsService } from "../../popup/services/popup-utils.service";

0
apps/browser/src/fido2/content/content-script.ts → apps/browser/src/vault/fido2/content/content-script.ts
View File

2
apps/browser/src/fido2/content/messaging/message.ts → apps/browser/src/vault/fido2/content/messaging/message.ts
View File

@@ -3,7 +3,7 @@ import {
CreateCredentialResult,
AssertCredentialParams,
AssertCredentialResult,
} from "@bitwarden/common/fido2/abstractions/fido2-client.service.abstraction";
} from "@bitwarden/common/vault/abstractions/fido2/fido2-client.service.abstraction";
export enum MessageType {
CredentialCreationRequest,

0
apps/browser/src/fido2/content/messaging/messenger.spec.ts → apps/browser/src/vault/fido2/content/messaging/messenger.spec.ts
View File

0
apps/browser/src/fido2/content/messaging/messenger.ts → apps/browser/src/vault/fido2/content/messaging/messenger.ts
View File

2
apps/browser/src/fido2/content/page-script.ts → apps/browser/src/vault/fido2/content/page-script.ts
View File

@@ -1,4 +1,4 @@
import { WebauthnUtils } from "../../browser/webauthn-utils";
import { WebauthnUtils } from "../../../browser/webauthn-utils";
import { MessageType } from "./messaging/message";
import { Messenger } from "./messaging/messenger";

0
apps/browser/src/fido2/popup/fido2/fido2.component.html → apps/browser/src/vault/popup/components/fido2/fido2.component.html
View File

6
apps/browser/src/fido2/popup/fido2/fido2.component.ts → apps/browser/src/vault/popup/components/fido2/fido2.component.ts
View File

@@ -12,17 +12,17 @@ import {
takeUntil,
} from "rxjs";
import { Fido2KeyView } from "@bitwarden/common/fido2/models/view/fido2-key.view";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service";
import { CipherType } from "@bitwarden/common/vault/enums/cipher-type";
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import { Fido2KeyView } from "@bitwarden/common/vault/models/view/fido2-key.view";
import { BrowserApi } from "../../../browser/browserApi";
import { BrowserApi } from "../../../../browser/browserApi";
import {
BrowserFido2Message,
BrowserFido2UserInterfaceSession,
} from "../../../services/fido2/browser-fido2-user-interface.service";
} from "../../../../services/fido2/browser-fido2-user-interface.service";
interface ViewData {
message: BrowserFido2Message;

4
apps/browser/webpack.config.js
View File

@@ -147,8 +147,8 @@ const mainConfig = {
"content/notificationBar": "./src/autofill/content/notification-bar.ts",
"content/contextMenuHandler": "./src/autofill/content/context-menu-handler.ts",
"content/message_handler": "./src/autofill/content/message_handler.ts",
"content/fido2/content-script": "./src/fido2/content/content-script.ts",
"content/fido2/page-script": "./src/fido2/content/page-script.ts",
"content/fido2/content-script": "./src/vault/fido2/content/content-script.ts",
"content/fido2/page-script": "./src/vault/fido2/content/page-script.ts",
"notification/bar": "./src/autofill/notification/bar.ts",
"encrypt-worker": "../../libs/common/src/services/cryptography/encrypt.worker.ts",
},