From db2d8aaa7eb86392149790e1fff01ae73ff6d6c6 Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Thu, 24 Nov 2022 15:05:45 +0100 Subject: [PATCH] Rename files and folders per ADR #12 (#4106) Renamed folders: ./apps/desktop/src/models/nativeMessaging ./apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads ./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses Renamed all files Cleaned up entries in whitelist-capital-letters.txt --- .github/whitelist-capital-letters.txt | 36 ------------------- .../src/commands/bw-credential-create.ts | 6 ++-- .../src/commands/bw-credential-retrieval.ts | 4 +-- .../src/commands/bw-credential-update.ts | 6 ++-- .../src/commands/bw-generate-password.ts | 4 +-- .../src/commands/bw-handshake.ts | 4 +-- .../src/commands/bw-status.ts | 4 +-- .../src/{ipcService.ts => ipc.service.ts} | 4 +-- .../src/{logUtils.ts => log-utils.ts} | 0 ...geService.ts => native-message.service.ts} | 18 +++++----- ...ce.ts => desktop-file-download.service.ts} | 0 apps/desktop/src/app/services/init.service.ts | 2 +- .../src/app/services/services.module.ts | 10 +++--- apps/desktop/src/main.ts | 6 ++-- ...=> desktop-credential-storage-listener.ts} | 0 ...aging.main.ts => native-messaging.main.ts} | 0 ...rMonitor.main.ts => power-monitor.main.ts} | 0 .../decrypted-command-data.ts} | 2 +- .../encrypted-command.ts} | 0 .../credential-create-payload.ts} | 0 .../credential-retrieve-payload.ts} | 0 .../credential-update-payload.ts} | 0 .../password-generate-payload.ts} | 0 .../encrypted-message-response.ts} | 2 +- .../account-status-response.ts} | 0 .../cannot-decrypt-error-response.ts} | 0 .../cipher-response.ts} | 0 .../encrypted-message-response.ts | 16 +++++++++ .../failure-status-response.ts} | 0 .../generate-response.ts} | 0 .../success-status-response.ts} | 0 .../user-status-error-response.ts} | 0 .../encrypted-message.ts} | 2 +- .../src/models/native-messaging/index.ts | 25 +++++++++++++ .../legacy-message-wrapper.ts} | 2 +- .../legacy-message.ts} | 0 .../message-common.ts} | 0 .../src/models/native-messaging/message.ts | 4 +++ .../unencrypted-command.ts} | 0 .../unencrypted-message-response.ts} | 2 +- .../unencrypted-message.ts} | 4 +-- .../encryptedMessageResponse.ts | 16 --------- .../src/models/nativeMessaging/index.ts | 25 ------------- .../src/models/nativeMessaging/message.ts | 4 --- ...s => encrypted-message-handler.service.ts} | 24 ++++++------- ...e.ts => native-message-handler.service.ts} | 14 ++++---- ...service.ts => native-messaging.service.ts} | 8 ++--- ...ervice.ts => password-reprompt.service.ts} | 0 48 files changed, 109 insertions(+), 145 deletions(-) rename apps/desktop/native-messaging-test-runner/src/{ipcService.ts => ipc.service.ts} (97%) rename apps/desktop/native-messaging-test-runner/src/{logUtils.ts => log-utils.ts} (100%) rename apps/desktop/native-messaging-test-runner/src/{nativeMessageService.ts => native-message.service.ts} (91%) rename apps/desktop/src/app/services/{desktopFileDownloadService.ts => desktop-file-download.service.ts} (100%) rename apps/desktop/src/main/{desktopCredentialStorageListener.ts => desktop-credential-storage-listener.ts} (100%) rename apps/desktop/src/main/{nativeMessaging.main.ts => native-messaging.main.ts} (100%) rename apps/desktop/src/main/{powerMonitor.main.ts => power-monitor.main.ts} (100%) rename apps/desktop/src/models/{nativeMessaging/decryptedCommandData.ts => native-messaging/decrypted-command-data.ts} (60%) rename apps/desktop/src/models/{nativeMessaging/encryptedCommand.ts => native-messaging/encrypted-command.ts} (100%) rename apps/desktop/src/models/{nativeMessaging/encryptedMessagePayloads/credentialCreatePayload.ts => native-messaging/encrypted-message-payloads/credential-create-payload.ts} (100%) rename apps/desktop/src/models/{nativeMessaging/encryptedMessagePayloads/credentialRetrievePayload.ts => native-messaging/encrypted-message-payloads/credential-retrieve-payload.ts} (100%) rename apps/desktop/src/models/{nativeMessaging/encryptedMessagePayloads/credentialUpdatePayload.ts => native-messaging/encrypted-message-payloads/credential-update-payload.ts} (100%) rename apps/desktop/src/models/{nativeMessaging/encryptedMessagePayloads/passwordGeneratePayload.ts => native-messaging/encrypted-message-payloads/password-generate-payload.ts} (100%) rename apps/desktop/src/models/{nativeMessaging/encryptedMessageResponse.ts => native-messaging/encrypted-message-response.ts} (76%) rename apps/desktop/src/models/{nativeMessaging/encryptedMessageResponses/accountStatusResponse.ts => native-messaging/encrypted-message-responses/account-status-response.ts} (100%) rename apps/desktop/src/models/{nativeMessaging/encryptedMessageResponses/cannotDecryptErrorResponse.ts => native-messaging/encrypted-message-responses/cannot-decrypt-error-response.ts} (100%) rename apps/desktop/src/models/{nativeMessaging/encryptedMessageResponses/cipherResponse.ts => native-messaging/encrypted-message-responses/cipher-response.ts} (100%) create mode 100644 apps/desktop/src/models/native-messaging/encrypted-message-responses/encrypted-message-response.ts rename apps/desktop/src/models/{nativeMessaging/encryptedMessageResponses/failureStatusResponse.ts => native-messaging/encrypted-message-responses/failure-status-response.ts} (100%) rename apps/desktop/src/models/{nativeMessaging/encryptedMessageResponses/generateResponse.ts => native-messaging/encrypted-message-responses/generate-response.ts} (100%) rename apps/desktop/src/models/{nativeMessaging/encryptedMessageResponses/successStatusResponse.ts => native-messaging/encrypted-message-responses/success-status-response.ts} (100%) rename apps/desktop/src/models/{nativeMessaging/encryptedMessageResponses/userStatusErrorResponse.ts => native-messaging/encrypted-message-responses/user-status-error-response.ts} (100%) rename apps/desktop/src/models/{nativeMessaging/encryptedMessage.ts => native-messaging/encrypted-message.ts} (80%) create mode 100644 apps/desktop/src/models/native-messaging/index.ts rename apps/desktop/src/models/{nativeMessaging/legacyMessageWrapper.ts => native-messaging/legacy-message-wrapper.ts} (77%) rename apps/desktop/src/models/{nativeMessaging/legacyMessage.ts => native-messaging/legacy-message.ts} (100%) rename apps/desktop/src/models/{nativeMessaging/messageCommon.ts => native-messaging/message-common.ts} (100%) create mode 100644 apps/desktop/src/models/native-messaging/message.ts rename apps/desktop/src/models/{nativeMessaging/unencryptedCommand.ts => native-messaging/unencrypted-command.ts} (100%) rename apps/desktop/src/models/{nativeMessaging/unencryptedMessageResponse.ts => native-messaging/unencrypted-message-response.ts} (85%) rename apps/desktop/src/models/{nativeMessaging/unencryptedMessage.ts => native-messaging/unencrypted-message.ts} (58%) delete mode 100644 apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/encryptedMessageResponse.ts delete mode 100644 apps/desktop/src/models/nativeMessaging/index.ts delete mode 100644 apps/desktop/src/models/nativeMessaging/message.ts rename apps/desktop/src/services/{encryptedMessageHandlerService.ts => encrypted-message-handler.service.ts} (84%) rename apps/desktop/src/services/{nativeMessageHandler.service.ts => native-message-handler.service.ts} (92%) rename apps/desktop/src/services/{nativeMessaging.service.ts => native-messaging.service.ts} (95%) rename apps/desktop/src/services/{passwordReprompt.service.ts => password-reprompt.service.ts} (100%) diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt index 1b5a775d835..613e70ee2c0 100644 --- a/.github/whitelist-capital-letters.txt +++ b/.github/whitelist-capital-letters.txt @@ -4,9 +4,6 @@ ./apps/browser/src/safari/desktop/Base.lproj ./apps/browser/src/services/vaultTimeout ./apps/browser/store/windows/Assets -./apps/desktop/src/models/nativeMessaging -./apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads -./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses ./libs/common/spec/misc/logInStrategies ./libs/common/src/abstractions/fileDownload ./libs/common/src/abstractions/userVerification @@ -179,42 +176,9 @@ ./apps/desktop/resources/appx/StoreLogo.png ./apps/desktop/resources/appx/Wide310x150Logo.png ./apps/desktop/resources/appx/Square44x44Logo.png -./apps/desktop/native-messaging-test-runner/src/ipcService.ts -./apps/desktop/native-messaging-test-runner/src/nativeMessageService.ts -./apps/desktop/native-messaging-test-runner/src/logUtils.ts ./apps/desktop/README.md ./apps/desktop/desktop_native/Cargo.toml ./apps/desktop/desktop_native/Cargo.lock -./apps/desktop/src/app/services/desktopFileDownloadService.ts -./apps/desktop/src/models/nativeMessaging/unencryptedCommand.ts -./apps/desktop/src/models/nativeMessaging/encryptedMessage.ts -./apps/desktop/src/models/nativeMessaging/legacyMessageWrapper.ts -./apps/desktop/src/models/nativeMessaging/unencryptedMessage.ts -./apps/desktop/src/models/nativeMessaging/unencryptedMessageResponse.ts -./apps/desktop/src/models/nativeMessaging/encryptedCommand.ts -./apps/desktop/src/models/nativeMessaging/encryptedMessageResponse.ts -./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/successStatusResponse.ts -./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/generateResponse.ts -./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/failureStatusResponse.ts -./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/cannotDecryptErrorResponse.ts -./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/userStatusErrorResponse.ts -./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/accountStatusResponse.ts -./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/encryptedMessageResponse.ts -./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/cipherResponse.ts -./apps/desktop/src/models/nativeMessaging/decryptedCommandData.ts -./apps/desktop/src/models/nativeMessaging/messageCommon.ts -./apps/desktop/src/models/nativeMessaging/legacyMessage.ts -./apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialUpdatePayload.ts -./apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/passwordGeneratePayload.ts -./apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialCreatePayload.ts -./apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialRetrievePayload.ts -./apps/desktop/src/main/desktopCredentialStorageListener.ts -./apps/desktop/src/main/powerMonitor.main.ts -./apps/desktop/src/main/nativeMessaging.main.ts -./apps/desktop/src/services/passwordReprompt.service.ts -./apps/desktop/src/services/encryptedMessageHandlerService.ts -./apps/desktop/src/services/nativeMessaging.service.ts -./apps/desktop/src/services/nativeMessageHandler.service.ts ./apps/cli/stores/chocolatey/tools/VERIFICATION.txt ./apps/cli/README.md ./apps/browser/README.md diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts index a017b4c72cb..5598f4e25ed 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts @@ -5,9 +5,9 @@ import { hideBin } from "yargs/helpers"; import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion"; -import { CredentialCreatePayload } from "../../../src/models/nativeMessaging/encryptedMessagePayloads/credentialCreatePayload"; -import { LogUtils } from "../logUtils"; -import NativeMessageService from "../nativeMessageService"; +import { CredentialCreatePayload } from "../../../src/models/native-messaging/encrypted-message-payloads/credential-create-payload"; +import { LogUtils } from "../log-utils"; +import NativeMessageService from "../native-message.service"; import * as config from "../variables"; const argv: any = yargs(hideBin(process.argv)).option("name", { diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-retrieval.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-retrieval.ts index 17244623b55..553b5f8ca95 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-retrieval.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-retrieval.ts @@ -5,8 +5,8 @@ import { hideBin } from "yargs/helpers"; import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion"; -import { LogUtils } from "../logUtils"; -import NativeMessageService from "../nativeMessageService"; +import { LogUtils } from "../log-utils"; +import NativeMessageService from "../native-message.service"; import * as config from "../variables"; const argv: any = yargs(hideBin(process.argv)).option("uri", { diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts index ecfbd3f5bb8..9de17ef63d2 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts @@ -5,9 +5,9 @@ import { hideBin } from "yargs/helpers"; import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion"; -import { CredentialUpdatePayload } from "../../../src/models/nativeMessaging/encryptedMessagePayloads/credentialUpdatePayload"; -import { LogUtils } from "../logUtils"; -import NativeMessageService from "../nativeMessageService"; +import { CredentialUpdatePayload } from "../../../src/models/native-messaging/encrypted-message-payloads/credential-update-payload"; +import { LogUtils } from "../log-utils"; +import NativeMessageService from "../native-message.service"; import * as config from "../variables"; // Command line arguments diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-generate-password.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-generate-password.ts index 34bb41abb95..eb711de9cb8 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-generate-password.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-generate-password.ts @@ -5,8 +5,8 @@ import { hideBin } from "yargs/helpers"; import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion"; -import { LogUtils } from "../logUtils"; -import NativeMessageService from "../nativeMessageService"; +import { LogUtils } from "../log-utils"; +import NativeMessageService from "../native-message.service"; import * as config from "../variables"; const argv: any = yargs(hideBin(process.argv)).option("userId", { diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-handshake.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-handshake.ts index f3098062c46..e22e9bc6b5e 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-handshake.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-handshake.ts @@ -2,8 +2,8 @@ import "module-alias/register"; import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion"; -import { LogUtils } from "../logUtils"; -import NativeMessageService from "../nativeMessageService"; +import { LogUtils } from "../log-utils"; +import NativeMessageService from "../native-message.service"; import * as config from "../variables"; (async () => { diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-status.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-status.ts index 7782e203cb8..b2d520ff0c8 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-status.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-status.ts @@ -2,8 +2,8 @@ import "module-alias/register"; import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion"; -import { LogUtils } from "../logUtils"; -import NativeMessageService from "../nativeMessageService"; +import { LogUtils } from "../log-utils"; +import NativeMessageService from "../native-message.service"; import * as config from "../variables"; (async () => { diff --git a/apps/desktop/native-messaging-test-runner/src/ipcService.ts b/apps/desktop/native-messaging-test-runner/src/ipc.service.ts similarity index 97% rename from apps/desktop/native-messaging-test-runner/src/ipcService.ts rename to apps/desktop/native-messaging-test-runner/src/ipc.service.ts index eadc69a3513..b1c1b9d16b6 100644 --- a/apps/desktop/native-messaging-test-runner/src/ipcService.ts +++ b/apps/desktop/native-messaging-test-runner/src/ipc.service.ts @@ -2,8 +2,8 @@ import { homedir } from "os"; import * as NodeIPC from "node-ipc"; -import { MessageCommon } from "../../src/models/nativeMessaging/messageCommon"; -import { UnencryptedMessageResponse } from "../../src/models/nativeMessaging/unencryptedMessageResponse"; +import { MessageCommon } from "../../src/models/native-messaging/message-common"; +import { UnencryptedMessageResponse } from "../../src/models/native-messaging/unencrypted-message-response"; import Deferred from "./deferred"; import { race } from "./race"; diff --git a/apps/desktop/native-messaging-test-runner/src/logUtils.ts b/apps/desktop/native-messaging-test-runner/src/log-utils.ts similarity index 100% rename from apps/desktop/native-messaging-test-runner/src/logUtils.ts rename to apps/desktop/native-messaging-test-runner/src/log-utils.ts diff --git a/apps/desktop/native-messaging-test-runner/src/nativeMessageService.ts b/apps/desktop/native-messaging-test-runner/src/native-message.service.ts similarity index 91% rename from apps/desktop/native-messaging-test-runner/src/nativeMessageService.ts rename to apps/desktop/native-messaging-test-runner/src/native-message.service.ts index d1f29493fc0..8ba6526384e 100644 --- a/apps/desktop/native-messaging-test-runner/src/nativeMessageService.ts +++ b/apps/desktop/native-messaging-test-runner/src/native-message.service.ts @@ -9,16 +9,16 @@ import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service import { EncryptServiceImplementation } from "@bitwarden/common/services/cryptography/encrypt.service.implementation"; import { NodeCryptoFunctionService } from "@bitwarden/node/services/node-crypto-function.service"; -import { DecryptedCommandData } from "../../src/models/nativeMessaging/decryptedCommandData"; -import { EncryptedMessage } from "../../src/models/nativeMessaging/encryptedMessage"; -import { CredentialCreatePayload } from "../../src/models/nativeMessaging/encryptedMessagePayloads/credentialCreatePayload"; -import { CredentialUpdatePayload } from "../../src/models/nativeMessaging/encryptedMessagePayloads/credentialUpdatePayload"; -import { EncryptedMessageResponse } from "../../src/models/nativeMessaging/encryptedMessageResponse"; -import { MessageCommon } from "../../src/models/nativeMessaging/messageCommon"; -import { UnencryptedMessage } from "../../src/models/nativeMessaging/unencryptedMessage"; -import { UnencryptedMessageResponse } from "../../src/models/nativeMessaging/unencryptedMessageResponse"; +import { DecryptedCommandData } from "../../src/models/native-messaging/decrypted-command-data"; +import { EncryptedMessage } from "../../src/models/native-messaging/encrypted-message"; +import { CredentialCreatePayload } from "../../src/models/native-messaging/encrypted-message-payloads/credential-create-payload"; +import { CredentialUpdatePayload } from "../../src/models/native-messaging/encrypted-message-payloads/credential-update-payload"; +import { EncryptedMessageResponse } from "../../src/models/native-messaging/encrypted-message-response"; +import { MessageCommon } from "../../src/models/native-messaging/message-common"; +import { UnencryptedMessage } from "../../src/models/native-messaging/unencrypted-message"; +import { UnencryptedMessageResponse } from "../../src/models/native-messaging/unencrypted-message-response"; -import IPCService, { IPCOptions } from "./ipcService"; +import IPCService, { IPCOptions } from "./ipc.service"; import * as config from "./variables"; type HandshakeResponse = { diff --git a/apps/desktop/src/app/services/desktopFileDownloadService.ts b/apps/desktop/src/app/services/desktop-file-download.service.ts similarity index 100% rename from apps/desktop/src/app/services/desktopFileDownloadService.ts rename to apps/desktop/src/app/services/desktop-file-download.service.ts diff --git a/apps/desktop/src/app/services/init.service.ts b/apps/desktop/src/app/services/init.service.ts index 525d593911d..c706136a758 100644 --- a/apps/desktop/src/app/services/init.service.ts +++ b/apps/desktop/src/app/services/init.service.ts @@ -18,7 +18,7 @@ import { EventService } from "@bitwarden/common/services/event.service"; import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service"; import { I18nService } from "../../services/i18n.service"; -import { NativeMessagingService } from "../../services/nativeMessaging.service"; +import { NativeMessagingService } from "../../services/native-messaging.service"; @Injectable() export class InitService { diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts index 6dc9b8b0dbb..cd07ce93d42 100644 --- a/apps/desktop/src/app/services/services.module.ts +++ b/apps/desktop/src/app/services/services.module.ts @@ -47,17 +47,17 @@ import { ElectronRendererSecureStorageService } from "@bitwarden/electron/servic import { ElectronRendererStorageService } from "@bitwarden/electron/services/electronRendererStorage.service"; import { Account } from "../../models/account"; -import { EncryptedMessageHandlerService } from "../../services/encryptedMessageHandlerService"; +import { EncryptedMessageHandlerService } from "../../services/encrypted-message-handler.service"; import { I18nService } from "../../services/i18n.service"; -import { NativeMessageHandlerService } from "../../services/nativeMessageHandler.service"; -import { NativeMessagingService } from "../../services/nativeMessaging.service"; -import { PasswordRepromptService } from "../../services/passwordReprompt.service"; +import { NativeMessageHandlerService } from "../../services/native-message-handler.service"; +import { NativeMessagingService } from "../../services/native-messaging.service"; +import { PasswordRepromptService } from "../../services/password-reprompt.service"; import { StateService } from "../../services/state.service"; import { LoginGuard } from "../guards/login.guard"; import { SearchBarService } from "../layout/search/search-bar.service"; +import { DesktopFileDownloadService } from "./desktop-file-download.service"; import { DesktopThemingService } from "./desktop-theming.service"; -import { DesktopFileDownloadService } from "./desktopFileDownloadService"; import { InitService } from "./init.service"; const RELOAD_CALLBACK = new InjectionToken<() => any>("RELOAD_CALLBACK"); diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts index d54d46487a2..8c99b81911a 100644 --- a/apps/desktop/src/main.ts +++ b/apps/desktop/src/main.ts @@ -14,11 +14,11 @@ import { UpdaterMain } from "@bitwarden/electron/updater.main"; import { WindowMain } from "@bitwarden/electron/window.main"; import { BiometricMain } from "./main/biometric/biometric.main"; -import { DesktopCredentialStorageListener } from "./main/desktopCredentialStorageListener"; +import { DesktopCredentialStorageListener } from "./main/desktop-credential-storage-listener"; import { MenuMain } from "./main/menu/menu.main"; import { MessagingMain } from "./main/messaging.main"; -import { NativeMessagingMain } from "./main/nativeMessaging.main"; -import { PowerMonitorMain } from "./main/powerMonitor.main"; +import { NativeMessagingMain } from "./main/native-messaging.main"; +import { PowerMonitorMain } from "./main/power-monitor.main"; import { Account } from "./models/account"; import { I18nService } from "./services/i18n.service"; diff --git a/apps/desktop/src/main/desktopCredentialStorageListener.ts b/apps/desktop/src/main/desktop-credential-storage-listener.ts similarity index 100% rename from apps/desktop/src/main/desktopCredentialStorageListener.ts rename to apps/desktop/src/main/desktop-credential-storage-listener.ts diff --git a/apps/desktop/src/main/nativeMessaging.main.ts b/apps/desktop/src/main/native-messaging.main.ts similarity index 100% rename from apps/desktop/src/main/nativeMessaging.main.ts rename to apps/desktop/src/main/native-messaging.main.ts diff --git a/apps/desktop/src/main/powerMonitor.main.ts b/apps/desktop/src/main/power-monitor.main.ts similarity index 100% rename from apps/desktop/src/main/powerMonitor.main.ts rename to apps/desktop/src/main/power-monitor.main.ts diff --git a/apps/desktop/src/models/nativeMessaging/decryptedCommandData.ts b/apps/desktop/src/models/native-messaging/decrypted-command-data.ts similarity index 60% rename from apps/desktop/src/models/nativeMessaging/decryptedCommandData.ts rename to apps/desktop/src/models/native-messaging/decrypted-command-data.ts index 0aea170f6e6..eeab234d7a4 100644 --- a/apps/desktop/src/models/nativeMessaging/decryptedCommandData.ts +++ b/apps/desktop/src/models/native-messaging/decrypted-command-data.ts @@ -1,4 +1,4 @@ -import { EncryptedCommand } from "./encryptedCommand"; +import { EncryptedCommand } from "./encrypted-command"; export type DecryptedCommandData = { command: EncryptedCommand; diff --git a/apps/desktop/src/models/nativeMessaging/encryptedCommand.ts b/apps/desktop/src/models/native-messaging/encrypted-command.ts similarity index 100% rename from apps/desktop/src/models/nativeMessaging/encryptedCommand.ts rename to apps/desktop/src/models/native-messaging/encrypted-command.ts diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialCreatePayload.ts b/apps/desktop/src/models/native-messaging/encrypted-message-payloads/credential-create-payload.ts similarity index 100% rename from apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialCreatePayload.ts rename to apps/desktop/src/models/native-messaging/encrypted-message-payloads/credential-create-payload.ts diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialRetrievePayload.ts b/apps/desktop/src/models/native-messaging/encrypted-message-payloads/credential-retrieve-payload.ts similarity index 100% rename from apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialRetrievePayload.ts rename to apps/desktop/src/models/native-messaging/encrypted-message-payloads/credential-retrieve-payload.ts diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialUpdatePayload.ts b/apps/desktop/src/models/native-messaging/encrypted-message-payloads/credential-update-payload.ts similarity index 100% rename from apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialUpdatePayload.ts rename to apps/desktop/src/models/native-messaging/encrypted-message-payloads/credential-update-payload.ts diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/passwordGeneratePayload.ts b/apps/desktop/src/models/native-messaging/encrypted-message-payloads/password-generate-payload.ts similarity index 100% rename from apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/passwordGeneratePayload.ts rename to apps/desktop/src/models/native-messaging/encrypted-message-payloads/password-generate-payload.ts diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponse.ts b/apps/desktop/src/models/native-messaging/encrypted-message-response.ts similarity index 76% rename from apps/desktop/src/models/nativeMessaging/encryptedMessageResponse.ts rename to apps/desktop/src/models/native-messaging/encrypted-message-response.ts index bed85b65e96..5f8deb05a30 100644 --- a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponse.ts +++ b/apps/desktop/src/models/native-messaging/encrypted-message-response.ts @@ -1,6 +1,6 @@ import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { MessageCommon } from "./messageCommon"; +import { MessageCommon } from "./message-common"; export type EncryptedMessageResponse = MessageCommon & { encryptedPayload: EncString; diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/accountStatusResponse.ts b/apps/desktop/src/models/native-messaging/encrypted-message-responses/account-status-response.ts similarity index 100% rename from apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/accountStatusResponse.ts rename to apps/desktop/src/models/native-messaging/encrypted-message-responses/account-status-response.ts diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/cannotDecryptErrorResponse.ts b/apps/desktop/src/models/native-messaging/encrypted-message-responses/cannot-decrypt-error-response.ts similarity index 100% rename from apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/cannotDecryptErrorResponse.ts rename to apps/desktop/src/models/native-messaging/encrypted-message-responses/cannot-decrypt-error-response.ts diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/cipherResponse.ts b/apps/desktop/src/models/native-messaging/encrypted-message-responses/cipher-response.ts similarity index 100% rename from apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/cipherResponse.ts rename to apps/desktop/src/models/native-messaging/encrypted-message-responses/cipher-response.ts diff --git a/apps/desktop/src/models/native-messaging/encrypted-message-responses/encrypted-message-response.ts b/apps/desktop/src/models/native-messaging/encrypted-message-responses/encrypted-message-response.ts new file mode 100644 index 00000000000..a0d35a7adbd --- /dev/null +++ b/apps/desktop/src/models/native-messaging/encrypted-message-responses/encrypted-message-response.ts @@ -0,0 +1,16 @@ +import { AccountStatusResponse } from "./account-status-response"; +import { CannotDecryptErrorResponse } from "./cannot-decrypt-error-response"; +import { CipherResponse } from "./cipher-response"; +import { FailureStatusResponse } from "./failure-status-response"; +import { GenerateResponse } from "./generate-response"; +import { SuccessStatusResponse } from "./success-status-response"; +import { UserStatusErrorResponse } from "./user-status-error-response"; + +export type EncyptedMessageResponse = + | AccountStatusResponse[] + | CannotDecryptErrorResponse + | CipherResponse[] + | FailureStatusResponse + | GenerateResponse + | SuccessStatusResponse + | UserStatusErrorResponse; diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/failureStatusResponse.ts b/apps/desktop/src/models/native-messaging/encrypted-message-responses/failure-status-response.ts similarity index 100% rename from apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/failureStatusResponse.ts rename to apps/desktop/src/models/native-messaging/encrypted-message-responses/failure-status-response.ts diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/generateResponse.ts b/apps/desktop/src/models/native-messaging/encrypted-message-responses/generate-response.ts similarity index 100% rename from apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/generateResponse.ts rename to apps/desktop/src/models/native-messaging/encrypted-message-responses/generate-response.ts diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/successStatusResponse.ts b/apps/desktop/src/models/native-messaging/encrypted-message-responses/success-status-response.ts similarity index 100% rename from apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/successStatusResponse.ts rename to apps/desktop/src/models/native-messaging/encrypted-message-responses/success-status-response.ts diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/userStatusErrorResponse.ts b/apps/desktop/src/models/native-messaging/encrypted-message-responses/user-status-error-response.ts similarity index 100% rename from apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/userStatusErrorResponse.ts rename to apps/desktop/src/models/native-messaging/encrypted-message-responses/user-status-error-response.ts diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessage.ts b/apps/desktop/src/models/native-messaging/encrypted-message.ts similarity index 80% rename from apps/desktop/src/models/nativeMessaging/encryptedMessage.ts rename to apps/desktop/src/models/native-messaging/encrypted-message.ts index bd0b5177a40..fc06214875e 100644 --- a/apps/desktop/src/models/nativeMessaging/encryptedMessage.ts +++ b/apps/desktop/src/models/native-messaging/encrypted-message.ts @@ -1,6 +1,6 @@ import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { MessageCommon } from "./messageCommon"; +import { MessageCommon } from "./message-common"; export type EncryptedMessage = MessageCommon & { // Will decrypt to a DecryptedCommandData object diff --git a/apps/desktop/src/models/native-messaging/index.ts b/apps/desktop/src/models/native-messaging/index.ts new file mode 100644 index 00000000000..7f6701886af --- /dev/null +++ b/apps/desktop/src/models/native-messaging/index.ts @@ -0,0 +1,25 @@ +export * from "./encrypted-message-payloads/credential-create-payload"; +export * from "./encrypted-message-payloads/credential-retrieve-payload"; +export * from "./encrypted-message-payloads/credential-update-payload"; +export * from "./encrypted-message-payloads/password-generate-payload"; + +export * from "./encrypted-message-responses/account-status-response"; +export * from "./encrypted-message-responses/cannot-decrypt-error-response"; +export * from "./encrypted-message-responses/cipher-response"; +export * from "./encrypted-message-responses/encrypted-message-response"; +export * from "./encrypted-message-responses/failure-status-response"; +export * from "./encrypted-message-responses/generate-response"; +export * from "./encrypted-message-responses/success-status-response"; +export * from "./encrypted-message-responses/user-status-error-response"; + +export * from "./decrypted-command-data"; +export * from "./encrypted-command"; +export * from "./encrypted-message"; +export * from "./encrypted-message-response"; +export * from "./legacy-message"; +export * from "./legacy-message-wrapper"; +export * from "./message"; +export * from "./message-common"; +export * from "./unencrypted-command"; +export * from "./unencrypted-message"; +export * from "./unencrypted-message-response"; diff --git a/apps/desktop/src/models/nativeMessaging/legacyMessageWrapper.ts b/apps/desktop/src/models/native-messaging/legacy-message-wrapper.ts similarity index 77% rename from apps/desktop/src/models/nativeMessaging/legacyMessageWrapper.ts rename to apps/desktop/src/models/native-messaging/legacy-message-wrapper.ts index 5ef10e73289..03068374069 100644 --- a/apps/desktop/src/models/nativeMessaging/legacyMessageWrapper.ts +++ b/apps/desktop/src/models/native-messaging/legacy-message-wrapper.ts @@ -1,6 +1,6 @@ import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { LegacyMessage } from "./legacyMessage"; +import { LegacyMessage } from "./legacy-message"; export type LegacyMessageWrapper = { message: LegacyMessage | EncString; diff --git a/apps/desktop/src/models/nativeMessaging/legacyMessage.ts b/apps/desktop/src/models/native-messaging/legacy-message.ts similarity index 100% rename from apps/desktop/src/models/nativeMessaging/legacyMessage.ts rename to apps/desktop/src/models/native-messaging/legacy-message.ts diff --git a/apps/desktop/src/models/nativeMessaging/messageCommon.ts b/apps/desktop/src/models/native-messaging/message-common.ts similarity index 100% rename from apps/desktop/src/models/nativeMessaging/messageCommon.ts rename to apps/desktop/src/models/native-messaging/message-common.ts diff --git a/apps/desktop/src/models/native-messaging/message.ts b/apps/desktop/src/models/native-messaging/message.ts new file mode 100644 index 00000000000..b76666bf142 --- /dev/null +++ b/apps/desktop/src/models/native-messaging/message.ts @@ -0,0 +1,4 @@ +import { EncryptedMessage } from "./encrypted-message"; +import { UnencryptedMessage } from "./unencrypted-message"; + +export type Message = UnencryptedMessage | EncryptedMessage; diff --git a/apps/desktop/src/models/nativeMessaging/unencryptedCommand.ts b/apps/desktop/src/models/native-messaging/unencrypted-command.ts similarity index 100% rename from apps/desktop/src/models/nativeMessaging/unencryptedCommand.ts rename to apps/desktop/src/models/native-messaging/unencrypted-command.ts diff --git a/apps/desktop/src/models/nativeMessaging/unencryptedMessageResponse.ts b/apps/desktop/src/models/native-messaging/unencrypted-message-response.ts similarity index 85% rename from apps/desktop/src/models/nativeMessaging/unencryptedMessageResponse.ts rename to apps/desktop/src/models/native-messaging/unencrypted-message-response.ts index a564b1324e2..b4f71ec6253 100644 --- a/apps/desktop/src/models/nativeMessaging/unencryptedMessageResponse.ts +++ b/apps/desktop/src/models/native-messaging/unencrypted-message-response.ts @@ -1,4 +1,4 @@ -import { MessageCommon } from "./messageCommon"; +import { MessageCommon } from "./message-common"; export type UnencryptedMessageResponse = MessageCommon & ( diff --git a/apps/desktop/src/models/nativeMessaging/unencryptedMessage.ts b/apps/desktop/src/models/native-messaging/unencrypted-message.ts similarity index 58% rename from apps/desktop/src/models/nativeMessaging/unencryptedMessage.ts rename to apps/desktop/src/models/native-messaging/unencrypted-message.ts index a665f312a98..d4ddb83ad68 100644 --- a/apps/desktop/src/models/nativeMessaging/unencryptedMessage.ts +++ b/apps/desktop/src/models/native-messaging/unencrypted-message.ts @@ -1,5 +1,5 @@ -import { MessageCommon } from "./messageCommon"; -import { UnencryptedCommand } from "./unencryptedCommand"; +import { MessageCommon } from "./message-common"; +import { UnencryptedCommand } from "./unencrypted-command"; export type UnencryptedMessage = MessageCommon & { command: UnencryptedCommand; diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/encryptedMessageResponse.ts b/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/encryptedMessageResponse.ts deleted file mode 100644 index a10da2d8571..00000000000 --- a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/encryptedMessageResponse.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { AccountStatusResponse } from "./accountStatusResponse"; -import { CannotDecryptErrorResponse } from "./cannotDecryptErrorResponse"; -import { CipherResponse } from "./cipherResponse"; -import { FailureStatusResponse } from "./failureStatusResponse"; -import { GenerateResponse } from "./generateResponse"; -import { SuccessStatusResponse } from "./successStatusResponse"; -import { UserStatusErrorResponse } from "./userStatusErrorResponse"; - -export type EncyptedMessageResponse = - | AccountStatusResponse[] - | CannotDecryptErrorResponse - | CipherResponse[] - | FailureStatusResponse - | GenerateResponse - | SuccessStatusResponse - | UserStatusErrorResponse; diff --git a/apps/desktop/src/models/nativeMessaging/index.ts b/apps/desktop/src/models/nativeMessaging/index.ts deleted file mode 100644 index 1b0148c3f90..00000000000 --- a/apps/desktop/src/models/nativeMessaging/index.ts +++ /dev/null @@ -1,25 +0,0 @@ -export * from "./encryptedMessagePayloads/credentialCreatePayload"; -export * from "./encryptedMessagePayloads/credentialRetrievePayload"; -export * from "./encryptedMessagePayloads/credentialUpdatePayload"; -export * from "./encryptedMessagePayloads/passwordGeneratePayload"; - -export * from "./encryptedMessageResponses/accountStatusResponse"; -export * from "./encryptedMessageResponses/cannotDecryptErrorResponse"; -export * from "./encryptedMessageResponses/cipherResponse"; -export * from "./encryptedMessageResponses/encryptedMessageResponse"; -export * from "./encryptedMessageResponses/failureStatusResponse"; -export * from "./encryptedMessageResponses/generateResponse"; -export * from "./encryptedMessageResponses/successStatusResponse"; -export * from "./encryptedMessageResponses/userStatusErrorResponse"; - -export * from "./decryptedCommandData"; -export * from "./encryptedCommand"; -export * from "./encryptedMessage"; -export * from "./encryptedMessageResponse"; -export * from "./legacyMessage"; -export * from "./legacyMessageWrapper"; -export * from "./message"; -export * from "./messageCommon"; -export * from "./unencryptedCommand"; -export * from "./unencryptedMessage"; -export * from "./unencryptedMessageResponse"; diff --git a/apps/desktop/src/models/nativeMessaging/message.ts b/apps/desktop/src/models/nativeMessaging/message.ts deleted file mode 100644 index 25d96aa218a..00000000000 --- a/apps/desktop/src/models/nativeMessaging/message.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { EncryptedMessage } from "./encryptedMessage"; -import { UnencryptedMessage } from "./unencryptedMessage"; - -export type Message = UnencryptedMessage | EncryptedMessage; diff --git a/apps/desktop/src/services/encryptedMessageHandlerService.ts b/apps/desktop/src/services/encrypted-message-handler.service.ts similarity index 84% rename from apps/desktop/src/services/encryptedMessageHandlerService.ts rename to apps/desktop/src/services/encrypted-message-handler.service.ts index f5ac1e5fcef..5f45118768e 100644 --- a/apps/desktop/src/services/encryptedMessageHandlerService.ts +++ b/apps/desktop/src/services/encrypted-message-handler.service.ts @@ -12,18 +12,18 @@ import { CipherView } from "@bitwarden/common/models/view/cipher.view"; import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view"; import { LoginView } from "@bitwarden/common/models/view/login.view"; -import { DecryptedCommandData } from "../models/nativeMessaging/decryptedCommandData"; -import { CredentialCreatePayload } from "../models/nativeMessaging/encryptedMessagePayloads/credentialCreatePayload"; -import { CredentialRetrievePayload } from "../models/nativeMessaging/encryptedMessagePayloads/credentialRetrievePayload"; -import { CredentialUpdatePayload } from "../models/nativeMessaging/encryptedMessagePayloads/credentialUpdatePayload"; -import { PasswordGeneratePayload } from "../models/nativeMessaging/encryptedMessagePayloads/passwordGeneratePayload"; -import { AccountStatusResponse } from "../models/nativeMessaging/encryptedMessageResponses/accountStatusResponse"; -import { CipherResponse } from "../models/nativeMessaging/encryptedMessageResponses/cipherResponse"; -import { EncyptedMessageResponse } from "../models/nativeMessaging/encryptedMessageResponses/encryptedMessageResponse"; -import { FailureStatusResponse } from "../models/nativeMessaging/encryptedMessageResponses/failureStatusResponse"; -import { GenerateResponse } from "../models/nativeMessaging/encryptedMessageResponses/generateResponse"; -import { SuccessStatusResponse } from "../models/nativeMessaging/encryptedMessageResponses/successStatusResponse"; -import { UserStatusErrorResponse } from "../models/nativeMessaging/encryptedMessageResponses/userStatusErrorResponse"; +import { DecryptedCommandData } from "../models/native-messaging/decrypted-command-data"; +import { CredentialCreatePayload } from "../models/native-messaging/encrypted-message-payloads/credential-create-payload"; +import { CredentialRetrievePayload } from "../models/native-messaging/encrypted-message-payloads/credential-retrieve-payload"; +import { CredentialUpdatePayload } from "../models/native-messaging/encrypted-message-payloads/credential-update-payload"; +import { PasswordGeneratePayload } from "../models/native-messaging/encrypted-message-payloads/password-generate-payload"; +import { AccountStatusResponse } from "../models/native-messaging/encrypted-message-responses/account-status-response"; +import { CipherResponse } from "../models/native-messaging/encrypted-message-responses/cipher-response"; +import { EncyptedMessageResponse } from "../models/native-messaging/encrypted-message-responses/encrypted-message-response"; +import { FailureStatusResponse } from "../models/native-messaging/encrypted-message-responses/failure-status-response"; +import { GenerateResponse } from "../models/native-messaging/encrypted-message-responses/generate-response"; +import { SuccessStatusResponse } from "../models/native-messaging/encrypted-message-responses/success-status-response"; +import { UserStatusErrorResponse } from "../models/native-messaging/encrypted-message-responses/user-status-error-response"; import { StateService } from "./state.service"; diff --git a/apps/desktop/src/services/nativeMessageHandler.service.ts b/apps/desktop/src/services/native-message-handler.service.ts similarity index 92% rename from apps/desktop/src/services/nativeMessageHandler.service.ts rename to apps/desktop/src/services/native-message-handler.service.ts index e7c92082075..fd00bf33f8e 100644 --- a/apps/desktop/src/services/nativeMessageHandler.service.ts +++ b/apps/desktop/src/services/native-message-handler.service.ts @@ -12,14 +12,14 @@ import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { StateService } from "@bitwarden/common/services/state.service"; -import { DecryptedCommandData } from "../models/nativeMessaging/decryptedCommandData"; -import { EncryptedMessage } from "../models/nativeMessaging/encryptedMessage"; -import { EncryptedMessageResponse } from "../models/nativeMessaging/encryptedMessageResponse"; -import { Message } from "../models/nativeMessaging/message"; -import { UnencryptedMessage } from "../models/nativeMessaging/unencryptedMessage"; -import { UnencryptedMessageResponse } from "../models/nativeMessaging/unencryptedMessageResponse"; +import { DecryptedCommandData } from "../models/native-messaging/decrypted-command-data"; +import { EncryptedMessage } from "../models/native-messaging/encrypted-message"; +import { EncryptedMessageResponse } from "../models/native-messaging/encrypted-message-response"; +import { Message } from "../models/native-messaging/message"; +import { UnencryptedMessage } from "../models/native-messaging/unencrypted-message"; +import { UnencryptedMessageResponse } from "../models/native-messaging/unencrypted-message-response"; -import { EncryptedMessageHandlerService } from "./encryptedMessageHandlerService"; +import { EncryptedMessageHandlerService } from "./encrypted-message-handler.service"; const EncryptionAlgorithm = "sha1"; diff --git a/apps/desktop/src/services/nativeMessaging.service.ts b/apps/desktop/src/services/native-messaging.service.ts similarity index 95% rename from apps/desktop/src/services/nativeMessaging.service.ts rename to apps/desktop/src/services/native-messaging.service.ts index 83e3705dc7d..0a2b443bfbf 100644 --- a/apps/desktop/src/services/nativeMessaging.service.ts +++ b/apps/desktop/src/services/native-messaging.service.ts @@ -15,11 +15,11 @@ import { Utils } from "@bitwarden/common/misc/utils"; import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { LegacyMessage } from "../models/nativeMessaging/legacyMessage"; -import { LegacyMessageWrapper } from "../models/nativeMessaging/legacyMessageWrapper"; -import { Message } from "../models/nativeMessaging/message"; +import { LegacyMessage } from "../models/native-messaging/legacy-message"; +import { LegacyMessageWrapper } from "../models/native-messaging/legacy-message-wrapper"; +import { Message } from "../models/native-messaging/message"; -import { NativeMessageHandlerService } from "./nativeMessageHandler.service"; +import { NativeMessageHandlerService } from "./native-message-handler.service"; const MessageValidTimeout = 10 * 1000; const EncryptionAlgorithm = "sha1"; diff --git a/apps/desktop/src/services/passwordReprompt.service.ts b/apps/desktop/src/services/password-reprompt.service.ts similarity index 100% rename from apps/desktop/src/services/passwordReprompt.service.ts rename to apps/desktop/src/services/password-reprompt.service.ts