diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2dc459d6ad2..a954236cdf7 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -52,3 +52,25 @@ libs/common/src/admin-console @bitwarden/team-admin-console-dev apps/web/src/app/billing @bitwarden/team-billing-dev libs/angular/src/billing @bitwarden/team-billing-dev libs/common/src/billing @bitwarden/team-billing-dev + +## Platform team files ## +apps/browser/src/platform @bitwarden/team-platform-dev +apps/cli/src/platform @bitwarden/team-platform-dev +apps/desktop/src/platform @bitwarden/team-platform-dev +apps/web/src/app/platform @bitwarden/team-platform-dev +libs/angular/src/platform @bitwarden/team-platform-dev +libs/common/src/platform @bitwarden/team-platform-dev +# Node-specifc platform files +libs/node @bitwarden/team-platform-dev +# Web utils used across app and connectors +apps/web/src/utils/ @bitwarden/team-platform-dev +# Web core and shared files +apps/web/src/app/core @bitwarden/team-platform-dev +apps/web/src/app/shared @bitwarden/team-platform-dev +apps/web/src/translation-constants.ts @bitwarden/team-platform-dev + +## Component Library ## +libs/components @bitwarden/team-platform-dev + +## Desktop native module ## +apps/desktop/desktop_native @bitwarden/team-platform-dev diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt index 91b604746ed..a17ec6b8113 100644 --- a/.github/whitelist-capital-letters.txt +++ b/.github/whitelist-capital-letters.txt @@ -5,6 +5,7 @@ ./apps/browser/src/services/vaultTimeout ./apps/browser/store/windows/Assets ./libs/common/src/abstractions/fileDownload +./libs/common/src/abstractions/userVerification ./libs/common/src/abstractions/vaultTimeout ./libs/common/src/services/vaultTimeout ./bitwarden_license/README.md @@ -22,8 +23,6 @@ ./libs/angular/src/validators/inputsFieldMatch.validator.ts ./libs/angular/src/validators/notAllowedValueAsync.validator.ts ./libs/angular/src/services/theming/themeBuilder.ts -./libs/angular/src/interfaces/selectOptions.ts -./libs/components/src/stories/Introduction.stories.mdx ./libs/common/src/misc/nodeUtils.ts ./libs/common/src/misc/linkedFieldOption.decorator.ts ./libs/common/src/misc/serviceUtils.ts @@ -37,24 +36,14 @@ ./libs/common/src/abstractions/fileDownload/fileDownload.service.ts ./libs/common/src/abstractions/fileDownload/fileDownloadRequest.ts ./libs/common/src/abstractions/formValidationErrors.service.ts +./libs/common/src/abstractions/userVerification/userVerification.service.abstraction.ts +./libs/common/src/abstractions/userVerification/userVerification-api.service.abstraction.ts ./libs/common/src/abstractions/vaultTimeout/vaultTimeoutSettings.service.ts ./libs/common/src/abstractions/vaultTimeout/vaultTimeout.service.ts -./libs/common/src/abstractions/cryptoFunction.service.ts ./libs/common/src/abstractions/anonymousHub.service.ts -./libs/common/src/abstractions/appId.service.ts -./libs/common/src/services/azureFileUpload.service.ts -./libs/common/src/services/stateMigration.service.ts -./libs/common/src/services/consoleLog.service.ts -./libs/common/src/services/formValidationErrors.service.ts ./libs/common/src/services/vaultTimeout/vaultTimeoutSettings.service.ts ./libs/common/src/services/vaultTimeout/vaultTimeout.service.ts ./libs/common/src/services/anonymousHub.service.ts -./libs/common/src/services/appId.service.ts -./libs/common/src/services/noopMessaging.service.ts -./libs/common/src/services/memoryStorage.service.ts -./libs/common/src/services/bitwardenFileUpload.service.ts -./libs/common/src/services/webCryptoFunction.service.ts -./libs/common/src/interfaces/IEncrypted.ts ./README.md ./LICENSE_BITWARDEN.txt ./CONTRIBUTING.md @@ -91,7 +80,6 @@ ./apps/browser/src/models/browserGroupingsComponentState.ts ./apps/browser/src/models/biometricErrors.ts ./apps/browser/src/browser/safariApp.ts -./apps/browser/src/browser/browserApi.ts ./apps/browser/src/safari/desktop/ViewController.swift ./apps/browser/src/safari/desktop/Assets.xcassets/AppIcon.appiconset/Contents.json ./apps/browser/src/safari/desktop/Assets.xcassets/AccentColor.colorset/Contents.json @@ -102,21 +90,5 @@ ./apps/browser/src/safari/safari/SafariWebExtensionHandler.swift ./apps/browser/src/safari/safari/Info.plist ./apps/browser/src/safari/desktop.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist -./apps/browser/src/listeners/onCommandListener.ts -./apps/browser/src/listeners/onInstallListener.ts -./apps/browser/src/services/browserFileDownloadService.ts -./apps/browser/src/services/localBackedSessionStorage.service.spec.ts -./apps/browser/src/services/browserMessagingPrivateModeBackground.service.ts -./apps/browser/src/services/browserPlatformUtils.service.spec.ts -./apps/browser/src/services/browserMemoryStorage.service.ts ./apps/browser/src/services/vaultTimeout/vaultTimeout.service.ts -./apps/browser/src/services/browserCrypto.service.ts -./apps/browser/src/services/browserPlatformUtils.service.ts -./apps/browser/src/services/abstractions/abstractKeyGeneration.service.ts -./apps/browser/src/services/browserLocalStorage.service.ts -./apps/browser/src/services/localBackedSessionStorage.service.ts -./apps/browser/src/services/browserMessagingPrivateModePopup.service.ts -./apps/browser/src/services/browserMessaging.service.ts -./apps/browser/src/services/keyGeneration.service.ts -./apps/browser/src/services/abstractChromeStorageApi.service.ts ./SECURITY.md diff --git a/.github/workflows/brew-bump-cli.yml b/.github/workflows/brew-bump-cli.yml index c5f7b126fe2..cae9db880ec 100644 --- a/.github/workflows/brew-bump-cli.yml +++ b/.github/workflows/brew-bump-cli.yml @@ -23,7 +23,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "brew-bump-workflow-pat" diff --git a/.github/workflows/brew-bump-desktop.yml b/.github/workflows/brew-bump-desktop.yml index 876180931c6..43b24f4553c 100644 --- a/.github/workflows/brew-bump-desktop.yml +++ b/.github/workflows/brew-bump-desktop.yml @@ -23,7 +23,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "brew-bump-workflow-pat" diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml index a48d8b7880b..89fa40a53fe 100644 --- a/.github/workflows/build-browser.yml +++ b/.github/workflows/build-browser.yml @@ -354,7 +354,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "crowdin-api-token" @@ -416,7 +416,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets if: failure() - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "devops-alerts-slack-webhook-url" diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml index 4e9ce9e2bb6..bc33a4ccd0a 100644 --- a/.github/workflows/build-cli.yml +++ b/.github/workflows/build-cli.yml @@ -404,7 +404,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets if: failure() - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "devops-alerts-slack-webhook-url" diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index b1989252dc8..b5da80f7f78 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -277,7 +277,7 @@ jobs: node-gyp install $(node -v) - name: Install AST - uses: bitwarden/gh-actions/install-ast@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/install-ast@72594be690a4e7bfa87b1402b2aedc75acdbff12 - name: Set up environmentF run: choco install checksum --no-progress @@ -302,7 +302,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "code-signing-vault-url, @@ -1190,7 +1190,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "crowdin-api-token" @@ -1269,7 +1269,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets if: failure() - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "devops-alerts-slack-webhook-url" diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml index 325d3f54df4..ee8d689c219 100644 --- a/.github/workflows/build-web.yml +++ b/.github/workflows/build-web.yml @@ -84,6 +84,8 @@ jobs: npm_command: "build:bit:poc" - name: "ee" npm_command: "build:bit:ee" + - name: "eudevtest" + npm_command: "build:bit:eudevtest" steps: - name: Checkout repo @@ -235,7 +237,7 @@ jobs: - name: Retrieve github PAT secrets id: retrieve-secret-pat - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "github-pat-bitwarden-devops-bot-repo-scope" @@ -243,7 +245,7 @@ jobs: - name: Setup DCT if: ${{ env.is_publish_branch == 'true' }} id: setup-dct - uses: bitwarden/gh-actions/setup-docker-trust@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/setup-docker-trust@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: azure-creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }} azure-keyvault-name: "bitwarden-ci" @@ -291,7 +293,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "crowdin-api-token" @@ -352,7 +354,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets if: failure() - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "devops-alerts-slack-webhook-url" diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index 453a19423ab..d2f1f45c25d 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -31,12 +31,17 @@ jobs: - name: Install Node dependencies run: npm ci + + # Manual build the storybook to resolve a chromatic/storybook bug related to TurboSnap + - name: Build Storybook + run: npm run build-storybook:ci - name: Publish to Chromatic - uses: chromaui/action@a89b674adf766dbde41ad9ea2b2b60b91188a0f0 + uses: chromaui/action@a2ed440e22f7d4e2c6b0710f7903aa2df70a1ecd with: token: ${{ secrets.GITHUB_TOKEN }} projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} + storybookBuildDir: ./storybook-static exitOnceUploaded: true onlyChanged: true externals: "[\"libs/components/**/*.scss\", \"libs/components/tailwind.config*.js\"]" diff --git a/.github/workflows/crowdin-pull.yml b/.github/workflows/crowdin-pull.yml index 35c31dc72ff..f058c712031 100644 --- a/.github/workflows/crowdin-pull.yml +++ b/.github/workflows/crowdin-pull.yml @@ -32,13 +32,13 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "crowdin-api-token, github-gpg-private-key, github-gpg-private-key-passphrase" - name: Download translations - uses: bitwarden/gh-actions/crowdin@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/crowdin@72594be690a4e7bfa87b1402b2aedc75acdbff12 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} CROWDIN_API_TOKEN: ${{ steps.retrieve-secrets.outputs.crowdin-api-token }} diff --git a/.github/workflows/deploy-non-prod-web.yml b/.github/workflows/deploy-non-prod-web.yml index 45f74ff52be..e0b6977a781 100644 --- a/.github/workflows/deploy-non-prod-web.yml +++ b/.github/workflows/deploy-non-prod-web.yml @@ -13,6 +13,7 @@ on: options: - QA - POC2 + - eudevtest jobs: @@ -63,7 +64,7 @@ jobs: uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 - name: Download latest cloud asset - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-web.yml path: apps/web diff --git a/.github/workflows/release-browser.yml b/.github/workflows/release-browser.yml index 4a65b0d412c..c9f9b20c62d 100644 --- a/.github/workflows/release-browser.yml +++ b/.github/workflows/release-browser.yml @@ -41,7 +41,7 @@ jobs: - name: Check Release Version id: version - uses: bitwarden/gh-actions/release-version-check@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/release-version-check@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: release-type: ${{ github.event.inputs.release_type }} project-type: ts @@ -103,7 +103,7 @@ jobs: - name: Download latest Release build artifacts if: ${{ github.event.inputs.release_type != 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-browser.yml workflow_conclusion: success @@ -116,7 +116,7 @@ jobs: - name: Dry Run - Download latest master build artifacts if: ${{ github.event.inputs.release_type == 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-browser.yml workflow_conclusion: success diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml index 5901d81740b..406b345c2fe 100644 --- a/.github/workflows/release-cli.yml +++ b/.github/workflows/release-cli.yml @@ -57,7 +57,7 @@ jobs: - name: Check Release Version id: version - uses: bitwarden/gh-actions/release-version-check@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/release-version-check@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: release-type: ${{ github.event.inputs.release_type }} project-type: ts @@ -78,7 +78,7 @@ jobs: - name: Download all Release artifacts if: ${{ github.event.inputs.release_type != 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-cli.yml path: apps/cli @@ -87,7 +87,7 @@ jobs: - name: Dry Run - Download all artifacts if: ${{ github.event.inputs.release_type == 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-cli.yml path: apps/cli @@ -150,7 +150,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "snapcraft-store-token" @@ -162,7 +162,7 @@ jobs: - name: Download artifacts if: ${{ github.event.inputs.release_type != 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-cli.yml path: apps/cli @@ -172,7 +172,7 @@ jobs: - name: Dry Run - Download artifacts if: ${{ github.event.inputs.release_type == 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-cli.yml path: apps/cli @@ -204,7 +204,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "cli-choco-api-key" @@ -220,7 +220,7 @@ jobs: - name: Download artifacts if: ${{ github.event.inputs.release_type != 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-cli.yml path: apps/cli/dist @@ -230,7 +230,7 @@ jobs: - name: Dry Run - Download artifacts if: ${{ github.event.inputs.release_type == 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-cli.yml path: apps/cli/dist @@ -263,14 +263,14 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "npm-api-key" - name: Download artifacts if: ${{ github.event.inputs.release_type != 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-cli.yml path: apps/cli/build @@ -280,7 +280,7 @@ jobs: - name: Dry Run - Download artifacts if: ${{ github.event.inputs.release_type == 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-cli.yml path: apps/cli/build diff --git a/.github/workflows/release-desktop-beta.yml b/.github/workflows/release-desktop-beta.yml index 74d02aefc79..f9a5e4d5ad3 100644 --- a/.github/workflows/release-desktop-beta.yml +++ b/.github/workflows/release-desktop-beta.yml @@ -47,7 +47,7 @@ jobs: - name: Check Release Version id: version - uses: bitwarden/gh-actions/release-version-check@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/release-version-check@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: release-type: 'Initial Release' project-type: ts @@ -231,7 +231,7 @@ jobs: node-gyp install $(node -v) - name: Install AST - uses: bitwarden/gh-actions/install-ast@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/install-ast@72594be690a4e7bfa87b1402b2aedc75acdbff12 - name: Set up environment run: choco install checksum --no-progress @@ -249,7 +249,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "code-signing-vault-url, @@ -932,7 +932,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "aws-electron-access-id, diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml index 8eaf148be98..e8832528143 100644 --- a/.github/workflows/release-desktop.yml +++ b/.github/workflows/release-desktop.yml @@ -67,7 +67,7 @@ jobs: - name: Check Release Version id: version - uses: bitwarden/gh-actions/release-version-check@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/release-version-check@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: release-type: ${{ github.event.inputs.release_type }} project-type: ts @@ -110,7 +110,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "aws-electron-access-id, @@ -123,7 +123,7 @@ jobs: - name: Download all artifacts if: ${{ github.event.inputs.release_type != 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-desktop.yml workflow_conclusion: success @@ -132,7 +132,7 @@ jobs: - name: Dry Run - Download all artifacts if: ${{ github.event.inputs.release_type == 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-desktop.yml workflow_conclusion: success @@ -185,14 +185,14 @@ jobs: --endpoint-url https://${CF_ACCOUNT}.r2.cloudflarestorage.com - name: Get checksum files - uses: bitwarden/gh-actions/get-checksum@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-checksum@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: packages_dir: "apps/desktop/artifacts" file_path: "apps/desktop/artifacts/sha256-checksums.txt" - name: Create Release uses: ncipollo/release-action@a2e71bdd4e7dab70ca26a852f29600c98b33153e # v1.12.0 - if: ${{ steps.release-channel.outputs.channel == 'latest' && github.event.inputs.release_type != 'Dry Run' && github.event.inputs.github_release }} + if: ${{ steps.release-channel.outputs.channel == 'latest' && github.event.inputs.release_type != 'Dry Run' && inputs.github_release }} env: PKG_VERSION: ${{ steps.version.outputs.version }} RELEASE_CHANNEL: ${{ steps.release-channel.outputs.channel }} @@ -263,15 +263,15 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "snapcraft-store-token" - name: Install Snap uses: samuelmeuli/action-snapcraft@d33c176a9b784876d966f80fb1b461808edc0641 # v2.1.1 - with: - snapcraft_token: ${{ steps.retrieve-secrets.outputs.snapcraft-store-token }} + env: + SNAPCRAFT_STORE_CREDENTIALS: ${{ steps.retrieve-secrets.outputs.snapcraft-store-token }} - name: Setup run: mkdir dist @@ -279,7 +279,7 @@ jobs: - name: Download Snap artifact if: ${{ github.event.inputs.release_type != 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-desktop.yml workflow_conclusion: success @@ -289,7 +289,7 @@ jobs: - name: Dry Run - Download Snap artifact if: ${{ github.event.inputs.release_type == 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-desktop.yml workflow_conclusion: success @@ -299,9 +299,11 @@ jobs: - name: Deploy to Snap Store if: ${{ github.event.inputs.release_type != 'Dry Run' }} + env: + SNAPCRAFT_STORE_CREDENTIALS: ${{ steps.retrieve-secrets.outputs.snapcraft-store-token }} run: | - snapcraft upload bitwarden_${{ env._PKG_VERSION }}_amd64.snap --release stable - snapcraft logout + /snap/bin/snapcraft upload bitwarden_${{ env._PKG_VERSION }}_amd64.snap --release stable + /snap/bin/snapcraft logout working-directory: apps/desktop/dist choco: @@ -327,7 +329,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "cli-choco-api-key" @@ -345,7 +347,7 @@ jobs: - name: Download choco artifact if: ${{ github.event.inputs.release_type != 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-desktop.yml workflow_conclusion: success @@ -355,7 +357,7 @@ jobs: - name: Dry Run - Download choco artifact if: ${{ github.event.inputs.release_type == 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-desktop.yml workflow_conclusion: success diff --git a/.github/workflows/release-qa-web.yml b/.github/workflows/release-qa-web.yml index b50e48753c4..60f38e9d320 100644 --- a/.github/workflows/release-qa-web.yml +++ b/.github/workflows/release-qa-web.yml @@ -23,7 +23,7 @@ jobs: uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 - name: Download latest cloud asset - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-web.yml path: apps/web diff --git a/.github/workflows/release-web.yml b/.github/workflows/release-web.yml index e5aea6b3778..1ba24a8369d 100644 --- a/.github/workflows/release-web.yml +++ b/.github/workflows/release-web.yml @@ -38,7 +38,7 @@ jobs: - name: Check Release Version id: version - uses: bitwarden/gh-actions/release-version-check@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/release-version-check@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: release-type: ${{ github.event.inputs.release_type }} project-type: ts @@ -70,7 +70,7 @@ jobs: ########## DockerHub ########## - name: Setup DCT id: setup-dct - uses: bitwarden/gh-actions/setup-docker-trust@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/setup-docker-trust@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: azure-creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }} azure-keyvault-name: "bitwarden-ci" @@ -156,7 +156,7 @@ jobs: - name: Retrieve bot secrets id: retrieve-bot-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: bitwarden-ci secrets: "github-pat-bitwarden-devops-bot-repo-scope" @@ -170,7 +170,7 @@ jobs: - name: Download latest cloud asset if: ${{ github.event.inputs.release_type != 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-web.yml path: assets @@ -180,7 +180,7 @@ jobs: - name: Dry Run - Download latest cloud asset if: ${{ github.event.inputs.release_type == 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-web.yml path: assets @@ -253,7 +253,7 @@ jobs: - name: Download latest build artifacts if: ${{ github.event.inputs.release_type != 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-web.yml path: apps/web/artifacts @@ -264,7 +264,7 @@ jobs: - name: Dry Run - Download latest build artifacts if: ${{ github.event.inputs.release_type == 'Dry Run' }} - uses: bitwarden/gh-actions/download-artifacts@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/download-artifacts@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: workflow: build-web.yml path: apps/web/artifacts diff --git a/.github/workflows/staged-rollout-desktop.yml b/.github/workflows/staged-rollout-desktop.yml index bd27e05cc69..7221028df2e 100644 --- a/.github/workflows/staged-rollout-desktop.yml +++ b/.github/workflows/staged-rollout-desktop.yml @@ -26,7 +26,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "aws-electron-access-id, diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml index 752e4baba2c..cebe740b9d1 100644 --- a/.github/workflows/version-bump.yml +++ b/.github/workflows/version-bump.yml @@ -49,7 +49,7 @@ jobs: - name: Retrieve secrets id: retrieve-secrets - uses: bitwarden/gh-actions/get-keyvault-secrets@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/get-keyvault-secrets@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: keyvault: "bitwarden-ci" secrets: "github-gpg-private-key, github-gpg-private-key-passphrase" @@ -86,14 +86,14 @@ jobs: - name: Bump Browser Version - Manifest if: ${{ github.event.inputs.client == 'Browser' || github.event.inputs.client == 'All' }} - uses: bitwarden/gh-actions/version-bump@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/version-bump@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: version: ${{ github.event.inputs.version_number }} file_path: "apps/browser/src/manifest.json" - name: Bump Browser Version - Manifest v3 if: ${{ github.event.inputs.client == 'Browser' || github.event.inputs.client == 'All' }} - uses: bitwarden/gh-actions/version-bump@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/version-bump@72594be690a4e7bfa87b1402b2aedc75acdbff12 with: version: ${{ github.event.inputs.version_number }} file_path: "apps/browser/src/manifest.v3.json" diff --git a/.github/workflows/workflow-linter.yml b/.github/workflows/workflow-linter.yml index 39f2436b722..20525879d5a 100644 --- a/.github/workflows/workflow-linter.yml +++ b/.github/workflows/workflow-linter.yml @@ -8,4 +8,4 @@ on: jobs: call-workflow: - uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@c86ced0dc8c9daeecf057a6333e6f318db9c5a2b + uses: bitwarden/gh-actions/.github/workflows/workflow-linter.yml@72594be690a4e7bfa87b1402b2aedc75acdbff12 diff --git a/.storybook/main.js b/.storybook/main.js deleted file mode 100644 index 3db3964022e..00000000000 --- a/.storybook/main.js +++ /dev/null @@ -1,33 +0,0 @@ -const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin"); - -module.exports = { - stories: [ - "../libs/components/src/**/*.stories.mdx", - "../libs/components/src/**/*.stories.@(js|jsx|ts|tsx)", - "../apps/web/src/**/*.stories.mdx", - "../apps/web/src/**/*.stories.@(js|jsx|ts|tsx)", - "../bitwarden_license/bit-web/src/**/*.stories.mdx", - "../bitwarden_license/bit-web/src/**/*.stories.@(js|jsx|ts|tsx)", - ], - addons: [ - "@storybook/addon-links", - "@storybook/addon-essentials", - "@storybook/addon-a11y", - "storybook-addon-designs", - ], - framework: "@storybook/angular", - core: { - builder: "webpack5", - disableTelemetry: true, - }, - env: (config) => ({ - ...config, - FLAGS: JSON.stringify({ - secretsManager: true, - }), - }), - webpackFinal: async (config, { configType }) => { - config.resolve.plugins = [new TsconfigPathsPlugin()]; - return config; - }, -}; diff --git a/.storybook/main.ts b/.storybook/main.ts new file mode 100644 index 00000000000..a7f12f469ba --- /dev/null +++ b/.storybook/main.ts @@ -0,0 +1,53 @@ +import { StorybookConfig } from "@storybook/angular"; +import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin"; +import remarkGfm from "remark-gfm"; + +const config: StorybookConfig = { + stories: [ + "../libs/components/src/**/*.mdx", + "../libs/components/src/**/*.stories.@(js|jsx|ts|tsx)", + "../apps/web/src/**/*.mdx", + "../apps/web/src/**/*.stories.@(js|jsx|ts|tsx)", + "../bitwarden_license/bit-web/src/**/*.mdx", + "../bitwarden_license/bit-web/src/**/*.stories.@(js|jsx|ts|tsx)", + ], + addons: [ + "@storybook/addon-links", + "@storybook/addon-essentials", + "@storybook/addon-a11y", + { + name: "@storybook/addon-docs", + options: { + mdxPluginOptions: { + mdxCompileOptions: { + remarkPlugins: [remarkGfm], + }, + }, + }, + }, + ], + framework: { + name: "@storybook/angular", + options: {}, + }, + core: { + disableTelemetry: true, + }, + env: (config) => ({ + ...config, + FLAGS: JSON.stringify({ + secretsManager: true, + }), + }), + webpackFinal: async (config, { configType }) => { + if (config.resolve) { + config.resolve.plugins = [new TsconfigPathsPlugin()] as any; + } + return config; + }, + docs: { + autodocs: true, + }, +}; + +export default config; diff --git a/.storybook/preview.js b/.storybook/preview.js deleted file mode 100644 index 754e8d2b884..00000000000 --- a/.storybook/preview.js +++ /dev/null @@ -1,38 +0,0 @@ -import { setCompodocJson } from "@storybook/addon-docs/angular"; -import { componentWrapperDecorator, addDecorator } from "@storybook/angular"; - -import docJson from "../documentation.json"; -setCompodocJson(docJson); - -export const parameters = { - actions: { argTypesRegex: "^on[A-Z].*" }, - controls: { - matchers: { - color: /(background|color)$/i, - date: /Date$/, - }, - }, - options: { - storySort: { - order: ["Documentation", ["Introduction", "Colors", "Icons"], "Component Library"], - }, - }, - docs: { inlineStories: true }, -}; - -// ng-template is used to scope any template reference variables and isolate the previews -const decorator = componentWrapperDecorator( - (story) => ` - -
${story}
-
- -
${story}
-
- - - -` -); - -addDecorator(decorator); diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx new file mode 100644 index 00000000000..d7d37a71e7c --- /dev/null +++ b/.storybook/preview.tsx @@ -0,0 +1,111 @@ +import { setCompodocJson } from "@storybook/addon-docs/angular"; +import { componentWrapperDecorator } from "@storybook/angular"; +import type { Preview } from "@storybook/angular"; + +import docJson from "../documentation.json"; +setCompodocJson(docJson); + +const decorator = componentWrapperDecorator( + (story) => { + return ` + +
+ ${story} +
+
+ +
+ ${story} +
+
+ +
+ ${story} +
+
+ +
+ ${story} +
+
+ + + + + + `; + }, + ({ globals }) => { + return { theme: `${globals["theme"]}` }; + } +); + +const preview: Preview = { + decorators: [decorator], + globalTypes: { + theme: { + description: "Global theme for components", + defaultValue: "both", + toolbar: { + title: "Theme", + icon: "circlehollow", + items: [ + { + title: "Light & Dark", + value: "both", + icon: "sidebyside", + }, + { + title: "Light", + value: "light", + icon: "sun", + }, + { + title: "Dark", + value: "dark", + icon: "moon", + }, + { + title: "Nord", + value: "nord", + left: "⛰", + }, + { + title: "Solarized", + value: "solarized", + left: "☯", + }, + ], + dynamicTitle: true, + }, + }, + }, + parameters: { + actions: { argTypesRegex: "^on[A-Z].*" }, + controls: { + matchers: { + color: /(background|color)$/i, + date: /Date$/, + }, + }, + options: { + storySort: { + order: ["Documentation", ["Introduction", "Colors", "Icons"], "Component Library"], + }, + }, + docs: { source: { type: "dynamic", excludeDecorators: true } }, + }, +}; + +export default preview; diff --git a/.storybook/tsconfig.json b/.storybook/tsconfig.json index 397be6b000c..113cc5bcde5 100644 --- a/.storybook/tsconfig.json +++ b/.storybook/tsconfig.json @@ -7,6 +7,7 @@ "exclude": ["../src/test.setup.ts", "../apps/src/**/*.spec.ts", "../libs/**/*.spec.ts"], "files": [ "./typings.d.ts", + "./preview.tsx", "../libs/components/src/main.ts", "../libs/components/src/polyfills.ts" ] diff --git a/.vscode/settings.json b/.vscode/settings.json index 48fd373db46..07423dd18ba 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "cSpell.words": ["Csprng", "Popout", "Reprompt", "takeuntil"] + "cSpell.words": ["Csprng", "decryptable", "Popout", "Reprompt", "takeuntil"] } diff --git a/angular.json b/angular.json index a2b82cc64e9..4b62c771cbf 100644 --- a/angular.json +++ b/angular.json @@ -135,20 +135,25 @@ } }, "defaultConfiguration": "development" - } - } - }, - "storybook": { - "projectType": "application", - "root": "libs/components", - "sourceRoot": "libs/components/src", - "architect": { - "build": { - "builder": "@angular-devkit/build-angular:browser", + }, + "storybook": { + "builder": "@storybook/angular:start-storybook", "options": { - "tsConfig": ".storybook/tsconfig.json", - "styles": ["libs/components/src/styles.scss", "libs/components/src/styles.css"], - "scripts": [] + "configDir": ".storybook", + "browserTarget": "components:build", + "compodoc": true, + "compodocArgs": ["-p", "./tsconfig.json", "-e", "json", "-d", "."], + "port": 6006 + } + }, + "build-storybook": { + "builder": "@storybook/angular:build-storybook", + "options": { + "configDir": ".storybook", + "browserTarget": "components:build", + "compodoc": true, + "compodocArgs": ["-e", "json", "-d", "."], + "outputDir": "storybook-static" } } } diff --git a/apps/browser/package.json b/apps/browser/package.json index b29ab9c27b3..4872af87d3f 100644 --- a/apps/browser/package.json +++ b/apps/browser/package.json @@ -1,6 +1,6 @@ { "name": "@bitwarden/browser", - "version": "2023.4.0", + "version": "2023.5.0", "scripts": { "build": "webpack", "build:mv3": "cross-env MANIFEST_VERSION=3 webpack", diff --git a/apps/browser/src/_locales/ca/messages.json b/apps/browser/src/_locales/ca/messages.json index e117d21790c..91bbfdb48b4 100644 --- a/apps/browser/src/_locales/ca/messages.json +++ b/apps/browser/src/_locales/ca/messages.json @@ -2222,17 +2222,17 @@ } }, "region": { - "message": "Region" + "message": "Regió" }, "opensInANewWindow": { "message": "S'obri en una finestra nova" }, "eu": { - "message": "EU", + "message": "UE", "description": "European Union" }, "us": { - "message": "US", + "message": "EUA", "description": "United States" } } diff --git a/apps/browser/src/_locales/el/messages.json b/apps/browser/src/_locales/el/messages.json index e6da9f04c8d..4f85e42e08f 100644 --- a/apps/browser/src/_locales/el/messages.json +++ b/apps/browser/src/_locales/el/messages.json @@ -1462,13 +1462,13 @@ "message": "Αυτόματη συμπλήρωση αντικειμένου" }, "insecurePageWarning": { - "message": "Warning: This is an unsecured HTTP page, and any information you submit can potentially be seen and changed by others. This Login was originally saved on a secure (HTTPS) page." + "message": "Προειδοποίηση: Αυτή είναι μια μη ασφαλή σελίδα HTTP και οποιαδήποτε πληροφορία υποβάλλετε μπορεί να γίνει ορατή και επεμβάσιμη από άλλους. Αυτή η σύνδεση αποθηκεύτηκε αρχικά σε μια ασφαλή (HTTPS) σελίδα." }, "insecurePageWarningFillPrompt": { "message": "Do you still wish to fill this login?" }, "autofillIframeWarning": { - "message": "The form is hosted by a different domain than the URI of your saved login. Choose OK to auto-fill anyway, or Cancel to stop." + "message": "Η φόρμα φιλοξενείται από διαφορετικό τομέα (domain) από το λινκ (uri) της αποθηκευμένης σύνδεσης σας (login). Επιλέξτε OK για αυτόματη συμπλήρωση, ή Ακύρωση για να σταματήσετε." }, "autofillIframeWarningTip": { "message": "To prevent this warning in the future, save this URI, $HOSTNAME$, to your Bitwarden login item for this site.", diff --git a/apps/browser/src/_locales/nl/messages.json b/apps/browser/src/_locales/nl/messages.json index cf3cae05d40..68a6ba26b1f 100644 --- a/apps/browser/src/_locales/nl/messages.json +++ b/apps/browser/src/_locales/nl/messages.json @@ -2225,7 +2225,7 @@ "message": "Regio" }, "opensInANewWindow": { - "message": "Opens in a new window" + "message": "Opent in een nieuw venster" }, "eu": { "message": "EU", diff --git a/apps/browser/src/_locales/pl/messages.json b/apps/browser/src/_locales/pl/messages.json index ca32eb73aa6..de2c505ced3 100644 --- a/apps/browser/src/_locales/pl/messages.json +++ b/apps/browser/src/_locales/pl/messages.json @@ -1471,7 +1471,7 @@ "message": "Formularz jest hostowany przez inną domenę niż zapisany adres URI dla tego loginu. Wybierz OK, aby i tak automatycznie wypełnić lub anuluj aby zatrzymać." }, "autofillIframeWarningTip": { - "message": "To prevent this warning in the future, save this URI, $HOSTNAME$, to your Bitwarden login item for this site.", + "message": "Aby zapobiec temu ostrzeżeniu w przyszłości, zapisz ten URI, $HOSTNAME$, dla tej witryny.", "placeholders": { "hostname": { "content": "$1", diff --git a/apps/browser/src/_locales/pt_PT/messages.json b/apps/browser/src/_locales/pt_PT/messages.json index 99503282049..abb193ecbab 100644 --- a/apps/browser/src/_locales/pt_PT/messages.json +++ b/apps/browser/src/_locales/pt_PT/messages.json @@ -3,7 +3,7 @@ "message": "Bitwarden" }, "extName": { - "message": "Bitwarden", + "message": "Bitwarden - gestor de palavras-passe", "description": "Extension name, MUST be less than 40 characters (Safari restriction)" }, "extDesc": { @@ -20,7 +20,7 @@ "message": "Iniciar sessão" }, "enterpriseSingleSignOn": { - "message": "Início de Sessão Único da Empresa" + "message": "Início de sessão único para empresas" }, "cancel": { "message": "Cancelar" @@ -32,22 +32,22 @@ "message": "Submeter" }, "emailAddress": { - "message": "Endereço de Email" + "message": "Endereço de e-mail" }, "masterPass": { - "message": "Palavra-passe Mestra" + "message": "Palavra-passe mestra" }, "masterPassDesc": { - "message": "A palavra-passe mestra é a palavra-passe que utiliza para aceder ao seu cofre. É muito importante que não se esqueça da sua palavra-passe mestra. Não existe maneira de recuperar a palavra-passe no caso de a esquecer." + "message": "A palavra-passe mestra é a palavra-passe que utiliza para aceder ao seu cofre. É muito importante que não se esqueça da sua palavra-passe mestra. Não há forma de recuperar a palavra-passe no caso de a esquecer." }, "masterPassHintDesc": { - "message": "Uma dica da palavra-passe mestra pode ajudar a lembrar-se da sua palavra-passe se a esquecer." + "message": "Uma dica da palavra-passe mestra pode ajudá-lo a lembrar-se da sua palavra-passe, caso se esqueça dela." }, "reTypeMasterPass": { - "message": "Re-digite a palavra-passe mestra" + "message": "Reintroduza a palavra-passe mestra" }, "masterPassHint": { - "message": "Dica da Palavra-passe Mestra (opcional)" + "message": "Dica da palavra-passe mestra (opcional)" }, "tab": { "message": "Separador" @@ -59,7 +59,7 @@ "message": "O meu cofre" }, "allVaults": { - "message": "Todos os Cofres" + "message": "Todos os cofres" }, "tools": { "message": "Ferramentas" @@ -68,10 +68,10 @@ "message": "Definições" }, "currentTab": { - "message": "Separador Atual" + "message": "Separador atual" }, "copyPassword": { - "message": "Copiar Palavra-passe" + "message": "Copiar palavra-passe" }, "copyNote": { "message": "Copiar nota" @@ -83,22 +83,22 @@ "message": "Copiar nome de utilizador" }, "copyNumber": { - "message": "Copiar Número" + "message": "Copiar número" }, "copySecurityCode": { "message": "Copiar código de segurança" }, "autoFill": { - "message": "Auto-preencher" + "message": "Preenchimento automático" }, "generatePasswordCopied": { - "message": "Gerar Palavra-passe (copiada)" + "message": "Gerar palavra-passe (copiada)" }, "copyElementIdentifier": { "message": "Copiar nome do campo personalizado" }, "noMatchingLogins": { - "message": "Sem credencias correspondidas." + "message": "Sem inícios de sessão correspondentes" }, "unlockVaultMenu": { "message": "Desbloqueie o seu cofre" @@ -107,19 +107,19 @@ "message": "Inicie sessão para abrir o seu cofre" }, "autoFillInfo": { - "message": "Não existem credenciais disponíveis para auto-preencher para o separador de navegador atual." + "message": "Não existem inícios de sessão disponíveis para preenchimento automático no separador atual do navegador." }, "addLogin": { - "message": "Adicionar uma credencial" + "message": "Adicionar um início de sessão" }, "addItem": { - "message": "Adicionar Item" + "message": "Adicionar item" }, "passwordHint": { "message": "Dica da palavra-passe" }, "enterEmailToGetHint": { - "message": "Introduza o endereço de email da sua conta para receber a dica da sua palavra-passe mestra." + "message": "Introduza o endereço de e-mail da sua conta para receber a dica da sua palavra-passe mestra." }, "getMasterPasswordHint": { "message": "Obter dica da palavra-passe mestra" @@ -131,13 +131,13 @@ "message": "Enviar um código de verificação para o seu e-mail" }, "sendCode": { - "message": "Enviar o código" + "message": "Enviar código" }, "codeSent": { "message": "Código enviado" }, "verificationCode": { - "message": "Código de Verificação" + "message": "Código de verificação" }, "confirmIdentity": { "message": "Confirme a sua identidade para continuar." @@ -146,24 +146,24 @@ "message": "Conta" }, "changeMasterPassword": { - "message": "Alterar Palavra-passe Mestra" + "message": "Alterar palavra-passe mestra" }, "fingerprintPhrase": { "message": "Frase de impressão digital", "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing." }, "yourAccountsFingerprint": { - "message": "A frase de impressão digital da sua conta", + "message": "Frase da impressão digital da sua conta", "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing." }, "twoStepLogin": { - "message": "Início de Sessão de Dois Passos" + "message": "Verificação de dois passos" }, "logOut": { - "message": "Terminar Sessão" + "message": "Terminar sessão" }, "about": { - "message": "Acerca" + "message": "Acerca de" }, "version": { "message": "Versão" @@ -175,13 +175,13 @@ "message": "Mover" }, "addFolder": { - "message": "Adicionar Pasta" + "message": "Adicionar pasta" }, "name": { "message": "Nome" }, "editFolder": { - "message": "Editar Pasta" + "message": "Editar pasta" }, "deleteFolder": { "message": "Eliminar pasta" @@ -196,7 +196,7 @@ "message": "Ajuda e feedback" }, "helpCenter": { - "message": "Centrro de ajuda do Bitwarden" + "message": "Centro de ajuda do Bitwarden" }, "communityForums": { "message": "Explorar os fóruns da comunidade do Bitwarden" @@ -208,7 +208,7 @@ "message": "Sincronizar" }, "syncVaultNow": { - "message": "Sincronizar cofre agora" + "message": "Sincronizar o cofre agora" }, "lastSync": { "message": "Última sincronização:" @@ -221,10 +221,10 @@ "description": "Short for 'Password Generator'." }, "passGenInfo": { - "message": "Gera automaticamente palavras-passe fortes e únicas para as suas credenciais." + "message": "Gera automaticamente palavras-passe fortes e únicas para os seus inícios de sessão." }, "bitWebVault": { - "message": "Cofre Web Bitwarden" + "message": "Cofre web Bitwarden" }, "importItems": { "message": "Importar itens" @@ -254,7 +254,7 @@ "message": "Números (0-9)" }, "specialCharacters": { - "message": "Caracteres Especiais (!@#$%^&*)" + "message": "Caracteres especiais (!@#$%^&*)" }, "numWords": { "message": "Número de palavras" @@ -273,13 +273,13 @@ "message": "Números mínimos" }, "minSpecial": { - "message": "Especiais minímos" + "message": "Caracteres especiais minímos" }, "avoidAmbChar": { "message": "Evitar caracteres ambíguos" }, "searchVault": { - "message": "Pesquisar cofre" + "message": "Procurar no cofre" }, "edit": { "message": "Editar" @@ -291,7 +291,7 @@ "message": "Não existem itens para listar." }, "itemInformation": { - "message": "Informação do item" + "message": "Informações do item" }, "username": { "message": "Nome de utilizador" @@ -300,7 +300,7 @@ "message": "Palavra-passe" }, "passphrase": { - "message": "Frase-passe" + "message": "Frase de acesso" }, "favorite": { "message": "Favorito" @@ -318,7 +318,7 @@ "message": "Pasta" }, "deleteItem": { - "message": "Apagar item" + "message": "Eliminar item" }, "viewItem": { "message": "Ver item" @@ -327,7 +327,7 @@ "message": "Iniciar" }, "website": { - "message": "Website" + "message": "Site" }, "toggleVisibility": { "message": "Alternar visibilidade" @@ -342,16 +342,16 @@ "message": "Avaliar a extensão" }, "rateExtensionDesc": { - "message": "Por favor considere ajudar-nos com uma boa análise!" + "message": "Por favor, considere ajudar-nos com uma boa avaliação!" }, "browserNotSupportClipboard": { - "message": "O seu navegador web não suporta cópia fácil da área de transferência. Em alternativa, copie manualmente." + "message": "O seu navegador web não suporta a cópia fácil da área de transferência. Em vez disso, copie manualmente." }, "verifyIdentity": { - "message": "Verificar Identidade" + "message": "Verificar identidade" }, "yourVaultIsLocked": { - "message": "O seu cofre está bloqueado. Verifique a sua palavra-passe mestra para continuar." + "message": "O seu cofre está bloqueado. Verifique a sua identidade para continuar." }, "unlock": { "message": "Desbloquear" @@ -412,7 +412,7 @@ "message": "4 horas" }, "onLocked": { - "message": "Quando o sistema está bloqueado" + "message": "No bloqueio do sistema" }, "onRestart": { "message": "Ao reiniciar o sistema" @@ -427,13 +427,13 @@ "message": "Ocorreu um erro" }, "emailRequired": { - "message": "O endereço de email é requerido." + "message": "É necessário o endereço de e-mail." }, "invalidEmail": { - "message": "Endereço de email inválido." + "message": "Endereço de e-mail inválido." }, "masterPasswordRequired": { - "message": "A palavra-passe mestra é necessária." + "message": "É necessária a palavra-passe mestra." }, "confirmMasterPasswordRequired": { "message": "É necessário reescrever a palavra-passe mestra." @@ -452,13 +452,13 @@ "message": "A confirmação da palavra-passe mestra não corresponde." }, "newAccountCreated": { - "message": "A sua nova conta foi criada! Agora pode iniciar sessão." + "message": "A sua nova conta foi criada! Pode agora iniciar sessão." }, "masterPassSent": { - "message": "Enviámos-lhe um email com a dica da sua palavra-passe mestra." + "message": "Enviámos-lhe um e-mail com a dica da sua palavra-passe mestra." }, "verificationCodeRequired": { - "message": "O código de verificação é requerido." + "message": "É necessário o código de verificação." }, "invalidVerificationCode": { "message": "Código de verificação inválido" @@ -474,7 +474,7 @@ } }, "autofillError": { - "message": "Não é possível auto-preencher o item selecionado nesta página. Em alternativa, copie e cole a informação." + "message": "Não é possível preencher automaticamente o item selecionado nesta página. Em vez disso, copie e cole as informações." }, "loggedOut": { "message": "Sessão terminada" @@ -495,7 +495,7 @@ "message": "Ocorreu um erro inesperado." }, "nameRequired": { - "message": "O nome é requerido." + "message": "É necessário o nome." }, "addedFolder": { "message": "Pasta adicionada" @@ -504,13 +504,13 @@ "message": "Alterar palavra-passe mestra" }, "changeMasterPasswordConfirmation": { - "message": "Pode alterar a sua palavra-passe mestra no cofre web bitwarden.com. Pretende visitar o website agora?" + "message": "Pode alterar o seu endereço de e-mail no cofre do site bitwarden.com. Deseja visitar o site agora?" }, "twoStepLoginConfirmation": { - "message": "O início de sessão de dois passos torna a sua conta mais segura ao requerer que verifique o seu início de sessão com outro dispositivo como uma chave de segurança, aplicação de autenticação, SMS, chamada telefónica, ou email. O início de sessão de dois passos pode ser ativado no cofre web bitwarden.com. Pretende visitar o website agora?" + "message": "A verificação de dois passos torna a sua conta mais segura, exigindo que verifique o seu início de sessão com outro dispositivo, como uma chave de segurança, aplicação de autenticação, SMS, chamada telefónica ou e-mail. A verificação de dois passos pode ser configurada em bitwarden.com. Pretende visitar o site agora?" }, "editedFolder": { - "message": "Pasta editada" + "message": "Pasta guardada" }, "deleteFolderConfirmation": { "message": "Tem a certeza de que pretende eliminar esta pasta?" @@ -522,13 +522,13 @@ "message": "Tutorial de introdução" }, "gettingStartedTutorialVideo": { - "message": "Veja o nosso tutorial de introdução e saiba como tirar o máximo partido da extensão de navegador." + "message": "Veja o nosso tutorial de introdução para saber como tirar o máximo partido da extensão do navegador." }, "syncingComplete": { - "message": "Sincronização completada" + "message": "Sincronização concluída" }, "syncingFailed": { - "message": "Sincronização falhada" + "message": "Falha na sincronização" }, "passwordCopied": { "message": "Palavra-passe copiada" @@ -553,44 +553,44 @@ "message": "Item adicionado" }, "editedItem": { - "message": "Item editado" + "message": "Item guardado" }, "deleteItemConfirmation": { - "message": "Tem a certeza de que pretende apagar este item?" + "message": "Tem a certeza de que pretende eliminar este item?" }, "deletedItem": { - "message": "Item enviado para o lixo" + "message": "Item movido para o lixo" }, "overwritePassword": { - "message": "Sobreescrever palavra-passe" + "message": "Substituir palavra-passe" }, "overwritePasswordConfirmation": { - "message": "Tem a certeza de que pretende sobreescrever a palavra-passe atual?" + "message": "Tem a certeza de que pretende substituir a palavra-passe atual?" }, "overwriteUsername": { - "message": "Sobrescrever nome de utilizador" + "message": "Substituir nome de utilizador" }, "overwriteUsernameConfirmation": { - "message": "Tem a certeza de que deseja sobrescrever o nome de utilizador atual?" + "message": "Tem a certeza de que pretende substituir o nome de utilizador atual?" }, "searchFolder": { - "message": "Pesquisar pasta" + "message": "Procurar na pasta" }, "searchCollection": { - "message": "Pesquisar coleção" + "message": "Procurar na coleção" }, "searchType": { - "message": "Pesquisar tipo" + "message": "Procurar no tipo" }, "noneFolder": { - "message": "Nenhuma pasta", + "message": "Em nenhuma pasta", "description": "This is the folder for uncategorized items" }, "enableAddLoginNotification": { "message": "Ask to add login" }, "addLoginNotificationDesc": { - "message": "A \"notificação de adicionar credencial\" solicita-lhe automaticamente a guardar novas credenciais para o seu cofre quando inicia sessão nas mesmas pela primeira vez." + "message": "Pedir para adicionar um item se não o encontrar no seu cofre." }, "showCardsCurrentTab": { "message": "Show cards on Tab page" @@ -609,14 +609,14 @@ "description": "Clipboard is the operating system thing where you copy/paste data to on your device." }, "clearClipboardDesc": { - "message": "Limpar automaticamente valores copiados da sua área de transferência.", + "message": "Limpar automaticamente os valores copiados da sua área de transferência.", "description": "Clipboard is the operating system thing where you copy/paste data to on your device." }, "notificationAddDesc": { - "message": "Deve o Bitwarden memorizar esta palavra-passe para si?" + "message": "Deve o Bitwarden memorizar esta palavra-passe por si?" }, "notificationAddSave": { - "message": "Sim, guardar agora" + "message": "Guardar" }, "enableChangedPasswordNotification": { "message": "Ask to update existing login" @@ -628,7 +628,7 @@ "message": "Pretende atualizar esta palavra-passe no Bitwarden?" }, "notificationChangeSave": { - "message": "Sim, atualizar agora" + "message": "Atualizar" }, "enableContextMenuItem": { "message": "Show context menu options" @@ -641,13 +641,13 @@ "description": "Default URI match detection for auto-fill." }, "defaultUriMatchDetectionDesc": { - "message": "Escolha a maneira predefinida pela qual a deteção de correspondência de URI é manuseada para credenciais ao realizar ações como auto-preenchimento." + "message": "Escolha a forma predefinida como a deteção de correspondência de URI é tratada para inícios de sessão ao executar ações como o preenchimento automático." }, "theme": { "message": "Tema" }, "themeDesc": { - "message": "Altere o tema de cor da aplicação." + "message": "Alterar o tema de cores da aplicação." }, "dark": { "message": "Escuro", @@ -658,7 +658,7 @@ "description": "Light color" }, "solarizedDark": { - "message": "Solarized escuro", + "message": "Solarized Dark", "description": "'Solarized' is a noun and the name of a color scheme. It should not be translated." }, "exportVault": { @@ -672,16 +672,16 @@ "description": "WARNING (should stay in capitalized letters if the language permits)" }, "confirmVaultExport": { - "message": "Confirmar exportação de cofre" + "message": "Confirmar a exportação do cofre" }, "exportWarningDesc": { - "message": "Esta exportação contém os seus dados do cofre num formato desencriptado. Não deve armazenar ou enviar o ficheiro exportado através de canais inseguros (como email). Apague-a imediatamente após a utilizar." + "message": "Esta exportação contém os dados do seu cofre num formato não encriptado. Não deve armazenar ou enviar o ficheiro exportado através de canais não seguros (como o e-mail). Elimine-o imediatamente após terminar a sua utilização." }, "encExportKeyWarningDesc": { - "message": "Esta exportação cifra os seus dados utilizando a chave de cifragem da sua conta. Se alguma vez mudar a chave de cifragem da sua conta, deve fazer a exportação novamente, já que não conseguirá decifrar este ficheiro de exportação." + "message": "Esta exportação encripta os seus dados utilizando a chave de encriptação da sua conta. Se alguma vez mudar a chave de encriptação da sua conta, deve exportar novamente, uma vez que não conseguirá desencriptar este ficheiro de exportação." }, "encExportAccountWarningDesc": { - "message": "As chaves de encriptação de conta são únicas para cada conta de utilizador Bitwarden, pelo que não se pode importar uma exportação encriptada para uma conta diferente." + "message": "As chaves de encriptação da conta são únicas para cada conta de utilizador Bitwarden, pelo que não é possível importar uma exportação encriptada para uma conta diferente." }, "exportMasterPassword": { "message": "Introduza a sua palavra-passe mestra para exportar os dados do seu cofre." @@ -690,13 +690,13 @@ "message": "Partilhado" }, "learnOrg": { - "message": "Saiba mais sobre as Organizações" + "message": "Saiba mais sobre as organizações" }, "learnOrgConfirmation": { - "message": "O Bitwarden permite-lhe partilhar os itens do seu cofre com outras pessoas ao usar uma organização. Gostaria de visitar o site bitwarden.com para saber mais?" + "message": "O Bitwarden permite-lhe partilhar os seus itens do cofre com outras pessoas através da utilização de uma organização. Gostaria de visitar o site bitwarden.com para saber mais?" }, "moveToOrganization": { - "message": "Mudança para Organização" + "message": "Mover para a organização" }, "share": { "message": "Partilhar" @@ -715,13 +715,13 @@ } }, "moveToOrgDesc": { - "message": "Escolha uma organização para a qual deseja mover este item. A mudança para uma organização transfere a propriedade do item para essa organização. Deixará de ser o proprietário directo deste item uma vez que tenha sido movido." + "message": "Escolha uma organização para a qual pretende mover este item. Mover para uma organização transfere a propriedade do item para essa organização. Deixará de ser o proprietário direto deste item depois de este ter sido movido." }, "learnMore": { "message": "Saber mais" }, "authenticatorKeyTotp": { - "message": "Chave de autenticador (TOTP)" + "message": "Chave de autenticação (TOTP)" }, "verificationCodeTotp": { "message": "Código de verificação (TOTP)" @@ -736,10 +736,10 @@ "message": "Eliminar anexo" }, "deleteAttachmentConfirmation": { - "message": "Tem a certeza de que deseja eliminar este anexo?" + "message": "Tem a certeza de que pretende eliminar este anexo?" }, "deletedAttachment": { - "message": "Anexo apagado" + "message": "Anexo eliminado" }, "newAttachment": { "message": "Adicionar novo anexo" @@ -748,13 +748,13 @@ "message": "Sem anexos." }, "attachmentSaved": { - "message": "O anexo foi guardado." + "message": "Anexo guardado" }, "file": { "message": "Ficheiro" }, "selectFile": { - "message": "Selecione um ficheiro." + "message": "Selecionar um ficheiro" }, "maxFileSize": { "message": "O tamanho máximo do ficheiro é de 500 MB." @@ -766,49 +766,49 @@ "message": "Não pode utilizar esta funcionalidade até atualizar a sua chave de encriptação." }, "premiumMembership": { - "message": "Adesão Premium" + "message": "Subscrição Premium" }, "premiumManage": { - "message": "Gerir adesão" + "message": "Gerir subscrição" }, "premiumManageAlert": { - "message": "Pode gerir a sua adesão premium no cofre web bitwarden.com. Pretende visitar o website agora?" + "message": "Pode gerir a sua subscrição no cofre web bitwarden.com. Pretende visitar o site agora?" }, "premiumRefresh": { - "message": "Atualizar adesão" + "message": "Atualizar subscrição" }, "premiumNotCurrentMember": { - "message": "Não é atualmente um membro premium." + "message": "Atualmente, não é um membro Premium." }, "premiumSignUpAndGet": { - "message": "Registe-se para uma adesão premium e obtenha:" + "message": "Subscreva uma subscrição Premium e obtenha:" }, "ppremiumSignUpStorage": { "message": "1 GB de armazenamento encriptado para anexos de ficheiros." }, "ppremiumSignUpTwoStep": { - "message": "Opções de início de sessão de dois passos adicionais como YubiKey, FIDO U2F, e Duo." + "message": "Opções adicionais de verificação de dois passos, como YubiKey, FIDO U2F e Duo." }, "ppremiumSignUpReports": { - "message": "Higiene de palavras-passe, saúde das contas, e relatórios de brechas de dados para manter o seu cofre seguro." + "message": "Higiene de palavras-passe, saúde da conta e relatórios de violação de dados para manter o seu cofre seguro." }, "ppremiumSignUpTotp": { - "message": "Gerador de códigos de verificação TOTP (2FA) para credenciais no seu cofre." + "message": "Gerador de código de verificação TOTP (2FA) para inícios de sessão no seu cofre." }, "ppremiumSignUpSupport": { "message": "Prioridade no apoio ao cliente." }, "ppremiumSignUpFuture": { - "message": "Todas as funcionalidades premium futuras. Mais a chegar brevemente!" + "message": "Todas as futuras funcionalidades Premium. Mais em breve!" }, "premiumPurchase": { - "message": "Comprar Premium" + "message": "Adquirir Premium" }, "premiumPurchaseAlert": { - "message": "Pode comprar adesão premium no cofre web bitwarden.com. Pretende visitar o website agora?" + "message": "Pode adquirir uma subscrição Premium no cofre web bitwarden.com. Pretende visitar o site agora?" }, "premiumCurrentMember": { - "message": "É um membro premium!" + "message": "É um membro Premium!" }, "premiumCurrentMemberThanks": { "message": "Obrigado por apoiar o Bitwarden." @@ -823,28 +823,28 @@ } }, "refreshComplete": { - "message": "Atualização completada" + "message": "Atualização concluída" }, "enableAutoTotpCopy": { "message": "Copy TOTP automatically" }, "disableAutoTotpCopyDesc": { - "message": "Se o seu início de sessão tem uma chave de autenticador anexada ao mesmo, o código de verificação TOTP é copiado automaticamente para a sua área de transferência quando quer que auto-preencha o início de sessão." + "message": "Se um início de sessão tiver uma chave de autenticação, copie o código de verificação TOTP para a sua área de transferência quando preencher automaticamente o início de sessão." }, "enableAutoBiometricsPrompt": { "message": "Ask for biometrics on launch" }, "premiumRequired": { - "message": "Premium requerido" + "message": "É necessária uma subscrição Premium" }, "premiumRequiredDesc": { - "message": "É requerida uma adesão premium para utilizar esta funcionalidade." + "message": "É necessária uma subscrição Premium para utilizar esta funcionalidade." }, "enterVerificationCodeApp": { - "message": "Introduza o código de verificação de 6 dígitos da sua aplicação de autenticador." + "message": "Introduza o código de verificação de 6 dígitos da sua aplicação de autenticação." }, "enterVerificationCodeEmail": { - "message": "Introduza o código de verificação de 6 dígitos que foi enviado por email para $EMAIL$.", + "message": "Introduza o código de verificação de 6 dígitos que foi enviado por e-mail para $EMAIL$.", "placeholders": { "email": { "content": "$1", @@ -853,7 +853,7 @@ } }, "verificationCodeEmailSent": { - "message": "Email de verificação enviado para $EMAIL$.", + "message": "E-mail de verificação enviado para $EMAIL$.", "placeholders": { "email": { "content": "$1", @@ -868,7 +868,7 @@ "message": "Enviar código de verificação novamente" }, "useAnotherTwoStepMethod": { - "message": "Utilizar outro método de início de sessão de dois passos" + "message": "Utilizar outro método de verificação de dois passos" }, "insertYubiKey": { "message": "Introduza a sua YubiKey na porta USB do seu computador, depois toque no botão da mesma." @@ -877,7 +877,7 @@ "message": "Introduza a sua chave de segurança na porta USB do seu computador. Se tiver um botão, toque no mesmo." }, "webAuthnNewTab": { - "message": "Para iniciar a verificação WebAuthn 2FA. Clique no botão abaixo para abrir um novo separador e siga as instruções fornecidas no novo separador." + "message": "Para iniciar a verificação do WebAuthn 2FA, clique no botão abaixo para abrir um novo separador e siga as instruções fornecidas no novo separador." }, "webAuthnNewTabOpen": { "message": "Abrir novo separador" @@ -889,64 +889,64 @@ "message": "Início de sessão indisponível" }, "noTwoStepProviders": { - "message": "Esta conta tem o início de sessão de dois passos ativado, no entanto, nenhum dos provedores de início de sessão de dois passos configurados são suportados por este navegador web." + "message": "Esta conta tem a verificação de dois passos configurada, no entanto, nenhum dos fornecedores da verificação de dois passos configurada é suportado por este navegador web." }, "noTwoStepProviders2": { - "message": "Por favor utilize um navegador web suportado (tal como o Chrome) e/ou adicione provedores adicionais que são melhor suportados entre navegadores web (tal como uma aplicação de autenticador)." + "message": "Utilize um navegador web suportado (como o Chrome) e/ou adicione fornecedores adicionais que sejam mais bem suportados nos navegadores web (como uma aplicação de autenticação)." }, "twoStepOptions": { - "message": "Opções de início de sessão de dois passos" + "message": "Opções de verificação de dois passos" }, "recoveryCodeDesc": { - "message": "Perdeu o acesso a todos os seus provedores de dois passos? Utilize o seu código de recuperação para desativar todos os provedores de dois passos da sua conta." + "message": "Perdeu o acesso a todos os seus fornecedores de verificação de dois passos? Utilize o seu código de recuperação para desativar todos os fornecedores de verificação de dois passos da sua conta." }, "recoveryCodeTitle": { "message": "Código de recuperação" }, "authenticatorAppTitle": { - "message": "Aplicação de autenticador" + "message": "Aplicação de autenticação" }, "authenticatorAppDesc": { - "message": "Utilize uma aplicação de autenticador (tal como Authy ou Google Authenticator) para gerar códigos de verificação baseados na hora.", + "message": "Utilize uma aplicação de autenticação (como o Authy ou o Google Authenticator) para gerar códigos de verificação baseados no tempo.", "description": "'Authy' and 'Google Authenticator' are product names and should not be translated." }, "yubiKeyTitle": { "message": "Chave de segurança YubiKey OTP" }, "yubiKeyDesc": { - "message": "Utilize uma YubiKey para aceder à sua conta. Funciona com YubiKey 4, 4 Nano, 4C, e dispositivos NEO." + "message": "Utilize uma YubiKey para aceder à sua conta. Funciona com os dispositivos YubiKey 4, 4 Nano, 4C e NEO." }, "duoDesc": { - "message": "Verifique com Duo Security utilizando a aplicação Duo Mobile, SMS, chamada telefónica, ou chave de segurança U2F.", + "message": "Verifique com a Duo Security utilizando a aplicação Duo Mobile, SMS, chamada telefónica ou chave de segurança U2F.", "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated." }, "duoOrganizationDesc": { - "message": "Verifique com Duo Security para a sua organização utilizando a aplicação Duo Mobile, SMS, chamada telefónica, ou chave de segurança U2F.", + "message": "Verifique com a Duo Security para a sua organização utilizando a aplicação Duo Mobile, SMS, chamada telefónica, ou chave de segurança U2F.", "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated." }, "webAuthnTitle": { "message": "FIDO2 WebAuthn" }, "webAuthnDesc": { - "message": "Utilize qualquer chave de segurança ativada pela WebAuthn para aceder à sua conta." + "message": "Utilize qualquer chave de segurança compatível com o WebAuthn para aceder à sua conta." }, "emailTitle": { - "message": "Email" + "message": "E-mail" }, "emailDesc": { - "message": "Os códigos de verificação vão ser enviados para si." + "message": "Os códigos de verificação ser-lhe-ão enviados por e-mail." }, "selfHostedEnvironment": { "message": "Ambiente auto-hospedado" }, "selfHostedEnvironmentFooter": { - "message": "Especifique o URL de base da sua instalação local do Bitwarden alojada nas suas premissas." + "message": "Especifique o URL de base da sua instalação Bitwarden hospedada no local." }, "customEnvironment": { "message": "Ambiente personalizado" }, "customEnvironmentFooter": { - "message": "Para utilizadores avançados. Pode especificar o URL de base de cada serviço independentemente." + "message": "Para utilizadores avançados. Pode especificar o URL de base de cada serviço de forma independente." }, "baseUrl": { "message": "URL do servidor" @@ -967,13 +967,13 @@ "message": "URL do servidor de ícones" }, "environmentSaved": { - "message": "Os URLs de ambiente foram guardados." + "message": "URLs de ambiente guardados" }, "enableAutoFillOnPageLoad": { - "message": "Ativar auto-preenchimento no carregar da página" + "message": "Preencher automaticamente ao carregar a página" }, "enableAutoFillOnPageLoadDesc": { - "message": "Se um formulário de início de sessão foram detetado, realizar automaticamente um auto-preenchimento quando a página web carregar." + "message": "Se for detetado um formulário de início de sessão, o preenchimento automático é efetuado quando a página web é carregada." }, "experimentalFeature": { "message": "Compromised or untrusted websites can exploit auto-fill on page load." @@ -982,31 +982,31 @@ "message": "Learn more about auto-fill" }, "defaultAutoFillOnPageLoad": { - "message": "Predefinição padrão de preenchimento automático para itens de login" + "message": "Definição de preenchimento automático predefinido para itens de início de sessão" }, "defaultAutoFillOnPageLoadDesc": { - "message": "Depois de activar o preenchimento automático no carregamento da página, pode activar ou desactivar a função de itens de início de sessão individuais. Esta é a configuração padrão para os itens de início de sessão que não estão configurados separadamente." + "message": "Pode desativar o preenchimento automático ao carregar a página para itens de início de sessão individuais a partir da vista Editar do item." }, "itemAutoFillOnPageLoad": { - "message": "Preenchimento automático no carregamento da página (se ativado em Opções)" + "message": "Preenchimento automático ao carregar a página (se configurado nas Opções)" }, "autoFillOnPageLoadUseDefault": { - "message": "Usar padrão" + "message": "Utilizar a predefinição" }, "autoFillOnPageLoadYes": { - "message": "Preenchimento automático na carga da página" + "message": "Preencher automaticamente ao carregar a página" }, "autoFillOnPageLoadNo": { - "message": "Não preencher automaticamente no carregamento da página" + "message": "Não preencher automaticamente ao carregar a página" }, "commandOpenPopup": { - "message": "Abrir popup do cofre" + "message": "Abrir o pop-up do cofre" }, "commandOpenSidebar": { - "message": "Abrir cofre na barra lateral" + "message": "Abrir o cofre na barra lateral" }, "commandAutofillDesc": { - "message": "Auto-preencher o último início de sessão utilizado para o website atual" + "message": "Preencher automaticamente o último início de sessão utilizado no site atual" }, "commandGeneratePasswordDesc": { "message": "Gerar e copiar uma nova palavra-passe aleatória para a área de transferência" @@ -1015,7 +1015,7 @@ "message": "Bloquear o cofre" }, "privateModeWarning": { - "message": "O suporte do modo privado é experimental e alguns recursos são limitados." + "message": "O suporte do modo privado é experimental e algumas funcionalidades são limitadas." }, "customFields": { "message": "Campos personalizados" @@ -1036,24 +1036,24 @@ "message": "Texto" }, "cfTypeHidden": { - "message": "Ocultado" + "message": "Oculto" }, "cfTypeBoolean": { "message": "Booleano" }, "cfTypeLinked": { - "message": "Ligado", + "message": "Associado", "description": "This describes a field that is 'linked' (tied) to another field." }, "linkedValue": { - "message": "Valor vinculado", + "message": "Valor associado", "description": "This describes a value that is 'linked' (tied) to another value." }, "popup2faCloseMessage": { - "message": "Clicar fora da janela popup para verificar o seu email pelo código de verificação irá causar com que este popup feche. Deseja abrir este popup numa nova janela para que este não se feche?" + "message": "Ao clicar fora da janela pop-up para verificar o código de verificação no seu e-mail fará com que este pop-up se feche. Pretende abrir esta janela pop-up numa nova janela para que não se feche?" }, "popupU2fCloseMessage": { - "message": "Este navegador não pode processar solicitações U2F nesta janela popup. Pretende abrir este popup numa nova janela para que inicie sessão utilizando U2F?" + "message": "Este navegador não pode processar pedidos U2F nesta janela pop-up. Pretende abrir este pop-up numa nova janela para poder iniciar sessão utilizando o U2F?" }, "enableFavicon": { "message": "Show website icons" @@ -1077,10 +1077,10 @@ "message": "Marca" }, "expirationMonth": { - "message": "Mês de expiração" + "message": "Mês de validade" }, "expirationYear": { - "message": "Ano de expiração" + "message": "Ano de validade" }, "expiration": { "message": "Expiração" @@ -1131,16 +1131,16 @@ "message": "Título" }, "mr": { - "message": "Sr" + "message": "Sr." }, "mrs": { - "message": "Sra" + "message": "Sra." }, "ms": { - "message": "Sra" + "message": "Sra." }, "dr": { - "message": "Dr" + "message": "Dr." }, "mx": { "message": "Mx" @@ -1149,13 +1149,13 @@ "message": "Primeiro nome" }, "middleName": { - "message": "Nome do meio" + "message": "Segundo nome" }, "lastName": { - "message": "Último nome" + "message": "Apelido" }, "fullName": { - "message": "Nome Completo" + "message": "Nome completo" }, "identityName": { "message": "Nome de identidade" @@ -1173,28 +1173,28 @@ "message": "Número da licença" }, "email": { - "message": "Email" + "message": "E-mail" }, "phone": { "message": "Telefone" }, "address": { - "message": "Endereço" + "message": "Morada" }, "address1": { - "message": "Endereço 1" + "message": "1.ª morada" }, "address2": { - "message": "Endereço 2" + "message": "2.ª morada" }, "address3": { - "message": "Endereço 3" + "message": "3.ª morada" }, "cityTown": { - "message": "Cidade / localidade" + "message": "Cidade / Localidade" }, "stateProvince": { - "message": "Estado / província" + "message": "Estado / Província" }, "zipPostalCode": { "message": "Código postal" @@ -1206,10 +1206,10 @@ "message": "Tipo" }, "typeLogin": { - "message": "Credencial" + "message": "Início de sessão" }, "typeLogins": { - "message": "Credenciais" + "message": "Inícios de sessão" }, "typeSecureNote": { "message": "Nota segura" @@ -1233,7 +1233,7 @@ "message": "Favoritos" }, "popOutNewWindow": { - "message": "Enviar para uma nova janela" + "message": "Abrir numa nova janela" }, "refresh": { "message": "Atualizar" @@ -1245,7 +1245,7 @@ "message": "Identidades" }, "logins": { - "message": "Credenciais" + "message": "Inícios de sessão" }, "secureNotes": { "message": "Notas seguras" @@ -1255,10 +1255,10 @@ "description": "To clear something out. example: To clear browser history." }, "checkPassword": { - "message": "Verifica se a palavra-passe foi exposta." + "message": "Verificar se a palavra-passe foi exposta." }, "passwordExposed": { - "message": "Esta palavra-passe foi exposta $VALUE$ vez(es) em brechas de dados. Deve alterá-la.", + "message": "Esta palavra-passe foi exposta $VALUE$ vez(es) em violações de dados. Deve alterá-la.", "placeholders": { "value": { "content": "$1", @@ -1267,14 +1267,14 @@ } }, "passwordSafe": { - "message": "Esta palavra-passe não foi encontrada em nenhuma brecha de dados conhecida. Esta deve ser segura de utilizar." + "message": "Esta palavra-passe não foi encontrada em nenhuma violação de dados conhecida. A sua utilização deve ser segura." }, "baseDomain": { "message": "Domínio base", "description": "Domain name. Ex. website.com" }, "domainName": { - "message": "Nome do Domínio", + "message": "Nome do domínio", "description": "Domain name. Ex. website.com" }, "host": { @@ -1334,7 +1334,7 @@ "description": "ex. Date this item was updated" }, "dateCreated": { - "message": "Criado", + "message": "Criado a", "description": "ex. Date this item was created" }, "datePasswordUpdated": { @@ -1342,7 +1342,7 @@ "description": "ex. Date this password was updated" }, "neverLockWarning": { - "message": "Tem a certeza de que pretende utilizar a opção \"Nunca\"? Definir as suas opções de bloqueio para \"Nunca\" armazena a chave de encriptação do seu cofre no seu dispositivo. Se utilizar esta opção deve assegurar-se de que mantém o seu dispositivo devidamente protegido." + "message": "Tem a certeza de que deseja utilizar a opção \"Nunca\"? Ao definir as opções de bloqueio para \"Nunca\" armazena a chave de encriptação do seu cofre no seu dispositivo. Se utilizar esta opção deve assegurar-se de que mantém o seu dispositivo devidamente protegido." }, "noOrganizationsList": { "message": "Não pertence a nenhuma organização. As organizações permitem-lhe partilhar itens em segurança com outros utilizadores." @@ -1372,7 +1372,7 @@ "message": "Palavra-passe mestra fraca" }, "weakMasterPasswordDesc": { - "message": "A palavra-passe mestra que escolheu é fraca. Deve utilizar uma palavra-passe mestra forte (ou uma frase-passe) para proteger adequadamente a sua conta Bitwarden. Tem a certeza de que pretende utilizar esta palavra-passe mestra?" + "message": "A palavra-passe mestra que escolheu é fraca. Deve utilizar uma palavra-passe mestra forte (ou uma frase de acesso) para proteger adequadamente a sua conta Bitwarden. Tem a certeza de que pretende utilizar esta palavra-passe mestra?" }, "pin": { "message": "PIN", @@ -1382,28 +1382,28 @@ "message": "Desbloquear com PIN" }, "setYourPinCode": { - "message": "Defina o seu código PIN para desbloquear o Bitwarden. As suas definições PIN serão redefinidas se terminar sessão completamente da aplicação." + "message": "Defina o seu código PIN para desbloquear o Bitwarden. As suas definições de PIN serão redefinidas se alguma vez terminar sessão completamente da aplicação." }, "pinRequired": { - "message": "O código PIN é requerido." + "message": "É necessário o código PIN." }, "invalidPin": { "message": "Código PIN inválido." }, "unlockWithBiometrics": { - "message": "Desbloquear com biométricos" + "message": "Desbloquear com biometria" }, "awaitDesktop": { - "message": "A aguardar confirmação do seu computador" + "message": "A aguardar confirmação da aplicação para computador" }, "awaitDesktopDesc": { - "message": "Por favor, confirme o uso de dados biométricos na aplicação Bitwarden Desktop para habilitar os dados biométricos do navegador." + "message": "Por favor, confirme a utilização da biometria na aplicação para computador Bitwarden para configurar a biometria no navegador." }, "lockWithMasterPassOnRestart": { - "message": "Bloquear com palavra-passe mestra quando reiniciar o navegador" + "message": "Bloquear com a palavra-passe mestra ao reiniciar o navegador" }, "selectOneCollection": { - "message": "Tem de selecionar pelo menos uma coleção." + "message": "Deve selecionar pelo menos uma coleção." }, "cloneItem": { "message": "Clonar item" @@ -1412,7 +1412,7 @@ "message": "Clonar" }, "passwordGeneratorPolicyInEffect": { - "message": "Uma ou mais políticas de organização estão a afetar as suas definições do gerador." + "message": "Uma ou mais políticas da organização estão a afetar as suas definições do gerador." }, "vaultTimeoutAction": { "message": "Ação de expiração do cofre" @@ -1426,7 +1426,7 @@ "description": "Noun: a special folder to hold deleted items" }, "searchTrash": { - "message": "Pesquisar lixo" + "message": "Procurar no lixo" }, "permanentlyDeleteItem": { "message": "Eliminar item permanentemente" @@ -1447,19 +1447,19 @@ "message": "Item restaurado" }, "vaultTimeoutLogOutConfirmation": { - "message": "Terminar sessão irá remover todos os acessos ao seu cofre e requer autenticação online após o período de expiração. Tem a certeza de que pretende utilizar esta definição?" + "message": "Ao terminar sessão removerá todo o acesso ao seu cofre e requer autenticação online após o período de tempo limite. Tem a certeza de que pretende utilizar esta definição?" }, "vaultTimeoutLogOutConfirmationTitle": { "message": "Confirmação de expiração do cofre" }, "autoFillAndSave": { - "message": "Auto-preencher e guardar" + "message": "Preencher automaticamente e guardar" }, "autoFillSuccessAndSavedUri": { - "message": "Item auto-preenchido e URI guardado" + "message": "Item preenchido automaticamente e URI guardado" }, "autoFillSuccess": { - "message": "Item auto-preenchido" + "message": "Item preenchido automaticamente " }, "insecurePageWarning": { "message": "Warning: This is an unsecured HTTP page, and any information you submit can potentially be seen and changed by others. This Login was originally saved on a secure (HTTPS) page." @@ -1489,10 +1489,10 @@ "message": "New master password" }, "confirmNewMasterPass": { - "message": "Confirm new master password" + "message": "Confirmar a nova palavra-passe mestra" }, "masterPasswordPolicyInEffect": { - "message": "Uma ou mais políticas da organização requerem que a sua palavra-passe mestra cumpra aos seguintes requisitos:" + "message": "Uma ou mais políticas da organização exigem que a sua palavra-passe mestra cumpra os seguintes requisitos:" }, "policyInEffectMinComplexity": { "message": "Pontuação mínima de complexidade de $SCORE$", @@ -1537,34 +1537,34 @@ "message": "Ao marcar esta caixa concorda com o seguinte:" }, "acceptPoliciesRequired": { - "message": "Os Termos de Serviço e a Política de Privacidade não foram reconhecidos." + "message": "Os Termos de utilização e a Política de privacidade não foram aceites." }, "termsOfService": { - "message": "Termos de serviço" + "message": "Termos de utilização" }, "privacyPolicy": { "message": "Política de privacidade" }, "hintEqualsPassword": { - "message": "A dica da sua senha não pode ser igual à senha." + "message": "A dica da sua palavra-passe não pode ser igual à sua palavra-passe." }, "ok": { "message": "Ok" }, "desktopSyncVerificationTitle": { - "message": "Verificação de sincronização do ambiente de trabalho" + "message": "Verificação da sincronização da aplicação para computador" }, "desktopIntegrationVerificationText": { - "message": "Por favor, verifique se a aplicação no computador mostra esta impressão digital: " + "message": "Verifique se a aplicação para computador apresenta esta impressão digital: " }, "desktopIntegrationDisabledTitle": { - "message": "Integração com o navegador não está ativada" + "message": "A integração do navegador não está configurada" }, "desktopIntegrationDisabledDesc": { - "message": "A integração com o navegador não está habilitada no aplicativo Bitwarden Desktop. Por favor, habilite-o nas configurações da aplicação para computador." + "message": "A integração do navegador não está configurada na aplicação para computador Bitwarden. Por favor, configure-a nas definições da aplicação para computador." }, "startDesktopTitle": { - "message": "Iniciar a aplicação Bitwarden Desktop" + "message": "Iniciar a aplicação para computador Bitwarden" }, "startDesktopDesc": { "message": "The Bitwarden desktop application needs to be started before unlock with biometrics can be used." @@ -1633,15 +1633,15 @@ } }, "send": { - "message": "Envio", + "message": "Send", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "searchSends": { - "message": "Pesquisar Envios", + "message": "Procurar Sends", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "addSend": { - "message": "Adicionar Envio", + "message": "Adicionar Send", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "sendTypeText": { @@ -1651,24 +1651,24 @@ "message": "Ficheiro" }, "allSends": { - "message": "Todos os Envios", + "message": "Todos os Sends", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "maxAccessCountReached": { - "message": "Número de acessos máximo atingido", + "message": "Número máximo de acessos atingido", "description": "This text will be displayed after a Send has been accessed the maximum amount of times." }, "expired": { "message": "Expirado" }, "pendingDeletion": { - "message": "Remoção pendente" + "message": "Eliminação pendente" }, "passwordProtected": { - "message": "Protegido por senha" + "message": "Protegido por palavra-passe" }, "copySendLink": { - "message": "Copiar Send link", + "message": "Copiar link do Send", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "removePassword": { @@ -1678,40 +1678,40 @@ "message": "Eliminar" }, "removedPassword": { - "message": "Senha removida" + "message": "Palavra-passe removida" }, "deletedSend": { - "message": "Envio eliminado", + "message": "Send eliminado", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "sendLink": { - "message": "Link de Envio", + "message": "Link do Send", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "disabled": { - "message": "Desabilitado" + "message": "Desativado" }, "removePasswordConfirmation": { - "message": "Tem a certeza que pretende remover a senha?" + "message": "Tem a certeza de que pretende remover a palavra-passe?" }, "deleteSend": { - "message": "Eliminar Envio", + "message": "Eliminar Send", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "deleteSendConfirmation": { - "message": "Tem a certeza que pretende eliminar este Envio?", + "message": "Tem a certeza de que pretende eliminar este Send?", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "editSend": { - "message": "Editar Envio", + "message": "Editar Send", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "sendTypeHeader": { - "message": "Que tipo de Envio é este?", + "message": "Que tipo de Send é este?", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "sendNameDesc": { - "message": "Um nome amigável para descrever este Envio.", + "message": "Um nome simpático para descrever este Send.", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "sendFileDesc": { @@ -1721,14 +1721,14 @@ "message": "Data de eliminação" }, "deletionDateDesc": { - "message": "The Send will be permanently deleted on the specified date and time.", + "message": "O Send será permanentemente eliminado na data e hora especificadas.", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "expirationDate": { - "message": "Expiration date" + "message": "Data de validade" }, "expirationDateDesc": { - "message": "If set, access to this Send will expire on the specified date and time.", + "message": "Se definido, o acesso a este Send expirará na data e hora especificadas.", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "oneDay": { @@ -1815,7 +1815,7 @@ "message": "Antes de começar" }, "sendFirefoxCustomDatePopoutMessage1": { - "message": "Para usar um seletor de data no estilo de calendário", + "message": "Para utilizar um seletor de datas do tipo calendário,", "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read '**To use a calendar style date picker ** click here to pop out your window.'" }, "sendFirefoxCustomDatePopoutMessage2": { @@ -1823,29 +1823,29 @@ "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To use a calendar style date picker **click here** to pop out your window.'" }, "sendFirefoxCustomDatePopoutMessage3": { - "message": "Para abrir em janela.", + "message": "para abrir a janela.", "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'To use a calendar style date picker click here **to pop out your window.**'" }, "expirationDateIsInvalid": { - "message": "A data de validade fornecida não é válida." + "message": "São necessárias uma data e uma hora de validade." }, "deletionDateIsInvalid": { "message": "A data de eliminação fornecida não é válida." }, "expirationDateAndTimeRequired": { - "message": "Uma data de validade e uma hora são obrigatórias." + "message": "São necessárias uma data e uma hora de validade." }, "deletionDateAndTimeRequired": { - "message": "Uma data de eliminação e uma hora são obrigatórias." + "message": "São necessárias uma data e uma hora de eliminação." }, "dateParsingError": { - "message": "Ocorreu um erro ao guardar a sua exclusão e datas de validade." + "message": "Ocorreu um erro ao guardar as suas datas de eliminação e validade." }, "hideEmail": { - "message": "Ocultar o meu endereço de correio eletrónico dos destinatários." + "message": "Ocultar o meu endereço de e-mail dos destinatários." }, "sendOptionsPolicyInEffect": { - "message": "One or more organization policies are affecting your Send options." + "message": "Uma ou mais políticas da organização estão a afetar as suas opções do Send." }, "passwordPrompt": { "message": "Master password re-prompt" @@ -1863,25 +1863,25 @@ "message": "You must verify your email to use this feature. You can verify your email in the web vault." }, "updatedMasterPassword": { - "message": "Palavra-passe Mestra Atualizada" + "message": "Palavra-passe mestra atualizada" }, "updateMasterPassword": { - "message": "Atualizar Senha Mestra" + "message": "Atualizar palavra-passe mestra" }, "updateMasterPasswordWarning": { - "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour." + "message": "A sua palavra-passe mestra foi recentemente alterada por um administrador da sua organização. Para aceder ao cofre, tem de atualizar a sua palavra-passe mestra agora. Se prosseguir, sairá da sua sessão atual e terá de iniciar sessão novamente. As sessões ativas noutros dispositivos poderão continuar ativas até uma hora." }, "updateWeakMasterPasswordWarning": { - "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour." + "message": "A sua palavra-passe mestra não cumpre uma ou mais políticas da sua organização. Para aceder ao cofre, tem de atualizar a sua palavra-passe mestra agora. Se prosseguir, sairá da sua sessão atual e terá de iniciar sessão novamente. As sessões ativas noutros dispositivos poderão continuar ativas até uma hora." }, "resetPasswordPolicyAutoEnroll": { - "message": "Inscrição Automática" + "message": "Inscrição automática" }, "resetPasswordAutoEnrollInviteWarning": { "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password." }, "selectFolder": { - "message": "Seleccionar pasta..." + "message": "Selecionar pasta..." }, "ssoCompleteRegistration": { "message": "In order to complete logging in with SSO, please set a master password to access and protect your vault." @@ -1938,7 +1938,7 @@ "message": "Vault export unavailable" }, "personalVaultExportPolicyInEffect": { - "message": "One or more organization policies prevents you from exporting your individual vault." + "message": "Uma ou mais políticas da organização impedem-no de exportar o seu cofre pessoal." }, "copyCustomFieldNameInvalidElement": { "message": "Unable to identify a valid form element. Try inspecting the HTML instead." @@ -1956,16 +1956,16 @@ } }, "leaveOrganization": { - "message": "Deixar a Organização" + "message": "Deixar a organização" }, "removeMasterPassword": { - "message": "Remover Senha Mestra" + "message": "Remover palavra-passe mestra" }, "removedMasterPassword": { - "message": "Senha mestra removida." + "message": "Palavra-passe mestra removida" }, "leaveOrganizationConfirmation": { - "message": "Tem a certeza de que pretende sair desta organização?" + "message": "Tem a certeza de que pretende deixar esta organização?" }, "leftOrganization": { "message": "Saiu da organização." @@ -1977,10 +1977,10 @@ "message": "A sua sessão expirou. Por favor, volte atrás e tente iniciar sessão novamente." }, "exportingPersonalVaultTitle": { - "message": "A Exportar Cofre Pessoal" + "message": "A exportar o cofre pessoal" }, "exportingPersonalVaultDescription": { - "message": "Apenas os itens do cofre pessoal associado ao $EMAIL$ serão exportados. Os itens do cofre da organização não serão incluídos.", + "message": "Apenas os itens do cofre pessoal associado a $EMAIL$ serão exportados. Os itens do cofre da organização não serão incluídos.", "placeholders": { "email": { "content": "$1", @@ -1992,7 +1992,7 @@ "message": "Erro" }, "regenerateUsername": { - "message": "Regerar nome de utilizador" + "message": "Regenerar nome de utilizador" }, "generateUsername": { "message": "Gerar nome de utilizador" @@ -2017,16 +2017,16 @@ "message": "Aleatório" }, "randomWord": { - "message": "Palavra Aleatória" + "message": "Palavra aleatória" }, "websiteName": { - "message": "Nome do Site" + "message": "Nome do site" }, "whatWouldYouLikeToGenerate": { - "message": "O que desejaria de gerar?" + "message": "O que é que gostaria de gerar?" }, "passwordType": { - "message": "Tipo de Palavra-passe" + "message": "Tipo de palavra-passe" }, "service": { "message": "Serviço" @@ -2042,7 +2042,7 @@ "description": "Part of a URL." }, "apiAccessToken": { - "message": "Token de acesso da API" + "message": "Token de acesso à API" }, "apiKey": { "message": "Chave da API" @@ -2051,7 +2051,7 @@ "message": "Key connector error: make sure key connector is available and working correctly." }, "premiumSubcriptionRequired": { - "message": "Subscrição premium necessária" + "message": "É necessária uma subscrição Premium" }, "organizationIsDisabled": { "message": "Organization suspended." @@ -2114,10 +2114,10 @@ "message": "Utilizador incorreto?" }, "newAroundHere": { - "message": "Novo por aqui?" + "message": "É novo por cá?" }, "rememberEmail": { - "message": "Relembrar e-mail" + "message": "Memorizar e-mail" }, "loginWithDevice": { "message": "Log in with device" diff --git a/apps/browser/src/_locales/sl/messages.json b/apps/browser/src/_locales/sl/messages.json index 91fdc621fdf..53c32c686c5 100644 --- a/apps/browser/src/_locales/sl/messages.json +++ b/apps/browser/src/_locales/sl/messages.json @@ -11,7 +11,7 @@ "description": "Extension description" }, "loginOrCreateNewAccount": { - "message": "Prijavite se ali ustvarite nov račun za dostop do vašega varnega trezorja." + "message": "Prijavite se ali ustvarite nov račun za dostop do svojega varnega trezorja." }, "createAccount": { "message": "Ustvari račun" @@ -38,10 +38,10 @@ "message": "Glavno geslo" }, "masterPassDesc": { - "message": "Glavno geslo je geslo, ki ga uporabljate za dostop do vašega trezorja. Zelo pomembno je, da ne pozabite vaše glavno geslo. Gesla ni mogoče obnoviti v primeru, če ga pozabite." + "message": "Glavno geslo je geslo, ki ga uporabljate za dostop do svojega trezorja. Zelo pomembno je, da ga ne pozabite. Če pozabite glavno geslo, ga ne bo mogoče obnoviti." }, "masterPassHintDesc": { - "message": "Namig glavnega gesla vam lahko pomaga, da se spomnite vašega gesla, če ga pozabite." + "message": "Če pozabite glavno geslo, boste prejeli ta namig, da bi se gesla laže spomnili." }, "reTypeMasterPass": { "message": "Ponovno vnesite glavno geslo" @@ -678,13 +678,13 @@ "message": "Ta datoteka z izvoženimi podatki vsebuje podatke iz vašega trezorja v nešifrirani obliki. Ne shranjujte in ne pošiljajte je po nezavarovanih kanalih, kot je elektronska pošta. Po uporabi jo takoj izbrišite." }, "encExportKeyWarningDesc": { - "message": "Ta izvoz šifrira vaše podatke z uporabo ključa za šifriranje. Če boste kdaj zamenjali ključ za šifriranje, je potrebno, da ponovno naredite izvoz, ker ne boste mogli dešifrirati to izvoženo datoteko." + "message": "Ta izvoz šifrira vaše podatke z uporabo ključa za šifriranje. Če boste kdaj zamenjali ključ za šifriranje, boste morali podatke izvoziti ponovno, saj pričujočega izvoza ne boste mogli več dešifrirati." }, "encExportAccountWarningDesc": { "message": "Ključ za šifriranje je edinstven za vsak Bitwarden račun, zato ni mogoče da se uvozi šifrirana datoteka v drugi račun." }, "exportMasterPassword": { - "message": "Vnesite vaše glavno geslo za izvoz podatkov iz vašega trezorja." + "message": "Za izvoz podatkov iz trezorja vnesite svoje glavno geslo." }, "shared": { "message": "V skupni rabi" @@ -763,7 +763,7 @@ "message": "Funkcija ni na voljo." }, "updateKey": { - "message": "Ne morete koristiti to funkcijo dokler ne posodobite vaš ključ za šifriranje." + "message": "To funkcijo lahko uporabite šele, ko posodobite svoj šifrirni ključ." }, "premiumMembership": { "message": "Premium članstvo" @@ -841,7 +841,7 @@ "message": "Premium članstvo je potrebno za uporabo te funkcije." }, "enterVerificationCodeApp": { - "message": "Vnesite 6-mestno verifikacijsko kodo iz vaše verifikacijske aplikacije." + "message": "Vnesite 6-mestno verifikacijsko kodo iz svoje aplikacije za avtentikacijo." }, "enterVerificationCodeEmail": { "message": "Vnesite 6-mestno verifikacijsko kodo, ki vam je bila poslana na $EMAIL$.", @@ -898,7 +898,7 @@ "message": "Možnosti dvostopenjske prijave" }, "recoveryCodeDesc": { - "message": "Ste izgubili dostop do vseh vaših ponudnikov dvostopenjske prijave? Uporabite svojo kodo za obnovitev in tako onemogočite dvostopenjsko prijavo v svoj račun." + "message": "Ste izgubili dostop do vseh ponudnikov dvostopenjske prijave? Uporabite svojo kodo za obnovitev in tako onemogočite dvostopenjsko prijavo v svoj račun." }, "recoveryCodeTitle": { "message": "Koda za obnovitev" @@ -1050,7 +1050,7 @@ "description": "This describes a value that is 'linked' (tied) to another value." }, "popup2faCloseMessage": { - "message": "Če kliknete izven pojavnega okna, da preverite vašo epošto za vašo verifikacijsko kodo, bo to povročilo, da se je pojavno okno zapre. Želite odpreti to pojavno okno v novem oknu, tako, da se ne bo zaprlo?" + "message": "Če kliknete izven tega pojavnega okna, da bi preverili pošto, se to pojavno okno zaprlo. Želite odpreti to pojavno okno v novem oknu, da se ne bo zaprlo?" }, "popupU2fCloseMessage": { "message": "Ta spletni brskalnik ne more obdelati U2F zahteve v tem pojavnem oknu. Želite odpreti to pojavno okno v novem oknu, tako, da se lahko prijavite z U2F?" diff --git a/apps/browser/src/_locales/zh_CN/messages.json b/apps/browser/src/_locales/zh_CN/messages.json index 45c3c62db0e..2275865d060 100644 --- a/apps/browser/src/_locales/zh_CN/messages.json +++ b/apps/browser/src/_locales/zh_CN/messages.json @@ -1462,7 +1462,7 @@ "message": "项目已自动填充 " }, "insecurePageWarning": { - "message": "警告:这是一个不安全的 HTTP 页面,您提交的任何信息都可能被其他人看到和更改。此登录最初保存在安全 (HTTPS) 页面上。" + "message": "警告:这是一个不安全的 HTTP 页面,您提交的任何信息都可能被其他人看到和更改。此登录信息最初保存在安全 (HTTPS) 页面上。" }, "insecurePageWarningFillPrompt": { "message": "您仍然想要填充此登录信息吗?" @@ -1471,7 +1471,7 @@ "message": "该表单由不同于您保存的登录的 URI 域名托管。选择「确定」以自动填充,或选择「取消」停止填充。" }, "autofillIframeWarningTip": { - "message": "要防止以后再次出现此警告,请将此站点的 URI $HOSTNAME$ 保存到您的 Bitwarden 登录项目中。", + "message": "要防止以后出现此警告,请将此站点的 URI $HOSTNAME$ 保存到您的 Bitwarden 登录项目中。", "placeholders": { "hostname": { "content": "$1", diff --git a/apps/browser/src/admin-console/background/service-factories/collection-service.factory.ts b/apps/browser/src/admin-console/background/service-factories/collection-service.factory.ts index 0035eee8c42..dcf48537b37 100644 --- a/apps/browser/src/admin-console/background/service-factories/collection-service.factory.ts +++ b/apps/browser/src/admin-console/background/service-factories/collection-service.factory.ts @@ -4,20 +4,20 @@ import { CollectionService } from "@bitwarden/common/admin-console/services/coll import { cryptoServiceFactory, CryptoServiceInitOptions, -} from "../../../background/service_factories/crypto-service.factory"; +} from "../../../platform/background/service-factories/crypto-service.factory"; import { CachedServices, factory, FactoryOptions, -} from "../../../background/service_factories/factory-options"; +} from "../../../platform/background/service-factories/factory-options"; import { i18nServiceFactory, I18nServiceInitOptions, -} from "../../../background/service_factories/i18n-service.factory"; +} from "../../../platform/background/service-factories/i18n-service.factory"; import { stateServiceFactory as stateServiceFactory, StateServiceInitOptions, -} from "../../../background/service_factories/state-service.factory"; +} from "../../../platform/background/service-factories/state-service.factory"; type CollectionServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/admin-console/background/service-factories/organization-service.factory.ts b/apps/browser/src/admin-console/background/service-factories/organization-service.factory.ts index 454b1ce9cd2..a050dc22ecc 100644 --- a/apps/browser/src/admin-console/background/service-factories/organization-service.factory.ts +++ b/apps/browser/src/admin-console/background/service-factories/organization-service.factory.ts @@ -4,11 +4,11 @@ import { FactoryOptions, CachedServices, factory, -} from "../../../background/service_factories/factory-options"; +} from "../../../platform/background/service-factories/factory-options"; import { stateServiceFactory, StateServiceInitOptions, -} from "../../../background/service_factories/state-service.factory"; +} from "../../../platform/background/service-factories/state-service.factory"; import { BrowserOrganizationService } from "../../services/browser-organization.service"; type OrganizationServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/admin-console/background/service-factories/policy-service.factory.ts b/apps/browser/src/admin-console/background/service-factories/policy-service.factory.ts index 4bb19639c88..89f4a667f8d 100644 --- a/apps/browser/src/admin-console/background/service-factories/policy-service.factory.ts +++ b/apps/browser/src/admin-console/background/service-factories/policy-service.factory.ts @@ -4,11 +4,11 @@ import { CachedServices, factory, FactoryOptions, -} from "../../../background/service_factories/factory-options"; +} from "../../../platform/background/service-factories/factory-options"; import { stateServiceFactory as stateServiceFactory, StateServiceInitOptions, -} from "../../../background/service_factories/state-service.factory"; +} from "../../../platform/background/service-factories/state-service.factory"; import { BrowserPolicyService } from "../../services/browser-policy.service"; import { diff --git a/apps/browser/src/admin-console/services/browser-organization.service.ts b/apps/browser/src/admin-console/services/browser-organization.service.ts index 3b0ae245a64..6294756cdf7 100644 --- a/apps/browser/src/admin-console/services/browser-organization.service.ts +++ b/apps/browser/src/admin-console/services/browser-organization.service.ts @@ -3,7 +3,7 @@ import { BehaviorSubject } from "rxjs"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { OrganizationService } from "@bitwarden/common/admin-console/services/organization/organization.service"; -import { browserSession, sessionSync } from "../../decorators/session-sync-observable"; +import { browserSession, sessionSync } from "../../platform/decorators/session-sync-observable"; @browserSession export class BrowserOrganizationService extends OrganizationService { diff --git a/apps/browser/src/admin-console/services/browser-policy.service.ts b/apps/browser/src/admin-console/services/browser-policy.service.ts index e51c8dc5978..74aa0f546af 100644 --- a/apps/browser/src/admin-console/services/browser-policy.service.ts +++ b/apps/browser/src/admin-console/services/browser-policy.service.ts @@ -1,13 +1,13 @@ import { BehaviorSubject, filter, map, Observable, switchMap, tap } from "rxjs"; import { Jsonify } from "type-fest"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; import { PolicyService } from "@bitwarden/common/admin-console/services/policy/policy.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; -import { browserSession, sessionSync } from "../../decorators/session-sync-observable"; +import { browserSession, sessionSync } from "../../platform/decorators/session-sync-observable"; @browserSession export class BrowserPolicyService extends PolicyService { diff --git a/apps/browser/src/auth/background/service-factories/auth-service.factory.ts b/apps/browser/src/auth/background/service-factories/auth-service.factory.ts index 251ceee0aa0..eefbf8e27fb 100644 --- a/apps/browser/src/auth/background/service-factories/auth-service.factory.ts +++ b/apps/browser/src/auth/background/service-factories/auth-service.factory.ts @@ -5,52 +5,52 @@ import { policyServiceFactory, PolicyServiceInitOptions, } from "../../../admin-console/background/service-factories/policy-service.factory"; +import { + passwordGenerationServiceFactory, + PasswordGenerationServiceInitOptions, +} from "../../../background/service-factories/password-generation-service.factory"; import { apiServiceFactory, ApiServiceInitOptions, -} from "../../../background/service_factories/api-service.factory"; -import { appIdServiceFactory } from "../../../background/service_factories/app-id-service.factory"; +} from "../../../platform/background/service-factories/api-service.factory"; +import { appIdServiceFactory } from "../../../platform/background/service-factories/app-id-service.factory"; import { - cryptoServiceFactory, CryptoServiceInitOptions, -} from "../../../background/service_factories/crypto-service.factory"; + cryptoServiceFactory, +} from "../../../platform/background/service-factories/crypto-service.factory"; import { - encryptServiceFactory, EncryptServiceInitOptions, -} from "../../../background/service_factories/encrypt-service.factory"; + encryptServiceFactory, +} from "../../../platform/background/service-factories/encrypt-service.factory"; import { environmentServiceFactory, EnvironmentServiceInitOptions, -} from "../../../background/service_factories/environment-service.factory"; +} from "../../../platform/background/service-factories/environment-service.factory"; import { CachedServices, factory, FactoryOptions, -} from "../../../background/service_factories/factory-options"; +} from "../../../platform/background/service-factories/factory-options"; import { i18nServiceFactory, I18nServiceInitOptions, -} from "../../../background/service_factories/i18n-service.factory"; +} from "../../../platform/background/service-factories/i18n-service.factory"; import { logServiceFactory, LogServiceInitOptions, -} from "../../../background/service_factories/log-service.factory"; +} from "../../../platform/background/service-factories/log-service.factory"; import { messagingServiceFactory, MessagingServiceInitOptions, -} from "../../../background/service_factories/messaging-service.factory"; -import { - passwordGenerationServiceFactory, - PasswordGenerationServiceInitOptions, -} from "../../../background/service_factories/password-generation-service.factory"; +} from "../../../platform/background/service-factories/messaging-service.factory"; import { platformUtilsServiceFactory, PlatformUtilsServiceInitOptions, -} from "../../../background/service_factories/platform-utils-service.factory"; +} from "../../../platform/background/service-factories/platform-utils-service.factory"; import { stateServiceFactory, StateServiceInitOptions, -} from "../../../background/service_factories/state-service.factory"; +} from "../../../platform/background/service-factories/state-service.factory"; import { keyConnectorServiceFactory, diff --git a/apps/browser/src/auth/background/service-factories/key-connector-service.factory.ts b/apps/browser/src/auth/background/service-factories/key-connector-service.factory.ts index 0689398f9c4..25eb85e5568 100644 --- a/apps/browser/src/auth/background/service-factories/key-connector-service.factory.ts +++ b/apps/browser/src/auth/background/service-factories/key-connector-service.factory.ts @@ -8,28 +8,28 @@ import { import { apiServiceFactory, ApiServiceInitOptions, -} from "../../../background/service_factories/api-service.factory"; +} from "../../../platform/background/service-factories/api-service.factory"; import { - cryptoFunctionServiceFactory, CryptoFunctionServiceInitOptions, -} from "../../../background/service_factories/crypto-function-service.factory"; + cryptoFunctionServiceFactory, +} from "../../../platform/background/service-factories/crypto-function-service.factory"; import { CryptoServiceInitOptions, cryptoServiceFactory, -} from "../../../background/service_factories/crypto-service.factory"; +} from "../../../platform/background/service-factories/crypto-service.factory"; import { FactoryOptions, CachedServices, factory, -} from "../../../background/service_factories/factory-options"; +} from "../../../platform/background/service-factories/factory-options"; import { logServiceFactory, LogServiceInitOptions, -} from "../../../background/service_factories/log-service.factory"; +} from "../../../platform/background/service-factories/log-service.factory"; import { stateServiceFactory, StateServiceInitOptions, -} from "../../../background/service_factories/state-service.factory"; +} from "../../../platform/background/service-factories/state-service.factory"; import { TokenServiceInitOptions, tokenServiceFactory } from "./token-service.factory"; diff --git a/apps/browser/src/auth/background/service-factories/token-service.factory.ts b/apps/browser/src/auth/background/service-factories/token-service.factory.ts index 00f09cbde11..389f8d1541a 100644 --- a/apps/browser/src/auth/background/service-factories/token-service.factory.ts +++ b/apps/browser/src/auth/background/service-factories/token-service.factory.ts @@ -5,11 +5,11 @@ import { FactoryOptions, CachedServices, factory, -} from "../../../background/service_factories/factory-options"; +} from "../../../platform/background/service-factories/factory-options"; import { stateServiceFactory, StateServiceInitOptions, -} from "../../../background/service_factories/state-service.factory"; +} from "../../../platform/background/service-factories/state-service.factory"; type TokenServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/auth/background/service-factories/totp-service.factory.ts b/apps/browser/src/auth/background/service-factories/totp-service.factory.ts index c6533bd0b4b..48331576cd3 100644 --- a/apps/browser/src/auth/background/service-factories/totp-service.factory.ts +++ b/apps/browser/src/auth/background/service-factories/totp-service.factory.ts @@ -4,16 +4,16 @@ import { TotpService } from "@bitwarden/common/services/totp.service"; import { CryptoFunctionServiceInitOptions, cryptoFunctionServiceFactory, -} from "../../../background/service_factories/crypto-function-service.factory"; +} from "../../../platform/background/service-factories/crypto-function-service.factory"; import { FactoryOptions, CachedServices, factory, -} from "../../../background/service_factories/factory-options"; +} from "../../../platform/background/service-factories/factory-options"; import { LogServiceInitOptions, logServiceFactory, -} from "../../../background/service_factories/log-service.factory"; +} from "../../../platform/background/service-factories/log-service.factory"; type TotpServiceOptions = FactoryOptions; diff --git a/apps/browser/src/auth/background/service-factories/two-factor-service.factory.ts b/apps/browser/src/auth/background/service-factories/two-factor-service.factory.ts index 8763a96d04e..040a5edfb4a 100644 --- a/apps/browser/src/auth/background/service-factories/two-factor-service.factory.ts +++ b/apps/browser/src/auth/background/service-factories/two-factor-service.factory.ts @@ -5,15 +5,15 @@ import { FactoryOptions, CachedServices, factory, -} from "../../../background/service_factories/factory-options"; +} from "../../../platform/background/service-factories/factory-options"; import { I18nServiceInitOptions, i18nServiceFactory, -} from "../../../background/service_factories/i18n-service.factory"; +} from "../../../platform/background/service-factories/i18n-service.factory"; import { PlatformUtilsServiceInitOptions, platformUtilsServiceFactory, -} from "../../../background/service_factories/platform-utils-service.factory"; +} from "../../../platform/background/service-factories/platform-utils-service.factory"; type TwoFactorServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/auth/popup/environment.component.ts b/apps/browser/src/auth/popup/environment.component.ts index 5ad42a600c7..c70b5f597c1 100644 --- a/apps/browser/src/auth/popup/environment.component.ts +++ b/apps/browser/src/auth/popup/environment.component.ts @@ -3,10 +3,10 @@ import { Router } from "@angular/router"; import { EnvironmentComponent as BaseEnvironmentComponent } from "@bitwarden/angular/components/environment.component"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { BrowserEnvironmentService } from "../../services/browser-environment.service"; +import { BrowserEnvironmentService } from "../../platform/services/browser-environment.service"; @Component({ selector: "app-environment", diff --git a/apps/browser/src/auth/popup/hint.component.ts b/apps/browser/src/auth/popup/hint.component.ts index a0477bb27a0..a743dc7da24 100644 --- a/apps/browser/src/auth/popup/hint.component.ts +++ b/apps/browser/src/auth/popup/hint.component.ts @@ -3,10 +3,10 @@ import { ActivatedRoute, Router } from "@angular/router"; import { HintComponent as BaseHintComponent } from "@bitwarden/angular/auth/components/hint.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; @Component({ selector: "app-hint", diff --git a/apps/browser/src/auth/popup/home.component.ts b/apps/browser/src/auth/popup/home.component.ts index 361218c6e4b..5dd3bdd641a 100644 --- a/apps/browser/src/auth/popup/home.component.ts +++ b/apps/browser/src/auth/popup/home.component.ts @@ -4,11 +4,11 @@ import { Router } from "@angular/router"; import { Subject, takeUntil } from "rxjs"; import { EnvironmentSelectorComponent } from "@bitwarden/angular/auth/components/environment-selector.component"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; @Component({ selector: "app-home", diff --git a/apps/browser/src/auth/popup/lock.component.ts b/apps/browser/src/auth/popup/lock.component.ts index ffcc6efa2cf..d95ff79fc8f 100644 --- a/apps/browser/src/auth/popup/lock.component.ts +++ b/apps/browser/src/auth/popup/lock.component.ts @@ -4,13 +4,6 @@ import { Router } from "@angular/router"; import { LockComponent as BaseLockComponent } from "@bitwarden/angular/auth/components/lock.component"; import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; @@ -18,6 +11,13 @@ import { InternalPolicyService } from "@bitwarden/common/admin-console/abstracti import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { BiometricErrors, BiometricErrorTypes } from "../../models/biometricErrors"; diff --git a/apps/browser/src/auth/popup/login-with-device.component.ts b/apps/browser/src/auth/popup/login-with-device.component.ts index dae6fd2d4da..cf0e57b5ee5 100644 --- a/apps/browser/src/auth/popup/login-with-device.component.ts +++ b/apps/browser/src/auth/popup/login-with-device.component.ts @@ -4,17 +4,17 @@ import { Router } from "@angular/router"; import { LoginWithDeviceComponent as BaseLoginWithDeviceComponent } from "@bitwarden/angular/auth/components/login-with-device.component"; import { AnonymousHubService } from "@bitwarden/common/abstractions/anonymousHub.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { AppIdService } from "@bitwarden/common/abstractions/appId.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { ValidationService } from "@bitwarden/common/abstractions/validation.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; +import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service"; +import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/browser/src/auth/popup/login.component.ts b/apps/browser/src/auth/popup/login.component.ts index 0652070a4da..496de2c54b5 100644 --- a/apps/browser/src/auth/popup/login.component.ts +++ b/apps/browser/src/auth/popup/login.component.ts @@ -3,22 +3,22 @@ import { FormBuilder } from "@angular/forms"; import { ActivatedRoute, Router } from "@angular/router"; import { LoginComponent as BaseLoginComponent } from "@bitwarden/angular/auth/components/login.component"; -import { AppIdService } from "@bitwarden/common/abstractions/appId.service"; -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; import { DevicesApiServiceAbstraction } from "@bitwarden/common/abstractions/devices/devices-api.service.abstraction"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { FormValidationErrorsService } from "@bitwarden/common/abstractions/formValidationErrors.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service"; +import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { FormValidationErrorsService } from "@bitwarden/common/platform/abstractions/form-validation-errors.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; -import { flagEnabled } from "../../flags"; +import { flagEnabled } from "../../platform/flags"; @Component({ selector: "app-login", diff --git a/apps/browser/src/auth/popup/register.component.ts b/apps/browser/src/auth/popup/register.component.ts index f7a80b62938..b061e1faf6a 100644 --- a/apps/browser/src/auth/popup/register.component.ts +++ b/apps/browser/src/auth/popup/register.component.ts @@ -6,14 +6,14 @@ import { RegisterComponent as BaseRegisterComponent } from "@bitwarden/angular/c import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { FormValidationErrorsService } from "@bitwarden/common/abstractions/formValidationErrors.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { FormValidationErrorsService } from "@bitwarden/common/platform/abstractions/form-validation-errors.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; @Component({ diff --git a/apps/browser/src/auth/popup/set-password.component.ts b/apps/browser/src/auth/popup/set-password.component.ts index 35af812714a..83ec3572737 100644 --- a/apps/browser/src/auth/popup/set-password.component.ts +++ b/apps/browser/src/auth/popup/set-password.component.ts @@ -4,15 +4,15 @@ import { ActivatedRoute, Router } from "@angular/router"; import { SetPasswordComponent as BaseSetPasswordComponent } from "@bitwarden/angular/components/set-password.component"; import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/browser/src/auth/popup/sso.component.ts b/apps/browser/src/auth/popup/sso.component.ts index 3892704ca47..2214e91687a 100644 --- a/apps/browser/src/auth/popup/sso.component.ts +++ b/apps/browser/src/auth/popup/sso.component.ts @@ -3,19 +3,19 @@ import { ActivatedRoute, Router } from "@angular/router"; import { SsoComponent as BaseSsoComponent } from "@bitwarden/angular/auth/components/sso.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; +import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; -import { BrowserApi } from "../../browser/browserApi"; +import { BrowserApi } from "../../platform/browser/browser-api"; @Component({ selector: "app-sso", diff --git a/apps/browser/src/auth/popup/two-factor-options.component.html b/apps/browser/src/auth/popup/two-factor-options.component.html index 3fc510bb27c..f25944aba65 100644 --- a/apps/browser/src/auth/popup/two-factor-options.component.html +++ b/apps/browser/src/auth/popup/two-factor-options.component.html @@ -1,6 +1,6 @@
- +

{{ "twoStepOptions" | i18n }} diff --git a/apps/browser/src/auth/popup/two-factor-options.component.ts b/apps/browser/src/auth/popup/two-factor-options.component.ts index 6aa8109f05b..a7e95a2a4ec 100644 --- a/apps/browser/src/auth/popup/two-factor-options.component.ts +++ b/apps/browser/src/auth/popup/two-factor-options.component.ts @@ -1,10 +1,10 @@ import { Component } from "@angular/core"; -import { Router } from "@angular/router"; +import { ActivatedRoute, Router } from "@angular/router"; import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "@bitwarden/angular/auth/components/two-factor-options.component"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; @Component({ selector: "app-two-factor-options", @@ -15,14 +15,33 @@ export class TwoFactorOptionsComponent extends BaseTwoFactorOptionsComponent { twoFactorService: TwoFactorService, router: Router, i18nService: I18nService, - platformUtilsService: PlatformUtilsService + platformUtilsService: PlatformUtilsService, + private activatedRoute: ActivatedRoute ) { super(twoFactorService, router, i18nService, platformUtilsService, window); } + close() { + this.navigateTo2FA(); + } + choose(p: any) { super.choose(p); this.twoFactorService.setSelectedProvider(p.type); - this.router.navigate(["2fa"]); + + this.navigateTo2FA(); + } + + navigateTo2FA() { + const sso = this.activatedRoute.snapshot.queryParamMap.get("sso") === "true"; + + if (sso) { + // Persist SSO flag back to the 2FA comp if it exists + // in order for successful login logic to work properly for + // SSO + 2FA in browser extension + this.router.navigate(["2fa"], { queryParams: { sso: true } }); + } else { + this.router.navigate(["2fa"]); + } } } diff --git a/apps/browser/src/auth/popup/two-factor.component.ts b/apps/browser/src/auth/popup/two-factor.component.ts index 678675ba389..21a2bd42f85 100644 --- a/apps/browser/src/auth/popup/two-factor.component.ts +++ b/apps/browser/src/auth/popup/two-factor.component.ts @@ -5,21 +5,21 @@ import { first } from "rxjs/operators"; import { TwoFactorComponent as BaseTwoFactorComponent } from "@bitwarden/angular/auth/components/two-factor.component"; import { DialogServiceAbstraction, SimpleDialogType } from "@bitwarden/angular/services/dialog"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { AppIdService } from "@bitwarden/common/abstractions/appId.service"; -import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service"; import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; +import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service"; +import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; -import { BrowserApi } from "../../browser/browserApi"; +import { BrowserApi } from "../../platform/browser/browser-api"; import { PopupUtilsService } from "../../popup/services/popup-utils.service"; const BroadcasterSubscriptionId = "TwoFactorComponent"; @@ -118,10 +118,20 @@ export class TwoFactorComponent extends BaseTwoFactorComponent { this.route.queryParams.pipe(first()).subscribe(async (qParams) => { if (qParams.sso === "true") { super.onSuccessfulLogin = () => { - BrowserApi.reloadOpenWindows(); - const thisWindow = window.open("", "_self"); - thisWindow.close(); - return this.syncService.fullSync(true); + // This is not awaited so we don't pause the application while the sync is happening. + // This call is executed by the service that lives in the background script so it will continue + // the sync even if this tab closes. + const syncPromise = this.syncService.fullSync(true); + + // Force sidebars (FF && Opera) to reload while exempting current window + // because we are just going to close the current window. + BrowserApi.reloadOpenWindows(true); + + // We don't need this window anymore because the intent is for the user to be left + // on the web vault screen which tells them to continue in the browser extension (sidebar or popup) + BrowserApi.closeBitwardenExtensionTab(); + + return syncPromise; }; } }); @@ -137,7 +147,15 @@ export class TwoFactorComponent extends BaseTwoFactorComponent { } anotherMethod() { - this.router.navigate(["2fa-options"]); + const sso = this.route.snapshot.queryParamMap.get("sso") === "true"; + + if (sso) { + // We must persist this so when the user returns to the 2FA comp, the + // proper onSuccessfulLogin logic is executed. + this.router.navigate(["2fa-options"], { queryParams: { sso: true } }); + } else { + this.router.navigate(["2fa-options"]); + } } async isLinux() { diff --git a/apps/browser/src/autofill/background/context-menus.background.ts b/apps/browser/src/autofill/background/context-menus.background.ts index 9d04571a7c4..681f86cdf67 100644 --- a/apps/browser/src/autofill/background/context-menus.background.ts +++ b/apps/browser/src/autofill/background/context-menus.background.ts @@ -1,5 +1,5 @@ import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem"; -import { BrowserApi } from "../../browser/browserApi"; +import { BrowserApi } from "../../platform/browser/browser-api"; import { ContextMenuClickedHandler } from "../browser/context-menu-clicked-handler"; export default class ContextMenusBackground { diff --git a/apps/browser/src/autofill/background/notification.background.ts b/apps/browser/src/autofill/background/notification.background.ts index b7cdfd97929..1f733f252c8 100644 --- a/apps/browser/src/autofill/background/notification.background.ts +++ b/apps/browser/src/autofill/background/notification.background.ts @@ -5,7 +5,7 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; import { ThemeType } from "@bitwarden/common/enums"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; @@ -17,8 +17,8 @@ import AddLoginRuntimeMessage from "../../background/models/addLoginRuntimeMessa import ChangePasswordRuntimeMessage from "../../background/models/changePasswordRuntimeMessage"; import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem"; import { NotificationQueueMessageType } from "../../background/models/notificationQueueMessageType"; -import { BrowserApi } from "../../browser/browserApi"; -import { BrowserStateService } from "../../services/abstractions/browser-state.service"; +import { BrowserApi } from "../../platform/browser/browser-api"; +import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service"; import { AutofillService } from "../services/abstractions/autofill.service"; export default class NotificationBackground { diff --git a/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts b/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts index a23b5e8dbaf..a802fd8cf1c 100644 --- a/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts +++ b/apps/browser/src/autofill/background/service_factories/autofill-service.factory.ts @@ -5,24 +5,24 @@ import { import { EventCollectionServiceInitOptions, eventCollectionServiceFactory, -} from "../../../background/service_factories/event-collection-service.factory"; +} from "../../../background/service-factories/event-collection-service.factory"; +import { + settingsServiceFactory, + SettingsServiceInitOptions, +} from "../../../background/service-factories/settings-service.factory"; import { CachedServices, factory, FactoryOptions, -} from "../../../background/service_factories/factory-options"; +} from "../../../platform/background/service-factories/factory-options"; import { logServiceFactory, LogServiceInitOptions, -} from "../../../background/service_factories/log-service.factory"; -import { - settingsServiceFactory, - SettingsServiceInitOptions, -} from "../../../background/service_factories/settings-service.factory"; +} from "../../../platform/background/service-factories/log-service.factory"; import { stateServiceFactory, StateServiceInitOptions, -} from "../../../background/service_factories/state-service.factory"; +} from "../../../platform/background/service-factories/state-service.factory"; import { cipherServiceFactory, CipherServiceInitOptions, diff --git a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts index 8803267685c..2eccc03c12b 100644 --- a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts +++ b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts @@ -1,8 +1,8 @@ import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; -import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { GlobalState } from "@bitwarden/common/models/domain/global-state"; +import { StateFactory } from "@bitwarden/common/platform/factories/state-factory"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; @@ -12,9 +12,9 @@ import { authServiceFactory, AuthServiceInitOptions, } from "../../auth/background/service-factories/auth-service.factory"; -import { CachedServices } from "../../background/service_factories/factory-options"; -import { BrowserApi } from "../../browser/browserApi"; import { Account } from "../../models/account"; +import { CachedServices } from "../../platform/background/service-factories/factory-options"; +import { BrowserApi } from "../../platform/browser/browser-api"; import { cipherServiceFactory, CipherServiceInitOptions, diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts index 4b75942e031..be7dee80a07 100644 --- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts +++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts @@ -3,8 +3,8 @@ import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; import { EventType } from "@bitwarden/common/enums"; -import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { GlobalState } from "@bitwarden/common/models/domain/global-state"; +import { StateFactory } from "@bitwarden/common/platform/factories/state-factory"; +import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; @@ -15,12 +15,12 @@ import { } from "../../auth/background/service-factories/auth-service.factory"; import { totpServiceFactory } from "../../auth/background/service-factories/totp-service.factory"; import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem"; -import { eventCollectionServiceFactory } from "../../background/service_factories/event-collection-service.factory"; -import { CachedServices } from "../../background/service_factories/factory-options"; -import { passwordGenerationServiceFactory } from "../../background/service_factories/password-generation-service.factory"; -import { stateServiceFactory } from "../../background/service_factories/state-service.factory"; -import { BrowserApi } from "../../browser/browserApi"; +import { eventCollectionServiceFactory } from "../../background/service-factories/event-collection-service.factory"; +import { passwordGenerationServiceFactory } from "../../background/service-factories/password-generation-service.factory"; import { Account } from "../../models/account"; +import { CachedServices } from "../../platform/background/service-factories/factory-options"; +import { stateServiceFactory } from "../../platform/background/service-factories/state-service.factory"; +import { BrowserApi } from "../../platform/browser/browser-api"; import { cipherServiceFactory, CipherServiceInitOptions, diff --git a/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts index 9d6a1db84a7..6b599986b67 100644 --- a/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts +++ b/apps/browser/src/autofill/browser/main-context-menu-handler.spec.ts @@ -1,12 +1,12 @@ import { mock, MockProxy } from "jest-mock-extended"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -import { BrowserStateService } from "../../services/abstractions/browser-state.service"; +import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service"; import { MainContextMenuHandler } from "./main-context-menu-handler"; diff --git a/apps/browser/src/autofill/browser/main-context-menu-handler.ts b/apps/browser/src/autofill/browser/main-context-menu-handler.ts index 14775c846f3..9b16aa266db 100644 --- a/apps/browser/src/autofill/browser/main-context-menu-handler.ts +++ b/apps/browser/src/autofill/browser/main-context-menu-handler.ts @@ -1,26 +1,26 @@ -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { GlobalState } from "@bitwarden/common/models/domain/global-state"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { StateFactory } from "@bitwarden/common/platform/factories/state-factory"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; -import { CachedServices } from "../../background/service_factories/factory-options"; +import { Account } from "../../models/account"; +import { CachedServices } from "../../platform/background/service-factories/factory-options"; import { i18nServiceFactory, I18nServiceInitOptions, -} from "../../background/service_factories/i18n-service.factory"; +} from "../../platform/background/service-factories/i18n-service.factory"; import { logServiceFactory, LogServiceInitOptions, -} from "../../background/service_factories/log-service.factory"; +} from "../../platform/background/service-factories/log-service.factory"; import { stateServiceFactory, StateServiceInitOptions, -} from "../../background/service_factories/state-service.factory"; -import { Account } from "../../models/account"; -import { BrowserStateService } from "../../services/abstractions/browser-state.service"; +} from "../../platform/background/service-factories/state-service.factory"; +import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service"; export const ROOT_ID = "root"; diff --git a/apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts b/apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts index baced83894d..7bfe7934046 100644 --- a/apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts +++ b/apps/browser/src/autofill/clipboard/clear-clipboard.spec.ts @@ -1,4 +1,4 @@ -import { BrowserApi } from "../../browser/browserApi"; +import { BrowserApi } from "../../platform/browser/browser-api"; import { ClearClipboard } from "./clear-clipboard"; diff --git a/apps/browser/src/autofill/clipboard/clear-clipboard.ts b/apps/browser/src/autofill/clipboard/clear-clipboard.ts index a96a72fc658..f8018bb036a 100644 --- a/apps/browser/src/autofill/clipboard/clear-clipboard.ts +++ b/apps/browser/src/autofill/clipboard/clear-clipboard.ts @@ -1,4 +1,4 @@ -import { BrowserApi } from "../../browser/browserApi"; +import { BrowserApi } from "../../platform/browser/browser-api"; export const clearClipboardAlarmName = "clearClipboard"; diff --git a/apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts b/apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts index 926b78b9762..92d35e70e57 100644 --- a/apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts +++ b/apps/browser/src/autofill/clipboard/copy-to-clipboard-command.ts @@ -1,4 +1,4 @@ -import { BrowserApi } from "../../browser/browserApi"; +import { BrowserApi } from "../../platform/browser/browser-api"; /** * Copies text to the clipboard in a MV3 safe way. diff --git a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts index 38c62231ac8..3001087f74f 100644 --- a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts +++ b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.spec.ts @@ -2,14 +2,14 @@ import { mock, MockProxy } from "jest-mock-extended"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; -import { setAlarmTime } from "../../alarms/alarm-state"; -import { BrowserApi } from "../../browser/browserApi"; -import { BrowserStateService } from "../../services/abstractions/browser-state.service"; +import { setAlarmTime } from "../../platform/alarms/alarm-state"; +import { BrowserApi } from "../../platform/browser/browser-api"; +import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service"; import { clearClipboardAlarmName } from "./clear-clipboard"; import { GeneratePasswordToClipboardCommand } from "./generate-password-to-clipboard-command"; -jest.mock("../../alarms/alarm-state", () => { +jest.mock("../../platform/alarms/alarm-state", () => { return { setAlarmTime: jest.fn(), }; diff --git a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts index 7dd37a64ad4..62110166658 100644 --- a/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts +++ b/apps/browser/src/autofill/clipboard/generate-password-to-clipboard-command.ts @@ -1,7 +1,7 @@ import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; -import { setAlarmTime } from "../../alarms/alarm-state"; -import { BrowserStateService } from "../../services/abstractions/browser-state.service"; +import { setAlarmTime } from "../../platform/alarms/alarm-state"; +import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service"; import { clearClipboardAlarmName } from "./clear-clipboard"; import { copyToClipboard } from "./copy-to-clipboard-command"; diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts index 090acf35dc3..54e7a833b65 100644 --- a/apps/browser/src/autofill/services/autofill.service.ts +++ b/apps/browser/src/autofill/services/autofill.service.ts @@ -1,16 +1,16 @@ import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { EventType, FieldType, UriMatchType } from "@bitwarden/common/enums"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; -import { BrowserApi } from "../../browser/browserApi"; -import { BrowserStateService } from "../../services/abstractions/browser-state.service"; +import { BrowserApi } from "../../platform/browser/browser-api"; +import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service"; import AutofillField from "../models/autofill-field"; import AutofillPageDetails from "../models/autofill-page-details"; import AutofillScript from "../models/autofill-script"; diff --git a/apps/browser/src/background/commands.background.ts b/apps/browser/src/background/commands.background.ts index b53c809c357..118953b9da0 100644 --- a/apps/browser/src/background/commands.background.ts +++ b/apps/browser/src/background/commands.background.ts @@ -1,10 +1,10 @@ -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; -import { BrowserApi } from "../browser/browserApi"; +import { BrowserApi } from "../platform/browser/browser-api"; import MainBackground from "./main.background"; import LockedVaultPendingNotificationsItem from "./models/lockedVaultPendingNotificationsItem"; diff --git a/apps/browser/src/background/idle.background.ts b/apps/browser/src/background/idle.background.ts index 0037340f03d..3854d2383b4 100644 --- a/apps/browser/src/background/idle.background.ts +++ b/apps/browser/src/background/idle.background.ts @@ -2,7 +2,7 @@ import { NotificationsService } from "@bitwarden/common/abstractions/notificatio import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum"; -import { BrowserStateService } from "../services/abstractions/browser-state.service"; +import { BrowserStateService } from "../platform/services/abstractions/browser-state.service"; const IdleInterval = 60 * 5; // 5 minutes diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index 3ccd8b97522..66b3281c915 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -1,27 +1,11 @@ import { AvatarUpdateService as AvatarUpdateServiceAbstraction } from "@bitwarden/common/abstractions/account/avatar-update.service"; import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstractions/api.service"; -import { AppIdService as AppIdServiceAbstraction } from "@bitwarden/common/abstractions/appId.service"; import { AuditService as AuditServiceAbstraction } from "@bitwarden/common/abstractions/audit.service"; -import { ConfigApiServiceAbstraction } from "@bitwarden/common/abstractions/config/config-api.service.abstraction"; -import { ConfigServiceAbstraction } from "@bitwarden/common/abstractions/config/config.service.abstraction"; -import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/abstractions/crypto.service"; -import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; import { EventCollectionService as EventCollectionServiceAbstraction } from "@bitwarden/common/abstractions/event/event-collection.service"; import { EventUploadService as EventUploadServiceAbstraction } from "@bitwarden/common/abstractions/event/event-upload.service"; -import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/abstractions/file-upload/file-upload.service"; -import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstractions/log.service"; -import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/abstractions/messaging.service"; import { NotificationsService as NotificationsServiceAbstraction } from "@bitwarden/common/abstractions/notifications.service"; -import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service"; import { SettingsService as SettingsServiceAbstraction } from "@bitwarden/common/abstractions/settings.service"; -import { - AbstractMemoryStorageService, - AbstractStorageService, -} from "@bitwarden/common/abstractions/storage.service"; -import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/abstractions/system.service"; import { TotpService as TotpServiceAbstraction } from "@bitwarden/common/abstractions/totp.service"; import { VaultTimeoutService as VaultTimeoutServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService as VaultTimeoutSettingsServiceAbstraction } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; @@ -45,28 +29,44 @@ import { TokenService } from "@bitwarden/common/auth/services/token.service"; import { TwoFactorService } from "@bitwarden/common/auth/services/two-factor.service"; 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 { GlobalState } from "@bitwarden/common/models/domain/global-state"; +import { AppIdService as AppIdServiceAbstraction } from "@bitwarden/common/platform/abstractions/app-id.service"; +import { ConfigApiServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config-api.service.abstraction"; +import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction"; +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 { 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 { LogService as LogServiceAbstraction } from "@bitwarden/common/platform/abstractions/log.service"; +import { MessagingService as MessagingServiceAbstraction } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService as PlatformUtilsServiceAbstraction } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { + AbstractMemoryStorageService, + AbstractStorageService, +} from "@bitwarden/common/platform/abstractions/storage.service"; +import { SystemService as SystemServiceAbstraction } from "@bitwarden/common/platform/abstractions/system.service"; +import { StateFactory } from "@bitwarden/common/platform/factories/state-factory"; +import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; +import { AppIdService } from "@bitwarden/common/platform/services/app-id.service"; +import { ConfigService } from "@bitwarden/common/platform/services/config/config.service"; +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 { MultithreadEncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/multithread-encrypt.service.implementation"; +import { FileUploadService } from "@bitwarden/common/platform/services/file-upload/file-upload.service"; +import { MemoryStorageService } from "@bitwarden/common/platform/services/memory-storage.service"; +import { StateMigrationService } from "@bitwarden/common/platform/services/state-migration.service"; +import { SystemService } from "@bitwarden/common/platform/services/system.service"; +import { WebCryptoFunctionService } from "@bitwarden/common/platform/services/web-crypto-function.service"; import { AvatarUpdateService } from "@bitwarden/common/services/account/avatar-update.service"; import { ApiService } from "@bitwarden/common/services/api.service"; -import { AppIdService } from "@bitwarden/common/services/appId.service"; import { AuditService } from "@bitwarden/common/services/audit.service"; -import { ConfigService } from "@bitwarden/common/services/config/config.service"; -import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; -import { ContainerService } from "@bitwarden/common/services/container.service"; -import { EncryptServiceImplementation } from "@bitwarden/common/services/cryptography/encrypt.service.implementation"; -import { MultithreadEncryptServiceImplementation } from "@bitwarden/common/services/cryptography/multithread-encrypt.service.implementation"; import { EventCollectionService } from "@bitwarden/common/services/event/event-collection.service"; import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service"; -import { FileUploadService } from "@bitwarden/common/services/file-upload/file-upload.service"; -import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; import { NotificationsService } from "@bitwarden/common/services/notifications.service"; import { SearchService } from "@bitwarden/common/services/search.service"; -import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service"; -import { SystemService } from "@bitwarden/common/services/system.service"; import { TotpService } from "@bitwarden/common/services/totp.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vaultTimeout/vaultTimeoutSettings.service"; -import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service"; import { PasswordGenerationService, PasswordGenerationServiceAbstraction, @@ -105,24 +105,24 @@ import { ContextMenuClickedHandler } from "../autofill/browser/context-menu-clic import { MainContextMenuHandler } from "../autofill/browser/main-context-menu-handler"; import { AutofillService as AutofillServiceAbstraction } from "../autofill/services/abstractions/autofill.service"; import AutofillService from "../autofill/services/autofill.service"; -import { BrowserApi } from "../browser/browserApi"; import { SafariApp } from "../browser/safariApp"; -import { flagEnabled } from "../flags"; -import { UpdateBadge } from "../listeners/update-badge"; import { Account } from "../models/account"; -import { BrowserStateService as StateServiceAbstraction } from "../services/abstractions/browser-state.service"; -import { BrowserEnvironmentService } from "../services/browser-environment.service"; -import { BrowserI18nService } from "../services/browser-i18n.service"; +import { BrowserApi } from "../platform/browser/browser-api"; +import { flagEnabled } from "../platform/flags"; +import { UpdateBadge } from "../platform/listeners/update-badge"; +import { BrowserStateService as StateServiceAbstraction } from "../platform/services/abstractions/browser-state.service"; +import { BrowserCryptoService } from "../platform/services/browser-crypto.service"; +import { BrowserEnvironmentService } from "../platform/services/browser-environment.service"; +import { BrowserI18nService } from "../platform/services/browser-i18n.service"; +import BrowserLocalStorageService from "../platform/services/browser-local-storage.service"; +import BrowserMessagingPrivateModeBackgroundService from "../platform/services/browser-messaging-private-mode-background.service"; +import BrowserMessagingService from "../platform/services/browser-messaging.service"; +import BrowserPlatformUtilsService from "../platform/services/browser-platform-utils.service"; +import { BrowserStateService } from "../platform/services/browser-state.service"; +import { KeyGenerationService } from "../platform/services/key-generation.service"; +import { LocalBackedSessionStorageService } from "../platform/services/local-backed-session-storage.service"; import { BrowserSendService } from "../services/browser-send.service"; import { BrowserSettingsService } from "../services/browser-settings.service"; -import { BrowserStateService } from "../services/browser-state.service"; -import { BrowserCryptoService } from "../services/browserCrypto.service"; -import BrowserLocalStorageService from "../services/browserLocalStorage.service"; -import BrowserMessagingService from "../services/browserMessaging.service"; -import BrowserMessagingPrivateModeBackgroundService from "../services/browserMessagingPrivateModeBackground.service"; -import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service"; -import { KeyGenerationService } from "../services/keyGeneration.service"; -import { LocalBackedSessionStorageService } from "../services/localBackedSessionStorage.service"; import VaultTimeoutService from "../services/vaultTimeout/vaultTimeout.service"; import { BrowserFolderService } from "../vault/services/browser-folder.service"; import { VaultFilterService } from "../vault/services/vault-filter.service"; diff --git a/apps/browser/src/background/models/addLoginQueueMessage.ts b/apps/browser/src/background/models/addLoginQueueMessage.ts index 7409100902a..d5db5db135b 100644 --- a/apps/browser/src/background/models/addLoginQueueMessage.ts +++ b/apps/browser/src/background/models/addLoginQueueMessage.ts @@ -1,4 +1,4 @@ -import { Utils } from "@bitwarden/common/misc/utils"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; diff --git a/apps/browser/src/background/nativeMessaging.background.ts b/apps/browser/src/background/nativeMessaging.background.ts index 7e4b91694c9..90c114a8650 100644 --- a/apps/browser/src/background/nativeMessaging.background.ts +++ b/apps/browser/src/background/nativeMessaging.background.ts @@ -1,18 +1,18 @@ -import { AppIdService } from "@bitwarden/common/abstractions/appId.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; -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 { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service"; +import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; -import { BrowserApi } from "../browser/browserApi"; +import { BrowserApi } from "../platform/browser/browser-api"; import RuntimeBackground from "./runtime.background"; diff --git a/apps/browser/src/background/runtime.background.ts b/apps/browser/src/background/runtime.background.ts index 7a6f293f8d1..a06ba43eff4 100644 --- a/apps/browser/src/background/runtime.background.ts +++ b/apps/browser/src/background/runtime.background.ts @@ -1,15 +1,15 @@ -import { ConfigServiceAbstraction } from "@bitwarden/common/abstractions/config/config.service.abstraction"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; -import { SystemService } from "@bitwarden/common/abstractions/system.service"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { SystemService } from "@bitwarden/common/platform/abstractions/system.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { AutofillService } from "../autofill/services/abstractions/autofill.service"; -import { BrowserApi } from "../browser/browserApi"; -import { BrowserEnvironmentService } from "../services/browser-environment.service"; -import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service"; +import { BrowserApi } from "../platform/browser/browser-api"; +import { BrowserEnvironmentService } from "../platform/services/browser-environment.service"; +import BrowserPlatformUtilsService from "../platform/services/browser-platform-utils.service"; import MainBackground from "./main.background"; import LockedVaultPendingNotificationsItem from "./models/lockedVaultPendingNotificationsItem"; diff --git a/apps/browser/src/background/service_factories/cipher-file-upload-service.factory.ts b/apps/browser/src/background/service-factories/cipher-file-upload-service.factory.ts similarity index 76% rename from apps/browser/src/background/service_factories/cipher-file-upload-service.factory.ts rename to apps/browser/src/background/service-factories/cipher-file-upload-service.factory.ts index ef2be8fa761..7c83958927f 100644 --- a/apps/browser/src/background/service_factories/cipher-file-upload-service.factory.ts +++ b/apps/browser/src/background/service-factories/cipher-file-upload-service.factory.ts @@ -1,12 +1,19 @@ import { CipherFileUploadService as CipherFileUploadServiceAbstraction } from "@bitwarden/common/vault/abstractions/file-upload/cipher-file-upload.service"; import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service"; -import { apiServiceFactory, ApiServiceInitOptions } from "./api-service.factory"; -import { FactoryOptions, CachedServices, factory } from "./factory-options"; import { - fileUploadServiceFactory, + ApiServiceInitOptions, + apiServiceFactory, +} from "../../platform/background/service-factories/api-service.factory"; +import { + FactoryOptions, + CachedServices, + factory, +} from "../../platform/background/service-factories/factory-options"; +import { FileUploadServiceInitOptions, -} from "./file-upload-service.factory"; + fileUploadServiceFactory, +} from "../../platform/background/service-factories/file-upload-service.factory"; type CipherFileUploadServiceFactoyOptions = FactoryOptions; diff --git a/apps/browser/src/background/service_factories/cipher-file-upload.service.factory.ts b/apps/browser/src/background/service-factories/cipher-file-upload.service.factory.ts similarity index 76% rename from apps/browser/src/background/service_factories/cipher-file-upload.service.factory.ts rename to apps/browser/src/background/service-factories/cipher-file-upload.service.factory.ts index ef2be8fa761..7c83958927f 100644 --- a/apps/browser/src/background/service_factories/cipher-file-upload.service.factory.ts +++ b/apps/browser/src/background/service-factories/cipher-file-upload.service.factory.ts @@ -1,12 +1,19 @@ import { CipherFileUploadService as CipherFileUploadServiceAbstraction } from "@bitwarden/common/vault/abstractions/file-upload/cipher-file-upload.service"; import { CipherFileUploadService } from "@bitwarden/common/vault/services/file-upload/cipher-file-upload.service"; -import { apiServiceFactory, ApiServiceInitOptions } from "./api-service.factory"; -import { FactoryOptions, CachedServices, factory } from "./factory-options"; import { - fileUploadServiceFactory, + ApiServiceInitOptions, + apiServiceFactory, +} from "../../platform/background/service-factories/api-service.factory"; +import { + FactoryOptions, + CachedServices, + factory, +} from "../../platform/background/service-factories/factory-options"; +import { FileUploadServiceInitOptions, -} from "./file-upload-service.factory"; + fileUploadServiceFactory, +} from "../../platform/background/service-factories/file-upload-service.factory"; type CipherFileUploadServiceFactoyOptions = FactoryOptions; diff --git a/apps/browser/src/background/service_factories/event-collection-service.factory.ts b/apps/browser/src/background/service-factories/event-collection-service.factory.ts similarity index 84% rename from apps/browser/src/background/service_factories/event-collection-service.factory.ts rename to apps/browser/src/background/service-factories/event-collection-service.factory.ts index 4008091c222..5ed6c24ca4b 100644 --- a/apps/browser/src/background/service_factories/event-collection-service.factory.ts +++ b/apps/browser/src/background/service-factories/event-collection-service.factory.ts @@ -5,6 +5,15 @@ import { organizationServiceFactory, OrganizationServiceInitOptions, } from "../../admin-console/background/service-factories/organization-service.factory"; +import { + FactoryOptions, + CachedServices, + factory, +} from "../../platform/background/service-factories/factory-options"; +import { + stateServiceFactory, + StateServiceInitOptions, +} from "../../platform/background/service-factories/state-service.factory"; import { cipherServiceFactory, CipherServiceInitOptions, @@ -14,8 +23,6 @@ import { eventUploadServiceFactory, EventUploadServiceInitOptions, } from "./event-upload-service.factory"; -import { FactoryOptions, CachedServices, factory } from "./factory-options"; -import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory"; type EventCollectionServiceOptions = FactoryOptions; diff --git a/apps/browser/src/background/service_factories/event-upload-service.factory.ts b/apps/browser/src/background/service-factories/event-upload-service.factory.ts similarity index 63% rename from apps/browser/src/background/service_factories/event-upload-service.factory.ts rename to apps/browser/src/background/service-factories/event-upload-service.factory.ts index c0ed0e5426d..f9e72395a74 100644 --- a/apps/browser/src/background/service_factories/event-upload-service.factory.ts +++ b/apps/browser/src/background/service-factories/event-upload-service.factory.ts @@ -1,10 +1,23 @@ import { EventUploadService as AbstractEventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service"; import { EventUploadService } from "@bitwarden/common/services/event/event-upload.service"; -import { apiServiceFactory, ApiServiceInitOptions } from "./api-service.factory"; -import { FactoryOptions, CachedServices, factory } from "./factory-options"; -import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory"; -import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory"; +import { + ApiServiceInitOptions, + apiServiceFactory, +} from "../../platform/background/service-factories/api-service.factory"; +import { + FactoryOptions, + CachedServices, + factory, +} from "../../platform/background/service-factories/factory-options"; +import { + logServiceFactory, + LogServiceInitOptions, +} from "../../platform/background/service-factories/log-service.factory"; +import { + stateServiceFactory, + StateServiceInitOptions, +} from "../../platform/background/service-factories/state-service.factory"; type EventUploadServiceOptions = FactoryOptions; diff --git a/apps/browser/src/background/service_factories/password-generation-service.factory.ts b/apps/browser/src/background/service-factories/password-generation-service.factory.ts similarity index 72% rename from apps/browser/src/background/service_factories/password-generation-service.factory.ts rename to apps/browser/src/background/service-factories/password-generation-service.factory.ts index cffbf376d4f..d97e8ce98a6 100644 --- a/apps/browser/src/background/service_factories/password-generation-service.factory.ts +++ b/apps/browser/src/background/service-factories/password-generation-service.factory.ts @@ -7,10 +7,19 @@ import { policyServiceFactory, PolicyServiceInitOptions, } from "../../admin-console/background/service-factories/policy-service.factory"; - -import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory"; -import { CachedServices, factory, FactoryOptions } from "./factory-options"; -import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory"; +import { + CryptoServiceInitOptions, + cryptoServiceFactory, +} from "../../platform/background/service-factories/crypto-service.factory"; +import { + CachedServices, + factory, + FactoryOptions, +} from "../../platform/background/service-factories/factory-options"; +import { + stateServiceFactory, + StateServiceInitOptions, +} from "../../platform/background/service-factories/state-service.factory"; type PasswordGenerationServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/background/service_factories/search-service.factory.ts b/apps/browser/src/background/service-factories/search-service.factory.ts similarity index 64% rename from apps/browser/src/background/service_factories/search-service.factory.ts rename to apps/browser/src/background/service-factories/search-service.factory.ts index eb6213c2b39..6ff9691c524 100644 --- a/apps/browser/src/background/service_factories/search-service.factory.ts +++ b/apps/browser/src/background/service-factories/search-service.factory.ts @@ -1,9 +1,19 @@ import { SearchService as AbstractSearchService } from "@bitwarden/common/abstractions/search.service"; import { SearchService } from "@bitwarden/common/services/search.service"; -import { CachedServices, factory, FactoryOptions } from "./factory-options"; -import { i18nServiceFactory, I18nServiceInitOptions } from "./i18n-service.factory"; -import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory"; +import { + CachedServices, + factory, + FactoryOptions, +} from "../../platform/background/service-factories/factory-options"; +import { + i18nServiceFactory, + I18nServiceInitOptions, +} from "../../platform/background/service-factories/i18n-service.factory"; +import { + logServiceFactory, + LogServiceInitOptions, +} from "../../platform/background/service-factories/log-service.factory"; type SearchServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/background/service_factories/send-service.factory.ts b/apps/browser/src/background/service-factories/send-service.factory.ts similarity index 56% rename from apps/browser/src/background/service_factories/send-service.factory.ts rename to apps/browser/src/background/service-factories/send-service.factory.ts index 2da4d88a1d8..bc0f83787fd 100644 --- a/apps/browser/src/background/service_factories/send-service.factory.ts +++ b/apps/browser/src/background/service-factories/send-service.factory.ts @@ -1,13 +1,25 @@ import { InternalSendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; +import { cryptoFunctionServiceFactory } from "../../platform/background/service-factories/crypto-function-service.factory"; +import { + CryptoServiceInitOptions, + cryptoServiceFactory, +} from "../../platform/background/service-factories/crypto-service.factory"; +import { + FactoryOptions, + CachedServices, + factory, +} from "../../platform/background/service-factories/factory-options"; +import { + i18nServiceFactory, + I18nServiceInitOptions, +} from "../../platform/background/service-factories/i18n-service.factory"; +import { + stateServiceFactory, + StateServiceInitOptions, +} from "../../platform/background/service-factories/state-service.factory"; import { BrowserSendService } from "../../services/browser-send.service"; -import { cryptoFunctionServiceFactory } from "./crypto-function-service.factory"; -import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory"; -import { FactoryOptions, CachedServices, factory } from "./factory-options"; -import { i18nServiceFactory, I18nServiceInitOptions } from "./i18n-service.factory"; -import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory"; - type SendServiceFactoryOptions = FactoryOptions; export type SendServiceInitOptions = SendServiceFactoryOptions & diff --git a/apps/browser/src/background/service_factories/settings-service.factory.ts b/apps/browser/src/background/service-factories/settings-service.factory.ts similarity index 72% rename from apps/browser/src/background/service_factories/settings-service.factory.ts rename to apps/browser/src/background/service-factories/settings-service.factory.ts index 73e0ae52032..17e22a6678d 100644 --- a/apps/browser/src/background/service_factories/settings-service.factory.ts +++ b/apps/browser/src/background/service-factories/settings-service.factory.ts @@ -1,10 +1,16 @@ import { SettingsService as AbstractSettingsService } from "@bitwarden/common/abstractions/settings.service"; +import { + FactoryOptions, + CachedServices, + factory, +} from "../../platform/background/service-factories/factory-options"; +import { + stateServiceFactory, + StateServiceInitOptions, +} from "../../platform/background/service-factories/state-service.factory"; import { BrowserSettingsService } from "../../services/browser-settings.service"; -import { FactoryOptions, CachedServices, factory } from "./factory-options"; -import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory"; - type SettingsServiceFactoryOptions = FactoryOptions; export type SettingsServiceInitOptions = SettingsServiceFactoryOptions & StateServiceInitOptions; diff --git a/apps/browser/src/background/service_factories/vault-timeout-service.factory.ts b/apps/browser/src/background/service-factories/vault-timeout-service.factory.ts similarity index 83% rename from apps/browser/src/background/service_factories/vault-timeout-service.factory.ts rename to apps/browser/src/background/service-factories/vault-timeout-service.factory.ts index b69d8d1d65f..f3f97803d1e 100644 --- a/apps/browser/src/background/service_factories/vault-timeout-service.factory.ts +++ b/apps/browser/src/background/service-factories/vault-timeout-service.factory.ts @@ -12,6 +12,27 @@ import { keyConnectorServiceFactory, KeyConnectorServiceInitOptions, } from "../../auth/background/service-factories/key-connector-service.factory"; +import { + CryptoServiceInitOptions, + cryptoServiceFactory, +} from "../../platform/background/service-factories/crypto-service.factory"; +import { + CachedServices, + factory, + FactoryOptions, +} from "../../platform/background/service-factories/factory-options"; +import { + messagingServiceFactory, + MessagingServiceInitOptions, +} from "../../platform/background/service-factories/messaging-service.factory"; +import { + platformUtilsServiceFactory, + PlatformUtilsServiceInitOptions, +} from "../../platform/background/service-factories/platform-utils-service.factory"; +import { + StateServiceInitOptions, + stateServiceFactory, +} from "../../platform/background/service-factories/state-service.factory"; import VaultTimeoutService from "../../services/vaultTimeout/vaultTimeout.service"; import { cipherServiceFactory, @@ -22,18 +43,7 @@ import { FolderServiceInitOptions, } from "../../vault/background/service_factories/folder-service.factory"; -import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory"; -import { CachedServices, factory, FactoryOptions } from "./factory-options"; -import { messagingServiceFactory, MessagingServiceInitOptions } from "./messaging-service.factory"; -import { - platformUtilsServiceFactory, - PlatformUtilsServiceInitOptions, -} from "./platform-utils-service.factory"; import { searchServiceFactory, SearchServiceInitOptions } from "./search-service.factory"; -import { - stateServiceFactory as stateServiceFactory, - StateServiceInitOptions, -} from "./state-service.factory"; import { vaultTimeoutSettingsServiceFactory, VaultTimeoutSettingsServiceInitOptions, diff --git a/apps/browser/src/background/service_factories/vault-timeout-settings-service.factory.ts b/apps/browser/src/background/service-factories/vault-timeout-settings-service.factory.ts similarity index 79% rename from apps/browser/src/background/service_factories/vault-timeout-settings-service.factory.ts rename to apps/browser/src/background/service-factories/vault-timeout-settings-service.factory.ts index d349771f428..724993127b7 100644 --- a/apps/browser/src/background/service_factories/vault-timeout-settings-service.factory.ts +++ b/apps/browser/src/background/service-factories/vault-timeout-settings-service.factory.ts @@ -9,13 +9,19 @@ import { tokenServiceFactory, TokenServiceInitOptions, } from "../../auth/background/service-factories/token-service.factory"; - -import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory"; -import { CachedServices, factory, FactoryOptions } from "./factory-options"; import { - stateServiceFactory as stateServiceFactory, + CryptoServiceInitOptions, + cryptoServiceFactory, +} from "../../platform/background/service-factories/crypto-service.factory"; +import { + CachedServices, + factory, + FactoryOptions, +} from "../../platform/background/service-factories/factory-options"; +import { StateServiceInitOptions, -} from "./state-service.factory"; + stateServiceFactory, +} from "../../platform/background/service-factories/state-service.factory"; type VaultTimeoutSettingsServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/background/webRequest.background.ts b/apps/browser/src/background/webRequest.background.ts index ca8ed05ea3e..6dd50c23e26 100644 --- a/apps/browser/src/background/webRequest.background.ts +++ b/apps/browser/src/background/webRequest.background.ts @@ -1,10 +1,10 @@ -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; import { UriMatchType } from "@bitwarden/common/enums"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; -import { BrowserApi } from "../browser/browserApi"; +import { BrowserApi } from "../platform/browser/browser-api"; export default class WebRequestBackground { private pendingAuthRequests: any[] = []; diff --git a/apps/browser/src/browser/safariApp.ts b/apps/browser/src/browser/safariApp.ts index 7a86295df67..683c9ef08a0 100644 --- a/apps/browser/src/browser/safariApp.ts +++ b/apps/browser/src/browser/safariApp.ts @@ -1,4 +1,4 @@ -import { BrowserApi } from "./browserApi"; +import { BrowserApi } from "../platform/browser/browser-api"; export class SafariApp { static sendMessageToApp(command: string, data: any = null, resolveNow = false): Promise { diff --git a/apps/browser/src/manifest.json b/apps/browser/src/manifest.json index 270112ab2a5..429e18cf526 100644 --- a/apps/browser/src/manifest.json +++ b/apps/browser/src/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "__MSG_extName__", "short_name": "__MSG_appName__", - "version": "2023.4.0", + "version": "2023.5.0", "description": "__MSG_extDesc__", "default_locale": "en", "author": "Bitwarden Inc.", diff --git a/apps/browser/src/manifest.v3.json b/apps/browser/src/manifest.v3.json index a66932ed1ec..5f76416c3b8 100644 --- a/apps/browser/src/manifest.v3.json +++ b/apps/browser/src/manifest.v3.json @@ -3,7 +3,7 @@ "minimum_chrome_version": "102.0", "name": "__MSG_extName__", "short_name": "__MSG_appName__", - "version": "2023.4.0", + "version": "2023.5.0", "description": "__MSG_extDesc__", "default_locale": "en", "author": "Bitwarden Inc.", diff --git a/apps/browser/src/models/account.ts b/apps/browser/src/models/account.ts index cfbcbecf979..57d7844fde6 100644 --- a/apps/browser/src/models/account.ts +++ b/apps/browser/src/models/account.ts @@ -3,7 +3,7 @@ import { Jsonify } from "type-fest"; import { Account as BaseAccount, AccountSettings as BaseAccountSettings, -} from "@bitwarden/common/models/domain/account"; +} from "@bitwarden/common/platform/models/domain/account"; import { BrowserComponentState } from "./browserComponentState"; import { BrowserGroupingsComponentState } from "./browserGroupingsComponentState"; diff --git a/apps/browser/src/models/browserGroupingsComponentState.ts b/apps/browser/src/models/browserGroupingsComponentState.ts index 32375463701..f47a9ff6ac6 100644 --- a/apps/browser/src/models/browserGroupingsComponentState.ts +++ b/apps/browser/src/models/browserGroupingsComponentState.ts @@ -1,5 +1,5 @@ import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { DeepJsonify } from "@bitwarden/common/types/deep-jsonify"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/apps/browser/src/models/browserSendComponentState.ts b/apps/browser/src/models/browserSendComponentState.ts index d4086f3703b..9158efc21d4 100644 --- a/apps/browser/src/models/browserSendComponentState.ts +++ b/apps/browser/src/models/browserSendComponentState.ts @@ -1,4 +1,4 @@ -import { Utils } from "@bitwarden/common/misc/utils"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; import { DeepJsonify } from "@bitwarden/common/types/deep-jsonify"; diff --git a/apps/browser/src/alarms/alarm-state.ts b/apps/browser/src/platform/alarms/alarm-state.ts similarity index 95% rename from apps/browser/src/alarms/alarm-state.ts rename to apps/browser/src/platform/alarms/alarm-state.ts index 695f8642809..c58d6035175 100644 --- a/apps/browser/src/alarms/alarm-state.ts +++ b/apps/browser/src/platform/alarms/alarm-state.ts @@ -1,5 +1,5 @@ -import { clearClipboardAlarmName } from "../autofill/clipboard"; -import { BrowserApi } from "../browser/browserApi"; +import { clearClipboardAlarmName } from "../../autofill/clipboard"; +import { BrowserApi } from "../browser/browser-api"; export const alarmKeys = [clearClipboardAlarmName] as const; export type AlarmKeys = (typeof alarmKeys)[number]; diff --git a/apps/browser/src/alarms/on-alarm-listener.ts b/apps/browser/src/platform/alarms/on-alarm-listener.ts similarity index 86% rename from apps/browser/src/alarms/on-alarm-listener.ts rename to apps/browser/src/platform/alarms/on-alarm-listener.ts index a476b6e4961..25516930233 100644 --- a/apps/browser/src/alarms/on-alarm-listener.ts +++ b/apps/browser/src/platform/alarms/on-alarm-listener.ts @@ -1,4 +1,4 @@ -import { ClearClipboard, clearClipboardAlarmName } from "../autofill/clipboard"; +import { ClearClipboard, clearClipboardAlarmName } from "../../autofill/clipboard"; import { alarmKeys, clearAlarmTime, getAlarmTime } from "./alarm-state"; diff --git a/apps/browser/src/alarms/register-alarms.ts b/apps/browser/src/platform/alarms/register-alarms.ts similarity index 100% rename from apps/browser/src/alarms/register-alarms.ts rename to apps/browser/src/platform/alarms/register-alarms.ts diff --git a/apps/browser/src/background.html b/apps/browser/src/platform/background.html similarity index 100% rename from apps/browser/src/background.html rename to apps/browser/src/platform/background.html diff --git a/apps/browser/src/background.ts b/apps/browser/src/platform/background.ts similarity index 91% rename from apps/browser/src/background.ts rename to apps/browser/src/platform/background.ts index 2c888cfd4b4..949991df9f0 100644 --- a/apps/browser/src/background.ts +++ b/apps/browser/src/platform/background.ts @@ -1,7 +1,8 @@ +import MainBackground from "../background/main.background"; + import { onAlarmListener } from "./alarms/on-alarm-listener"; import { registerAlarms } from "./alarms/register-alarms"; -import MainBackground from "./background/main.background"; -import { BrowserApi } from "./browser/browserApi"; +import { BrowserApi } from "./browser/browser-api"; import { contextMenusClickedListener, onCommandListener, diff --git a/apps/browser/src/background/service_factories/api-service.factory.ts b/apps/browser/src/platform/background/service-factories/api-service.factory.ts similarity index 88% rename from apps/browser/src/background/service_factories/api-service.factory.ts rename to apps/browser/src/platform/background/service-factories/api-service.factory.ts index 830d51a1a2d..bcde07fbb20 100644 --- a/apps/browser/src/background/service_factories/api-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/api-service.factory.ts @@ -4,14 +4,18 @@ import { ApiService } from "@bitwarden/common/services/api.service"; import { tokenServiceFactory, TokenServiceInitOptions, -} from "../../auth/background/service-factories/token-service.factory"; +} from "../../../auth/background/service-factories/token-service.factory"; +import { + CachedServices, + factory, + FactoryOptions, +} from "../../background/service-factories/factory-options"; import { AppIdServiceInitOptions, appIdServiceFactory } from "./app-id-service.factory"; import { environmentServiceFactory, EnvironmentServiceInitOptions, } from "./environment-service.factory"; -import { CachedServices, factory, FactoryOptions } from "./factory-options"; import { PlatformUtilsServiceInitOptions, platformUtilsServiceFactory, diff --git a/apps/browser/src/background/service_factories/app-id-service.factory.ts b/apps/browser/src/platform/background/service-factories/app-id-service.factory.ts similarity index 84% rename from apps/browser/src/background/service_factories/app-id-service.factory.ts rename to apps/browser/src/platform/background/service-factories/app-id-service.factory.ts index 743c8eb5bc6..30397d737ef 100644 --- a/apps/browser/src/background/service_factories/app-id-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/app-id-service.factory.ts @@ -1,7 +1,7 @@ import { DiskStorageOptions } from "@koa/multer"; -import { AppIdService as AbstractAppIdService } from "@bitwarden/common/abstractions/appId.service"; -import { AppIdService } from "@bitwarden/common/services/appId.service"; +import { AppIdService as AbstractAppIdService } from "@bitwarden/common/platform/abstractions/app-id.service"; +import { AppIdService } from "@bitwarden/common/platform/services/app-id.service"; import { FactoryOptions, CachedServices, factory } from "./factory-options"; import { diskStorageServiceFactory } from "./storage-service.factory"; diff --git a/apps/browser/src/background/service_factories/crypto-function-service.factory.ts b/apps/browser/src/platform/background/service-factories/crypto-function-service.factory.ts similarity index 75% rename from apps/browser/src/background/service_factories/crypto-function-service.factory.ts rename to apps/browser/src/platform/background/service-factories/crypto-function-service.factory.ts index 6a092091746..bcfffb6bd08 100644 --- a/apps/browser/src/background/service_factories/crypto-function-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/crypto-function-service.factory.ts @@ -1,5 +1,5 @@ -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { WebCryptoFunctionService } from "@bitwarden/common/services/webCryptoFunction.service"; +import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; +import { WebCryptoFunctionService } from "@bitwarden/common/platform/services/web-crypto-function.service"; import { CachedServices, factory, FactoryOptions } from "./factory-options"; diff --git a/apps/browser/src/background/service_factories/crypto-service.factory.ts b/apps/browser/src/platform/background/service-factories/crypto-service.factory.ts similarity index 77% rename from apps/browser/src/background/service_factories/crypto-service.factory.ts rename to apps/browser/src/platform/background/service-factories/crypto-service.factory.ts index 784314b12d2..7f66a4f6fe7 100644 --- a/apps/browser/src/background/service_factories/crypto-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/crypto-service.factory.ts @@ -1,6 +1,14 @@ -import { CryptoService as AbstractCryptoService } from "@bitwarden/common/abstractions/crypto.service"; +import { CryptoService as AbstractCryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; -import { BrowserCryptoService } from "../../services/browserCrypto.service"; +import { + StateServiceInitOptions, + stateServiceFactory, +} from "../../../platform/background/service-factories/state-service.factory"; +import { + LogServiceInitOptions, + logServiceFactory, +} from "../../background/service-factories/log-service.factory"; +import { BrowserCryptoService } from "../../services/browser-crypto.service"; import { cryptoFunctionServiceFactory, @@ -8,12 +16,10 @@ import { } from "./crypto-function-service.factory"; import { encryptServiceFactory, EncryptServiceInitOptions } from "./encrypt-service.factory"; import { FactoryOptions, CachedServices, factory } from "./factory-options"; -import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory"; import { - platformUtilsServiceFactory, PlatformUtilsServiceInitOptions, + platformUtilsServiceFactory, } from "./platform-utils-service.factory"; -import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory"; type CryptoServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/background/service_factories/encrypt-service.factory.ts b/apps/browser/src/platform/background/service-factories/encrypt-service.factory.ts similarity index 78% rename from apps/browser/src/background/service_factories/encrypt-service.factory.ts rename to apps/browser/src/platform/background/service-factories/encrypt-service.factory.ts index 5b2a3766a3f..75e8c1974e2 100644 --- a/apps/browser/src/background/service_factories/encrypt-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/encrypt-service.factory.ts @@ -1,11 +1,15 @@ -import { EncryptServiceImplementation } from "@bitwarden/common/services/cryptography/encrypt.service.implementation"; +import { EncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/encrypt.service.implementation"; + +import { + LogServiceInitOptions, + logServiceFactory, +} from "../../background/service-factories/log-service.factory"; import { cryptoFunctionServiceFactory, CryptoFunctionServiceInitOptions, } from "./crypto-function-service.factory"; -import { CachedServices, factory, FactoryOptions } from "./factory-options"; -import { LogServiceInitOptions, logServiceFactory } from "./log-service.factory"; +import { FactoryOptions, CachedServices, factory } from "./factory-options"; type EncryptServiceFactoryOptions = FactoryOptions & { encryptServiceOptions: { diff --git a/apps/browser/src/background/service_factories/environment-service.factory.ts b/apps/browser/src/platform/background/service-factories/environment-service.factory.ts similarity index 100% rename from apps/browser/src/background/service_factories/environment-service.factory.ts rename to apps/browser/src/platform/background/service-factories/environment-service.factory.ts diff --git a/apps/browser/src/background/service_factories/factory-options.ts b/apps/browser/src/platform/background/service-factories/factory-options.ts similarity index 100% rename from apps/browser/src/background/service_factories/factory-options.ts rename to apps/browser/src/platform/background/service-factories/factory-options.ts diff --git a/apps/browser/src/background/service_factories/file-upload-service.factory.ts b/apps/browser/src/platform/background/service-factories/file-upload-service.factory.ts similarity index 68% rename from apps/browser/src/background/service_factories/file-upload-service.factory.ts rename to apps/browser/src/platform/background/service-factories/file-upload-service.factory.ts index 5ead09f929c..d890a3b37a7 100644 --- a/apps/browser/src/background/service_factories/file-upload-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/file-upload-service.factory.ts @@ -1,7 +1,12 @@ -import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/abstractions/file-upload/file-upload.service"; -import { FileUploadService } from "@bitwarden/common/services/file-upload/file-upload.service"; +import { FileUploadService as FileUploadServiceAbstraction } from "@bitwarden/common/platform/abstractions/file-upload/file-upload.service"; +import { FileUploadService } from "@bitwarden/common/platform/services/file-upload/file-upload.service"; + +import { + CachedServices, + factory, + FactoryOptions, +} from "../../background/service-factories/factory-options"; -import { CachedServices, factory, FactoryOptions } from "./factory-options"; import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory"; type FileUploadServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/background/service_factories/i18n-service.factory.ts b/apps/browser/src/platform/background/service-factories/i18n-service.factory.ts similarity index 91% rename from apps/browser/src/background/service_factories/i18n-service.factory.ts rename to apps/browser/src/platform/background/service-factories/i18n-service.factory.ts index 1ba61d70b34..3dd7e1814ff 100644 --- a/apps/browser/src/background/service_factories/i18n-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/i18n-service.factory.ts @@ -1,5 +1,5 @@ -import { I18nService as AbstractI18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { I18nService as BaseI18nService } from "@bitwarden/common/services/i18n.service"; +import { I18nService as AbstractI18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { I18nService as BaseI18nService } from "@bitwarden/common/platform/services/i18n.service"; import I18nService from "../../services/i18n.service"; diff --git a/apps/browser/src/background/service_factories/key-generation-service.factory.ts b/apps/browser/src/platform/background/service-factories/key-generation-service.factory.ts similarity index 82% rename from apps/browser/src/background/service_factories/key-generation-service.factory.ts rename to apps/browser/src/platform/background/service-factories/key-generation-service.factory.ts index d6d31b6326e..7dbcf3fa79e 100644 --- a/apps/browser/src/background/service_factories/key-generation-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/key-generation-service.factory.ts @@ -1,10 +1,10 @@ -import { KeyGenerationService } from "../../services/keyGeneration.service"; +import { KeyGenerationService } from "../../services/key-generation.service"; import { cryptoFunctionServiceFactory, CryptoFunctionServiceInitOptions, } from "./crypto-function-service.factory"; -import { CachedServices, factory, FactoryOptions } from "./factory-options"; +import { FactoryOptions, CachedServices, factory } from "./factory-options"; type KeyGenerationServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/background/service_factories/log-service.factory.ts b/apps/browser/src/platform/background/service-factories/log-service.factory.ts similarity index 71% rename from apps/browser/src/background/service_factories/log-service.factory.ts rename to apps/browser/src/platform/background/service-factories/log-service.factory.ts index 286bafd9516..69e49fabb70 100644 --- a/apps/browser/src/background/service_factories/log-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/log-service.factory.ts @@ -1,8 +1,8 @@ -import { LogService } from "@bitwarden/common/abstractions/log.service"; import { LogLevelType } from "@bitwarden/common/enums"; -import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service"; -import { CachedServices, factory, FactoryOptions } from "./factory-options"; +import { FactoryOptions, CachedServices, factory } from "./factory-options"; type LogServiceFactoryOptions = FactoryOptions & { logServiceOptions: { diff --git a/apps/browser/src/background/service_factories/messaging-service.factory.ts b/apps/browser/src/platform/background/service-factories/messaging-service.factory.ts similarity index 65% rename from apps/browser/src/background/service_factories/messaging-service.factory.ts rename to apps/browser/src/platform/background/service-factories/messaging-service.factory.ts index 633f1b2d578..0d0c797056e 100644 --- a/apps/browser/src/background/service_factories/messaging-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/messaging-service.factory.ts @@ -1,8 +1,11 @@ -import { MessagingService as AbstractMessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { MessagingService as AbstractMessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; -import BrowserMessagingService from "../../services/browserMessaging.service"; - -import { CachedServices, factory, FactoryOptions } from "./factory-options"; +import { + CachedServices, + factory, + FactoryOptions, +} from "../../background/service-factories/factory-options"; +import BrowserMessagingService from "../../services/browser-messaging.service"; type MessagingServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/background/service_factories/platform-utils-service.factory.ts b/apps/browser/src/platform/background/service-factories/platform-utils-service.factory.ts similarity index 85% rename from apps/browser/src/background/service_factories/platform-utils-service.factory.ts rename to apps/browser/src/platform/background/service-factories/platform-utils-service.factory.ts index da25e51ce0c..5748c523f70 100644 --- a/apps/browser/src/background/service_factories/platform-utils-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/platform-utils-service.factory.ts @@ -1,6 +1,6 @@ -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import BrowserPlatformUtilsService from "../../services/browserPlatformUtils.service"; +import BrowserPlatformUtilsService from "../../services/browser-platform-utils.service"; import { CachedServices, factory, FactoryOptions } from "./factory-options"; import { MessagingServiceInitOptions, messagingServiceFactory } from "./messaging-service.factory"; diff --git a/apps/browser/src/background/service_factories/state-migration-service.factory.ts b/apps/browser/src/platform/background/service-factories/state-migration-service.factory.ts similarity index 76% rename from apps/browser/src/background/service_factories/state-migration-service.factory.ts rename to apps/browser/src/platform/background/service-factories/state-migration-service.factory.ts index 5c7fba3ed85..8d4ee969583 100644 --- a/apps/browser/src/background/service_factories/state-migration-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/state-migration-service.factory.ts @@ -1,8 +1,8 @@ -import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { GlobalState } from "@bitwarden/common/models/domain/global-state"; -import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service"; +import { StateFactory } from "@bitwarden/common/platform/factories/state-factory"; +import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; +import { StateMigrationService } from "@bitwarden/common/platform/services/state-migration.service"; -import { Account } from "../../models/account"; +import { Account } from "../../../models/account"; import { CachedServices, factory, FactoryOptions } from "./factory-options"; import { diff --git a/apps/browser/src/background/service_factories/state-service.factory.ts b/apps/browser/src/platform/background/service-factories/state-service.factory.ts similarity index 88% rename from apps/browser/src/background/service_factories/state-service.factory.ts rename to apps/browser/src/platform/background/service-factories/state-service.factory.ts index 6d2c5cb4fa7..f926d428890 100644 --- a/apps/browser/src/background/service_factories/state-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/state-service.factory.ts @@ -1,7 +1,7 @@ -import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { GlobalState } from "@bitwarden/common/models/domain/global-state"; +import { StateFactory } from "@bitwarden/common/platform/factories/state-factory"; +import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; -import { Account } from "../../models/account"; +import { Account } from "../../../models/account"; import { BrowserStateService } from "../../services/browser-state.service"; import { CachedServices, factory, FactoryOptions } from "./factory-options"; diff --git a/apps/browser/src/background/service_factories/storage-service.factory.ts b/apps/browser/src/platform/background/service-factories/storage-service.factory.ts similarity index 81% rename from apps/browser/src/background/service_factories/storage-service.factory.ts rename to apps/browser/src/platform/background/service-factories/storage-service.factory.ts index c30bda731e6..9de8f1cffca 100644 --- a/apps/browser/src/background/service_factories/storage-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/storage-service.factory.ts @@ -1,18 +1,18 @@ import { AbstractMemoryStorageService, AbstractStorageService, -} from "@bitwarden/common/abstractions/storage.service"; -import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; +} from "@bitwarden/common/platform/abstractions/storage.service"; +import { MemoryStorageService } from "@bitwarden/common/platform/services/memory-storage.service"; -import { BrowserApi } from "../../browser/browserApi"; -import BrowserLocalStorageService from "../../services/browserLocalStorage.service"; -import { LocalBackedSessionStorageService } from "../../services/localBackedSessionStorage.service"; +import { BrowserApi } from "../../browser/browser-api"; +import BrowserLocalStorageService from "../../services/browser-local-storage.service"; +import { LocalBackedSessionStorageService } from "../../services/local-backed-session-storage.service"; -import { encryptServiceFactory, EncryptServiceInitOptions } from "./encrypt-service.factory"; +import { EncryptServiceInitOptions, encryptServiceFactory } from "./encrypt-service.factory"; import { CachedServices, factory, FactoryOptions } from "./factory-options"; import { - keyGenerationServiceFactory, KeyGenerationServiceInitOptions, + keyGenerationServiceFactory, } from "./key-generation-service.factory"; type StorageServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/browser/browserApi.ts b/apps/browser/src/platform/browser/browser-api.ts similarity index 95% rename from apps/browser/src/browser/browserApi.ts rename to apps/browser/src/platform/browser/browser-api.ts index b1313ebda6f..7c646e5c7e6 100644 --- a/apps/browser/src/browser/browserApi.ts +++ b/apps/browser/src/platform/browser/browser-api.ts @@ -1,7 +1,7 @@ -import { DeviceType } from "@bitwarden/common/enums/device-type.enum"; +import { DeviceType } from "@bitwarden/common/enums"; -import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service"; -import { TabMessage } from "../types/tab-messages"; +import { TabMessage } from "../../types/tab-messages"; +import BrowserPlatformUtilsService from "../services/browser-platform-utils.service"; export class BrowserApi { static isWebExtensionsApi: boolean = typeof browser !== "undefined"; @@ -227,10 +227,12 @@ export class BrowserApi { } } - static reloadOpenWindows() { + static reloadOpenWindows(exemptCurrentHref = false) { + const currentHref = window.location.href; const views = chrome.extension.getViews() as Window[]; views .filter((w) => w.location.href != null && !w.location.href.includes("background.html")) + .filter((w) => !exemptCurrentHref || w.location.href !== currentHref) .forEach((w) => { w.location.reload(); }); diff --git a/apps/browser/src/decorators/dev-flag.decorator.spec.ts b/apps/browser/src/platform/decorators/dev-flag.decorator.spec.ts similarity index 100% rename from apps/browser/src/decorators/dev-flag.decorator.spec.ts rename to apps/browser/src/platform/decorators/dev-flag.decorator.spec.ts diff --git a/apps/browser/src/decorators/dev-flag.decorator.ts b/apps/browser/src/platform/decorators/dev-flag.decorator.ts similarity index 100% rename from apps/browser/src/decorators/dev-flag.decorator.ts rename to apps/browser/src/platform/decorators/dev-flag.decorator.ts diff --git a/apps/browser/src/decorators/session-sync-observable/browser-session.decorator.spec.ts b/apps/browser/src/platform/decorators/session-sync-observable/browser-session.decorator.spec.ts similarity index 95% rename from apps/browser/src/decorators/session-sync-observable/browser-session.decorator.spec.ts rename to apps/browser/src/platform/decorators/session-sync-observable/browser-session.decorator.spec.ts index ab29c86e984..5ddc3f8e07e 100644 --- a/apps/browser/src/decorators/session-sync-observable/browser-session.decorator.spec.ts +++ b/apps/browser/src/platform/decorators/session-sync-observable/browser-session.decorator.spec.ts @@ -1,7 +1,7 @@ import { BehaviorSubject } from "rxjs"; -import { AbstractMemoryStorageService } from "@bitwarden/common/abstractions/storage.service"; -import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; +import { AbstractMemoryStorageService } from "@bitwarden/common/platform/abstractions/storage.service"; +import { MemoryStorageService } from "@bitwarden/common/platform/services/memory-storage.service"; import { BrowserStateService } from "../../services/browser-state.service"; diff --git a/apps/browser/src/decorators/session-sync-observable/browser-session.decorator.ts b/apps/browser/src/platform/decorators/session-sync-observable/browser-session.decorator.ts similarity index 98% rename from apps/browser/src/decorators/session-sync-observable/browser-session.decorator.ts rename to apps/browser/src/platform/decorators/session-sync-observable/browser-session.decorator.ts index dbb45ddba8e..b325f6b9a56 100644 --- a/apps/browser/src/decorators/session-sync-observable/browser-session.decorator.ts +++ b/apps/browser/src/platform/decorators/session-sync-observable/browser-session.decorator.ts @@ -1,6 +1,6 @@ import { Constructor } from "type-fest"; -import { AbstractMemoryStorageService } from "@bitwarden/common/abstractions/storage.service"; +import { AbstractMemoryStorageService } from "@bitwarden/common/platform/abstractions/storage.service"; import { SessionStorable } from "./session-storable"; import { SessionSyncer } from "./session-syncer"; diff --git a/apps/browser/src/decorators/session-sync-observable/index.ts b/apps/browser/src/platform/decorators/session-sync-observable/index.ts similarity index 100% rename from apps/browser/src/decorators/session-sync-observable/index.ts rename to apps/browser/src/platform/decorators/session-sync-observable/index.ts diff --git a/apps/browser/src/decorators/session-sync-observable/session-storable.ts b/apps/browser/src/platform/decorators/session-sync-observable/session-storable.ts similarity index 100% rename from apps/browser/src/decorators/session-sync-observable/session-storable.ts rename to apps/browser/src/platform/decorators/session-sync-observable/session-storable.ts diff --git a/apps/browser/src/decorators/session-sync-observable/session-sync.decorator.spec.ts b/apps/browser/src/platform/decorators/session-sync-observable/session-sync.decorator.spec.ts similarity index 100% rename from apps/browser/src/decorators/session-sync-observable/session-sync.decorator.spec.ts rename to apps/browser/src/platform/decorators/session-sync-observable/session-sync.decorator.spec.ts diff --git a/apps/browser/src/decorators/session-sync-observable/session-sync.decorator.ts b/apps/browser/src/platform/decorators/session-sync-observable/session-sync.decorator.ts similarity index 100% rename from apps/browser/src/decorators/session-sync-observable/session-sync.decorator.ts rename to apps/browser/src/platform/decorators/session-sync-observable/session-sync.decorator.ts diff --git a/apps/browser/src/decorators/session-sync-observable/session-syncer.spec.ts b/apps/browser/src/platform/decorators/session-sync-observable/session-syncer.spec.ts similarity index 98% rename from apps/browser/src/decorators/session-sync-observable/session-syncer.spec.ts rename to apps/browser/src/platform/decorators/session-sync-observable/session-syncer.spec.ts index 63312376293..afa66db0454 100644 --- a/apps/browser/src/decorators/session-sync-observable/session-syncer.spec.ts +++ b/apps/browser/src/platform/decorators/session-sync-observable/session-syncer.spec.ts @@ -2,9 +2,9 @@ import { awaitAsync } from "@bitwarden/angular/../test-utils"; import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject, ReplaySubject } from "rxjs"; -import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; +import { MemoryStorageService } from "@bitwarden/common/platform/services/memory-storage.service"; -import { BrowserApi } from "../../browser/browserApi"; +import { BrowserApi } from "../../browser/browser-api"; import { SessionSyncer } from "./session-syncer"; import { SyncedItemMetadata } from "./sync-item-metadata"; diff --git a/apps/browser/src/decorators/session-sync-observable/session-syncer.ts b/apps/browser/src/platform/decorators/session-sync-observable/session-syncer.ts similarity index 95% rename from apps/browser/src/decorators/session-sync-observable/session-syncer.ts rename to apps/browser/src/platform/decorators/session-sync-observable/session-syncer.ts index 8751a12d1df..001c546b9c6 100644 --- a/apps/browser/src/decorators/session-sync-observable/session-syncer.ts +++ b/apps/browser/src/platform/decorators/session-sync-observable/session-syncer.ts @@ -1,9 +1,9 @@ import { BehaviorSubject, concatMap, ReplaySubject, skip, Subject, Subscription } from "rxjs"; -import { AbstractMemoryStorageService } from "@bitwarden/common/abstractions/storage.service"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { AbstractMemoryStorageService } from "@bitwarden/common/platform/abstractions/storage.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { BrowserApi } from "../../browser/browserApi"; +import { BrowserApi } from "../../browser/browser-api"; import { SyncedItemMetadata } from "./sync-item-metadata"; diff --git a/apps/browser/src/decorators/session-sync-observable/sync-item-metadata.ts b/apps/browser/src/platform/decorators/session-sync-observable/sync-item-metadata.ts similarity index 100% rename from apps/browser/src/decorators/session-sync-observable/sync-item-metadata.ts rename to apps/browser/src/platform/decorators/session-sync-observable/sync-item-metadata.ts diff --git a/apps/browser/src/decorators/session-sync-observable/synced-item-metadata.spec.ts b/apps/browser/src/platform/decorators/session-sync-observable/synced-item-metadata.spec.ts similarity index 100% rename from apps/browser/src/decorators/session-sync-observable/synced-item-metadata.spec.ts rename to apps/browser/src/platform/decorators/session-sync-observable/synced-item-metadata.spec.ts diff --git a/apps/browser/src/flags.ts b/apps/browser/src/platform/flags.ts similarity index 86% rename from apps/browser/src/flags.ts rename to apps/browser/src/platform/flags.ts index 5159cac9683..270835bc6a1 100644 --- a/apps/browser/src/flags.ts +++ b/apps/browser/src/platform/flags.ts @@ -4,9 +4,9 @@ import { devFlagValue as baseDevFlagValue, SharedFlags, SharedDevFlags, -} from "@bitwarden/common/misc/flags"; +} from "@bitwarden/common/platform/misc/flags"; -import { GroupPolicyEnvironment } from "./admin-console/types/group-policy-environment"; +import { GroupPolicyEnvironment } from "../admin-console/types/group-policy-environment"; // required to avoid linting errors when there are no flags /* eslint-disable-next-line @typescript-eslint/ban-types */ diff --git a/apps/browser/src/globals.d.ts b/apps/browser/src/platform/globals.d.ts similarity index 100% rename from apps/browser/src/globals.d.ts rename to apps/browser/src/platform/globals.d.ts diff --git a/apps/browser/src/listeners/combine.spec.ts b/apps/browser/src/platform/listeners/combine.spec.ts similarity index 100% rename from apps/browser/src/listeners/combine.spec.ts rename to apps/browser/src/platform/listeners/combine.spec.ts diff --git a/apps/browser/src/listeners/combine.ts b/apps/browser/src/platform/listeners/combine.ts similarity index 86% rename from apps/browser/src/listeners/combine.ts rename to apps/browser/src/platform/listeners/combine.ts index b87631de977..91d2af7ba55 100644 --- a/apps/browser/src/listeners/combine.ts +++ b/apps/browser/src/platform/listeners/combine.ts @@ -1,4 +1,4 @@ -import { CachedServices } from "../background/service_factories/factory-options"; +import { CachedServices } from "../background/service-factories/factory-options"; type Listener = (...args: [...T, CachedServices]) => Promise; diff --git a/apps/browser/src/listeners/index.ts b/apps/browser/src/platform/listeners/index.ts similarity index 78% rename from apps/browser/src/listeners/index.ts rename to apps/browser/src/platform/listeners/index.ts index e9dc0908278..cf4950023f3 100644 --- a/apps/browser/src/listeners/index.ts +++ b/apps/browser/src/platform/listeners/index.ts @@ -1,9 +1,9 @@ -import { CipherContextMenuHandler } from "../autofill/browser/cipher-context-menu-handler"; -import { ContextMenuClickedHandler } from "../autofill/browser/context-menu-clicked-handler"; +import { CipherContextMenuHandler } from "../../autofill/browser/cipher-context-menu-handler"; +import { ContextMenuClickedHandler } from "../../autofill/browser/context-menu-clicked-handler"; import { combine } from "./combine"; -import { onCommandListener } from "./onCommandListener"; -import { onInstallListener } from "./onInstallListener"; +import { onCommandListener } from "./on-command-listener"; +import { onInstallListener } from "./on-install-listener"; import { UpdateBadge } from "./update-badge"; const tabsOnActivatedListener = combine([ diff --git a/apps/browser/src/listeners/onCommandListener.ts b/apps/browser/src/platform/listeners/on-command-listener.ts similarity index 74% rename from apps/browser/src/listeners/onCommandListener.ts rename to apps/browser/src/platform/listeners/on-command-listener.ts index 7ea7de9a0f0..1511e937813 100644 --- a/apps/browser/src/listeners/onCommandListener.ts +++ b/apps/browser/src/platform/listeners/on-command-listener.ts @@ -1,20 +1,20 @@ import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; -import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { GlobalState } from "@bitwarden/common/models/domain/global-state"; +import { StateFactory } from "@bitwarden/common/platform/factories/state-factory"; +import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; -import { authServiceFactory } from "../auth/background/service-factories/auth-service.factory"; -import { autofillServiceFactory } from "../autofill/background/service_factories/autofill-service.factory"; -import { GeneratePasswordToClipboardCommand } from "../autofill/clipboard"; -import { AutofillTabCommand } from "../autofill/commands/autofill-tab-command"; -import { CachedServices } from "../background/service_factories/factory-options"; -import { logServiceFactory } from "../background/service_factories/log-service.factory"; +import { authServiceFactory } from "../../auth/background/service-factories/auth-service.factory"; +import { autofillServiceFactory } from "../../autofill/background/service_factories/autofill-service.factory"; +import { GeneratePasswordToClipboardCommand } from "../../autofill/clipboard"; +import { AutofillTabCommand } from "../../autofill/commands/autofill-tab-command"; import { - passwordGenerationServiceFactory, PasswordGenerationServiceInitOptions, -} from "../background/service_factories/password-generation-service.factory"; -import { stateServiceFactory } from "../background/service_factories/state-service.factory"; -import { BrowserApi } from "../browser/browserApi"; -import { Account } from "../models/account"; + passwordGenerationServiceFactory, +} from "../../background/service-factories/password-generation-service.factory"; +import { Account } from "../../models/account"; +import { stateServiceFactory } from "../../platform/background/service-factories/state-service.factory"; +import { CachedServices } from "../background/service-factories/factory-options"; +import { logServiceFactory } from "../background/service-factories/log-service.factory"; +import { BrowserApi } from "../browser/browser-api"; export const onCommandListener = async (command: string, tab: chrome.tabs.Tab) => { switch (command) { @@ -91,7 +91,7 @@ const doGeneratePasswordToClipboard = async (tab: chrome.tabs.Tab): Promise Promise.resolve(true), - clipboardWriteCallback: (_clipboardValue, _clearMs) => Promise.resolve(), + clipboardWriteCallback: () => Promise.resolve(), win: self, }, stateMigrationServiceOptions: { diff --git a/apps/browser/src/listeners/onInstallListener.ts b/apps/browser/src/platform/listeners/on-install-listener.ts similarity index 75% rename from apps/browser/src/listeners/onInstallListener.ts rename to apps/browser/src/platform/listeners/on-install-listener.ts index 92cd2fd6b78..480e811fd26 100644 --- a/apps/browser/src/listeners/onInstallListener.ts +++ b/apps/browser/src/platform/listeners/on-install-listener.ts @@ -1,12 +1,12 @@ -import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { GlobalState } from "@bitwarden/common/models/domain/global-state"; +import { StateFactory } from "@bitwarden/common/platform/factories/state-factory"; +import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; +import { Account } from "../../models/account"; import { - environmentServiceFactory, EnvironmentServiceInitOptions, -} from "../background/service_factories/environment-service.factory"; -import { BrowserApi } from "../browser/browserApi"; -import { Account } from "../models/account"; + environmentServiceFactory, +} from "../background/service-factories/environment-service.factory"; +import { BrowserApi } from "../browser/browser-api"; export async function onInstallListener(details: chrome.runtime.InstalledDetails) { const cache = {}; diff --git a/apps/browser/src/listeners/update-badge.ts b/apps/browser/src/platform/listeners/update-badge.ts similarity index 87% rename from apps/browser/src/listeners/update-badge.ts rename to apps/browser/src/platform/listeners/update-badge.ts index 14a93c474ff..4623ff30f05 100644 --- a/apps/browser/src/listeners/update-badge.ts +++ b/apps/browser/src/platform/listeners/update-badge.ts @@ -1,21 +1,21 @@ -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; -import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { GlobalState } from "@bitwarden/common/models/domain/global-state"; -import { ContainerService } from "@bitwarden/common/services/container.service"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service"; +import { StateFactory } from "@bitwarden/common/platform/factories/state-factory"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; +import { ContainerService } from "@bitwarden/common/platform/services/container.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; -import { authServiceFactory } from "../auth/background/service-factories/auth-service.factory"; -import { stateServiceFactory } from "../background/service_factories/state-service.factory"; -import { BrowserApi } from "../browser/browserApi"; -import { Account } from "../models/account"; -import { BrowserStateService } from "../services/abstractions/browser-state.service"; -import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service"; -import IconDetails from "../vault/background/models/icon-details"; -import { cipherServiceFactory } from "../vault/background/service_factories/cipher-service.factory"; +import { authServiceFactory } from "../../auth/background/service-factories/auth-service.factory"; +import { Account } from "../../models/account"; +import { stateServiceFactory } from "../../platform/background/service-factories/state-service.factory"; +import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service"; +import IconDetails from "../../vault/background/models/icon-details"; +import { cipherServiceFactory } from "../../vault/background/service_factories/cipher-service.factory"; +import { BrowserApi } from "../browser/browser-api"; +import BrowserPlatformUtilsService from "../services/browser-platform-utils.service"; export type BadgeOptions = { tab?: chrome.tabs.Tab; diff --git a/apps/browser/src/popup/locales.ts b/apps/browser/src/platform/popup/locales.ts similarity index 100% rename from apps/browser/src/popup/locales.ts rename to apps/browser/src/platform/popup/locales.ts diff --git a/apps/browser/src/services/abstractChromeStorageApi.service.ts b/apps/browser/src/platform/services/abstractions/abstract-chrome-storage-api.service.ts similarity index 92% rename from apps/browser/src/services/abstractChromeStorageApi.service.ts rename to apps/browser/src/platform/services/abstractions/abstract-chrome-storage-api.service.ts index 4d83e369727..5e9c14fd3c4 100644 --- a/apps/browser/src/services/abstractChromeStorageApi.service.ts +++ b/apps/browser/src/platform/services/abstractions/abstract-chrome-storage-api.service.ts @@ -1,4 +1,4 @@ -import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service"; +import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service"; export default abstract class AbstractChromeStorageService implements AbstractStorageService { protected abstract chromeStorageApi: chrome.storage.StorageArea; diff --git a/apps/browser/src/services/abstractions/abstractKeyGeneration.service.ts b/apps/browser/src/platform/services/abstractions/abstract-key-generation.service.ts similarity index 54% rename from apps/browser/src/services/abstractions/abstractKeyGeneration.service.ts rename to apps/browser/src/platform/services/abstractions/abstract-key-generation.service.ts index 6a70718addf..5c2751dceff 100644 --- a/apps/browser/src/services/abstractions/abstractKeyGeneration.service.ts +++ b/apps/browser/src/platform/services/abstractions/abstract-key-generation.service.ts @@ -1,4 +1,4 @@ -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; +import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; export interface AbstractKeyGenerationService { makeEphemeralKey(numBytes?: number): Promise; diff --git a/apps/browser/src/services/abstractions/browser-state.service.ts b/apps/browser/src/platform/services/abstractions/browser-state.service.ts similarity index 70% rename from apps/browser/src/services/abstractions/browser-state.service.ts rename to apps/browser/src/platform/services/abstractions/browser-state.service.ts index 0c8a35afbd2..30b1bb98635 100644 --- a/apps/browser/src/services/abstractions/browser-state.service.ts +++ b/apps/browser/src/platform/services/abstractions/browser-state.service.ts @@ -1,10 +1,10 @@ -import { StateService as BaseStateServiceAbstraction } from "@bitwarden/common/abstractions/state.service"; -import { StorageOptions } from "@bitwarden/common/models/domain/storage-options"; +import { StateService as BaseStateServiceAbstraction } from "@bitwarden/common/platform/abstractions/state.service"; +import { StorageOptions } from "@bitwarden/common/platform/models/domain/storage-options"; -import { Account } from "../../models/account"; -import { BrowserComponentState } from "../../models/browserComponentState"; -import { BrowserGroupingsComponentState } from "../../models/browserGroupingsComponentState"; -import { BrowserSendComponentState } from "../../models/browserSendComponentState"; +import { Account } from "../../../models/account"; +import { BrowserComponentState } from "../../../models/browserComponentState"; +import { BrowserGroupingsComponentState } from "../../../models/browserGroupingsComponentState"; +import { BrowserSendComponentState } from "../../../models/browserSendComponentState"; export abstract class BrowserStateService extends BaseStateServiceAbstraction { getBrowserGroupingComponentState: ( diff --git a/apps/browser/src/services/browser-config.service.ts b/apps/browser/src/platform/services/browser-config.service.ts similarity index 64% rename from apps/browser/src/services/browser-config.service.ts rename to apps/browser/src/platform/services/browser-config.service.ts index 14aae684bd3..68237b4c206 100644 --- a/apps/browser/src/services/browser-config.service.ts +++ b/apps/browser/src/platform/services/browser-config.service.ts @@ -1,7 +1,7 @@ import { BehaviorSubject } from "rxjs"; -import { ServerConfig } from "@bitwarden/common/abstractions/config/server-config"; -import { ConfigService } from "@bitwarden/common/services/config/config.service"; +import { ServerConfig } from "@bitwarden/common/platform/abstractions/config/server-config"; +import { ConfigService } from "@bitwarden/common/platform/services/config/config.service"; import { browserSession, sessionSync } from "../decorators/session-sync-observable"; diff --git a/apps/browser/src/services/browserCrypto.service.ts b/apps/browser/src/platform/services/browser-crypto.service.ts similarity index 82% rename from apps/browser/src/services/browserCrypto.service.ts rename to apps/browser/src/platform/services/browser-crypto.service.ts index 3714e265fa5..1018c270cb2 100644 --- a/apps/browser/src/services/browserCrypto.service.ts +++ b/apps/browser/src/platform/services/browser-crypto.service.ts @@ -1,5 +1,5 @@ import { KeySuffixOptions } from "@bitwarden/common/enums"; -import { CryptoService } from "@bitwarden/common/services/crypto.service"; +import { CryptoService } from "@bitwarden/common/platform/services/crypto.service"; export class BrowserCryptoService extends CryptoService { protected async retrieveKeyFromStorage(keySuffix: KeySuffixOptions) { diff --git a/apps/browser/src/services/browser-environment.service.ts b/apps/browser/src/platform/services/browser-environment.service.ts similarity index 83% rename from apps/browser/src/services/browser-environment.service.ts rename to apps/browser/src/platform/services/browser-environment.service.ts index bad4b4b8321..08a4d811d9d 100644 --- a/apps/browser/src/services/browser-environment.service.ts +++ b/apps/browser/src/platform/services/browser-environment.service.ts @@ -1,8 +1,8 @@ -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { EnvironmentService } from "@bitwarden/common/services/environment.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { EnvironmentService } from "@bitwarden/common/platform/services/environment.service"; -import { GroupPolicyEnvironment } from "../admin-console/types/group-policy-environment"; +import { GroupPolicyEnvironment } from "../../admin-console/types/group-policy-environment"; import { devFlagEnabled, devFlagValue } from "../flags"; export class BrowserEnvironmentService extends EnvironmentService { diff --git a/apps/browser/src/services/browserFileDownloadService.ts b/apps/browser/src/platform/services/browser-file-download.service.ts similarity index 66% rename from apps/browser/src/services/browserFileDownloadService.ts rename to apps/browser/src/platform/services/browser-file-download.service.ts index 89ae6722b59..1ade74367f5 100644 --- a/apps/browser/src/services/browserFileDownloadService.ts +++ b/apps/browser/src/platform/services/browser-file-download.service.ts @@ -1,12 +1,12 @@ import { Injectable } from "@angular/core"; -import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; -import { FileDownloadBuilder } from "@bitwarden/common/abstractions/fileDownload/fileDownloadBuilder"; -import { FileDownloadRequest } from "@bitwarden/common/abstractions/fileDownload/fileDownloadRequest"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { FileDownloadBuilder } from "@bitwarden/common/platform/abstractions/file-download/file-download.builder"; +import { FileDownloadRequest } from "@bitwarden/common/platform/abstractions/file-download/file-download.request"; +import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { BrowserApi } from "../browser/browserApi"; -import { SafariApp } from "../browser/safariApp"; +import { SafariApp } from "../../browser/safariApp"; +import { BrowserApi } from "../browser/browser-api"; @Injectable() export class BrowserFileDownloadService implements FileDownloadService { diff --git a/apps/browser/src/services/browser-i18n.service.ts b/apps/browser/src/platform/services/browser-i18n.service.ts similarity index 83% rename from apps/browser/src/services/browser-i18n.service.ts rename to apps/browser/src/platform/services/browser-i18n.service.ts index 3d2f244ab57..03406c5b706 100644 --- a/apps/browser/src/services/browser-i18n.service.ts +++ b/apps/browser/src/platform/services/browser-i18n.service.ts @@ -1,6 +1,6 @@ import { ReplaySubject } from "rxjs"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { browserSession, sessionSync } from "../decorators/session-sync-observable"; diff --git a/apps/browser/src/services/browserLocalStorage.service.ts b/apps/browser/src/platform/services/browser-local-storage.service.ts similarity index 60% rename from apps/browser/src/services/browserLocalStorage.service.ts rename to apps/browser/src/platform/services/browser-local-storage.service.ts index 2c93920df0c..8be8127d545 100644 --- a/apps/browser/src/services/browserLocalStorage.service.ts +++ b/apps/browser/src/platform/services/browser-local-storage.service.ts @@ -1,4 +1,4 @@ -import AbstractChromeStorageService from "./abstractChromeStorageApi.service"; +import AbstractChromeStorageService from "./abstractions/abstract-chrome-storage-api.service"; export default class BrowserLocalStorageService extends AbstractChromeStorageService { protected chromeStorageApi = chrome.storage.local; diff --git a/apps/browser/src/services/browserMemoryStorage.service.ts b/apps/browser/src/platform/services/browser-memory-storage.service.ts similarity index 60% rename from apps/browser/src/services/browserMemoryStorage.service.ts rename to apps/browser/src/platform/services/browser-memory-storage.service.ts index 993ae8a16ef..cdefbe45812 100644 --- a/apps/browser/src/services/browserMemoryStorage.service.ts +++ b/apps/browser/src/platform/services/browser-memory-storage.service.ts @@ -1,4 +1,4 @@ -import AbstractChromeStorageService from "./abstractChromeStorageApi.service"; +import AbstractChromeStorageService from "./abstractions/abstract-chrome-storage-api.service"; export default class BrowserMemoryStorageService extends AbstractChromeStorageService { protected chromeStorageApi = chrome.storage.session; diff --git a/apps/browser/src/services/browserMessagingPrivateModeBackground.service.ts b/apps/browser/src/platform/services/browser-messaging-private-mode-background.service.ts similarity index 74% rename from apps/browser/src/services/browserMessagingPrivateModeBackground.service.ts rename to apps/browser/src/platform/services/browser-messaging-private-mode-background.service.ts index 6d0bcd81afc..c2a6f8c5e1f 100644 --- a/apps/browser/src/services/browserMessagingPrivateModeBackground.service.ts +++ b/apps/browser/src/platform/services/browser-messaging-private-mode-background.service.ts @@ -1,4 +1,4 @@ -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; export default class BrowserMessagingPrivateModeBackgroundService implements MessagingService { send(subscriber: string, arg: any = {}) { diff --git a/apps/browser/src/services/browserMessagingPrivateModePopup.service.ts b/apps/browser/src/platform/services/browser-messaging-private-mode-popup.service.ts similarity index 74% rename from apps/browser/src/services/browserMessagingPrivateModePopup.service.ts rename to apps/browser/src/platform/services/browser-messaging-private-mode-popup.service.ts index a0a3c938acf..5572ba1ba41 100644 --- a/apps/browser/src/services/browserMessagingPrivateModePopup.service.ts +++ b/apps/browser/src/platform/services/browser-messaging-private-mode-popup.service.ts @@ -1,4 +1,4 @@ -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; export default class BrowserMessagingPrivateModePopupService implements MessagingService { send(subscriber: string, arg: any = {}) { diff --git a/apps/browser/src/services/browserMessaging.service.ts b/apps/browser/src/platform/services/browser-messaging.service.ts similarity index 54% rename from apps/browser/src/services/browserMessaging.service.ts rename to apps/browser/src/platform/services/browser-messaging.service.ts index 7832e08b323..5eff957cb50 100644 --- a/apps/browser/src/services/browserMessaging.service.ts +++ b/apps/browser/src/platform/services/browser-messaging.service.ts @@ -1,6 +1,6 @@ -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; -import { BrowserApi } from "../browser/browserApi"; +import { BrowserApi } from "../browser/browser-api"; export default class BrowserMessagingService implements MessagingService { send(subscriber: string, arg: any = {}) { diff --git a/apps/browser/src/services/browserPlatformUtils.service.spec.ts b/apps/browser/src/platform/services/browser-platform-utils.service.spec.ts similarity index 98% rename from apps/browser/src/services/browserPlatformUtils.service.spec.ts rename to apps/browser/src/platform/services/browser-platform-utils.service.spec.ts index c0d62b4d994..964200dfcea 100644 --- a/apps/browser/src/services/browserPlatformUtils.service.spec.ts +++ b/apps/browser/src/platform/services/browser-platform-utils.service.spec.ts @@ -1,6 +1,6 @@ import { DeviceType } from "@bitwarden/common/enums"; -import BrowserPlatformUtilsService from "./browserPlatformUtils.service"; +import BrowserPlatformUtilsService from "./browser-platform-utils.service"; describe("Browser Utils Service", () => { describe("getBrowser", () => { diff --git a/apps/browser/src/services/browserPlatformUtils.service.ts b/apps/browser/src/platform/services/browser-platform-utils.service.ts similarity index 97% rename from apps/browser/src/services/browserPlatformUtils.service.ts rename to apps/browser/src/platform/services/browser-platform-utils.service.ts index 29086db9ec8..79c52d615fb 100644 --- a/apps/browser/src/services/browserPlatformUtils.service.ts +++ b/apps/browser/src/platform/services/browser-platform-utils.service.ts @@ -1,9 +1,9 @@ -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { ClientType, DeviceType } from "@bitwarden/common/enums"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { BrowserApi } from "../browser/browserApi"; -import { SafariApp } from "../browser/safariApp"; +import { SafariApp } from "../../browser/safariApp"; +import { BrowserApi } from "../browser/browser-api"; export default class BrowserPlatformUtilsService implements PlatformUtilsService { private static deviceCache: DeviceType = null; diff --git a/apps/browser/src/services/browser-state.service.spec.ts b/apps/browser/src/platform/services/browser-state.service.spec.ts similarity index 82% rename from apps/browser/src/services/browser-state.service.spec.ts rename to apps/browser/src/platform/services/browser-state.service.spec.ts index 5ef70897b30..874e13b7d8f 100644 --- a/apps/browser/src/services/browser-state.service.spec.ts +++ b/apps/browser/src/platform/services/browser-state.service.spec.ts @@ -1,21 +1,21 @@ import { mock, MockProxy } from "jest-mock-extended"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { AbstractMemoryStorageService, AbstractStorageService, -} from "@bitwarden/common/abstractions/storage.service"; -import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { GlobalState } from "@bitwarden/common/models/domain/global-state"; -import { State } from "@bitwarden/common/models/domain/state"; -import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service"; +} from "@bitwarden/common/platform/abstractions/storage.service"; +import { StateFactory } from "@bitwarden/common/platform/factories/state-factory"; +import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; +import { State } from "@bitwarden/common/platform/models/domain/state"; +import { StateMigrationService } from "@bitwarden/common/platform/services/state-migration.service"; import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; -import { Account } from "../models/account"; -import { BrowserComponentState } from "../models/browserComponentState"; -import { BrowserGroupingsComponentState } from "../models/browserGroupingsComponentState"; -import { BrowserSendComponentState } from "../models/browserSendComponentState"; +import { Account } from "../../models/account"; +import { BrowserComponentState } from "../../models/browserComponentState"; +import { BrowserGroupingsComponentState } from "../../models/browserGroupingsComponentState"; +import { BrowserSendComponentState } from "../../models/browserSendComponentState"; import { BrowserStateService } from "./browser-state.service"; diff --git a/apps/browser/src/services/browser-state.service.ts b/apps/browser/src/platform/services/browser-state.service.ts similarity index 89% rename from apps/browser/src/services/browser-state.service.ts rename to apps/browser/src/platform/services/browser-state.service.ts index 3efd6e2edc5..37f50d6dc77 100644 --- a/apps/browser/src/services/browser-state.service.ts +++ b/apps/browser/src/platform/services/browser-state.service.ts @@ -1,14 +1,14 @@ import { BehaviorSubject } from "rxjs"; -import { GlobalState } from "@bitwarden/common/models/domain/global-state"; -import { StorageOptions } from "@bitwarden/common/models/domain/storage-options"; -import { StateService as BaseStateService } from "@bitwarden/common/services/state.service"; +import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; +import { StorageOptions } from "@bitwarden/common/platform/models/domain/storage-options"; +import { StateService as BaseStateService } from "@bitwarden/common/platform/services/state.service"; +import { Account } from "../../models/account"; +import { BrowserComponentState } from "../../models/browserComponentState"; +import { BrowserGroupingsComponentState } from "../../models/browserGroupingsComponentState"; +import { BrowserSendComponentState } from "../../models/browserSendComponentState"; import { browserSession, sessionSync } from "../decorators/session-sync-observable"; -import { Account } from "../models/account"; -import { BrowserComponentState } from "../models/browserComponentState"; -import { BrowserGroupingsComponentState } from "../models/browserGroupingsComponentState"; -import { BrowserSendComponentState } from "../models/browserSendComponentState"; import { BrowserStateService as StateServiceAbstraction } from "./abstractions/browser-state.service"; diff --git a/apps/browser/src/services/i18n.service.ts b/apps/browser/src/platform/services/i18n.service.ts similarity index 98% rename from apps/browser/src/services/i18n.service.ts rename to apps/browser/src/platform/services/i18n.service.ts index eddd2559a1a..1badfdb7cb2 100644 --- a/apps/browser/src/services/i18n.service.ts +++ b/apps/browser/src/platform/services/i18n.service.ts @@ -1,4 +1,4 @@ -import { I18nService as BaseI18nService } from "@bitwarden/common/services/i18n.service"; +import { I18nService as BaseI18nService } from "@bitwarden/common/platform/services/i18n.service"; export default class I18nService extends BaseI18nService { constructor(systemLanguage: string) { diff --git a/apps/browser/src/services/keyGeneration.service.ts b/apps/browser/src/platform/services/key-generation.service.ts similarity index 70% rename from apps/browser/src/services/keyGeneration.service.ts rename to apps/browser/src/platform/services/key-generation.service.ts index 0dbb1e81225..b2c76e1aee2 100644 --- a/apps/browser/src/services/keyGeneration.service.ts +++ b/apps/browser/src/platform/services/key-generation.service.ts @@ -1,7 +1,7 @@ -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; +import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; +import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; -import { AbstractKeyGenerationService } from "./abstractions/abstractKeyGeneration.service"; +import { AbstractKeyGenerationService } from "./abstractions/abstract-key-generation.service"; export class KeyGenerationService implements AbstractKeyGenerationService { constructor(private cryptoFunctionService: CryptoFunctionService) {} diff --git a/apps/browser/src/services/localBackedSessionStorage.service.spec.ts b/apps/browser/src/platform/services/local-backed-session-storage.service.spec.ts similarity index 94% rename from apps/browser/src/services/localBackedSessionStorage.service.spec.ts rename to apps/browser/src/platform/services/local-backed-session-storage.service.spec.ts index b5f80d4fee1..d2da5f6fc1a 100644 --- a/apps/browser/src/services/localBackedSessionStorage.service.spec.ts +++ b/apps/browser/src/platform/services/local-backed-session-storage.service.spec.ts @@ -1,15 +1,15 @@ // eslint-disable-next-line no-restricted-imports import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute"; -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 { EncryptServiceImplementation } from "@bitwarden/common/services/cryptography/encrypt.service.implementation"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; +import { EncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/encrypt.service.implementation"; -import BrowserLocalStorageService from "./browserLocalStorage.service"; -import BrowserMemoryStorageService from "./browserMemoryStorage.service"; -import { KeyGenerationService } from "./keyGeneration.service"; -import { LocalBackedSessionStorageService } from "./localBackedSessionStorage.service"; +import BrowserLocalStorageService from "./browser-local-storage.service"; +import BrowserMemoryStorageService from "./browser-memory-storage.service"; +import { KeyGenerationService } from "./key-generation.service"; +import { LocalBackedSessionStorageService } from "./local-backed-session-storage.service"; describe("Browser Session Storage Service", () => { let encryptService: SubstituteOf; diff --git a/apps/browser/src/services/localBackedSessionStorage.service.ts b/apps/browser/src/platform/services/local-backed-session-storage.service.ts similarity index 88% rename from apps/browser/src/services/localBackedSessionStorage.service.ts rename to apps/browser/src/platform/services/local-backed-session-storage.service.ts index 662a431b797..6c44adabccc 100644 --- a/apps/browser/src/services/localBackedSessionStorage.service.ts +++ b/apps/browser/src/platform/services/local-backed-session-storage.service.ts @@ -1,17 +1,17 @@ import { Jsonify } from "type-fest"; -import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; -import { AbstractMemoryStorageService } from "@bitwarden/common/abstractions/storage.service"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { MemoryStorageOptions } from "@bitwarden/common/models/domain/storage-options"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; +import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service"; +import { AbstractMemoryStorageService } from "@bitwarden/common/platform/abstractions/storage.service"; +import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; +import { MemoryStorageOptions } from "@bitwarden/common/platform/models/domain/storage-options"; +import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; import { devFlag } from "../decorators/dev-flag.decorator"; import { devFlagEnabled } from "../flags"; -import { AbstractKeyGenerationService } from "./abstractions/abstractKeyGeneration.service"; -import BrowserLocalStorageService from "./browserLocalStorage.service"; -import BrowserMemoryStorageService from "./browserMemoryStorage.service"; +import { AbstractKeyGenerationService } from "./abstractions/abstract-key-generation.service"; +import BrowserLocalStorageService from "./browser-local-storage.service"; +import BrowserMemoryStorageService from "./browser-memory-storage.service"; const keys = { encKey: "localEncryptionKey", diff --git a/apps/browser/src/popup/app.component.ts b/apps/browser/src/popup/app.component.ts index d9dc602a0cc..485b283407e 100644 --- a/apps/browser/src/popup/app.component.ts +++ b/apps/browser/src/popup/app.component.ts @@ -13,14 +13,14 @@ import { filter, concatMap, Subject, takeUntil } from "rxjs"; import Swal from "sweetalert2"; import { DialogServiceAbstraction, SimpleDialogOptions } from "@bitwarden/angular/services/dialog"; -import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; +import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { BrowserApi } from "../browser/browserApi"; -import { BrowserStateService } from "../services/abstractions/browser-state.service"; +import { BrowserApi } from "../platform/browser/browser-api"; +import { BrowserStateService } from "../platform/services/abstractions/browser-state.service"; import { routerTransition } from "./app-routing.animations"; diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts index 3b8501be447..d48465b0a47 100644 --- a/apps/browser/src/popup/app.module.ts +++ b/apps/browser/src/popup/app.module.ts @@ -74,7 +74,7 @@ import { VaultTimeoutInputComponent } from "./settings/vault-timeout-input.compo import { TabsComponent } from "./tabs.component"; // Register the locales for the application -import "./locales"; +import "../platform/popup/locales"; @NgModule({ imports: [ diff --git a/apps/browser/src/popup/components/pop-out.component.ts b/apps/browser/src/popup/components/pop-out.component.ts index f3cf66c13f0..b8675ec4d4c 100644 --- a/apps/browser/src/popup/components/pop-out.component.ts +++ b/apps/browser/src/popup/components/pop-out.component.ts @@ -1,6 +1,6 @@ import { Component, Input, OnInit } from "@angular/core"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { PopupUtilsService } from "../services/popup-utils.service"; diff --git a/apps/browser/src/popup/main.ts b/apps/browser/src/popup/main.ts index 3103fa2d99c..0772f3c7f09 100644 --- a/apps/browser/src/popup/main.ts +++ b/apps/browser/src/popup/main.ts @@ -1,7 +1,7 @@ import { enableProdMode } from "@angular/core"; import { platformBrowserDynamic } from "@angular/platform-browser-dynamic"; -import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service"; +import BrowserPlatformUtilsService from "../platform/services/browser-platform-utils.service"; require("./scss/popup.scss"); diff --git a/apps/browser/src/popup/services/init.service.ts b/apps/browser/src/popup/services/init.service.ts index 8008f6c88ce..23ae6e8e892 100644 --- a/apps/browser/src/popup/services/init.service.ts +++ b/apps/browser/src/popup/services/init.service.ts @@ -1,11 +1,11 @@ import { Injectable } from "@angular/core"; import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService as LogServiceAbstraction } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; -import { BrowserStateService as StateServiceAbstraction } from "../../services/abstractions/browser-state.service"; +import { BrowserStateService as StateServiceAbstraction } from "../../platform/services/abstractions/browser-state.service"; import { PopupUtilsService } from "./popup-utils.service"; diff --git a/apps/browser/src/popup/services/popup-search.service.ts b/apps/browser/src/popup/services/popup-search.service.ts index 21b6e307959..43fbed055e8 100644 --- a/apps/browser/src/popup/services/popup-search.service.ts +++ b/apps/browser/src/popup/services/popup-search.service.ts @@ -1,5 +1,5 @@ -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service"; import { SearchService } from "@bitwarden/common/services/search.service"; export class PopupSearchService extends SearchService { diff --git a/apps/browser/src/popup/services/popup-utils.service.ts b/apps/browser/src/popup/services/popup-utils.service.ts index 62557bf9457..1ab80a4564d 100644 --- a/apps/browser/src/popup/services/popup-utils.service.ts +++ b/apps/browser/src/popup/services/popup-utils.service.ts @@ -1,7 +1,7 @@ import { Injectable } from "@angular/core"; import { fromEvent, Subscription } from "rxjs"; -import { BrowserApi } from "../../browser/browserApi"; +import { BrowserApi } from "../../platform/browser/browser-api"; @Injectable() export class PopupUtilsService { diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index 068ad9c8d76..d6fe3a22062 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/apps/browser/src/popup/services/services.module.ts @@ -8,34 +8,12 @@ import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services. import { ThemingService } from "@bitwarden/angular/services/theming/theming.service"; import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { AppIdService } from "@bitwarden/common/abstractions/appId.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { ConfigApiServiceAbstraction } from "@bitwarden/common/abstractions/config/config-api.service.abstraction"; -import { ConfigServiceAbstraction } from "@bitwarden/common/abstractions/config/config.service.abstraction"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; import { EventUploadService } from "@bitwarden/common/abstractions/event/event-upload.service"; -import { FileUploadService } from "@bitwarden/common/abstractions/file-upload/file-upload.service"; -import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; -import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstractions/log.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abstractions/search.service"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; -import { - StateService as BaseStateServiceAbstraction, - StateService, -} from "@bitwarden/common/abstractions/state.service"; -import { StateMigrationService } from "@bitwarden/common/abstractions/stateMigration.service"; -import { - AbstractMemoryStorageService, - AbstractStorageService, -} from "@bitwarden/common/abstractions/storage.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; @@ -56,10 +34,32 @@ import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; import { AuthService } from "@bitwarden/common/auth/services/auth.service"; import { LoginService } from "@bitwarden/common/auth/services/login.service"; -import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { GlobalState } from "@bitwarden/common/models/domain/global-state"; -import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; -import { ContainerService } from "@bitwarden/common/services/container.service"; +import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service"; +import { ConfigApiServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config-api.service.abstraction"; +import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction"; +import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service"; +import { FileUploadService } from "@bitwarden/common/platform/abstractions/file-upload/file-upload.service"; +import { I18nService as I18nServiceAbstraction } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService as LogServiceAbstraction } from "@bitwarden/common/platform/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateMigrationService } from "@bitwarden/common/platform/abstractions/state-migration.service"; +import { + StateService as BaseStateServiceAbstraction, + StateService, +} from "@bitwarden/common/platform/abstractions/state.service"; +import { + AbstractMemoryStorageService, + AbstractStorageService, +} from "@bitwarden/common/platform/abstractions/storage.service"; +import { StateFactory } from "@bitwarden/common/platform/factories/state-factory"; +import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; +import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service"; +import { ContainerService } from "@bitwarden/common/platform/services/container.service"; import { SearchService } from "@bitwarden/common/services/search.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { UsernameGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/username"; @@ -86,18 +86,18 @@ import { BrowserPolicyService } from "../../admin-console/services/browser-polic import { LockGuardService, UnauthGuardService } from "../../auth/popup/services"; import { AutofillService } from "../../autofill/services/abstractions/autofill.service"; import MainBackground from "../../background/main.background"; -import { BrowserApi } from "../../browser/browserApi"; import { Account } from "../../models/account"; -import { BrowserStateService as StateServiceAbstraction } from "../../services/abstractions/browser-state.service"; -import { BrowserConfigService } from "../../services/browser-config.service"; -import { BrowserEnvironmentService } from "../../services/browser-environment.service"; -import { BrowserI18nService } from "../../services/browser-i18n.service"; +import { BrowserApi } from "../../platform/browser/browser-api"; +import { BrowserStateService as StateServiceAbstraction } from "../../platform/services/abstractions/browser-state.service"; +import { BrowserConfigService } from "../../platform/services/browser-config.service"; +import { BrowserEnvironmentService } from "../../platform/services/browser-environment.service"; +import { BrowserFileDownloadService } from "../../platform/services/browser-file-download.service"; +import { BrowserI18nService } from "../../platform/services/browser-i18n.service"; +import BrowserMessagingPrivateModePopupService from "../../platform/services/browser-messaging-private-mode-popup.service"; +import BrowserMessagingService from "../../platform/services/browser-messaging.service"; +import { BrowserStateService } from "../../platform/services/browser-state.service"; import { BrowserSendService } from "../../services/browser-send.service"; import { BrowserSettingsService } from "../../services/browser-settings.service"; -import { BrowserStateService } from "../../services/browser-state.service"; -import { BrowserFileDownloadService } from "../../services/browserFileDownloadService"; -import BrowserMessagingService from "../../services/browserMessaging.service"; -import BrowserMessagingPrivateModePopupService from "../../services/browserMessagingPrivateModePopup.service"; import { PasswordRepromptService } from "../../vault/popup/services/password-reprompt.service"; import { BrowserFolderService } from "../../vault/services/browser-folder.service"; import { VaultFilterService } from "../../vault/services/vault-filter.service"; diff --git a/apps/browser/src/popup/settings/about.component.ts b/apps/browser/src/popup/settings/about.component.ts index 338a00e2685..459dd7850fa 100644 --- a/apps/browser/src/popup/settings/about.component.ts +++ b/apps/browser/src/popup/settings/about.component.ts @@ -1,11 +1,11 @@ import { Component } from "@angular/core"; import { Observable } from "rxjs"; -import { ConfigServiceAbstraction } from "@bitwarden/common/abstractions/config/config.service.abstraction"; -import { ServerConfig } from "@bitwarden/common/abstractions/config/server-config"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; +import { ConfigServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config.service.abstraction"; +import { ServerConfig } from "@bitwarden/common/platform/abstractions/config/server-config"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; -import { BrowserApi } from "../../browser/browserApi"; +import { BrowserApi } from "../../platform/browser/browser-api"; @Component({ selector: "app-about", diff --git a/apps/browser/src/popup/settings/autofill.component.ts b/apps/browser/src/popup/settings/autofill.component.ts index 05975e60920..477c0592664 100644 --- a/apps/browser/src/popup/settings/autofill.component.ts +++ b/apps/browser/src/popup/settings/autofill.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit } from "@angular/core"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { UriMatchType } from "@bitwarden/common/enums"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; -import { BrowserApi } from "../../browser/browserApi"; +import { BrowserApi } from "../../platform/browser/browser-api"; @Component({ selector: "app-autofill", diff --git a/apps/browser/src/popup/settings/excluded-domains.component.ts b/apps/browser/src/popup/settings/excluded-domains.component.ts index 74c336ad85b..7adedd72240 100644 --- a/apps/browser/src/popup/settings/excluded-domains.component.ts +++ b/apps/browser/src/popup/settings/excluded-domains.component.ts @@ -1,13 +1,13 @@ import { Component, NgZone, OnDestroy, OnInit } from "@angular/core"; import { Router } from "@angular/router"; -import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; -import { BrowserApi } from "../../browser/browserApi"; +import { BrowserApi } from "../../platform/browser/browser-api"; interface ExcludedDomain { uri: string; diff --git a/apps/browser/src/popup/settings/folder-add-edit.component.ts b/apps/browser/src/popup/settings/folder-add-edit.component.ts index 92db7e4ba56..781dbff5721 100644 --- a/apps/browser/src/popup/settings/folder-add-edit.component.ts +++ b/apps/browser/src/popup/settings/folder-add-edit.component.ts @@ -4,9 +4,9 @@ import { first } from "rxjs/operators"; import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { FolderAddEditComponent as BaseFolderAddEditComponent } from "@bitwarden/angular/vault/components/folder-add-edit.component"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; diff --git a/apps/browser/src/popup/settings/help-and-feedback.component.ts b/apps/browser/src/popup/settings/help-and-feedback.component.ts index 006f76f48bc..0ff9887353c 100644 --- a/apps/browser/src/popup/settings/help-and-feedback.component.ts +++ b/apps/browser/src/popup/settings/help-and-feedback.component.ts @@ -1,6 +1,6 @@ import { Component } from "@angular/core"; -import { BrowserApi } from "../../browser/browserApi"; +import { BrowserApi } from "../../platform/browser/browser-api"; @Component({ selector: "app-help-and-feedback", diff --git a/apps/browser/src/popup/settings/options.component.ts b/apps/browser/src/popup/settings/options.component.ts index e5d7f4b80ed..b020816158c 100644 --- a/apps/browser/src/popup/settings/options.component.ts +++ b/apps/browser/src/popup/settings/options.component.ts @@ -1,12 +1,12 @@ import { Component, OnInit } from "@angular/core"; import { AbstractThemingService } from "@bitwarden/angular/services/theming/theming.service.abstraction"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { SettingsService } from "@bitwarden/common/abstractions/settings.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { ThemeType, UriMatchType } from "@bitwarden/common/enums"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; @Component({ selector: "app-options", diff --git a/apps/browser/src/popup/settings/premium.component.ts b/apps/browser/src/popup/settings/premium.component.ts index 63d45d79141..426347ada97 100644 --- a/apps/browser/src/popup/settings/premium.component.ts +++ b/apps/browser/src/popup/settings/premium.component.ts @@ -4,10 +4,10 @@ import { Component } from "@angular/core"; import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { PremiumComponent as BasePremiumComponent } from "@bitwarden/angular/vault/components/premium.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; @Component({ selector: "app-premium", diff --git a/apps/browser/src/popup/settings/settings.component.ts b/apps/browser/src/popup/settings/settings.component.ts index 383e18de292..562cf55f2da 100644 --- a/apps/browser/src/popup/settings/settings.component.ts +++ b/apps/browser/src/popup/settings/settings.component.ts @@ -6,12 +6,6 @@ import Swal from "sweetalert2"; import { DialogServiceAbstraction, SimpleDialogType } from "@bitwarden/angular/services/dialog"; import { ModalService } from "@bitwarden/angular/services/modal.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; @@ -19,9 +13,15 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { DeviceType } from "@bitwarden/common/enums"; import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; -import { BrowserApi } from "../../browser/browserApi"; import { BiometricErrors, BiometricErrorTypes } from "../../models/biometricErrors"; +import { BrowserApi } from "../../platform/browser/browser-api"; import { SetPinComponent } from "../components/set-pin.component"; import { PopupUtilsService } from "../services/popup-utils.service"; diff --git a/apps/browser/src/popup/settings/sync.component.ts b/apps/browser/src/popup/settings/sync.component.ts index 2ce6d2c27b3..ffc20363f71 100644 --- a/apps/browser/src/popup/settings/sync.component.ts +++ b/apps/browser/src/popup/settings/sync.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from "@angular/core"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Component({ diff --git a/apps/browser/src/services/browser-send.service.ts b/apps/browser/src/services/browser-send.service.ts index d937a1387fb..8a197444a98 100644 --- a/apps/browser/src/services/browser-send.service.ts +++ b/apps/browser/src/services/browser-send.service.ts @@ -4,7 +4,7 @@ import { Send } from "@bitwarden/common/tools/send/models/domain/send"; import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; import { SendService } from "@bitwarden/common/tools/send/services/send.service"; -import { browserSession, sessionSync } from "../decorators/session-sync-observable"; +import { browserSession, sessionSync } from "../platform/decorators/session-sync-observable"; @browserSession export class BrowserSendService extends SendService { diff --git a/apps/browser/src/services/browser-settings.service.ts b/apps/browser/src/services/browser-settings.service.ts index 0fc71eddc61..89378bcc745 100644 --- a/apps/browser/src/services/browser-settings.service.ts +++ b/apps/browser/src/services/browser-settings.service.ts @@ -1,9 +1,9 @@ import { BehaviorSubject } from "rxjs"; -import { AccountSettingsSettings } from "@bitwarden/common/models/domain/account"; +import { AccountSettingsSettings } from "@bitwarden/common/platform/models/domain/account"; import { SettingsService } from "@bitwarden/common/services/settings.service"; -import { browserSession, sessionSync } from "../decorators/session-sync-observable"; +import { browserSession, sessionSync } from "../platform/decorators/session-sync-observable"; @browserSession export class BrowserSettingsService extends SettingsService { diff --git a/apps/browser/src/tools/popup/generator/generator.component.ts b/apps/browser/src/tools/popup/generator/generator.component.ts index e869f6d7794..03d7442e6eb 100644 --- a/apps/browser/src/tools/popup/generator/generator.component.ts +++ b/apps/browser/src/tools/popup/generator/generator.component.ts @@ -3,10 +3,10 @@ import { Component } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { GeneratorComponent as BaseGeneratorComponent } from "@bitwarden/angular/tools/generator/components/generator.component"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { UsernameGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/username"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/apps/browser/src/tools/popup/generator/password-generator-history.component.ts b/apps/browser/src/tools/popup/generator/password-generator-history.component.ts index 18110fc5d96..fbe1ba10d33 100644 --- a/apps/browser/src/tools/popup/generator/password-generator-history.component.ts +++ b/apps/browser/src/tools/popup/generator/password-generator-history.component.ts @@ -2,8 +2,8 @@ import { Location } from "@angular/common"; import { Component } from "@angular/core"; import { PasswordGeneratorHistoryComponent as BasePasswordGeneratorHistoryComponent } from "@bitwarden/angular/tools/generator/components/password-generator-history.component"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; @Component({ diff --git a/apps/browser/src/tools/popup/send/efflux-dates.component.ts b/apps/browser/src/tools/popup/send/efflux-dates.component.ts index 0578cce2dda..3d575b41fa7 100644 --- a/apps/browser/src/tools/popup/send/efflux-dates.component.ts +++ b/apps/browser/src/tools/popup/send/efflux-dates.component.ts @@ -3,8 +3,8 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; import { ControlContainer, NgForm } from "@angular/forms"; import { EffluxDatesComponent as BaseEffluxDatesComponent } from "@bitwarden/angular/tools/send/efflux-dates.component"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; @Component({ selector: "app-send-efflux-dates", diff --git a/apps/browser/src/tools/popup/send/send-add-edit.component.ts b/apps/browser/src/tools/popup/send/send-add-edit.component.ts index 8a45d39dcc8..aaf951e036f 100644 --- a/apps/browser/src/tools/popup/send/send-add-edit.component.ts +++ b/apps/browser/src/tools/popup/send/send-add-edit.component.ts @@ -5,17 +5,17 @@ import { first } from "rxjs/operators"; import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/tools/send/add-edit.component"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; +import { BrowserStateService } from "../../../platform/services/abstractions/browser-state.service"; import { PopupUtilsService } from "../../../popup/services/popup-utils.service"; -import { BrowserStateService } from "../../../services/abstractions/browser-state.service"; @Component({ selector: "app-send-add-edit", diff --git a/apps/browser/src/tools/popup/send/send-groupings.component.ts b/apps/browser/src/tools/popup/send/send-groupings.component.ts index 8c84df39768..596d6e5ed35 100644 --- a/apps/browser/src/tools/popup/send/send-groupings.component.ts +++ b/apps/browser/src/tools/popup/send/send-groupings.component.ts @@ -3,13 +3,13 @@ import { Router } from "@angular/router"; import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { SendComponent as BaseSendComponent } from "@bitwarden/angular/tools/send/send.component"; -import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; @@ -17,8 +17,8 @@ import { SendService } from "@bitwarden/common/tools/send/services/send.service. import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { BrowserSendComponentState } from "../../../models/browserSendComponentState"; +import { BrowserStateService } from "../../../platform/services/abstractions/browser-state.service"; import { PopupUtilsService } from "../../../popup/services/popup-utils.service"; -import { BrowserStateService } from "../../../services/abstractions/browser-state.service"; const ComponentId = "SendComponent"; diff --git a/apps/browser/src/tools/popup/send/send-type.component.ts b/apps/browser/src/tools/popup/send/send-type.component.ts index f7637070413..c76561586d0 100644 --- a/apps/browser/src/tools/popup/send/send-type.component.ts +++ b/apps/browser/src/tools/popup/send/send-type.component.ts @@ -5,21 +5,21 @@ import { first } from "rxjs/operators"; import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { SendComponent as BaseSendComponent } from "@bitwarden/angular/tools/send/send.component"; -import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; import { BrowserComponentState } from "../../../models/browserComponentState"; +import { BrowserStateService } from "../../../platform/services/abstractions/browser-state.service"; import { PopupUtilsService } from "../../../popup/services/popup-utils.service"; -import { BrowserStateService } from "../../../services/abstractions/browser-state.service"; const ComponentId = "SendTypeComponent"; diff --git a/apps/browser/src/tools/popup/settings/export.component.ts b/apps/browser/src/tools/popup/settings/export.component.ts index c4deb89fcfc..e21f3b9bd48 100644 --- a/apps/browser/src/tools/popup/settings/export.component.ts +++ b/apps/browser/src/tools/popup/settings/export.component.ts @@ -4,14 +4,14 @@ import { Router } from "@angular/router"; import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { ExportComponent as BaseExportComponent } from "@bitwarden/angular/tools/export/components/export.component"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { VaultExportServiceAbstraction } from "@bitwarden/exporter/vault-export"; @Component({ diff --git a/apps/browser/src/vault/background/service_factories/cipher-service.factory.ts b/apps/browser/src/vault/background/service_factories/cipher-service.factory.ts index 24cc6f2f89a..006daadc1af 100644 --- a/apps/browser/src/vault/background/service_factories/cipher-service.factory.ts +++ b/apps/browser/src/vault/background/service_factories/cipher-service.factory.ts @@ -1,43 +1,43 @@ import { CipherService as AbstractCipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherService } from "@bitwarden/common/vault/services/cipher.service"; -import { - apiServiceFactory, - ApiServiceInitOptions, -} from "../../../background/service_factories/api-service.factory"; import { CipherFileUploadServiceInitOptions, cipherFileUploadServiceFactory, -} from "../../../background/service_factories/cipher-file-upload-service.factory"; +} from "../../../background/service-factories/cipher-file-upload-service.factory"; +import { + searchServiceFactory, + SearchServiceInitOptions, +} from "../../../background/service-factories/search-service.factory"; +import { + SettingsServiceInitOptions, + settingsServiceFactory, +} from "../../../background/service-factories/settings-service.factory"; +import { + apiServiceFactory, + ApiServiceInitOptions, +} from "../../../platform/background/service-factories/api-service.factory"; import { - cryptoServiceFactory, CryptoServiceInitOptions, -} from "../../../background/service_factories/crypto-service.factory"; + cryptoServiceFactory, +} from "../../../platform/background/service-factories/crypto-service.factory"; import { - encryptServiceFactory, EncryptServiceInitOptions, -} from "../../../background/service_factories/encrypt-service.factory"; + encryptServiceFactory, +} from "../../../platform/background/service-factories/encrypt-service.factory"; import { CachedServices, factory, FactoryOptions, -} from "../../../background/service_factories/factory-options"; +} from "../../../platform/background/service-factories/factory-options"; import { i18nServiceFactory, I18nServiceInitOptions, -} from "../../../background/service_factories/i18n-service.factory"; -import { - searchServiceFactory, - SearchServiceInitOptions, -} from "../../../background/service_factories/search-service.factory"; -import { - SettingsServiceInitOptions, - settingsServiceFactory, -} from "../../../background/service_factories/settings-service.factory"; +} from "../../../platform/background/service-factories/i18n-service.factory"; import { stateServiceFactory, StateServiceInitOptions, -} from "../../../background/service_factories/state-service.factory"; +} from "../../../platform/background/service-factories/state-service.factory"; type CipherServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/vault/background/service_factories/folder-service.factory.ts b/apps/browser/src/vault/background/service_factories/folder-service.factory.ts index ba6cad613fc..b33c79a012b 100644 --- a/apps/browser/src/vault/background/service_factories/folder-service.factory.ts +++ b/apps/browser/src/vault/background/service_factories/folder-service.factory.ts @@ -1,22 +1,22 @@ import { FolderService as AbstractFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { - cryptoServiceFactory, CryptoServiceInitOptions, -} from "../../../background/service_factories/crypto-service.factory"; + cryptoServiceFactory, +} from "../../../platform/background/service-factories/crypto-service.factory"; import { CachedServices, factory, FactoryOptions, -} from "../../../background/service_factories/factory-options"; +} from "../../../platform/background/service-factories/factory-options"; import { i18nServiceFactory, I18nServiceInitOptions, -} from "../../../background/service_factories/i18n-service.factory"; +} from "../../../platform/background/service-factories/i18n-service.factory"; import { stateServiceFactory as stateServiceFactory, StateServiceInitOptions, -} from "../../../background/service_factories/state-service.factory"; +} from "../../../platform/background/service-factories/state-service.factory"; import { BrowserFolderService } from "../../services/browser-folder.service"; import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory"; diff --git a/apps/browser/src/vault/background/service_factories/sync-notifier-service.factory.ts b/apps/browser/src/vault/background/service_factories/sync-notifier-service.factory.ts index 78ebb0c7730..9e976b3bf75 100644 --- a/apps/browser/src/vault/background/service_factories/sync-notifier-service.factory.ts +++ b/apps/browser/src/vault/background/service_factories/sync-notifier-service.factory.ts @@ -5,7 +5,7 @@ import { FactoryOptions, CachedServices, factory, -} from "../../../background/service_factories/factory-options"; +} from "../../../platform/background/service-factories/factory-options"; type SyncNotifierServiceFactoryOptions = FactoryOptions; diff --git a/apps/browser/src/vault/popup/components/action-buttons.component.ts b/apps/browser/src/vault/popup/components/action-buttons.component.ts index fb6f7d78110..110e4ef32a5 100644 --- a/apps/browser/src/vault/popup/components/action-buttons.component.ts +++ b/apps/browser/src/vault/popup/components/action-buttons.component.ts @@ -1,11 +1,11 @@ import { Component, EventEmitter, Input, Output } from "@angular/core"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { EventType } from "@bitwarden/common/enums"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; diff --git a/apps/browser/src/vault/popup/components/vault/add-edit-custom-fields.component.ts b/apps/browser/src/vault/popup/components/vault/add-edit-custom-fields.component.ts index 517e5016c6f..6992455a8a6 100644 --- a/apps/browser/src/vault/popup/components/vault/add-edit-custom-fields.component.ts +++ b/apps/browser/src/vault/popup/components/vault/add-edit-custom-fields.component.ts @@ -2,7 +2,7 @@ import { Component } from "@angular/core"; import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "@bitwarden/angular/vault/components/add-edit-custom-fields.component"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @Component({ selector: "app-vault-add-edit-custom-fields", diff --git a/apps/browser/src/vault/popup/components/vault/add-edit.component.ts b/apps/browser/src/vault/popup/components/vault/add-edit.component.ts index 1c4dc5dadef..f6e8c1f03b6 100644 --- a/apps/browser/src/vault/popup/components/vault/add-edit.component.ts +++ b/apps/browser/src/vault/popup/components/vault/add-edit.component.ts @@ -7,14 +7,14 @@ import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/vault/components/add-edit.component"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; @@ -22,7 +22,7 @@ import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/pa import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; -import { BrowserApi } from "../../../../browser/browserApi"; +import { BrowserApi } from "../../../../platform/browser/browser-api"; import { PopupUtilsService } from "../../../../popup/services/popup-utils.service"; @Component({ diff --git a/apps/browser/src/vault/popup/components/vault/attachments.component.ts b/apps/browser/src/vault/popup/components/vault/attachments.component.ts index 68f59def546..7c1107caa42 100644 --- a/apps/browser/src/vault/popup/components/vault/attachments.component.ts +++ b/apps/browser/src/vault/popup/components/vault/attachments.component.ts @@ -6,12 +6,12 @@ import { first } from "rxjs/operators"; import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/angular/vault/components/attachments.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ diff --git a/apps/browser/src/vault/popup/components/vault/collections.component.ts b/apps/browser/src/vault/popup/components/vault/collections.component.ts index 3f61c1f23ff..1b7570eaf6e 100644 --- a/apps/browser/src/vault/popup/components/vault/collections.component.ts +++ b/apps/browser/src/vault/popup/components/vault/collections.component.ts @@ -4,10 +4,10 @@ import { ActivatedRoute } from "@angular/router"; import { first } from "rxjs/operators"; import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/admin-console/components/collections.component"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ diff --git a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts index 1a83142cf11..a48c7003759 100644 --- a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts +++ b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts @@ -3,13 +3,13 @@ import { Router } from "@angular/router"; import { Subject } from "rxjs"; import { debounceTime, takeUntil } from "rxjs/operators"; -import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @@ -18,7 +18,7 @@ import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { AutofillService } from "../../../../autofill/services/abstractions/autofill.service"; -import { BrowserApi } from "../../../../browser/browserApi"; +import { BrowserApi } from "../../../../platform/browser/browser-api"; import { PopupUtilsService } from "../../../../popup/services/popup-utils.service"; import { VaultFilterService } from "../../../services/vault-filter.service"; diff --git a/apps/browser/src/vault/popup/components/vault/password-history.component.ts b/apps/browser/src/vault/popup/components/vault/password-history.component.ts index 44c5d683b83..1dd7697a7d5 100644 --- a/apps/browser/src/vault/popup/components/vault/password-history.component.ts +++ b/apps/browser/src/vault/popup/components/vault/password-history.component.ts @@ -4,8 +4,8 @@ import { ActivatedRoute } from "@angular/router"; import { first } from "rxjs/operators"; import { PasswordHistoryComponent as BasePasswordHistoryComponent } from "@bitwarden/angular/vault/components/password-history.component"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ diff --git a/apps/browser/src/vault/popup/components/vault/share.component.ts b/apps/browser/src/vault/popup/components/vault/share.component.ts index c7dde9ab78d..e6103b4f261 100644 --- a/apps/browser/src/vault/popup/components/vault/share.component.ts +++ b/apps/browser/src/vault/popup/components/vault/share.component.ts @@ -3,11 +3,11 @@ import { ActivatedRoute, Router } from "@angular/router"; import { first } from "rxjs/operators"; import { ShareComponent as BaseShareComponent } from "@bitwarden/angular/components/share.component"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ diff --git a/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts b/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts index a5eaa8bc383..1b41a9d0a1b 100644 --- a/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts +++ b/apps/browser/src/vault/popup/components/vault/vault-filter.component.ts @@ -5,22 +5,22 @@ import { firstValueFrom } from "rxjs"; import { first } from "rxjs/operators"; import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model"; -import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; +import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; -import { BrowserApi } from "../../../../browser/browserApi"; import { BrowserGroupingsComponentState } from "../../../../models/browserGroupingsComponentState"; +import { BrowserApi } from "../../../../platform/browser/browser-api"; +import { BrowserStateService } from "../../../../platform/services/abstractions/browser-state.service"; import { PopupUtilsService } from "../../../../popup/services/popup-utils.service"; -import { BrowserStateService } from "../../../../services/abstractions/browser-state.service"; import { VaultFilterService } from "../../../services/vault-filter.service"; const ComponentId = "VaultComponent"; diff --git a/apps/browser/src/vault/popup/components/vault/vault-items.component.ts b/apps/browser/src/vault/popup/components/vault/vault-items.component.ts index c3c6da6332a..1ce8b3ab41b 100644 --- a/apps/browser/src/vault/popup/components/vault/vault-items.component.ts +++ b/apps/browser/src/vault/popup/components/vault/vault-items.component.ts @@ -5,24 +5,24 @@ import { first } from "rxjs/operators"; import { VaultItemsComponent as BaseVaultItemsComponent } from "@bitwarden/angular/vault/components/vault-items.component"; import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model"; -import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { TreeNode } from "@bitwarden/common/models/domain/tree-node"; +import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; -import { BrowserApi } from "../../../../browser/browserApi"; import { BrowserComponentState } from "../../../../models/browserComponentState"; +import { BrowserApi } from "../../../../platform/browser/browser-api"; +import { BrowserStateService } from "../../../../platform/services/abstractions/browser-state.service"; import { PopupUtilsService } from "../../../../popup/services/popup-utils.service"; -import { BrowserStateService } from "../../../../services/abstractions/browser-state.service"; import { VaultFilterService } from "../../../services/vault-filter.service"; const ComponentId = "VaultItemsComponent"; diff --git a/apps/browser/src/vault/popup/components/vault/vault-select.component.ts b/apps/browser/src/vault/popup/components/vault/vault-select.component.ts index aea920ad2a1..c9049c6ee21 100644 --- a/apps/browser/src/vault/popup/components/vault/vault-select.component.ts +++ b/apps/browser/src/vault/popup/components/vault/vault-select.component.ts @@ -15,11 +15,11 @@ import { } from "@angular/core"; import { BehaviorSubject, concatMap, map, merge, Observable, Subject, takeUntil } from "rxjs"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { VaultFilterService } from "../../../services/vault-filter.service"; diff --git a/apps/browser/src/vault/popup/components/vault/view.component.ts b/apps/browser/src/vault/popup/components/vault/view.component.ts index 237a4cfed21..efdb48b95cd 100644 --- a/apps/browser/src/vault/popup/components/vault/view.component.ts +++ b/apps/browser/src/vault/popup/components/vault/view.component.ts @@ -7,17 +7,17 @@ import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { ViewComponent as BaseViewComponent } from "@bitwarden/angular/vault/components/view.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; +import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; @@ -26,7 +26,7 @@ import { Cipher } from "@bitwarden/common/vault/models/domain/cipher"; import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; import { AutofillService } from "../../../../autofill/services/abstractions/autofill.service"; -import { BrowserApi } from "../../../../browser/browserApi"; +import { BrowserApi } from "../../../../platform/browser/browser-api"; import { PopupUtilsService } from "../../../../popup/services/popup-utils.service"; const BroadcasterSubscriptionId = "ChildViewComponent"; diff --git a/apps/browser/src/vault/services/browser-folder.service.ts b/apps/browser/src/vault/services/browser-folder.service.ts index ca7b57989ff..b86dd2d5f1f 100644 --- a/apps/browser/src/vault/services/browser-folder.service.ts +++ b/apps/browser/src/vault/services/browser-folder.service.ts @@ -4,7 +4,7 @@ import { Folder } from "@bitwarden/common/vault/models/domain/folder"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { FolderService as BaseFolderService } from "@bitwarden/common/vault/services/folder/folder.service"; -import { browserSession, sessionSync } from "../../decorators/session-sync-observable"; +import { browserSession, sessionSync } from "../../platform/decorators/session-sync-observable"; @browserSession export class BrowserFolderService extends BaseFolderService { diff --git a/apps/browser/src/vault/services/vault-filter.service.ts b/apps/browser/src/vault/services/vault-filter.service.ts index 4b7c497fd48..4b8b9de7085 100644 --- a/apps/browser/src/vault/services/vault-filter.service.ts +++ b/apps/browser/src/vault/services/vault-filter.service.ts @@ -1,9 +1,9 @@ import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model"; import { VaultFilterService as BaseVaultFilterService } from "@bitwarden/angular/vault/vault-filter/services/vault-filter.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/apps/browser/store/locales/pt_PT/copy.resx b/apps/browser/store/locales/pt_PT/copy.resx index 9fd0780a540..df8db70e3ee 100644 --- a/apps/browser/store/locales/pt_PT/copy.resx +++ b/apps/browser/store/locales/pt_PT/copy.resx @@ -155,21 +155,21 @@ Secure and share sensitive data within your Bitwarden Vault from any browser, mo Um gestor de palavras-passe seguro e gratuito para todos os seus dispositivos - Sincronize e acesse o seu cofre através de múltiplos dispositivos + Sincronize e aceda ao seu cofre através de vários dispositivos - Gira todas as suas credenciais e palavras-passe a partir de um cofre seguro + Gira todos os seus inícios de sessão e palavras-passe a partir de um cofre seguro - Rapidamente auto-preencha as suas credenciais dentro de qualquer website que visitar + Preencha rapidamente e de forma automática as suas credenciais de início de sessão em qualquer site que visite - O seu cofre é também convenientemente acessível a partir do menu de contexto de clique de lado direito do rato + O seu cofre também está convenientemente acessível a partir do menu do botão direito do rato - Gira automaticamente palvras-passe fortes, aleatórias e seguras + Gera automaticamente palavras-passe fortes, aleatórias e seguras - A sua informação é gerida com segurança utilizando encriptação AES-256 bits + As suas informações são geridas de forma segura utilizando a encriptação AES-256 bit diff --git a/apps/browser/tsconfig.json b/apps/browser/tsconfig.json index fa3df30d131..7744c082f17 100644 --- a/apps/browser/tsconfig.json +++ b/apps/browser/tsconfig.json @@ -20,5 +20,5 @@ "strictTemplates": true, "preserveWhitespaces": true }, - "include": ["src", "../../libs/common/src/services/**/*.worker.ts"] + "include": ["src", "../../libs/common/src/platform/services/**/*.worker.ts"] } diff --git a/apps/browser/webpack.config.js b/apps/browser/webpack.config.js index 546f2322b9a..992462b615d 100644 --- a/apps/browser/webpack.config.js +++ b/apps/browser/webpack.config.js @@ -148,7 +148,7 @@ const mainConfig = { "content/contextMenuHandler": "./src/autofill/content/context-menu-handler.ts", "content/message_handler": "./src/autofill/content/message_handler.ts", "notification/bar": "./src/autofill/notification/bar.ts", - "encrypt-worker": "../../libs/common/src/services/cryptography/encrypt.worker.ts", + "encrypt-worker": "../../libs/common/src/platform/services/cryptography/encrypt.worker.ts", }, optimization: { minimize: ENV !== "development", @@ -241,7 +241,7 @@ if (manifestVersion == 2) { // Manifest V2 uses Background Pages which requires a html page. mainConfig.plugins.push( new HtmlWebpackPlugin({ - template: "./src/background.html", + template: "./src/platform/background.html", filename: "background.html", chunks: ["vendor", "background"], }) @@ -249,7 +249,7 @@ if (manifestVersion == 2) { // Manifest V2 background pages can be run through the regular build pipeline. // Since it's a standard webpage. - mainConfig.entry.background = "./src/background.ts"; + mainConfig.entry.background = "./src/platform/background.ts"; configs.push(mainConfig); } else { @@ -264,7 +264,7 @@ if (manifestVersion == 2) { name: "background", mode: ENV, devtool: false, - entry: "./src/background.ts", + entry: "./src/platform/background.ts", target: "webworker", output: { filename: "background.js", diff --git a/apps/cli/package.json b/apps/cli/package.json index bd95a8461ca..d6577a9f337 100644 --- a/apps/cli/package.json +++ b/apps/cli/package.json @@ -1,7 +1,7 @@ { "name": "@bitwarden/cli", "description": "A secure and free password manager for all of your devices.", - "version": "2023.4.0", + "version": "2023.5.0", "keywords": [ "bitwarden", "password", @@ -48,7 +48,7 @@ }, "dependencies": { "@koa/multer": "3.0.2", - "@koa/router": "10.1.1", + "@koa/router": "12.0.0", "argon2": "0.30.3", "big-integer": "1.6.51", "browser-hrtime": "1.1.8", @@ -57,7 +57,7 @@ "form-data": "4.0.0", "https-proxy-agent": "5.0.1", "inquirer": "8.2.5", - "jsdom": "22.0.0", + "jsdom": "22.1.0", "jszip": "3.10.1", "koa": "2.14.2", "koa-bodyparser": "4.4.0", diff --git a/apps/cli/src/admin-console/commands/confirm.command.ts b/apps/cli/src/admin-console/commands/confirm.command.ts index c91af4d6683..912c8417753 100644 --- a/apps/cli/src/admin-console/commands/confirm.command.ts +++ b/apps/cli/src/admin-console/commands/confirm.command.ts @@ -1,8 +1,8 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationUserConfirmRequest } from "@bitwarden/common/abstractions/organization-user/requests"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { Response } from "../../models/response"; diff --git a/apps/cli/src/auth/commands/login.command.ts b/apps/cli/src/auth/commands/login.command.ts index 1a62543a1d1..b8d8d1335fd 100644 --- a/apps/cli/src/auth/commands/login.command.ts +++ b/apps/cli/src/auth/commands/login.command.ts @@ -6,11 +6,6 @@ import Separator from "inquirer/lib/objects/separator"; import { firstValueFrom } from "rxjs"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; @@ -30,10 +25,15 @@ import { PasswordRequest } from "@bitwarden/common/auth/models/request/password. import { TwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/two-factor-email.request"; import { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request/update-temp-password.request"; import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; -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 { ErrorResponse } from "@bitwarden/common/models/response/error.response"; +import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/cli/src/auth/commands/logout.command.ts b/apps/cli/src/auth/commands/logout.command.ts index a82edc62f9c..a2dce59da3f 100644 --- a/apps/cli/src/auth/commands/logout.command.ts +++ b/apps/cli/src/auth/commands/logout.command.ts @@ -1,5 +1,5 @@ -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { Response } from "../../models/response"; import { MessageResponse } from "../../models/response/message.response"; diff --git a/apps/cli/src/auth/commands/unlock.command.ts b/apps/cli/src/auth/commands/unlock.command.ts index bfe609f4f3a..30625672126 100644 --- a/apps/cli/src/auth/commands/unlock.command.ts +++ b/apps/cli/src/auth/commands/unlock.command.ts @@ -1,14 +1,14 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; import { SecretVerificationRequest } from "@bitwarden/common/auth/models/request/secret-verification.request"; import { HashPurpose } from "@bitwarden/common/enums"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; +import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { ConvertToKeyConnectorCommand } from "../../commands/convert-to-key-connector.command"; diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index b3696db0c23..956ae23b008 100644 --- a/apps/cli/src/bw.ts +++ b/apps/cli/src/bw.ts @@ -20,24 +20,24 @@ 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 { ClientType, KeySuffixOptions, LogLevelType } from "@bitwarden/common/enums"; -import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { Account } from "@bitwarden/common/models/domain/account"; -import { GlobalState } from "@bitwarden/common/models/domain/global-state"; -import { AppIdService } from "@bitwarden/common/services/appId.service"; +import { StateFactory } from "@bitwarden/common/platform/factories/state-factory"; +import { Account } from "@bitwarden/common/platform/models/domain/account"; +import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; +import { AppIdService } from "@bitwarden/common/platform/services/app-id.service"; +import { BroadcasterService } from "@bitwarden/common/platform/services/broadcaster.service"; +import { ContainerService } from "@bitwarden/common/platform/services/container.service"; +import { CryptoService } from "@bitwarden/common/platform/services/crypto.service"; +import { EncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/encrypt.service.implementation"; +import { EnvironmentService } from "@bitwarden/common/platform/services/environment.service"; +import { FileUploadService } from "@bitwarden/common/platform/services/file-upload/file-upload.service"; +import { MemoryStorageService } from "@bitwarden/common/platform/services/memory-storage.service"; +import { NoopMessagingService } from "@bitwarden/common/platform/services/noop-messaging.service"; +import { StateMigrationService } from "@bitwarden/common/platform/services/state-migration.service"; +import { StateService } from "@bitwarden/common/platform/services/state.service"; import { AuditService } from "@bitwarden/common/services/audit.service"; -import { BroadcasterService } from "@bitwarden/common/services/broadcaster.service"; -import { ContainerService } from "@bitwarden/common/services/container.service"; -import { CryptoService } from "@bitwarden/common/services/crypto.service"; -import { EncryptServiceImplementation } from "@bitwarden/common/services/cryptography/encrypt.service.implementation"; -import { EnvironmentService } from "@bitwarden/common/services/environment.service"; -import { FileUploadService } from "@bitwarden/common/services/file-upload/file-upload.service"; -import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; -import { NoopMessagingService } from "@bitwarden/common/services/noopMessaging.service"; import { OrganizationUserServiceImplementation } from "@bitwarden/common/services/organization-user/organization-user.service.implementation"; import { SearchService } from "@bitwarden/common/services/search.service"; import { SettingsService } from "@bitwarden/common/services/settings.service"; -import { StateService } from "@bitwarden/common/services/state.service"; -import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service"; import { TotpService } from "@bitwarden/common/services/totp.service"; import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service"; import { VaultTimeoutSettingsService } from "@bitwarden/common/services/vaultTimeout/vaultTimeoutSettings.service"; @@ -66,13 +66,13 @@ import { } from "@bitwarden/importer"; import { NodeCryptoFunctionService } from "@bitwarden/node/services/node-crypto-function.service"; +import { CliPlatformUtilsService } from "./platform/services/cli-platform-utils.service"; +import { ConsoleLogService } from "./platform/services/console-log.service"; +import { I18nService } from "./platform/services/i18n.service"; +import { LowdbStorageService } from "./platform/services/lowdb-storage.service"; +import { NodeApiService } from "./platform/services/node-api.service"; +import { NodeEnvSecureStorageService } from "./platform/services/node-env-secure-storage.service"; import { Program } from "./program"; -import { CliPlatformUtilsService } from "./services/cli-platform-utils.service"; -import { ConsoleLogService } from "./services/console-log.service"; -import { I18nService } from "./services/i18n.service"; -import { LowdbStorageService } from "./services/lowdb-storage.service"; -import { NodeApiService } from "./services/node-api.service"; -import { NodeEnvSecureStorageService } from "./services/node-env-secure-storage.service"; import { SendProgram } from "./tools/send/send.program"; import { VaultProgram } from "./vault.program"; diff --git a/apps/cli/src/commands/config.command.ts b/apps/cli/src/commands/config.command.ts index 9110b46bf29..bf3507ee3d0 100644 --- a/apps/cli/src/commands/config.command.ts +++ b/apps/cli/src/commands/config.command.ts @@ -1,6 +1,6 @@ import * as program from "commander"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; import { Response } from "../models/response"; import { MessageResponse } from "../models/response/message.response"; diff --git a/apps/cli/src/commands/convert-to-key-connector.command.ts b/apps/cli/src/commands/convert-to-key-connector.command.ts index d124fbfc67d..d3c7b5c3fc7 100644 --- a/apps/cli/src/commands/convert-to-key-connector.command.ts +++ b/apps/cli/src/commands/convert-to-key-connector.command.ts @@ -1,8 +1,8 @@ import * as inquirer from "inquirer"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { Response } from "../models/response"; diff --git a/apps/cli/src/commands/download.command.ts b/apps/cli/src/commands/download.command.ts index 8d7a6130c0d..5c3decc27d4 100644 --- a/apps/cli/src/commands/download.command.ts +++ b/apps/cli/src/commands/download.command.ts @@ -1,8 +1,8 @@ import * as fet from "node-fetch"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { EncArrayBuffer } from "@bitwarden/common/platform/models/domain/enc-array-buffer"; +import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; import { Response } from "../models/response"; import { FileResponse } from "../models/response/file.response"; diff --git a/apps/cli/src/commands/edit.command.ts b/apps/cli/src/commands/edit.command.ts index 29cccc6b430..e0b81e914ec 100644 --- a/apps/cli/src/commands/edit.command.ts +++ b/apps/cli/src/commands/edit.command.ts @@ -1,11 +1,11 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { CollectionRequest } from "@bitwarden/common/admin-console/models/request/collection.request"; import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request"; -import { Utils } from "@bitwarden/common/misc/utils"; import { CipherExport } from "@bitwarden/common/models/export/cipher.export"; import { CollectionExport } from "@bitwarden/common/models/export/collection.export"; import { FolderExport } from "@bitwarden/common/models/export/folder.export"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts index 6ffe432b187..5ef7e1e17db 100644 --- a/apps/cli/src/commands/get.command.ts +++ b/apps/cli/src/commands/get.command.ts @@ -1,15 +1,11 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; import { CardExport } from "@bitwarden/common/models/export/card.export"; import { CipherExport } from "@bitwarden/common/models/export/cipher.export"; import { CollectionExport } from "@bitwarden/common/models/export/collection.export"; @@ -20,6 +16,10 @@ import { LoginUriExport } from "@bitwarden/common/models/export/login-uri.export import { LoginExport } from "@bitwarden/common/models/export/login.export"; import { SecureNoteExport } from "@bitwarden/common/models/export/secure-note.export"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; diff --git a/apps/cli/src/commands/list.command.ts b/apps/cli/src/commands/list.command.ts index ade81aac024..59c2b92e74f 100644 --- a/apps/cli/src/commands/list.command.ts +++ b/apps/cli/src/commands/list.command.ts @@ -9,8 +9,8 @@ import { CollectionDetailsResponse as ApiCollectionDetailsResponse, CollectionResponse as ApiCollectionResponse, } from "@bitwarden/common/admin-console/models/response/collection.response"; -import { Utils } from "@bitwarden/common/misc/utils"; import { ListResponse as ApiListResponse } from "@bitwarden/common/models/response/list.response"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; diff --git a/apps/cli/src/commands/serve.command.ts b/apps/cli/src/commands/serve.command.ts index 81243cd4a49..92e8747bc33 100644 --- a/apps/cli/src/commands/serve.command.ts +++ b/apps/cli/src/commands/serve.command.ts @@ -6,7 +6,7 @@ import * as koaBodyParser from "koa-bodyparser"; import * as koaJson from "koa-json"; import { KeySuffixOptions } from "@bitwarden/common/enums"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { ConfirmCommand } from "../admin-console/commands/confirm.command"; import { ShareCommand } from "../admin-console/commands/share.command"; diff --git a/apps/cli/src/commands/status.command.ts b/apps/cli/src/commands/status.command.ts index b847ce389cd..b04a9dcb760 100644 --- a/apps/cli/src/commands/status.command.ts +++ b/apps/cli/src/commands/status.command.ts @@ -1,7 +1,7 @@ -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { Response } from "../models/response"; diff --git a/apps/cli/src/commands/update.command.ts b/apps/cli/src/commands/update.command.ts index 449afabbb55..b70c4abcc57 100644 --- a/apps/cli/src/commands/update.command.ts +++ b/apps/cli/src/commands/update.command.ts @@ -1,6 +1,6 @@ import * as fetch from "node-fetch"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { Response } from "../models/response"; import { MessageResponse } from "../models/response/message.response"; diff --git a/apps/cli/src/flags.ts b/apps/cli/src/platform/flags.ts similarity index 94% rename from apps/cli/src/flags.ts rename to apps/cli/src/platform/flags.ts index d8692db0871..4e31e39e998 100644 --- a/apps/cli/src/flags.ts +++ b/apps/cli/src/platform/flags.ts @@ -4,7 +4,7 @@ import { devFlagValue as baseDevFlagValue, SharedFlags, SharedDevFlags, -} from "@bitwarden/common/misc/flags"; +} from "@bitwarden/common/platform/misc/flags"; // required to avoid linting errors when there are no flags /* eslint-disable-next-line @typescript-eslint/ban-types */ diff --git a/apps/cli/src/services/cli-platform-utils.service.ts b/apps/cli/src/platform/services/cli-platform-utils.service.ts similarity index 96% rename from apps/cli/src/services/cli-platform-utils.service.ts rename to apps/cli/src/platform/services/cli-platform-utils.service.ts index b109610a4ae..e6e25e237b7 100644 --- a/apps/cli/src/services/cli-platform-utils.service.ts +++ b/apps/cli/src/platform/services/cli-platform-utils.service.ts @@ -1,7 +1,7 @@ import * as child_process from "child_process"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { ClientType, DeviceType } from "@bitwarden/common/enums"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; // eslint-disable-next-line const open = require("open"); diff --git a/apps/cli/src/services/console-log.service.spec.ts b/apps/cli/src/platform/services/console-log.service.spec.ts similarity index 100% rename from apps/cli/src/services/console-log.service.spec.ts rename to apps/cli/src/platform/services/console-log.service.spec.ts diff --git a/apps/cli/src/services/console-log.service.ts b/apps/cli/src/platform/services/console-log.service.ts similarity index 91% rename from apps/cli/src/services/console-log.service.ts rename to apps/cli/src/platform/services/console-log.service.ts index 4fe4d61e7f9..cf3aec036ff 100644 --- a/apps/cli/src/services/console-log.service.ts +++ b/apps/cli/src/platform/services/console-log.service.ts @@ -1,5 +1,5 @@ import { LogLevelType } from "@bitwarden/common/enums"; -import { ConsoleLogService as BaseConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; +import { ConsoleLogService as BaseConsoleLogService } from "@bitwarden/common/platform/services/console-log.service"; export class ConsoleLogService extends BaseConsoleLogService { constructor(isDev: boolean, filter: (level: LogLevelType) => boolean = null) { diff --git a/apps/cli/src/services/i18n.service.ts b/apps/cli/src/platform/services/i18n.service.ts similarity index 95% rename from apps/cli/src/services/i18n.service.ts rename to apps/cli/src/platform/services/i18n.service.ts index f3e6eabc609..276fa7ef9a9 100644 --- a/apps/cli/src/services/i18n.service.ts +++ b/apps/cli/src/platform/services/i18n.service.ts @@ -1,7 +1,7 @@ import * as fs from "fs"; import * as path from "path"; -import { I18nService as BaseI18nService } from "@bitwarden/common/services/i18n.service"; +import { I18nService as BaseI18nService } from "@bitwarden/common/platform/services/i18n.service"; export class I18nService extends BaseI18nService { constructor(systemLanguage: string, localesDirectory: string) { diff --git a/apps/cli/src/services/lowdb-storage.service.ts b/apps/cli/src/platform/services/lowdb-storage.service.ts similarity index 93% rename from apps/cli/src/services/lowdb-storage.service.ts rename to apps/cli/src/platform/services/lowdb-storage.service.ts index 6e096bd3c37..bd5895907c3 100644 --- a/apps/cli/src/services/lowdb-storage.service.ts +++ b/apps/cli/src/platform/services/lowdb-storage.service.ts @@ -6,11 +6,11 @@ import * as FileSync from "lowdb/adapters/FileSync"; import * as lock from "proper-lockfile"; import { OperationOptions } from "retry"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service"; import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; -import { sequentialize } from "@bitwarden/common/misc/sequentialize"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service"; +import { sequentialize } from "@bitwarden/common/platform/misc/sequentialize"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; const retries: OperationOptions = { retries: 50, diff --git a/apps/cli/src/services/node-api.service.ts b/apps/cli/src/platform/services/node-api.service.ts similarity index 80% rename from apps/cli/src/services/node-api.service.ts rename to apps/cli/src/platform/services/node-api.service.ts index 9a757afd25e..669a562d597 100644 --- a/apps/cli/src/services/node-api.service.ts +++ b/apps/cli/src/platform/services/node-api.service.ts @@ -2,10 +2,10 @@ import * as FormData from "form-data"; import { HttpsProxyAgent } from "https-proxy-agent"; import * as fe from "node-fetch"; -import { AppIdService } from "@bitwarden/common/abstractions/appId.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; +import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { ApiService } from "@bitwarden/common/services/api.service"; (global as any).fetch = fe.default; diff --git a/apps/cli/src/services/node-env-secure-storage.service.ts b/apps/cli/src/platform/services/node-env-secure-storage.service.ts similarity index 83% rename from apps/cli/src/services/node-env-secure-storage.service.ts rename to apps/cli/src/platform/services/node-env-secure-storage.service.ts index 2d1a8663eb8..80e3cea64c4 100644 --- a/apps/cli/src/services/node-env-secure-storage.service.ts +++ b/apps/cli/src/platform/services/node-env-secure-storage.service.ts @@ -1,9 +1,9 @@ -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { EncArrayBuffer } from "@bitwarden/common/models/domain/enc-array-buffer"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { EncArrayBuffer } from "@bitwarden/common/platform/models/domain/enc-array-buffer"; +import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; export class NodeEnvSecureStorageService implements AbstractStorageService { constructor( diff --git a/apps/cli/src/tools/export.command.ts b/apps/cli/src/tools/export.command.ts index 161086c2ea8..272901a34c9 100644 --- a/apps/cli/src/tools/export.command.ts +++ b/apps/cli/src/tools/export.command.ts @@ -3,7 +3,7 @@ import * as inquirer from "inquirer"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { ExportFormat, EXPORT_FORMATS, diff --git a/apps/cli/src/tools/generate.command.ts b/apps/cli/src/tools/generate.command.ts index c203c14ea8c..bd9ad88a04f 100644 --- a/apps/cli/src/tools/generate.command.ts +++ b/apps/cli/src/tools/generate.command.ts @@ -1,4 +1,4 @@ -import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { Response } from "../models/response"; diff --git a/apps/cli/src/tools/import.command.ts b/apps/cli/src/tools/import.command.ts index 3ee4ddae986..0080197aa74 100644 --- a/apps/cli/src/tools/import.command.ts +++ b/apps/cli/src/tools/import.command.ts @@ -2,6 +2,7 @@ import * as program from "commander"; import * as inquirer from "inquirer"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { ImportServiceAbstraction, ImportType } from "@bitwarden/importer"; import { Response } from "../models/response"; @@ -11,7 +12,8 @@ import { CliUtils } from "../utils"; export class ImportCommand { constructor( private importService: ImportServiceAbstraction, - private organizationService: OrganizationService + private organizationService: OrganizationService, + private syncService: SyncService ) {} async run( @@ -76,6 +78,7 @@ export class ImportCommand { const response = await this.importService.import(importer, contents, organizationId); if (response.success) { + this.syncService.fullSync(true); return Response.success(new MessageResponse("Imported " + filepath, null)); } } catch (err) { diff --git a/apps/cli/src/tools/send/commands/create.command.ts b/apps/cli/src/tools/send/commands/create.command.ts index 229babd5c26..54e8340bdbe 100644 --- a/apps/cli/src/tools/send/commands/create.command.ts +++ b/apps/cli/src/tools/send/commands/create.command.ts @@ -1,9 +1,9 @@ import * as fs from "fs"; import * as path from "path"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; diff --git a/apps/cli/src/tools/send/commands/edit.command.ts b/apps/cli/src/tools/send/commands/edit.command.ts index 2b4e6d23f9e..d17694f46df 100644 --- a/apps/cli/src/tools/send/commands/edit.command.ts +++ b/apps/cli/src/tools/send/commands/edit.command.ts @@ -1,4 +1,4 @@ -import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; diff --git a/apps/cli/src/tools/send/commands/get.command.ts b/apps/cli/src/tools/send/commands/get.command.ts index b92044ac4b1..4746e3dfe2d 100644 --- a/apps/cli/src/tools/send/commands/get.command.ts +++ b/apps/cli/src/tools/send/commands/get.command.ts @@ -1,9 +1,9 @@ import * as program from "commander"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; diff --git a/apps/cli/src/tools/send/commands/list.command.ts b/apps/cli/src/tools/send/commands/list.command.ts index d6fce941830..008c584388a 100644 --- a/apps/cli/src/tools/send/commands/list.command.ts +++ b/apps/cli/src/tools/send/commands/list.command.ts @@ -1,5 +1,5 @@ -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; import { SendService } from "@bitwarden/common/tools/send/services/send.service.abstraction"; import { Response } from "../../../models/response"; diff --git a/apps/cli/src/tools/send/commands/receive.command.ts b/apps/cli/src/tools/send/commands/receive.command.ts index 578f1d4695b..486afed2613 100644 --- a/apps/cli/src/tools/send/commands/receive.command.ts +++ b/apps/cli/src/tools/send/commands/receive.command.ts @@ -2,14 +2,14 @@ import * as program from "commander"; import * as inquirer from "inquirer"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; +import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; import { SendAccess } from "@bitwarden/common/tools/send/models/domain/send-access"; import { SendAccessRequest } from "@bitwarden/common/tools/send/models/request/send-access.request"; diff --git a/apps/cli/src/tools/send/models/send.response.ts b/apps/cli/src/tools/send/models/send.response.ts index 0615a73289a..c238663529c 100644 --- a/apps/cli/src/tools/send/models/send.response.ts +++ b/apps/cli/src/tools/send/models/send.response.ts @@ -1,4 +1,4 @@ -import { Utils } from "@bitwarden/common/misc/utils"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; import { SendView } from "@bitwarden/common/tools/send/models/view/send.view"; diff --git a/apps/cli/src/tools/send/send.program.ts b/apps/cli/src/tools/send/send.program.ts index 8d7921f8310..48aba023c10 100644 --- a/apps/cli/src/tools/send/send.program.ts +++ b/apps/cli/src/tools/send/send.program.ts @@ -4,7 +4,7 @@ import * as path from "path"; import * as chalk from "chalk"; import * as program from "commander"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { SendType } from "@bitwarden/common/tools/send/enums/send-type"; import { Main } from "../../bw"; diff --git a/apps/cli/src/utils.ts b/apps/cli/src/utils.ts index a2e9008239a..42f1482b694 100644 --- a/apps/cli/src/utils.ts +++ b/apps/cli/src/utils.ts @@ -4,11 +4,11 @@ import * as path from "path"; import * as inquirer from "inquirer"; import * as JSZip from "jszip"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; import { Response } from "./models/response"; diff --git a/apps/cli/src/vault.program.ts b/apps/cli/src/vault.program.ts index 767893d5eee..85f413a9feb 100644 --- a/apps/cli/src/vault.program.ts +++ b/apps/cli/src/vault.program.ts @@ -442,7 +442,11 @@ export class VaultProgram extends Program { }) .action(async (format, filepath, options) => { await this.exitIfLocked(); - const command = new ImportCommand(this.main.importService, this.main.organizationService); + const command = new ImportCommand( + this.main.importService, + this.main.organizationService, + this.main.syncService + ); const response = await command.run(format, filepath, options); this.processResponse(response); }); diff --git a/apps/cli/src/vault/create.command.ts b/apps/cli/src/vault/create.command.ts index f6ee54a32ff..d98221dc39c 100644 --- a/apps/cli/src/vault/create.command.ts +++ b/apps/cli/src/vault/create.command.ts @@ -2,14 +2,14 @@ import * as fs from "fs"; import * as path from "path"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { CollectionRequest } from "@bitwarden/common/admin-console/models/request/collection.request"; import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request"; -import { Utils } from "@bitwarden/common/misc/utils"; import { CipherExport } from "@bitwarden/common/models/export/cipher.export"; import { CollectionExport } from "@bitwarden/common/models/export/collection.export"; import { FolderExport } from "@bitwarden/common/models/export/folder.export"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; diff --git a/apps/cli/src/vault/delete.command.ts b/apps/cli/src/vault/delete.command.ts index cf952e3a681..12b8ae415f8 100644 --- a/apps/cli/src/vault/delete.command.ts +++ b/apps/cli/src/vault/delete.command.ts @@ -1,6 +1,6 @@ import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock index 468bdbc7b0e..09ffcd4fd9f 100644 --- a/apps/desktop/desktop_native/Cargo.lock +++ b/apps/desktop/desktop_native/Cargo.lock @@ -24,9 +24,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "autocfg" @@ -36,9 +36,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bitflags" @@ -294,6 +294,17 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.14", +] + [[package]] name = "futures-task" version = "0.3.28" @@ -307,6 +318,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-core", + "futures-macro", "futures-task", "pin-project-lite", "pin-utils", @@ -336,26 +348,29 @@ dependencies = [ [[package]] name = "gio" -version = "0.15.12" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +checksum = "d14522e56c6bcb6f7a3aebc25cbcfb06776af4c0c25232b601b4383252d7cb92" dependencies = [ "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", + "futures-util", "gio-sys", "glib", "libc", "once_cell", + "pin-project-lite", + "smallvec", "thiserror", ] [[package]] name = "gio-sys" -version = "0.15.10" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +checksum = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5" dependencies = [ "glib-sys", "gobject-sys", @@ -366,19 +381,22 @@ dependencies = [ [[package]] name = "glib" -version = "0.15.12" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +checksum = "a7f1de7cbde31ea4f0a919453a2dcece5d54d5b70e08f8ad254dc4840f5f09b6" dependencies = [ "bitflags 1.3.2", "futures-channel", "futures-core", "futures-executor", "futures-task", + "futures-util", + "gio-sys", "glib-macros", "glib-sys", "gobject-sys", "libc", + "memchr", "once_cell", "smallvec", "thiserror", @@ -386,9 +404,9 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.15.13" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" +checksum = "0a7206c5c03851ef126ea1444990e81fdd6765fb799d5bc694e4897ca01bb97f" dependencies = [ "anyhow", "heck", @@ -401,9 +419,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.15.10" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +checksum = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5" dependencies = [ "libc", "system-deps", @@ -411,9 +429,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.15.10" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +checksum = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0" dependencies = [ "glib-sys", "libc", @@ -500,9 +518,9 @@ dependencies = [ [[package]] name = "libsecret" -version = "0.1.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15ed5dab9789d9c4caedf88457214d822cfbad5562b63f6c8f61597501f6b8b" +checksum = "accb700635d0b1b296d83c93fa5d112400168d04481db0ccca946293af9f0206" dependencies = [ "bitflags 1.3.2", "gio", @@ -514,9 +532,9 @@ dependencies = [ [[package]] name = "libsecret-sys" -version = "0.1.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77abfe0fd35152462d1736d11f5c1ba381f74535171b2138fed1604bcb803d2b" +checksum = "2b06012ca123d27ccceffa112d0f930c23eb549a2447dc710e99f5dc2d1040b2" dependencies = [ "gio-sys", "glib-sys", @@ -569,14 +587,14 @@ dependencies = [ "libc", "log", "wasi", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] name = "napi" -version = "2.12.4" +version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556470a21074b55be8adee5f27ca04389cfdaca323a28b4b0e9c15466de94731" +checksum = "d7f0a2e93526dd9c8c522d72a4d0c88678be8966fabe9fb8f2947fde6339b682" dependencies = [ "bitflags 2.2.1", "ctor", @@ -594,10 +612,11 @@ checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e" [[package]] name = "napi-derive" -version = "2.12.3" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2ac63101a19228b0881694cac07468d642fd10e4f943a9c9feebeebf1a4787" +checksum = "da1c6a8fa84d549aa8708fcd062372bf8ec6e849de39016ab921067d21bde367" dependencies = [ + "cfg-if", "convert_case", "napi-derive-backend", "proc-macro2", @@ -607,9 +626,9 @@ dependencies = [ [[package]] name = "napi-derive-backend" -version = "1.0.49" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e32b5bc4d803e40b783b0aa3fe488eac8711cfaa4c5c9915293dfd3d0b99925" +checksum = "20bbc7c69168d06a848f925ec5f0e0997f98e8c8d4f2cc30157f0da51c009e17" dependencies = [ "convert_case", "once_cell", @@ -665,7 +684,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -823,9 +842,9 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" [[package]] name = "security-framework" -version = "2.8.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" +checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -836,9 +855,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" dependencies = [ "core-foundation-sys", "libc", @@ -976,9 +995,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.27.0" +version = "1.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" dependencies = [ "autocfg", "bytes", @@ -990,14 +1009,14 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", @@ -1135,6 +1154,15 @@ dependencies = [ "windows-targets 0.42.2", ] +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + [[package]] name = "windows-targets" version = "0.42.2" diff --git a/apps/desktop/desktop_native/Cargo.toml b/apps/desktop/desktop_native/Cargo.toml index f005ed9d50c..15b0cb632e0 100644 --- a/apps/desktop/desktop_native/Cargo.toml +++ b/apps/desktop/desktop_native/Cargo.toml @@ -14,17 +14,17 @@ manual_test = [] [dependencies] aes = "=0.8.2" -anyhow = "=1.0.70" -base64 = "=0.21.0" +anyhow = "=1.0.71" +base64 = "=0.21.2" cbc = { version = "=0.1.2", features = ["alloc"] } -napi = { version = "=2.12.4", features = ["async"] } -napi-derive = "=2.12.3" +napi = { version = "=2.13.1", features = ["async"] } +napi-derive = "=2.13.0" rand = "=0.8.5" retry = "=2.0.0" scopeguard = "=1.1.0" sha2 = "=0.10.6" thiserror = "=1.0.40" -tokio = { version = "=1.27.0", features = ["full"] } +tokio = { version = "=1.28.2", features = ["full"] } typenum = "=1.16.0" [build-dependencies] @@ -49,9 +49,9 @@ keytar = "=0.1.6" [target.'cfg(target_os = "macos")'.dependencies] core-foundation = "=0.9.3" -security-framework = "=2.8.2" -security-framework-sys = "=2.8.0" +security-framework = "=2.9.1" +security-framework-sys = "=2.9.0" [target.'cfg(target_os = "linux")'.dependencies] -gio = "=0.15.12" -libsecret = "=0.1.5" +gio = "=0.17.9" +libsecret = "=0.3.0" diff --git a/apps/desktop/desktop_native/package.json b/apps/desktop/desktop_native/package.json index c002255d9de..fe37602768e 100644 --- a/apps/desktop/desktop_native/package.json +++ b/apps/desktop/desktop_native/package.json @@ -11,7 +11,7 @@ "author": "", "license": "GPL-3.0", "devDependencies": { - "@napi-rs/cli": "2.15.2" + "@napi-rs/cli": "2.16.1" }, "napi": { "name": "desktop_native", diff --git a/apps/desktop/native-messaging-test-runner/package-lock.json b/apps/desktop/native-messaging-test-runner/package-lock.json index fa63ccf67fc..d90b46ea702 100644 --- a/apps/desktop/native-messaging-test-runner/package-lock.json +++ b/apps/desktop/native-messaging-test-runner/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@bitwarden/common": "file:../../../libs/common", "@bitwarden/node": "file:../../../libs/node", - "module-alias": "2.2.2", + "module-alias": "2.2.3", "node-ipc": "9.2.1", "ts-node": "10.9.1", "uuid": "8.3.2", @@ -19,7 +19,7 @@ }, "devDependencies": { "@tsconfig/node16": "1.0.4", - "@types/node": "18.16.14", + "@types/node": "18.16.16", "@types/node-ipc": "9.2.0", "typescript": "4.7.4" } @@ -99,9 +99,9 @@ "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==" }, "node_modules/@types/node": { - "version": "18.16.14", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.14.tgz", - "integrity": "sha512-+ImzUB3mw2c5ISJUq0punjDilUQ5GnUim0ZRvchHIWJmOC0G+p0kzhXBqj6cDjK0QdPFwzrHWgrJp3RPvCG5qg==" + "version": "18.16.16", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.16.16.tgz", + "integrity": "sha512-NpaM49IGQQAUlBhHMF82QH80J08os4ZmyF9MkpCzWAGuOHqE4gTEbhzd7L3l5LmWuZ6E0OiC1FweQ4tsiW35+g==" }, "node_modules/@types/node-ipc": { "version": "9.2.0", @@ -270,9 +270,9 @@ "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==" }, "node_modules/module-alias": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.2.tgz", - "integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==" + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.3.tgz", + "integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==" }, "node_modules/node-ipc": { "version": "9.2.1", diff --git a/apps/desktop/native-messaging-test-runner/package.json b/apps/desktop/native-messaging-test-runner/package.json index 310cc62f075..70e69fd51ae 100644 --- a/apps/desktop/native-messaging-test-runner/package.json +++ b/apps/desktop/native-messaging-test-runner/package.json @@ -16,7 +16,7 @@ "dependencies": { "@bitwarden/common": "file:../../../libs/common", "@bitwarden/node": "file:../../../libs/node", - "module-alias": "2.2.2", + "module-alias": "2.2.3", "node-ipc": "9.2.1", "ts-node": "10.9.1", "uuid": "8.3.2", @@ -24,7 +24,7 @@ }, "devDependencies": { "@tsconfig/node16": "1.0.4", - "@types/node": "18.16.14", + "@types/node": "18.16.16", "@types/node-ipc": "9.2.0", "typescript": "4.7.4" }, diff --git a/apps/desktop/native-messaging-test-runner/src/native-message.service.ts b/apps/desktop/native-messaging-test-runner/src/native-message.service.ts index 8ba6526384e..a6a535a73d0 100644 --- a/apps/desktop/native-messaging-test-runner/src/native-message.service.ts +++ b/apps/desktop/native-messaging-test-runner/src/native-message.service.ts @@ -2,11 +2,11 @@ import "module-alias/register"; import { v4 as uuidv4 } from "uuid"; -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 { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; -import { EncryptServiceImplementation } from "@bitwarden/common/services/cryptography/encrypt.service.implementation"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; +import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service"; +import { EncryptServiceImplementation } from "@bitwarden/common/platform/services/cryptography/encrypt.service.implementation"; import { NodeCryptoFunctionService } from "@bitwarden/node/services/node-crypto-function.service"; import { DecryptedCommandData } from "../../src/models/native-messaging/decrypted-command-data"; diff --git a/apps/desktop/package.json b/apps/desktop/package.json index e9625ab83d6..5b04709763b 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -1,7 +1,7 @@ { "name": "@bitwarden/desktop", "description": "A secure and free password manager for all of your devices.", - "version": "2023.4.1", + "version": "2023.5.1", "keywords": [ "bitwarden", "password", diff --git a/apps/desktop/src/admin-console/vault-filters/collection-filter.component.html b/apps/desktop/src/admin-console/vault-filters/collection-filter.component.html index bf4422a8a17..28c815d8371 100644 --- a/apps/desktop/src/admin-console/vault-filters/collection-filter.component.html +++ b/apps/desktop/src/admin-console/vault-filters/collection-filter.component.html @@ -51,6 +51,7 @@ class="filter-button" (click)="applyFilter(c.node)" [attr.aria-pressed]="c.node.id === activeFilter.selectedCollectionId" + [title]="c.node.name" > { this.ngZone.run(() => { switch (message.command) { @@ -151,7 +151,7 @@ export class LoginComponent extends BaseLoginComponent implements OnDestroy { // eslint-disable-next-line rxjs/no-async-subscribe childComponent.onSaved.pipe(takeUntil(this.componentDestroyed$)).subscribe(async () => { modal.close(); - await this.checkSelfHosted(); + await this.getLoginWithDevice(this.loggedEmail); }); } @@ -188,10 +188,4 @@ export class LoginComponent extends BaseLoginComponent implements OnDestroy { const email = this.loggedEmail; document.getElementById(email == null || email === "" ? "email" : "masterPassword").focus(); } - - private async checkSelfHosted() { - this.selfHosted = this.environmentService.isSelfHosted(); - - await this.getLoginWithDevice(this.loggedEmail); - } } diff --git a/apps/desktop/src/auth/register.component.ts b/apps/desktop/src/auth/register.component.ts index 5e6b0b16778..6cf46de7c70 100644 --- a/apps/desktop/src/auth/register.component.ts +++ b/apps/desktop/src/auth/register.component.ts @@ -6,15 +6,15 @@ import { RegisterComponent as BaseRegisterComponent } from "@bitwarden/angular/c import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { FormValidationErrorsService } from "@bitwarden/common/abstractions/formValidationErrors.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; +import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { FormValidationErrorsService } from "@bitwarden/common/platform/abstractions/form-validation-errors.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; const BroadcasterSubscriptionId = "RegisterComponent"; diff --git a/apps/desktop/src/auth/set-password.component.ts b/apps/desktop/src/auth/set-password.component.ts index d7a7c8d699d..b710e96b7ee 100644 --- a/apps/desktop/src/auth/set-password.component.ts +++ b/apps/desktop/src/auth/set-password.component.ts @@ -4,16 +4,16 @@ import { ActivatedRoute, Router } from "@angular/router"; import { SetPasswordComponent as BaseSetPasswordComponent } from "@bitwarden/angular/components/set-password.component"; import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/desktop/src/auth/sso.component.ts b/apps/desktop/src/auth/sso.component.ts index b56fc663a41..75f380b0ed3 100644 --- a/apps/desktop/src/auth/sso.component.ts +++ b/apps/desktop/src/auth/sso.component.ts @@ -3,13 +3,13 @@ import { ActivatedRoute, Router } from "@angular/router"; import { SsoComponent as BaseSsoComponent } from "@bitwarden/angular/auth/components/sso.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; +import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; diff --git a/apps/desktop/src/auth/two-factor-options.component.ts b/apps/desktop/src/auth/two-factor-options.component.ts index 514994f7537..5743711e831 100644 --- a/apps/desktop/src/auth/two-factor-options.component.ts +++ b/apps/desktop/src/auth/two-factor-options.component.ts @@ -2,9 +2,9 @@ import { Component } from "@angular/core"; import { Router } from "@angular/router"; import { TwoFactorOptionsComponent as BaseTwoFactorOptionsComponent } from "@bitwarden/angular/auth/components/two-factor-options.component"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; @Component({ selector: "app-two-factor-options", diff --git a/apps/desktop/src/auth/two-factor.component.ts b/apps/desktop/src/auth/two-factor.component.ts index 47f52b36d1b..ee3764027a5 100644 --- a/apps/desktop/src/auth/two-factor.component.ts +++ b/apps/desktop/src/auth/two-factor.component.ts @@ -4,16 +4,16 @@ import { ActivatedRoute, Router } from "@angular/router"; import { TwoFactorComponent as BaseTwoFactorComponent } from "@bitwarden/angular/auth/components/two-factor.component"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { AppIdService } from "@bitwarden/common/abstractions/appId.service"; -import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { LoginService } from "@bitwarden/common/auth/abstractions/login.service"; import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service"; import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type"; +import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { TwoFactorOptionsComponent } from "./two-factor-options.component"; diff --git a/apps/desktop/src/locales/af/messages.json b/apps/desktop/src/locales/af/messages.json index f9843da28bb..237c0fcb094 100644 --- a/apps/desktop/src/locales/af/messages.json +++ b/apps/desktop/src/locales/af/messages.json @@ -464,13 +464,13 @@ "message": "Is u seker u wil hierdie aanhegsel skrap?" }, "attachmentSaved": { - "message": "Die aanhegsel is bewaar." + "message": "Aanhegsel is bewaar" }, "file": { "message": "Lêer" }, "selectFile": { - "message": "Kies ’n lêer." + "message": "Kies ’n lêer" }, "maxFileSize": { "message": "Maksimumlêergrootte is 500 MB." @@ -711,7 +711,7 @@ "message": "Ikoonbedienerbronadres" }, "environmentSaved": { - "message": "Die omgewingbronadresse is bewaar." + "message": "Die omgewingbronadresse is bewaar" }, "ok": { "message": "Goed" @@ -1001,7 +1001,7 @@ "description": "Copy to clipboard" }, "checkForUpdates": { - "message": "Gaan na vir bywerkings" + "message": "Gaan na vir bywerkings…" }, "version": { "message": "Weergawe $VERSION_NUM$", @@ -1393,7 +1393,7 @@ "message": "Ontgrendel met Windows Hello" }, "additionalWindowsHelloSettings": { - "message": "Additional Windows Hello settings" + "message": "Bykomende Windows Hello-instellings" }, "windowsHelloConsentMessage": { "message": "Bevestig vir Bitwarden." @@ -1414,7 +1414,7 @@ "message": "Vra vir Touch ID by lansering" }, "requirePasswordOnStart": { - "message": "Require password or PIN on app start" + "message": "Vereis wagwoord of PIN wanneer toep geopen word" }, "recommendedForSecurity": { "message": "Aanbeveel vir veiligheid." @@ -1859,7 +1859,7 @@ "message": "U hoofwagwoord is onlangs deur ’n administrateur in u organisasie verander. Om toegang tot u kluis te verkry moet u dit nóú bywerk. Deur voort te gaan word u uit u huidige sessie geteken, waarna u weer sal moet aanteken. Aktiewe sessies op ander toestelle kan vir tot ’n uur steeds aktief bly." }, "updateWeakMasterPasswordWarning": { - "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour." + "message": "U hoofwagwoord voldoen nie aan een of meer van die organisasiebeleide nie. Om toegang tot die kluis te kry, moet u nou u hoofwagwoord bywerk. Deur voort te gaan sal u van u huidige sessie afgeteken word, en u sal weer moet aanteken. Aktiewe sessies op ander toestelle kan vir tot een uur aktief bly." }, "hours": { "message": "Uur" @@ -1928,7 +1928,7 @@ "message": "Verwyder hoofwagwoord" }, "removedMasterPassword": { - "message": "Hoofwagwoord is verwyder." + "message": "Hoofwagwoord is verwyder" }, "convertOrganizationEncryptionDesc": { "message": "$ORGANIZATION$ gebruik SSO met ’n sleutelbediener op ’n eie gasheer. ’n Hoofwagwoord word nie meer vereis vir aantekening vir lede van hierdie organisasie nie.", @@ -2074,7 +2074,7 @@ "message": "Premie-intekening word vereis" }, "organizationIsDisabled": { - "message": "Organisasie is gedeaktiveer." + "message": "Organisasie is gedeaktiveer" }, "disabledOrganizationFilterError": { "message": "Items in gedeaktiveerde organisasies is ontoeganklik. Kontak u organisasie-eienaar vir bystand." @@ -2247,23 +2247,23 @@ } }, "windowsBiometricUpdateWarning": { - "message": "Bitwarden recommends updating your biometric settings to require your master password (or PIN) on the first unlock. Would you like to update your settings now?" + "message": "Bitwarden beveel aan dat u u biometriese instellings bywerk om u hoofwagwoord (of PIN) by eerste ontgrendeling te vereis. Wil u nou u instellings bywerk?" }, "windowsBiometricUpdateWarningTitle": { - "message": "Recommended Settings Update" + "message": "Aanbevole bywerking van instellings" }, "region": { - "message": "Region" + "message": "Streek" }, "eu": { "message": "EU", "description": "European Union" }, "us": { - "message": "US", + "message": "VS", "description": "United States" }, "selfHosted": { - "message": "Self-hosted" + "message": "Selghehuisves" } } diff --git a/apps/desktop/src/locales/el/messages.json b/apps/desktop/src/locales/el/messages.json index bb84afe7d0d..9e59ee81fe9 100644 --- a/apps/desktop/src/locales/el/messages.json +++ b/apps/desktop/src/locales/el/messages.json @@ -542,7 +542,7 @@ "message": "Απαιτείται επιβεβαίωση του κύριου κωδικού." }, "masterPasswordMinlength": { - "message": "Master password must be at least $VALUE$ characters long.", + "message": "Ο κύριος κωδικός πρέπει να έχει τουλάχιστον $VALUE$ χαρακτήρες μήκος.", "description": "The Master Password must be at least a specific number of characters long.", "placeholders": { "value": { @@ -771,7 +771,7 @@ "message": "Επικοινωνία" }, "helpAndFeedback": { - "message": "Help and feedback" + "message": "Βοήθεια και σχόλια" }, "getHelp": { "message": "Ζητήστε Βοήθεια" @@ -1417,7 +1417,7 @@ "message": "Require password or PIN on app start" }, "recommendedForSecurity": { - "message": "Recommended for security." + "message": "Συνίσταται για ασφάλεια." }, "lockWithMasterPassOnRestart": { "message": "Κλείδωμα με τον κύριο κωδικό πρόσβασης κατά την επανεκκίνηση" @@ -1540,7 +1540,7 @@ "message": "Για να ολοκληρώσετε τη σύνδεση με SSO, ορίστε έναν κύριο κωδικό πρόσβασης για πρόσβαση και προστασία του vault σας." }, "currentMasterPass": { - "message": "Current master password" + "message": "Τρέχων κύριος κωδικός" }, "newMasterPass": { "message": "Νέος Κύριος Κωδικός" @@ -2250,17 +2250,17 @@ "message": "Bitwarden recommends updating your biometric settings to require your master password (or PIN) on the first unlock. Would you like to update your settings now?" }, "windowsBiometricUpdateWarningTitle": { - "message": "Recommended Settings Update" + "message": "Ενημέρωση Προτεινόμενων Ρυθμίσεων" }, "region": { - "message": "Region" + "message": "Περιοχή" }, "eu": { - "message": "EU", + "message": "ΕΕ", "description": "European Union" }, "us": { - "message": "US", + "message": "ΗΠΑ", "description": "United States" }, "selfHosted": { diff --git a/apps/desktop/src/locales/pt_PT/messages.json b/apps/desktop/src/locales/pt_PT/messages.json index 554f81d971b..13e57dda795 100644 --- a/apps/desktop/src/locales/pt_PT/messages.json +++ b/apps/desktop/src/locales/pt_PT/messages.json @@ -15,7 +15,7 @@ "message": "Tipos" }, "typeLogin": { - "message": "Credencial" + "message": "Início de sessão" }, "typeCard": { "message": "Cartão" @@ -61,7 +61,7 @@ } }, "moveToOrgDesc": { - "message": "Escolha uma organização para a qual deseja mover este item. A mudança para uma organização transfere a propriedade do item para essa organização. Deixará de ser o proprietário directo deste item uma vez que tenha sido movido." + "message": "Escolha uma organização para a qual pretende mover este item. Mover para uma organização transfere a propriedade do item para essa organização. Deixará de ser o proprietário directo deste item depois de este ter sido movido." }, "attachments": { "message": "Anexos" @@ -95,19 +95,19 @@ "message": "Palavra-passe" }, "passphrase": { - "message": "Frase-passe" + "message": "Frase de acesso" }, "editItem": { "message": "Editar item" }, "emailAddress": { - "message": "Endereço de email" + "message": "Endereço de e-mail" }, "verificationCodeTotp": { "message": "Código de verificação (TOTP)" }, "website": { - "message": "Website" + "message": "Site" }, "notes": { "message": "Notas" @@ -126,10 +126,10 @@ "message": "Minimizar ao copiar para a área de transferência" }, "minimizeOnCopyToClipboardDesc": { - "message": "Minimizar ao copiar dados de um item para a área de transferência." + "message": "Minimizar a aplicação ao copiar os dados de um item para a área de transferência." }, "toggleVisibility": { - "message": "Alternar Visibilidade" + "message": "Alternar visibilidade" }, "toggleCollapse": { "message": "Alternar colapso", @@ -166,19 +166,19 @@ "message": "Número da licença" }, "email": { - "message": "Email" + "message": "E-mail" }, "phone": { "message": "Telefone" }, "address": { - "message": "Endereço" + "message": "Morada" }, "premiumRequired": { - "message": "Premium requerido" + "message": "É necessária uma subscrição Premium" }, "premiumRequiredDesc": { - "message": "É requerida uma adesão premium para utilizar esta funcionalidade." + "message": "É necessária uma subscrição Premium para utilizar esta funcionalidade." }, "errorOccurred": { "message": "Ocorreu um erro." @@ -230,25 +230,25 @@ "message": "Título" }, "mr": { - "message": "Sr" + "message": "Sr." }, "mrs": { - "message": "Sra" + "message": "Sra." }, "ms": { - "message": "Sra" + "message": "Sra." }, "mx": { "message": "Mx" }, "dr": { - "message": "Dr" + "message": "Dr." }, "expirationMonth": { - "message": "Mês de expiração" + "message": "Mês de validade" }, "expirationYear": { - "message": "Ano de expiração" + "message": "Ano de validade" }, "select": { "message": "Selecionar" @@ -266,28 +266,28 @@ "message": "Primeiro nome" }, "middleName": { - "message": "Nome do meio" + "message": "Segundo nome" }, "lastName": { - "message": "Último nome" + "message": "Apelido" }, "fullName": { "message": "Nome completo" }, "address1": { - "message": "Endereço 1" + "message": "1.ª morada" }, "address2": { - "message": "Endereço 2" + "message": "2.ª morada" }, "address3": { - "message": "Endereço 3" + "message": "3.ª morada" }, "cityTown": { - "message": "Cidade / localidade" + "message": "Cidade / Localidade" }, "stateProvince": { - "message": "Estado / província" + "message": "Estado / Província" }, "zipPostalCode": { "message": "Código postal" @@ -311,7 +311,7 @@ "message": "Editar" }, "authenticatorKeyTotp": { - "message": "Chave de autenticador (TOTP)" + "message": "Chave de autenticação (TOTP)" }, "folder": { "message": "Pasta" @@ -329,13 +329,13 @@ "message": "Texto" }, "cfTypeHidden": { - "message": "Ocultado" + "message": "Oculto" }, "cfTypeBoolean": { "message": "Booleano" }, "cfTypeLinked": { - "message": "Ligado", + "message": "Associado", "description": "This describes a field that is 'linked' (related) to another field." }, "linkedValue": { @@ -346,13 +346,13 @@ "message": "Remover" }, "nameRequired": { - "message": "O nome é requerido." + "message": "É necessário o nome." }, "addedItem": { "message": "Item adicionado" }, "editedItem": { - "message": "Item editado" + "message": "Item guardado" }, "deleteItem": { "message": "Eliminar item" @@ -364,19 +364,19 @@ "message": "Eliminar anexo" }, "deleteItemConfirmation": { - "message": "Tem a certeza de que pretende eliminar?" + "message": "Tem a certeza de que pretende eliminar este item?" }, "deletedItem": { - "message": "Item enviado para o lixo" + "message": "Item movido para o lixo" }, "overwritePasswordConfirmation": { - "message": "Tem a certeza de que pretende sobreescrever a palavra-passe atual?" + "message": "Tem a certeza de que pretende substituir a palavra-passe atual?" }, "overwriteUsername": { - "message": "Sobrescrever nome de utilizador" + "message": "Substituir nome de utilizador" }, "overwriteUsernameConfirmation": { - "message": "Tem a certeza de que deseja sobrescrever o nome de utilizador atual?" + "message": "Tem a certeza de que pretende substituir o nome de utilizador atual?" }, "noneFolder": { "message": "Em nenhuma pasta", @@ -435,23 +435,23 @@ "message": "Números mínimos" }, "minSpecial": { - "message": "Especiais minímos", + "message": "Caracteres especiais minímos", "description": "Minimum Special Characters" }, "ambiguous": { "message": "Evitar caracteres ambíguos" }, "searchCollection": { - "message": "Pesquisar coleção" + "message": "Procurar na coleção" }, "searchFolder": { - "message": "Pesquisar pasta" + "message": "Procurar na pasta" }, "searchFavorites": { - "message": "Pesquisar favoritos" + "message": "Procurar nos favoritos" }, "searchType": { - "message": "Pesquisar tipo", + "message": "Procurar no tipo", "description": "Search item type" }, "newAttachment": { @@ -461,16 +461,16 @@ "message": "Anexo eliminado" }, "deleteAttachmentConfirmation": { - "message": "Tem a certeza de que deseja eliminar este anexo?" + "message": "Tem a certeza de que pretende eliminar este anexo?" }, "attachmentSaved": { - "message": "O anexo foi guardado." + "message": "Anexo guardado" }, "file": { "message": "Ficheiro" }, "selectFile": { - "message": "Selecione um ficheiro." + "message": "Selecionar um ficheiro" }, "maxFileSize": { "message": "O tamanho máximo do ficheiro é de 500 MB." @@ -479,13 +479,13 @@ "message": "Não pode utilizar esta funcionalidade até atualizar a sua chave de encriptação." }, "editedFolder": { - "message": "Pasta editada" + "message": "Pasta guardada" }, "addedFolder": { "message": "Pasta adicionada" }, "deleteFolderConfirmation": { - "message": "Tem certeza de que pretende eliminar esta pasta?" + "message": "Tem a certeza de que pretende eliminar esta pasta?" }, "deletedFolder": { "message": "Pasta eliminada" @@ -506,13 +506,13 @@ "message": "Palavra-passe mestra" }, "masterPassDesc": { - "message": "A palavra-passe mestra é a palavra-passe que utiliza para aceder ao seu cofre. É muito importante que não se esqueça da sua palavra-passe mestra. Não existe maneira de recuperar a palavra-passe no caso de a esquecer." + "message": "A palavra-passe mestra é a palavra-passe que utiliza para aceder ao seu cofre. É muito importante que não se esqueça da sua palavra-passe mestra. Não há forma de recuperar a palavra-passe no caso de a esquecer." }, "masterPassHintDesc": { "message": "Uma dica da palavra-passe mestra pode ajudá-lo a lembrar-se da sua palavra-passe, caso se esqueça dela." }, "reTypeMasterPass": { - "message": "Reescreva a palavra-passe mestra" + "message": "Reintroduza a palavra-passe mestra" }, "masterPassHint": { "message": "Dica da palavra-passe mestra (opcional)" @@ -524,16 +524,16 @@ "message": "Dica da palavra-passe" }, "enterEmailToGetHint": { - "message": "Introduza o endereço de email da sua conta para receber a dica da sua palavra-passe mestra." + "message": "Introduza o endereço de e-mail da sua conta para receber a dica da sua palavra-passe mestra." }, "getMasterPasswordHint": { "message": "Obter dica da palavra-passe mestra" }, "emailRequired": { - "message": "O endereço de email é requerido." + "message": "É necessário o endereço de e-mail." }, "invalidEmail": { - "message": "Endereço de email inválido." + "message": "Endereço de e-mail inválido." }, "masterPasswordRequired": { "message": "É necessária a palavra-passe mestra." @@ -555,16 +555,16 @@ "message": "A confirmação da palavra-passe mestra não corresponde." }, "newAccountCreated": { - "message": "A sua nova conta foi criada! Agora pode iniciar sessão." + "message": "A sua nova conta foi criada! Pode agora iniciar sessão." }, "masterPassSent": { - "message": "Enviámos-lhe um email com a dica da sua palavra-passe mestra." + "message": "Enviámos-lhe um e-mail com a dica da sua palavra-passe mestra." }, "unexpectedError": { "message": "Ocorreu um erro inesperado." }, "itemInformation": { - "message": "Informação do item" + "message": "Informações do item" }, "noItemsInList": { "message": "Não existem itens para listar." @@ -573,7 +573,7 @@ "message": "Enviar um código de verificação para o seu e-mail" }, "sendCode": { - "message": "Enviar o código" + "message": "Enviar código" }, "codeSent": { "message": "Código enviado" @@ -585,7 +585,7 @@ "message": "Confirme a sua identidade para continuar." }, "verificationCodeRequired": { - "message": "O código de verificação é requerido." + "message": "É necessário o código de verificação." }, "invalidVerificationCode": { "message": "Código de verificação inválido" @@ -594,10 +594,10 @@ "message": "Continuar" }, "enterVerificationCodeApp": { - "message": "Introduza o código de verificação de 6 dígitos da sua aplicação de autenticador." + "message": "Introduza o código de verificação de 6 dígitos da sua aplicação de autenticação." }, "enterVerificationCodeEmail": { - "message": "Introduza o código de verificação de 6 dígitos que foi enviado por email para $EMAIL$.", + "message": "Introduza o código de verificação de 6 dígitos que foi enviado por e-mail para $EMAIL$.", "placeholders": { "email": { "content": "$1", @@ -606,7 +606,7 @@ } }, "verificationCodeEmailSent": { - "message": "Email de verificação enviado para $EMAIL$.", + "message": "E-mail de verificação enviado para $EMAIL$.", "placeholders": { "email": { "content": "$1", @@ -630,52 +630,52 @@ "message": "Introduza a sua chave de segurança na porta USB do seu computador. Se tiver um botão, toque no mesmo." }, "recoveryCodeDesc": { - "message": "Perdeu o acesso a todos os seus provedores de dois passos? Utilize o seu código de recuperação para desativar todos os provedores de dois passos da sua conta." + "message": "Perdeu o acesso a todos os seus fornecedores de verificação de dois passos? Utilize o seu código de recuperação para desativar todos os fornecedores de verificação de dois passos da sua conta." }, "recoveryCodeTitle": { "message": "Código de recuperação" }, "authenticatorAppTitle": { - "message": "Aplicação de autenticador" + "message": "Aplicação de autenticação" }, "authenticatorAppDesc": { - "message": "Utilize uma aplicação de autenticador (tal como Authy ou Google Authenticator) para gerar códigos de verificação baseados na hora.", + "message": "Utilize uma aplicação de autenticação (como o Authy ou o Google Authenticator) para gerar códigos de verificação baseados no tempo.", "description": "'Authy' and 'Google Authenticator' are product names and should not be translated." }, "yubiKeyTitle": { "message": "Chave de segurança YubiKey OTP" }, "yubiKeyDesc": { - "message": "Utilize uma YubiKey para aceder à sua conta. Funciona com YubiKey 4, 4 Nano, 4C, e dispositivos NEO." + "message": "Utilize uma YubiKey para aceder à sua conta. Funciona com os dispositivos YubiKey 4, 4 Nano, 4C e NEO." }, "duoDesc": { - "message": "Verifique com Duo Security utilizando a aplicação Duo Mobile, SMS, chamada telefónica, ou chave de segurança U2F.", + "message": "Verifique com a Duo Security utilizando a aplicação Duo Mobile, SMS, chamada telefónica ou chave de segurança U2F.", "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated." }, "duoOrganizationDesc": { - "message": "Verifique com Duo Security para a sua organização utilizando a aplicação Duo Mobile, SMS, chamada telefónica, ou chave de segurança U2F.", + "message": "Verifique com a Duo Security para a sua organização utilizando a aplicação Duo Mobile, SMS, chamada telefónica, ou chave de segurança U2F.", "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated." }, "webAuthnTitle": { "message": "FIDO2 WebAuthn" }, "webAuthnDesc": { - "message": "Utilize qualquer chave de segurança ativada pela WebAuthn para aceder à sua conta." + "message": "Utilize qualquer chave de segurança compatível com o WebAuthn para aceder à sua conta." }, "emailTitle": { - "message": "Email" + "message": "E-mail" }, "emailDesc": { - "message": "Os códigos de verificação vão ser enviados para si." + "message": "Os códigos de verificação ser-lhe-ão enviados por e-mail." }, "loginUnavailable": { "message": "Início de sessão indisponível" }, "noTwoStepProviders": { - "message": "Esta conta tem a verificação de dois passos configurada, no entanto, nenhum dos fornecedores de dois passos configurados é suportado por este dispositivo." + "message": "Esta conta tem a verificação de dois passos configurada, no entanto, nenhum dos fornecedores da verificação de dois passos configurada é suportado por este dispositivo." }, "noTwoStepProviders2": { - "message": "Por favor adicione provedores adicionais que são melhor suportados entre dispositivos (como uma aplicação de autenticador)." + "message": "Por favor, adicione outros fornecedores que sejam mais bem suportados em todos os dispositivos (por exemplo, uma aplicação de autenticação)." }, "twoStepOptions": { "message": "Opções de verificação de dois passos" @@ -684,13 +684,13 @@ "message": "Ambiente auto-hospedado" }, "selfHostedEnvironmentFooter": { - "message": "Especifique o URL de base da sua instalação do Bitwarden alojada nas suas premissas." + "message": "Especifique o URL de base da sua instalação Bitwarden hospedada no local." }, "customEnvironment": { "message": "Ambiente personalizado" }, "customEnvironmentFooter": { - "message": "Para utilizadores avançados. Pode especificar o URL de base de cada serviço independentemente." + "message": "Para utilizadores avançados. Pode especificar o URL de base de cada serviço de forma independente." }, "baseUrl": { "message": "URL do servidor" @@ -711,7 +711,7 @@ "message": "URL do servidor de ícones" }, "environmentSaved": { - "message": "Os URLs de ambiente foram guardados." + "message": "URLs de ambiente guardados" }, "ok": { "message": "Ok" @@ -723,7 +723,7 @@ "message": "Não" }, "overwritePassword": { - "message": "Sobreescrever palavra-passe" + "message": "Substituir palavra-passe" }, "learnMore": { "message": "Saber mais" @@ -744,10 +744,10 @@ "message": "Terminar sessão" }, "addNewLogin": { - "message": "Adicionar nova credencial" + "message": "Novo início de sessão" }, "addNewItem": { - "message": "Adicionar novo item" + "message": "Novo item" }, "addNewFolder": { "message": "Nova pasta" @@ -777,13 +777,13 @@ "message": "Obter ajuda" }, "fileBugReport": { - "message": "Submeter um relatório de bug" + "message": "Apresentar um relatório de erros" }, "blog": { "message": "Blogue" }, "followUs": { - "message": "Seguir-nos" + "message": "Siga-nos" }, "syncVault": { "message": "Sincronizar cofre" @@ -792,33 +792,33 @@ "message": "Alterar palavra-passe mestra" }, "changeMasterPasswordConfirmation": { - "message": "Pode alterar a sua palavra-passe mestra no cofre web bitwarden.com. Pretende visitar o website agora?" + "message": "Pode alterar o seu endereço de e-mail no cofre do site bitwarden.com. Deseja visitar o site agora?" }, "fingerprintPhrase": { "message": "Frase de impressão digital", "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing." }, "yourAccountsFingerprint": { - "message": "A frase de impressão digital da sua conta", + "message": "Frase da impressão digital da sua conta", "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing." }, "goToWebVault": { "message": "Ir para o cofre web" }, "getMobileApp": { - "message": "Obter aplicação móvel" + "message": "Obter a aplicação móvel" }, "getBrowserExtension": { - "message": "Obter extensão de navegador" + "message": "Obter a extensão do navegador" }, "syncingComplete": { - "message": "Sincronização completada" + "message": "Sincronização concluída" }, "syncingFailed": { - "message": "Sincronização falhada" + "message": "Falha na sincronização" }, "yourVaultIsLocked": { - "message": "O seu cofre está bloqueado. Verifique a sua palavra-passe mestra para continuar." + "message": "O seu cofre está bloqueado. Verifique a sua identidade para continuar." }, "unlock": { "message": "Desbloquear" @@ -849,7 +849,7 @@ "message": "Expiração do cofre" }, "vaultTimeoutDesc": { - "message": "Escolha quando o seu cofre irá expirar e realizar a ação selecionada." + "message": "Escolha a que altura expira o seu cofre, realizando a ação de expiração do mesmo." }, "immediately": { "message": "Imediatamente" @@ -885,16 +885,16 @@ "message": "4 horas" }, "onIdle": { - "message": "Quando o sistema está inativo" + "message": "Na inatividade do sistema" }, "onSleep": { - "message": "Quando o sistema está hibernado" + "message": "Na suspensão do sistema" }, "onLocked": { - "message": "Quando o sistema está bloqueado" + "message": "No bloqueio do sistema" }, "onRestart": { - "message": "Quando reiniciar" + "message": "Ao reiniciar" }, "never": { "message": "Nunca" @@ -907,7 +907,7 @@ "description": "Clipboard is the operating system thing where you copy/paste data to on your device." }, "clearClipboardDesc": { - "message": "Limpar automaticamente valores copiados da sua área de transferência.", + "message": "Limpar automaticamente os valores copiados da sua área de transferência.", "description": "Clipboard is the operating system thing where you copy/paste data to on your device." }, "enableFavicon": { @@ -935,13 +935,13 @@ "message": "Ao fechar a janela, mostrar um ícone na bandeja do sistema em alternativa." }, "enableCloseToMenuBar": { - "message": "Próximo da barra do menu" + "message": "Próximo da barra de menu" }, "enableCloseToMenuBarDesc": { - "message": "Ao fechar a janela, mostrar em alternativa um ícone na barra do menu." + "message": "Ao fechar a janela, mostrar em alternativa um ícone na barra de menu." }, "enableTray": { - "message": "Ativar ícone de bandeja" + "message": "Mostrar ícone de bandeja" }, "enableTrayDesc": { "message": "Mostrar sempre um ícone na bandeja do sistema." @@ -980,13 +980,13 @@ "message": "Idioma" }, "languageDesc": { - "message": "Altere o idioma utilizado pela aplicação. Reinício é requerido." + "message": "Alterar o idioma utilizado pela aplicação. É necessário reiniciar." }, "theme": { "message": "Tema" }, "themeDesc": { - "message": "Altere o tema de cor da aplicação." + "message": "Alterar o tema de cores da aplicação." }, "dark": { "message": "Escuro", @@ -1001,7 +1001,7 @@ "description": "Copy to clipboard" }, "checkForUpdates": { - "message": "Procurar atualizações" + "message": "Procurar atualizações…" }, "version": { "message": "Versão $VERSION_NUM$", @@ -1016,7 +1016,7 @@ "message": "Reiniciar para atualizar" }, "restartToUpdateDesc": { - "message": "A versão $VERSION_NUM$ está pronta para instalar. Tem de reiniciar a aplicação para completar a instalação. Pretende reiniciar e atualizar agora?", + "message": "A versão $VERSION_NUM$ está pronta para ser instalada. É necessário reiniciar a aplicação para concluir a instalação. Pretende reiniciar e atualizar agora?", "placeholders": { "version_num": { "content": "$1", @@ -1037,7 +1037,7 @@ "message": "Mais tarde" }, "noUpdatesAvailable": { - "message": "Não existem atualizações disponíveis atualmente. Está a atualizar a versão mais recente." + "message": "Atualmente, não existem atualizações disponíveis. Está a utilizar a versão mais recente." }, "updateError": { "message": "Erro de atualização" @@ -1057,22 +1057,22 @@ "description": "Copy credit card security code (CVV)" }, "premiumMembership": { - "message": "Adesão Premium" + "message": "Subscrição Premium" }, "premiumManage": { - "message": "Gerir adesão" + "message": "Gerir subscrição" }, "premiumManageAlert": { - "message": "Pode gerir a sua adesão premium no cofre web bitwarden.com. Pretende visitar o website agora?" + "message": "Pode gerir a sua subscrição no cofre web bitwarden.com. Pretende visitar o site agora?" }, "premiumRefresh": { - "message": "Atualizar adesão" + "message": "Atualizar subscrição" }, "premiumNotCurrentMember": { - "message": "Não é atualmente um membro premium." + "message": "Atualmente, não é um membro Premium." }, "premiumSignUpAndGet": { - "message": "Registe-se para uma adesão premium e obtenha:" + "message": "Subscreva uma subscrição Premium e obtenha:" }, "premiumSignUpStorage": { "message": "1 GB de armazenamento encriptado para anexos de ficheiros." @@ -1081,25 +1081,25 @@ "message": "Opções adicionais de verificação de dois passos, como YubiKey, FIDO U2F e Duo." }, "premiumSignUpReports": { - "message": "Higiene de palavras-passe, saúde das contas, e relatórios de brechas de dados para manter o seu cofre seguro." + "message": "Higiene de palavras-passe, saúde da conta e relatórios de violação de dados para manter o seu cofre seguro." }, "premiumSignUpTotp": { - "message": "Gerador de códigos de verificação TOTP (2FA) para credenciais no seu cofre." + "message": "Gerador de código de verificação TOTP (2FA) para inícios de sessão no seu cofre." }, "premiumSignUpSupport": { "message": "Prioridade no apoio ao cliente." }, "premiumSignUpFuture": { - "message": "Todas as funcionalidades premium futuras. Mais a chegar brevemente!" + "message": "Todas as futuras funcionalidades Premium. Mais em breve!" }, "premiumPurchase": { - "message": "Comprar Premium" + "message": "Adquirir Premium" }, "premiumPurchaseAlert": { - "message": "Pode comprar adesão premium no cofre web bitwarden.com. Pretende visitar o website agora?" + "message": "Pode adquirir uma subscrição Premium no cofre web bitwarden.com. Pretende visitar o site agora?" }, "premiumCurrentMember": { - "message": "É um membro premium!" + "message": "É um membro Premium!" }, "premiumCurrentMemberThanks": { "message": "Obrigado por apoiar o Bitwarden." @@ -1114,7 +1114,7 @@ } }, "refreshComplete": { - "message": "Atualização completada" + "message": "Atualização concluída" }, "passwordHistory": { "message": "Histórico de palavras-passe" @@ -1150,10 +1150,10 @@ "message": "Reduzir" }, "resetZoom": { - "message": "Repor zoom" + "message": "Repor ampliação" }, "toggleFullScreen": { - "message": "Alternar ecrã completo" + "message": "Alternar ecrã inteiro" }, "reload": { "message": "Recarregar" @@ -1166,7 +1166,7 @@ "description": "Minimize window" }, "zoom": { - "message": "Zoom" + "message": "Ampliar" }, "bringAllToFront": { "message": "Trazer tudo para a frente", @@ -1185,7 +1185,7 @@ "message": "Ocultar outros" }, "showAll": { - "message": "Mostrar todos" + "message": "Mostrar tudo" }, "quitBitwarden": { "message": "Sair do Bitwarden" @@ -1207,10 +1207,10 @@ "message": "Janela" }, "checkPassword": { - "message": "Verifica se a palavra-passe foi exposta." + "message": "Verificar se a palavra-passe foi exposta." }, "passwordExposed": { - "message": "Esta palavra-passe foi exposta $VALUE$ vez(es) em brechas de dados. Deve alterá-la.", + "message": "Esta palavra-passe foi exposta $VALUE$ vez(es) em violações de dados. Deve alterá-la.", "placeholders": { "value": { "content": "$1", @@ -1219,7 +1219,7 @@ } }, "passwordSafe": { - "message": "Esta palavra-passe não foi encontrada em nenhuma brecha de dados conhecida. Esta deve ser segura de utilizar." + "message": "Esta palavra-passe não foi encontrada em nenhuma violação de dados conhecida. A sua utilização deve ser segura." }, "baseDomain": { "message": "Domínio base", @@ -1276,11 +1276,11 @@ "description": "Application window should always stay on top of other windows" }, "dateUpdated": { - "message": "Atualizado", + "message": "Atualizado a", "description": "ex. Date this item was updated" }, "dateCreated": { - "message": "Criado", + "message": "Criado a", "description": "ex. Date this item was created" }, "datePasswordUpdated": { @@ -1335,19 +1335,19 @@ "message": "Confirm vault export" }, "exportWarningDesc": { - "message": "Esta exportação contém os seus dados do cofre num formato desencriptado. Não deve armazenar ou enviar o ficheiro exportado através de canais inseguros (como email). Elimine-o imediatamente após o utilizar." + "message": "Esta exportação contém os dados do seu cofre num formato não encriptado. Não deve armazenar ou enviar o ficheiro exportado através de canais não seguros (como o e-mail). Elimine-o imediatamente após terminar a sua utilização." }, "encExportKeyWarningDesc": { - "message": "This export encrypts your data using your account's encryption key. If you ever rotate your account's encryption key you should export again since you will not be able to decrypt this export file." + "message": "Esta exportação encripta os seus dados utilizando a chave de encriptação da sua conta. Se alguma vez mudar a chave de encriptação da sua conta, deve exportar novamente, uma vez que não conseguirá desencriptar este ficheiro de exportação." }, "encExportAccountWarningDesc": { - "message": "Account encryption keys are unique to each Bitwarden user account, so you can't import an encrypted export into a different account." + "message": "As chaves de encriptação da conta são únicas para cada conta de utilizador Bitwarden, pelo que não é possível importar uma exportação encriptada para uma conta diferente." }, "noOrganizationsList": { "message": "Não pertence a nenhuma organização. As organizações permitem-lhe partilhar itens em segurança com outros utilizadores." }, "noCollectionsInList": { - "message": "Não existem coleções para exibir." + "message": "Não existem coleções para listar." }, "ownership": { "message": "Propriedade" @@ -1371,7 +1371,7 @@ "message": "Palavra-passe mestra fraca" }, "weakMasterPasswordDesc": { - "message": "A palavra-passe mestra que escolheu é fraca. Deve utilizar uma palavra-passe mestra forte (ou uma frase-passe) para proteger adequadamente a sua conta Bitwarden. Tem a certeza de que pretende utilizar esta palavra-passe mestra?" + "message": "A palavra-passe mestra que escolheu é fraca. Deve utilizar uma palavra-passe mestra forte (ou uma frase de acesso) para proteger adequadamente a sua conta Bitwarden. Tem a certeza de que pretende utilizar esta palavra-passe mestra?" }, "pin": { "message": "PIN", @@ -1381,22 +1381,22 @@ "message": "Desbloquear com PIN" }, "setYourPinCode": { - "message": "Defina o seu código PIN para desbloquear o Bitwarden. As suas definições PIN serão redefinidas se terminar sessão completamente da aplicação." + "message": "Defina o seu código PIN para desbloquear o Bitwarden. As suas definições de PIN serão redefinidas se alguma vez terminar sessão completamente da aplicação." }, "pinRequired": { - "message": "O código PIN é requerido." + "message": "É necessário o código PIN." }, "invalidPin": { "message": "Código PIN inválido." }, "unlockWithWindowsHello": { - "message": "Desbloquear com Windows Hello" + "message": "Desbloquear com o Windows Hello" }, "additionalWindowsHelloSettings": { "message": "Additional Windows Hello settings" }, "windowsHelloConsentMessage": { - "message": "Verificar para Bitwarden." + "message": "Verificar para o Bitwarden." }, "unlockWithTouchId": { "message": "Desbloquear com Touch ID" @@ -1405,7 +1405,7 @@ "message": "Additional Touch ID settings" }, "touchIdConsentMessage": { - "message": "Verificar para Bitwarden." + "message": "desbloqueie o seu cofre" }, "autoPromptWindowsHello": { "message": "Ask for Windows Hello on app start" @@ -1420,7 +1420,7 @@ "message": "Recommended for security." }, "lockWithMasterPassOnRestart": { - "message": "Bloquear com palavra-passe mestra ao reiniciar" + "message": "Bloquear com a palavra-passe mestra ao reiniciar" }, "deleteAccount": { "message": "Delete account" @@ -1441,7 +1441,7 @@ "message": "Preferências" }, "enableMenuBar": { - "message": "Ativar ícone da barra de menu" + "message": "Mostrar ícone da barra de menu" }, "enableMenuBarDesc": { "message": "Mostrar sempre um ícone na barra de menu." @@ -1450,7 +1450,7 @@ "message": "Ocultar para a barra de menu" }, "selectOneCollection": { - "message": "Tem de selecionar pelo menos uma coleção." + "message": "Deve selecionar pelo menos uma coleção." }, "premiumUpdated": { "message": "Atualizou para o Premium." @@ -1459,20 +1459,20 @@ "message": "Restaurar" }, "premiumManageAlertAppStore": { - "message": "Pode gerir a sua assinatura através da App Store. Pretende visitar a App Store agora?" + "message": "Pode gerir a sua subscrição a partir da App Store. Pretende visitar a App Store agora?" }, "legal": { "message": "Informação legal", "description": "Noun. As in 'legal documents', like our terms of service and privacy policy." }, "termsOfService": { - "message": "Termos de serviço" + "message": "Termos de utilização" }, "privacyPolicy": { "message": "Política de privacidade" }, "unsavedChangesConfirmation": { - "message": "Tem a certeza que pretende sair? Se sair agora, as suas informações atuais não irão ser guardadas" + "message": "Tem a certeza de que pretende sair? Se sair agora, as suas informações atuais não serão guardadas." }, "unsavedChangesTitle": { "message": "Alterações por guardar" @@ -1481,16 +1481,16 @@ "message": "Clonar" }, "passwordGeneratorPolicyInEffect": { - "message": "Uma ou mais políticas de organização estão a afetar as suas definições do gerador." + "message": "Uma ou mais políticas da organização estão a afetar as suas definições do gerador." }, "vaultTimeoutAction": { "message": "Ação de expiração do cofre" }, "vaultTimeoutActionLockDesc": { - "message": "Um cofre bloqueado requer que reintroduza a sua palavra-passe mestra para aceder novamente." + "message": "É necessária uma palavra-passe mestra ou outro método de desbloqueio para aceder novamente ao seu cofre." }, "vaultTimeoutActionLogOutDesc": { - "message": "Um cofre com sessão terminada requer que se volte a autenticar para o poder aceder novamente." + "message": "É necessária uma nova autenticação para aceder novamente ao seu cofre." }, "lock": { "message": "Bloquear", @@ -1501,7 +1501,7 @@ "description": "Noun: a special folder to hold deleted items" }, "searchTrash": { - "message": "Pesquisar lixo" + "message": "Procurar no lixo" }, "permanentlyDeleteItem": { "message": "Eliminar item permanentemente" @@ -1525,19 +1525,19 @@ "message": "Eliminar permanentemente" }, "vaultTimeoutLogOutConfirmation": { - "message": "Terminar sessão irá remover todos os acessos ao seu cofre e requer autenticação online após o período de expiração. Tem a certeza de que pretende utilizar esta definição?" + "message": "Ao terminar sessão removerá todo o acesso ao seu cofre e requer autenticação online após o período de tempo limite. Tem a certeza de que pretende utilizar esta definição?" }, "vaultTimeoutLogOutConfirmationTitle": { "message": "Confirmação de expiração do cofre" }, "enterpriseSingleSignOn": { - "message": "Início de Sessão Único da Empresa" + "message": "Início de sessão único para empresas" }, "setMasterPassword": { "message": "Definir palavra-passe mestra" }, "ssoCompleteRegistration": { - "message": "Para concluir o início de sessão com SSO, por favor defina uma palavra-passe mestra para aceder e proteger o seu cofre." + "message": "Para concluir o início de sessão com SSO, por favor, defina uma palavra-passe mestra para aceder e proteger o seu cofre." }, "currentMasterPass": { "message": "Current master password" @@ -1546,10 +1546,10 @@ "message": "Nova palavra-passe mestra" }, "confirmNewMasterPass": { - "message": "Confirmar nova palavra-passe mestra" + "message": "Confirmar a nova palavra-passe mestra" }, "masterPasswordPolicyInEffect": { - "message": "Uma ou mais políticas da organização requerem que a sua palavra-passe mestra cumpra aos seguintes requisitos:" + "message": "Uma ou mais políticas da organização exigem que a sua palavra-passe mestra cumpra os seguintes requisitos:" }, "policyInEffectMinComplexity": { "message": "Pontuação mínima de complexidade de $SCORE$", @@ -1594,7 +1594,7 @@ "message": "Ao marcar esta caixa concorda com o seguinte:" }, "acceptPoliciesRequired": { - "message": "Os Termos de Serviço e a Política de Privacidade não foram reconhecidos." + "message": "Os Termos de utilização e a Política de privacidade não foram aceites." }, "enableBrowserIntegration": { "message": "Allow browser integration" @@ -1666,7 +1666,7 @@ "message": "An organization policy is affecting your ownership options." }, "allSends": { - "message": "Tudo o que foi enviado", + "message": "Todos os Sends", "description": "'Sends' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "sendTypeFile": { @@ -1676,11 +1676,11 @@ "message": "Texto" }, "searchSends": { - "message": "Pesquisar 'Sends'", + "message": "Procurar Sends", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "editSend": { - "message": "Editar Envio", + "message": "Editar Send", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "myVault": { @@ -1690,14 +1690,14 @@ "message": "Texto" }, "deletionDate": { - "message": "Data da eliminação" + "message": "Data de eliminação" }, "deletionDateDesc": { - "message": "The Send will be permanently deleted on the specified date and time.", + "message": "O Send será permanentemente eliminado na data e hora especificadas.", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "expirationDate": { - "message": "Data de expiração" + "message": "Data de validade" }, "expirationDateDesc": { "message": "If set, access to this Send will expire on the specified date and time.", @@ -1727,11 +1727,11 @@ "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "sendLink": { - "message": "Enviar ligação", + "message": "Link do Send", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "sendLinkLabel": { - "message": "Enviar Ligação", + "message": "Link do Send", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "textHiddenByDefault": { @@ -1754,21 +1754,21 @@ "message": "Nova palavra-passe" }, "whatTypeOfSend": { - "message": "Qual será o tipo de envio?", + "message": "Que tipo de Send é este?", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "createSend": { - "message": "Criar envio", + "message": "Novo Send", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "sendTextDesc": { - "message": "O que deseja enviar." + "message": "O texto que deseja enviar." }, "sendFileDesc": { "message": "O ficheiro que deseja enviar." }, "days": { - "message": "$DAYS$ Dias", + "message": "$DAYS$ dias", "placeholders": { "days": { "content": "$1", @@ -1783,22 +1783,22 @@ "message": "Personalizado" }, "deleteSendConfirmation": { - "message": "Tem a certeza que quer eliminar?", + "message": "Tem a certeza de que pretende eliminar este Send?", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "copySendLinkToClipboard": { - "message": "Copiar link para a área de transferências", + "message": "Copiar o link do Send para a área de transferência", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "copySendLinkOnSave": { - "message": "Copie o link para o partilhar para a área de transferências ao guardar." + "message": "Copiar o link para partilhar este Send para a minha área de transferência ao guardar." }, "sendDisabled": { - "message": "Envio desativado", + "message": "Send removido", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "sendDisabledWarning": { - "message": "Devido a uma política corporativa, apenas é possível eliminar um envio já existente.", + "message": "Devido a uma política da empresa, só é possível eliminar um Send existente.", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." }, "copyLink": { @@ -1814,40 +1814,40 @@ "message": "Palavra-passe removida" }, "removePasswordConfirmation": { - "message": "Tem a certeza de que deseja remover a palavra-passe?" + "message": "Tem a certeza de que pretende remover a palavra-passe?" }, "maxAccessCountReached": { "message": "Max access count reached" }, "expired": { - "message": "Expirou" + "message": "Expirado" }, "pendingDeletion": { - "message": "Data pendente" + "message": "Eliminação pendente" }, "webAuthnAuthenticate": { "message": "Autenticar WebAuthn" }, "hideEmail": { - "message": "Ocultar meu endereço de e-mail aos destinatários." + "message": "Ocultar o meu endereço de e-mail dos destinatários." }, "sendOptionsPolicyInEffect": { - "message": "Uma ou mais políticas da organização estão a afetar as suas opções de envio." + "message": "Uma ou mais políticas da organização estão a afetar as suas opções do Send." }, "emailVerificationRequired": { - "message": "Verificação de Email Necessária" + "message": "Verificação de e-mail necessária" }, "emailVerificationRequiredDesc": { - "message": "É necessário verificar o seu e-mail para usar esta funcionalidade." + "message": "É necessário verificar o seu e-mail para utilizar esta funcionalidade." }, "passwordPrompt": { - "message": "Redefinir palavra-passe mestra" + "message": "Pedir novamente a palavra-passe mestra" }, "passwordConfirmation": { "message": "Confirmação da palavra-passe mestra" }, "passwordConfirmationDesc": { - "message": "Esta ação está protegida. Para continuar, por favor reinsira a sua palavra-passe mestra para verificarmos a sua identidade." + "message": "Esta ação está protegida. Para continuar, por favor, reintroduza a sua palavra-passe mestra para verificar a sua identidade." }, "updatedMasterPassword": { "message": "Palavra-passe mestra atualizada" @@ -1856,10 +1856,10 @@ "message": "Atualizar palavra-passe mestra" }, "updateMasterPasswordWarning": { - "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour." + "message": "A sua palavra-passe mestra foi recentemente alterada por um administrador da sua organização. Para aceder ao cofre, tem de atualizar a sua palavra-passe mestra agora. Se prosseguir, sairá da sua sessão atual e terá de iniciar sessão novamente. As sessões ativas noutros dispositivos poderão continuar ativas até uma hora." }, "updateWeakMasterPasswordWarning": { - "message": "Your master password does not meet one or more of your organization policies. In order to access the vault, you must update your master password now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour." + "message": "A sua palavra-passe mestra não cumpre uma ou mais políticas da sua organização. Para aceder ao cofre, tem de atualizar a sua palavra-passe mestra agora. Se prosseguir, sairá da sua sessão atual e terá de iniciar sessão novamente. As sessões ativas noutros dispositivos poderão continuar ativas até uma hora." }, "hours": { "message": "Horas" @@ -1910,16 +1910,16 @@ "message": "O tempo limite do seu cofre excede as restrições definidas pela sua organização." }, "resetPasswordPolicyAutoEnroll": { - "message": "Registo automático" + "message": "Inscrição automática" }, "resetPasswordAutoEnrollInviteWarning": { "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password." }, "vaultExportDisabled": { - "message": "Exportação de cofre inválida" + "message": "Exportação do cofre removida" }, "personalVaultExportPolicyInEffect": { - "message": "Uma ou mais políticas da organização impedem que exporte o seu cofre pessoal." + "message": "Uma ou mais políticas da organização impedem-no de exportar o seu cofre pessoal." }, "addAccount": { "message": "Adicionar conta" @@ -1928,7 +1928,7 @@ "message": "Remover palavra-passe mestra" }, "removedMasterPassword": { - "message": "Palavra-passe mestra removida." + "message": "Palavra-passe mestra removida" }, "convertOrganizationEncryptionDesc": { "message": "$ORGANIZATION$ is using SSO with a self-hosted key server. A master password is no longer required to log in for members of this organization.", @@ -1943,7 +1943,7 @@ "message": "Deixar a organização" }, "leaveOrganizationConfirmation": { - "message": "Tem a certeza que quer deixar a organização?" + "message": "Tem a certeza de que pretende deixar esta organização?" }, "leftOrganization": { "message": "Saiu da organização." @@ -1985,7 +1985,7 @@ "message": "A sua sessão expirou. Por favor, volte atrás e tente iniciar sessão novamente." }, "exportingPersonalVaultTitle": { - "message": "A exportar cofre pessoal" + "message": "A exportar o cofre pessoal" }, "exportingPersonalVaultDescription": { "message": "Apenas os itens do cofre pessoal associado a $EMAIL$ serão exportados. Os itens do cofre da organização não serão incluídos.", @@ -2012,7 +2012,7 @@ "message": "Password type" }, "regenerateUsername": { - "message": "Regerar nome de utilizador" + "message": "Regenerar nome de utilizador" }, "generateUsername": { "message": "Gerar nome de utilizador" @@ -2049,7 +2049,7 @@ "message": "Todos os cofres" }, "searchOrganization": { - "message": "Procurar organização" + "message": "Procurar na organização" }, "searchMyVault": { "message": "Procurar no meu cofre" @@ -2071,7 +2071,7 @@ "message": "API key" }, "premiumSubcriptionRequired": { - "message": "Premium subscription required" + "message": "É necessária uma subscrição Premium" }, "organizationIsDisabled": { "message": "Organization suspended" @@ -2092,7 +2092,7 @@ "message": "A iniciar sessão como" }, "rememberEmail": { - "message": "Lembrar e-mail" + "message": "Memorizar e-mail" }, "notYou": { "message": "Utilizador incorreto?" @@ -2247,7 +2247,7 @@ } }, "windowsBiometricUpdateWarning": { - "message": "Bitwarden recommends updating your biometric settings to require your master password (or PIN) on the first unlock. Would you like to update your settings now?" + "message": "O Bitwarden recomenda a atualização das suas definições biométricas para exigir a sua palavra-passe mestra (ou PIN) no primeiro desbloqueio. Gostaria de atualizar as suas definições agora?" }, "windowsBiometricUpdateWarningTitle": { "message": "Recommended Settings Update" diff --git a/apps/desktop/src/locales/sl/messages.json b/apps/desktop/src/locales/sl/messages.json index f670e572bc4..4bccab8c51c 100644 --- a/apps/desktop/src/locales/sl/messages.json +++ b/apps/desktop/src/locales/sl/messages.json @@ -12,7 +12,7 @@ "message": "Priljubljene" }, "types": { - "message": "Tipi" + "message": "Vrste" }, "typeLogin": { "message": "Prijava" @@ -36,7 +36,7 @@ "message": "Išči v trezorju" }, "addItem": { - "message": "Dodaj vnos" + "message": "Dodaj element" }, "shared": { "message": "Deljeno" @@ -67,7 +67,7 @@ "message": "Priloge" }, "viewItem": { - "message": "Ogled vnosa" + "message": "Prikaži element" }, "name": { "message": "Naziv" @@ -98,7 +98,7 @@ "message": "Večbesedno geslo" }, "editItem": { - "message": "Uredi vnos" + "message": "Uredi element" }, "emailAddress": { "message": "E-poštni naslov" @@ -349,13 +349,13 @@ "message": "Ime je obvezen podatek." }, "addedItem": { - "message": "Vnos dodan" + "message": "Element dodan" }, "editedItem": { - "message": "Vnos urejen" + "message": "Element urejen" }, "deleteItem": { - "message": "Vnos odstranjen" + "message": "Element odstranjen" }, "deleteFolder": { "message": "Izbriši mapo" @@ -367,7 +367,7 @@ "message": "Ali res želite poslati v koš?" }, "deletedItem": { - "message": "Pošlji vnos v smeti" + "message": "Pošlji element v smeti" }, "overwritePasswordConfirmation": { "message": "Ali ste prepričani, da želite prepisati vaše trenutno geslo?" @@ -564,10 +564,10 @@ "message": "An unexpected error has occurred." }, "itemInformation": { - "message": "Informacije o vnosu" + "message": "Informacije o elementu" }, "noItemsInList": { - "message": "Ni vnosov za prikaz." + "message": "Ni elementov za prikaz." }, "sendVerificationCode": { "message": "Pošlji verifikacijsko kodo po e-pošti" @@ -1353,7 +1353,7 @@ "message": "Lastništvo" }, "whoOwnsThisItem": { - "message": "Kdo je lastnik tega vnosa?" + "message": "Kdo je lastnik tega elementa?" }, "strong": { "message": "Močno", @@ -1922,7 +1922,7 @@ "message": "One or more organization policies prevents you from exporting your personal vault." }, "addAccount": { - "message": "Add account" + "message": "Dodaj račun" }, "removeMasterPassword": { "message": "Odstranite glavno geslo" diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts index 918daf47d20..9dfcd9776a6 100644 --- a/apps/desktop/src/main.ts +++ b/apps/desktop/src/main.ts @@ -2,12 +2,10 @@ import * as path from "path"; import { app } from "electron"; -import { StateFactory } from "@bitwarden/common/factories/stateFactory"; -import { GlobalState } from "@bitwarden/common/models/domain/global-state"; -import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service"; +import { StateFactory } from "@bitwarden/common/platform/factories/state-factory"; +import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; +import { MemoryStorageService } from "@bitwarden/common/platform/services/memory-storage.service"; -import { BiometricsService, BiometricsServiceAbstraction } from "./main/biometric/index"; -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/native-messaging.main"; @@ -16,11 +14,13 @@ import { TrayMain } from "./main/tray.main"; import { UpdaterMain } from "./main/updater.main"; import { WindowMain } from "./main/window.main"; import { Account } from "./models/account"; -import { ElectronLogService } from "./services/electron-log.service"; +import { BiometricsService, BiometricsServiceAbstraction } from "./platform/main/biometric/index"; +import { DesktopCredentialStorageListener } from "./platform/main/desktop-credential-storage-listener"; +import { ElectronLogService } from "./platform/services/electron-log.service"; +import { ElectronStateService } from "./platform/services/electron-state.service"; +import { ElectronStorageService } from "./platform/services/electron-storage.service"; +import { I18nService } from "./platform/services/i18n.service"; import { ElectronMainMessagingService } from "./services/electron-main-messaging.service"; -import { ElectronStateService } from "./services/electron-state.service"; -import { ElectronStorageService } from "./services/electron-storage.service"; -import { I18nService } from "./services/i18n.service"; export class Main { logService: ElectronLogService; diff --git a/apps/desktop/src/main/menu/menu.about.ts b/apps/desktop/src/main/menu/menu.about.ts index 33d4f12ea55..aa50f2d9978 100644 --- a/apps/desktop/src/main/menu/menu.about.ts +++ b/apps/desktop/src/main/menu/menu.about.ts @@ -1,6 +1,6 @@ import { BrowserWindow, clipboard, dialog, MenuItemConstructorOptions } from "electron"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { isMacAppStore, isSnapStore, isWindowsStore } from "../../utils"; import { UpdaterMain } from "../updater.main"; diff --git a/apps/desktop/src/main/menu/menu.account.ts b/apps/desktop/src/main/menu/menu.account.ts index 31e0797ebb6..10a6d6d77d5 100644 --- a/apps/desktop/src/main/menu/menu.account.ts +++ b/apps/desktop/src/main/menu/menu.account.ts @@ -1,7 +1,7 @@ import { BrowserWindow, dialog, MenuItemConstructorOptions, shell } from "electron"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { isMacAppStore, isWindowsStore } from "../../utils"; diff --git a/apps/desktop/src/main/menu/menu.bitwarden.ts b/apps/desktop/src/main/menu/menu.bitwarden.ts index 7a20b381f58..3c3a16702ee 100644 --- a/apps/desktop/src/main/menu/menu.bitwarden.ts +++ b/apps/desktop/src/main/menu/menu.bitwarden.ts @@ -1,7 +1,7 @@ import { BrowserWindow, MenuItemConstructorOptions } from "electron"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { isMac } from "../../utils"; import { UpdaterMain } from "../updater.main"; diff --git a/apps/desktop/src/main/menu/menu.edit.ts b/apps/desktop/src/main/menu/menu.edit.ts index c5827015ba6..6b817dd3902 100644 --- a/apps/desktop/src/main/menu/menu.edit.ts +++ b/apps/desktop/src/main/menu/menu.edit.ts @@ -1,7 +1,7 @@ import { MenuItemConstructorOptions } from "electron"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { IMenubarMenu } from "./menubar"; diff --git a/apps/desktop/src/main/menu/menu.file.ts b/apps/desktop/src/main/menu/menu.file.ts index 6a7c3ba16dd..618acdc7fe1 100644 --- a/apps/desktop/src/main/menu/menu.file.ts +++ b/apps/desktop/src/main/menu/menu.file.ts @@ -1,7 +1,7 @@ import { BrowserWindow, MenuItemConstructorOptions } from "electron"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { isMac, isMacAppStore } from "../../utils"; import { UpdaterMain } from "../updater.main"; diff --git a/apps/desktop/src/main/menu/menu.first.ts b/apps/desktop/src/main/menu/menu.first.ts index 06f24b0570e..805956f2632 100644 --- a/apps/desktop/src/main/menu/menu.first.ts +++ b/apps/desktop/src/main/menu/menu.first.ts @@ -1,7 +1,7 @@ import { BrowserWindow, dialog, MenuItem, MenuItemConstructorOptions } from "electron"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { isMacAppStore, isSnapStore, isWindowsStore } from "../../utils"; import { UpdaterMain } from "../updater.main"; diff --git a/apps/desktop/src/main/menu/menu.help.ts b/apps/desktop/src/main/menu/menu.help.ts index 6a17d088fba..41c9e71776f 100644 --- a/apps/desktop/src/main/menu/menu.help.ts +++ b/apps/desktop/src/main/menu/menu.help.ts @@ -1,6 +1,6 @@ import { shell, MenuItemConstructorOptions } from "electron"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { isMacAppStore, isWindowsStore } from "../../utils"; diff --git a/apps/desktop/src/main/menu/menu.main.ts b/apps/desktop/src/main/menu/menu.main.ts index 4ae9669c488..094ff27b454 100644 --- a/apps/desktop/src/main/menu/menu.main.ts +++ b/apps/desktop/src/main/menu/menu.main.ts @@ -1,8 +1,8 @@ import { app, Menu } from "electron"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { UpdaterMain } from "../updater.main"; import { WindowMain } from "../window.main"; diff --git a/apps/desktop/src/main/menu/menu.view.ts b/apps/desktop/src/main/menu/menu.view.ts index 2953ec8eaac..e884337cf77 100644 --- a/apps/desktop/src/main/menu/menu.view.ts +++ b/apps/desktop/src/main/menu/menu.view.ts @@ -1,7 +1,7 @@ import { MenuItemConstructorOptions } from "electron"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { IMenubarMenu } from "./menubar"; diff --git a/apps/desktop/src/main/menu/menu.window.ts b/apps/desktop/src/main/menu/menu.window.ts index 8f588781a56..811d01e793e 100644 --- a/apps/desktop/src/main/menu/menu.window.ts +++ b/apps/desktop/src/main/menu/menu.window.ts @@ -1,7 +1,7 @@ import { MenuItemConstructorOptions } from "electron"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { isMac } from "../../utils"; import { WindowMain } from "../window.main"; diff --git a/apps/desktop/src/main/menu/menubar.ts b/apps/desktop/src/main/menu/menubar.ts index 5048c60dc09..6ac28a1c8db 100644 --- a/apps/desktop/src/main/menu/menubar.ts +++ b/apps/desktop/src/main/menu/menubar.ts @@ -1,7 +1,7 @@ import { Menu, MenuItemConstructorOptions } from "electron"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { isMac } from "../../utils"; import { UpdaterMain } from "../updater.main"; diff --git a/apps/desktop/src/main/messaging.main.ts b/apps/desktop/src/main/messaging.main.ts index 430949703bb..2dec019da89 100644 --- a/apps/desktop/src/main/messaging.main.ts +++ b/apps/desktop/src/main/messaging.main.ts @@ -3,7 +3,7 @@ import * as path from "path"; import { app, ipcMain } from "electron"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { Main } from "../main"; diff --git a/apps/desktop/src/main/native-messaging.main.ts b/apps/desktop/src/main/native-messaging.main.ts index 360e219e22a..c1bccd5e0a9 100644 --- a/apps/desktop/src/main/native-messaging.main.ts +++ b/apps/desktop/src/main/native-messaging.main.ts @@ -7,7 +7,7 @@ import * as util from "util"; import { ipcMain } from "electron"; import * as ipc from "node-ipc"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { getIpcSocketRoot } from "../proxy/ipc"; diff --git a/apps/desktop/src/main/tray.main.ts b/apps/desktop/src/main/tray.main.ts index aea05d6606d..a4cedc82179 100644 --- a/apps/desktop/src/main/tray.main.ts +++ b/apps/desktop/src/main/tray.main.ts @@ -2,8 +2,8 @@ import * as path from "path"; import { app, BrowserWindow, Menu, MenuItemConstructorOptions, nativeImage, Tray } from "electron"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { WindowMain } from "./window.main"; diff --git a/apps/desktop/src/main/updater.main.ts b/apps/desktop/src/main/updater.main.ts index 088e76e2c5e..946d09b255a 100644 --- a/apps/desktop/src/main/updater.main.ts +++ b/apps/desktop/src/main/updater.main.ts @@ -2,7 +2,7 @@ import { dialog, shell } from "electron"; import log from "electron-log"; import { autoUpdater } from "electron-updater"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { isAppImage, isDev, isMacAppStore, isWindowsPortable, isWindowsStore } from "../utils"; diff --git a/apps/desktop/src/main/window.main.ts b/apps/desktop/src/main/window.main.ts index e4489f70203..5e976bb93c8 100644 --- a/apps/desktop/src/main/window.main.ts +++ b/apps/desktop/src/main/window.main.ts @@ -3,9 +3,9 @@ import * as url from "url"; import { app, BrowserWindow, screen } from "electron"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { WindowState } from "@bitwarden/common/models/domain/window-state"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { cleanUserAgent, isDev, isMacAppStore, isSnapStore } from "../utils"; diff --git a/apps/desktop/src/models/account.ts b/apps/desktop/src/models/account.ts index 2c4b5c39103..65140975aff 100644 --- a/apps/desktop/src/models/account.ts +++ b/apps/desktop/src/models/account.ts @@ -4,8 +4,8 @@ import { Account as BaseAccount, AccountSettings as BaseAccountSettings, AccountKeys as BaseAccountKeys, -} from "@bitwarden/common/models/domain/account"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; +} from "@bitwarden/common/platform/models/domain/account"; +import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; export class AccountSettings extends BaseAccountSettings { vaultTimeout = -1; // On Restart diff --git a/apps/desktop/src/models/native-messaging/encrypted-message-response.ts b/apps/desktop/src/models/native-messaging/encrypted-message-response.ts index 5f8deb05a30..b47422f565c 100644 --- a/apps/desktop/src/models/native-messaging/encrypted-message-response.ts +++ b/apps/desktop/src/models/native-messaging/encrypted-message-response.ts @@ -1,4 +1,4 @@ -import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { MessageCommon } from "./message-common"; diff --git a/apps/desktop/src/models/native-messaging/encrypted-message.ts b/apps/desktop/src/models/native-messaging/encrypted-message.ts index fc06214875e..474459242be 100644 --- a/apps/desktop/src/models/native-messaging/encrypted-message.ts +++ b/apps/desktop/src/models/native-messaging/encrypted-message.ts @@ -1,4 +1,4 @@ -import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { MessageCommon } from "./message-common"; diff --git a/apps/desktop/src/models/native-messaging/legacy-message-wrapper.ts b/apps/desktop/src/models/native-messaging/legacy-message-wrapper.ts index 03068374069..f520dd40e4b 100644 --- a/apps/desktop/src/models/native-messaging/legacy-message-wrapper.ts +++ b/apps/desktop/src/models/native-messaging/legacy-message-wrapper.ts @@ -1,4 +1,4 @@ -import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { LegacyMessage } from "./legacy-message"; diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json index fb8e56077c4..79c805b4aa8 100644 --- a/apps/desktop/src/package-lock.json +++ b/apps/desktop/src/package-lock.json @@ -1,12 +1,12 @@ { "name": "@bitwarden/desktop", - "version": "2023.4.1", + "version": "2023.5.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@bitwarden/desktop", - "version": "2023.4.1", + "version": "2023.5.1", "license": "GPL-3.0", "dependencies": { "@bitwarden/desktop-native": "file:../desktop_native" diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json index 143d1bad74f..7852d199655 100644 --- a/apps/desktop/src/package.json +++ b/apps/desktop/src/package.json @@ -2,7 +2,7 @@ "name": "@bitwarden/desktop", "productName": "Bitwarden", "description": "A secure and free password manager for all of your devices.", - "version": "2023.4.1", + "version": "2023.5.1", "author": "Bitwarden Inc. (https://bitwarden.com)", "homepage": "https://bitwarden.com", "license": "GPL-3.0", diff --git a/apps/desktop/src/app/locales.ts b/apps/desktop/src/platform/app/locales.ts similarity index 100% rename from apps/desktop/src/app/locales.ts rename to apps/desktop/src/platform/app/locales.ts diff --git a/apps/desktop/src/flags.ts b/apps/desktop/src/platform/flags.ts similarity index 94% rename from apps/desktop/src/flags.ts rename to apps/desktop/src/platform/flags.ts index 8306e3c8795..0481c8ce9b4 100644 --- a/apps/desktop/src/flags.ts +++ b/apps/desktop/src/platform/flags.ts @@ -4,7 +4,7 @@ import { devFlagValue as baseDevFlagValue, SharedFlags, SharedDevFlags, -} from "@bitwarden/common/misc/flags"; +} from "@bitwarden/common/platform/misc/flags"; // required to avoid linting errors when there are no flags /* eslint-disable-next-line @typescript-eslint/ban-types */ diff --git a/apps/desktop/src/main/biometric/biometric.darwin.main.ts b/apps/desktop/src/platform/main/biometric/biometric.darwin.main.ts similarity index 91% rename from apps/desktop/src/main/biometric/biometric.darwin.main.ts rename to apps/desktop/src/platform/main/biometric/biometric.darwin.main.ts index 8eb893d2ba7..e50c0644a45 100644 --- a/apps/desktop/src/main/biometric/biometric.darwin.main.ts +++ b/apps/desktop/src/platform/main/biometric/biometric.darwin.main.ts @@ -1,7 +1,7 @@ import { systemPreferences } from "electron"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { passwords } from "@bitwarden/desktop-native"; import { OsBiometricService } from "./biometrics.service.abstraction"; diff --git a/apps/desktop/src/main/biometric/biometric.windows.main.ts b/apps/desktop/src/platform/main/biometric/biometric.windows.main.ts similarity index 94% rename from apps/desktop/src/main/biometric/biometric.windows.main.ts rename to apps/desktop/src/platform/main/biometric/biometric.windows.main.ts index 04139b666a5..749013a47c1 100644 --- a/apps/desktop/src/main/biometric/biometric.windows.main.ts +++ b/apps/desktop/src/platform/main/biometric/biometric.windows.main.ts @@ -1,11 +1,11 @@ -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; import { biometrics, passwords } from "@bitwarden/desktop-native"; +import { WindowMain } from "../../../main/window.main"; import { ElectronStateService } from "../../services/electron-state.service.abstraction"; -import { WindowMain } from "../window.main"; import { OsBiometricService } from "./biometrics.service.abstraction"; diff --git a/apps/desktop/src/main/biometric/biometrics.service.abstraction.ts b/apps/desktop/src/platform/main/biometric/biometrics.service.abstraction.ts similarity index 100% rename from apps/desktop/src/main/biometric/biometrics.service.abstraction.ts rename to apps/desktop/src/platform/main/biometric/biometrics.service.abstraction.ts diff --git a/apps/desktop/src/main/biometric/biometrics.service.spec.ts b/apps/desktop/src/platform/main/biometric/biometrics.service.spec.ts similarity index 92% rename from apps/desktop/src/main/biometric/biometrics.service.spec.ts rename to apps/desktop/src/platform/main/biometric/biometrics.service.spec.ts index bb2ab881c04..8bccaf4b9b2 100644 --- a/apps/desktop/src/main/biometric/biometrics.service.spec.ts +++ b/apps/desktop/src/platform/main/biometric/biometrics.service.spec.ts @@ -1,11 +1,11 @@ import { mock, MockProxy } from "jest-mock-extended"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { WindowMain } from "../../../main/window.main"; import { ElectronStateService } from "../../services/electron-state.service.abstraction"; -import { WindowMain } from "../window.main"; import BiometricDarwinMain from "./biometric.darwin.main"; import BiometricWindowsMain from "./biometric.windows.main"; diff --git a/apps/desktop/src/main/biometric/biometrics.service.ts b/apps/desktop/src/platform/main/biometric/biometrics.service.ts similarity index 94% rename from apps/desktop/src/main/biometric/biometrics.service.ts rename to apps/desktop/src/platform/main/biometric/biometrics.service.ts index ce45003b247..c5b3a10b14e 100644 --- a/apps/desktop/src/main/biometric/biometrics.service.ts +++ b/apps/desktop/src/platform/main/biometric/biometrics.service.ts @@ -1,9 +1,9 @@ -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { WindowMain } from "../../../main/window.main"; import { ElectronStateService } from "../../services/electron-state.service.abstraction"; -import { WindowMain } from "../window.main"; import { BiometricsServiceAbstraction, OsBiometricService } from "./biometrics.service.abstraction"; diff --git a/apps/desktop/src/main/biometric/index.ts b/apps/desktop/src/platform/main/biometric/index.ts similarity index 100% rename from apps/desktop/src/main/biometric/index.ts rename to apps/desktop/src/platform/main/biometric/index.ts diff --git a/apps/desktop/src/main/desktop-credential-storage-listener.ts b/apps/desktop/src/platform/main/desktop-credential-storage-listener.ts similarity index 95% rename from apps/desktop/src/main/desktop-credential-storage-listener.ts rename to apps/desktop/src/platform/main/desktop-credential-storage-listener.ts index 472dd88169b..c1af4fc5113 100644 --- a/apps/desktop/src/main/desktop-credential-storage-listener.ts +++ b/apps/desktop/src/platform/main/desktop-credential-storage-listener.ts @@ -1,10 +1,10 @@ import { ipcMain } from "electron"; import { BiometricKey } from "@bitwarden/common/auth/types/biometric-key"; -import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service"; +import { ConsoleLogService } from "@bitwarden/common/platform/services/console-log.service"; import { passwords } from "@bitwarden/desktop-native"; -import { BiometricMessage, BiometricStorageAction } from "../types/biometric-message"; +import { BiometricMessage, BiometricStorageAction } from "../../types/biometric-message"; import { BiometricsServiceAbstraction } from "./biometric/index"; diff --git a/apps/desktop/src/services/electron-crypto.service.ts b/apps/desktop/src/platform/services/electron-crypto.service.ts similarity index 78% rename from apps/desktop/src/services/electron-crypto.service.ts rename to apps/desktop/src/platform/services/electron-crypto.service.ts index 98e1a29a013..1fb90e52ca4 100644 --- a/apps/desktop/src/services/electron-crypto.service.ts +++ b/apps/desktop/src/platform/services/electron-crypto.service.ts @@ -1,11 +1,11 @@ -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { KeySuffixOptions } from "@bitwarden/common/enums"; -import { Utils } from "@bitwarden/common/misc/utils"; -import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { CryptoService } from "@bitwarden/common/services/crypto.service"; +import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; +import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; +import { CryptoService } from "@bitwarden/common/platform/services/crypto.service"; import { CsprngString } from "@bitwarden/common/types/csprng"; import { ElectronStateService } from "./electron-state.service.abstraction"; diff --git a/apps/desktop/src/services/electron-log.service.spec.ts b/apps/desktop/src/platform/services/electron-log.service.spec.ts similarity index 100% rename from apps/desktop/src/services/electron-log.service.spec.ts rename to apps/desktop/src/platform/services/electron-log.service.spec.ts diff --git a/apps/desktop/src/services/electron-log.service.ts b/apps/desktop/src/platform/services/electron-log.service.ts similarity index 92% rename from apps/desktop/src/services/electron-log.service.ts rename to apps/desktop/src/platform/services/electron-log.service.ts index 177b6b7cbac..d5e8e4ae806 100644 --- a/apps/desktop/src/services/electron-log.service.ts +++ b/apps/desktop/src/platform/services/electron-log.service.ts @@ -3,9 +3,9 @@ import * as path from "path"; import log from "electron-log"; import { LogLevelType } from "@bitwarden/common/enums"; -import { ConsoleLogService as BaseLogService } from "@bitwarden/common/services/consoleLog.service"; +import { ConsoleLogService as BaseLogService } from "@bitwarden/common/platform/services/console-log.service"; -import { isDev } from "../utils"; +import { isDev } from "../../utils"; export class ElectronLogService extends BaseLogService { constructor(protected filter: (level: LogLevelType) => boolean = null, logDir: string = null) { diff --git a/apps/desktop/src/services/electron-platform-utils.service.ts b/apps/desktop/src/platform/services/electron-platform-utils.service.ts similarity index 88% rename from apps/desktop/src/services/electron-platform-utils.service.ts rename to apps/desktop/src/platform/services/electron-platform-utils.service.ts index 4a646033043..485490c0a87 100644 --- a/apps/desktop/src/services/electron-platform-utils.service.ts +++ b/apps/desktop/src/platform/services/electron-platform-utils.service.ts @@ -1,13 +1,13 @@ import { clipboard, ipcRenderer, shell } from "electron"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { ClientType, DeviceType } from "@bitwarden/common/enums"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; -import { BiometricMessage, BiometricStorageAction } from "../types/biometric-message"; -import { isDev, isMacAppStore } from "../utils"; +import { BiometricMessage, BiometricStorageAction } from "../../types/biometric-message"; +import { isDev, isMacAppStore } from "../../utils"; export class ElectronPlatformUtilsService implements PlatformUtilsService { private deviceCache: DeviceType = null; diff --git a/apps/desktop/src/services/electron-renderer-messaging.service.ts b/apps/desktop/src/platform/services/electron-renderer-messaging.service.ts similarity index 79% rename from apps/desktop/src/services/electron-renderer-messaging.service.ts rename to apps/desktop/src/platform/services/electron-renderer-messaging.service.ts index 842c26a2e03..25414812c42 100644 --- a/apps/desktop/src/services/electron-renderer-messaging.service.ts +++ b/apps/desktop/src/platform/services/electron-renderer-messaging.service.ts @@ -1,7 +1,7 @@ import { ipcRenderer } from "electron"; -import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; +import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; export class ElectronRendererMessagingService implements MessagingService { constructor(private broadcasterService: BroadcasterService) { diff --git a/apps/desktop/src/services/electron-renderer-secure-storage.service.ts b/apps/desktop/src/platform/services/electron-renderer-secure-storage.service.ts similarity index 85% rename from apps/desktop/src/services/electron-renderer-secure-storage.service.ts rename to apps/desktop/src/platform/services/electron-renderer-secure-storage.service.ts index 2a645559c89..ce3923af5f4 100644 --- a/apps/desktop/src/services/electron-renderer-secure-storage.service.ts +++ b/apps/desktop/src/platform/services/electron-renderer-secure-storage.service.ts @@ -1,7 +1,7 @@ import { ipcRenderer } from "electron"; -import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service"; -import { StorageOptions } from "@bitwarden/common/models/domain/storage-options"; +import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service"; +import { StorageOptions } from "@bitwarden/common/platform/models/domain/storage-options"; export class ElectronRendererSecureStorageService implements AbstractStorageService { async get(key: string, options?: StorageOptions): Promise { diff --git a/apps/desktop/src/services/electron-renderer-storage.service.ts b/apps/desktop/src/platform/services/electron-renderer-storage.service.ts similarity index 87% rename from apps/desktop/src/services/electron-renderer-storage.service.ts rename to apps/desktop/src/platform/services/electron-renderer-storage.service.ts index 601dcbb22f1..3810e10ab50 100644 --- a/apps/desktop/src/services/electron-renderer-storage.service.ts +++ b/apps/desktop/src/platform/services/electron-renderer-storage.service.ts @@ -1,6 +1,6 @@ import { ipcRenderer } from "electron"; -import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service"; +import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service"; export class ElectronRendererStorageService implements AbstractStorageService { get(key: string): Promise { diff --git a/apps/desktop/src/services/electron-state.service.abstraction.ts b/apps/desktop/src/platform/services/electron-state.service.abstraction.ts similarity index 68% rename from apps/desktop/src/services/electron-state.service.abstraction.ts rename to apps/desktop/src/platform/services/electron-state.service.abstraction.ts index e8c3459a243..2beabe48eae 100644 --- a/apps/desktop/src/services/electron-state.service.abstraction.ts +++ b/apps/desktop/src/platform/services/electron-state.service.abstraction.ts @@ -1,8 +1,8 @@ -import { StateService } from "@bitwarden/common/abstractions/state.service"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { StorageOptions } from "@bitwarden/common/models/domain/storage-options"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; +import { StorageOptions } from "@bitwarden/common/platform/models/domain/storage-options"; -import { Account } from "../models/account"; +import { Account } from "../../models/account"; export abstract class ElectronStateService extends StateService { getBiometricEncryptionClientKeyHalf: (options?: StorageOptions) => Promise; diff --git a/apps/desktop/src/services/electron-state.service.ts b/apps/desktop/src/platform/services/electron-state.service.ts similarity index 88% rename from apps/desktop/src/services/electron-state.service.ts rename to apps/desktop/src/platform/services/electron-state.service.ts index 137302c8019..7c3ff38a1b5 100644 --- a/apps/desktop/src/services/electron-state.service.ts +++ b/apps/desktop/src/platform/services/electron-state.service.ts @@ -1,14 +1,14 @@ -import { Utils } from "@bitwarden/common/misc/utils"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; -import { GlobalState } from "@bitwarden/common/models/domain/global-state"; -import { StorageOptions } from "@bitwarden/common/models/domain/storage-options"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; +import { GlobalState } from "@bitwarden/common/platform/models/domain/global-state"; +import { StorageOptions } from "@bitwarden/common/platform/models/domain/storage-options"; import { DeviceKey, SymmetricCryptoKey, -} from "@bitwarden/common/models/domain/symmetric-crypto-key"; -import { StateService as BaseStateService } from "@bitwarden/common/services/state.service"; +} from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; +import { StateService as BaseStateService } from "@bitwarden/common/platform/services/state.service"; -import { Account } from "../models/account"; +import { Account } from "../../models/account"; import { ElectronStateService as ElectronStateServiceAbstraction } from "./electron-state.service.abstraction"; diff --git a/apps/desktop/src/services/electron-storage.service.ts b/apps/desktop/src/platform/services/electron-storage.service.ts similarity index 95% rename from apps/desktop/src/services/electron-storage.service.ts rename to apps/desktop/src/platform/services/electron-storage.service.ts index d6e5bc4d523..51fb9cfe9c0 100644 --- a/apps/desktop/src/services/electron-storage.service.ts +++ b/apps/desktop/src/platform/services/electron-storage.service.ts @@ -2,8 +2,8 @@ import * as fs from "fs"; import { ipcMain } from "electron"; -import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service"; import { NodeUtils } from "@bitwarden/common/misc/nodeUtils"; +import { AbstractStorageService } from "@bitwarden/common/platform/abstractions/storage.service"; // See: https://github.com/sindresorhus/electron-store/blob/main/index.d.ts interface ElectronStoreOptions { diff --git a/apps/desktop/src/services/i18n.service.ts b/apps/desktop/src/platform/services/i18n.service.ts similarity index 97% rename from apps/desktop/src/services/i18n.service.ts rename to apps/desktop/src/platform/services/i18n.service.ts index e36af04c181..ddcc9ca972e 100644 --- a/apps/desktop/src/services/i18n.service.ts +++ b/apps/desktop/src/platform/services/i18n.service.ts @@ -1,7 +1,7 @@ import * as fs from "fs"; import * as path from "path"; -import { I18nService as BaseI18nService } from "@bitwarden/common/services/i18n.service"; +import { I18nService as BaseI18nService } from "@bitwarden/common/platform/services/i18n.service"; export class I18nService extends BaseI18nService { constructor(systemLanguage: string, localesDirectory: string) { diff --git a/apps/desktop/src/services/electron-main-messaging.service.ts b/apps/desktop/src/services/electron-main-messaging.service.ts index 07afddec8c3..c37fe3ea49f 100644 --- a/apps/desktop/src/services/electron-main-messaging.service.ts +++ b/apps/desktop/src/services/electron-main-messaging.service.ts @@ -2,8 +2,8 @@ import * as path from "path"; import { app, dialog, ipcMain, Menu, MenuItem, nativeTheme, session, Notification } from "electron"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { ThemeType } from "@bitwarden/common/enums"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { WindowMain } from "../main/window.main"; import { RendererMenuItem } from "../utils"; diff --git a/apps/desktop/src/services/encrypted-message-handler.service.ts b/apps/desktop/src/services/encrypted-message-handler.service.ts index 4891a5799a6..1889bfc7451 100644 --- a/apps/desktop/src/services/encrypted-message-handler.service.ts +++ b/apps/desktop/src/services/encrypted-message-handler.service.ts @@ -1,10 +1,10 @@ import { firstValueFrom } from "rxjs"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CipherType } from "@bitwarden/common/vault/enums/cipher-type"; @@ -24,8 +24,7 @@ import { GenerateResponse } from "../models/native-messaging/encrypted-message-r import { MessageResponseData } from "../models/native-messaging/encrypted-message-responses/message-response-data"; 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 { ElectronStateService } from "./electron-state.service"; +import { ElectronStateService } from "../platform/services/electron-state.service"; export class EncryptedMessageHandlerService { constructor( diff --git a/apps/desktop/src/services/native-message-handler.service.ts b/apps/desktop/src/services/native-message-handler.service.ts index 4ef4545d2b1..1921ea5fa05 100644 --- a/apps/desktop/src/services/native-message-handler.service.ts +++ b/apps/desktop/src/services/native-message-handler.service.ts @@ -2,15 +2,15 @@ import { Injectable } from "@angular/core"; import { ipcRenderer } from "electron"; import Swal from "sweetalert2"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { NativeMessagingVersion } from "@bitwarden/common/enums"; -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 { StateService } from "@bitwarden/common/services/state.service"; +import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; +import { StateService } from "@bitwarden/common/platform/services/state.service"; import { DecryptedCommandData } from "../models/native-messaging/decrypted-command-data"; import { EncryptedMessage } from "../models/native-messaging/encrypted-message"; diff --git a/apps/desktop/src/services/native-messaging.service.ts b/apps/desktop/src/services/native-messaging.service.ts index 39b916261e8..494a65b6703 100644 --- a/apps/desktop/src/services/native-messaging.service.ts +++ b/apps/desktop/src/services/native-messaging.service.ts @@ -3,17 +3,17 @@ import { ipcRenderer } from "electron"; import { firstValueFrom } from "rxjs"; import Swal from "sweetalert2"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { KeySuffixOptions } from "@bitwarden/common/enums"; -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 { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; +import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; import { LegacyMessage } from "../models/native-messaging/legacy-message"; import { LegacyMessageWrapper } from "../models/native-messaging/legacy-message-wrapper"; diff --git a/apps/desktop/src/vault/app/accounts/premium.component.ts b/apps/desktop/src/vault/app/accounts/premium.component.ts index 70650661e77..13116fd3ed4 100644 --- a/apps/desktop/src/vault/app/accounts/premium.component.ts +++ b/apps/desktop/src/vault/app/accounts/premium.component.ts @@ -3,10 +3,10 @@ import { Component } from "@angular/core"; import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { PremiumComponent as BasePremiumComponent } from "@bitwarden/angular/vault/components/premium.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; @Component({ selector: "app-premium", diff --git a/apps/desktop/src/vault/app/vault/add-edit-custom-fields.component.ts b/apps/desktop/src/vault/app/vault/add-edit-custom-fields.component.ts index 517e5016c6f..6992455a8a6 100644 --- a/apps/desktop/src/vault/app/vault/add-edit-custom-fields.component.ts +++ b/apps/desktop/src/vault/app/vault/add-edit-custom-fields.component.ts @@ -2,7 +2,7 @@ import { Component } from "@angular/core"; import { AddEditCustomFieldsComponent as BaseAddEditCustomFieldsComponent } from "@bitwarden/angular/vault/components/add-edit-custom-fields.component"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; @Component({ selector: "app-vault-add-edit-custom-fields", diff --git a/apps/desktop/src/vault/app/vault/add-edit.component.ts b/apps/desktop/src/vault/app/vault/add-edit.component.ts index 8718f171d1d..d06f37dc08d 100644 --- a/apps/desktop/src/vault/app/vault/add-edit.component.ts +++ b/apps/desktop/src/vault/app/vault/add-edit.component.ts @@ -4,16 +4,16 @@ import { NgForm } from "@angular/forms"; import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { AddEditComponent as BaseAddEditComponent } from "@bitwarden/angular/vault/components/add-edit.component"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; diff --git a/apps/desktop/src/vault/app/vault/attachments.component.ts b/apps/desktop/src/vault/app/vault/attachments.component.ts index bd327951a1a..edee15fc4e5 100644 --- a/apps/desktop/src/vault/app/vault/attachments.component.ts +++ b/apps/desktop/src/vault/app/vault/attachments.component.ts @@ -3,12 +3,12 @@ import { Component } from "@angular/core"; import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { AttachmentsComponent as BaseAttachmentsComponent } from "@bitwarden/angular/vault/components/attachments.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ diff --git a/apps/desktop/src/vault/app/vault/collections.component.ts b/apps/desktop/src/vault/app/vault/collections.component.ts index ae64f67b0ff..1b596c9c6a8 100644 --- a/apps/desktop/src/vault/app/vault/collections.component.ts +++ b/apps/desktop/src/vault/app/vault/collections.component.ts @@ -1,10 +1,10 @@ import { Component } from "@angular/core"; import { CollectionsComponent as BaseCollectionsComponent } from "@bitwarden/angular/admin-console/components/collections.component"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ diff --git a/apps/desktop/src/vault/app/vault/folder-add-edit.component.ts b/apps/desktop/src/vault/app/vault/folder-add-edit.component.ts index 6b7321e634a..9f28a2ea063 100644 --- a/apps/desktop/src/vault/app/vault/folder-add-edit.component.ts +++ b/apps/desktop/src/vault/app/vault/folder-add-edit.component.ts @@ -2,9 +2,9 @@ import { Component } from "@angular/core"; import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { FolderAddEditComponent as BaseFolderAddEditComponent } from "@bitwarden/angular/vault/components/folder-add-edit.component"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { FolderApiServiceAbstraction } from "@bitwarden/common/vault/abstractions/folder/folder-api.service.abstraction"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; diff --git a/apps/desktop/src/vault/app/vault/password-history.component.ts b/apps/desktop/src/vault/app/vault/password-history.component.ts index e52236a0c0b..3d542f62331 100644 --- a/apps/desktop/src/vault/app/vault/password-history.component.ts +++ b/apps/desktop/src/vault/app/vault/password-history.component.ts @@ -1,8 +1,8 @@ import { Component } from "@angular/core"; import { PasswordHistoryComponent as BasePasswordHistoryComponent } from "@bitwarden/angular/vault/components/password-history.component"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ diff --git a/apps/desktop/src/vault/app/vault/share.component.ts b/apps/desktop/src/vault/app/vault/share.component.ts index 683bd7d5238..e07a100d882 100644 --- a/apps/desktop/src/vault/app/vault/share.component.ts +++ b/apps/desktop/src/vault/app/vault/share.component.ts @@ -2,11 +2,11 @@ import { Component } from "@angular/core"; import { ModalRef } from "@bitwarden/angular/components/modal/modal.ref"; import { ShareComponent as BaseShareComponent } from "@bitwarden/angular/components/share.component"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; @Component({ diff --git a/apps/desktop/src/vault/app/vault/vault.component.ts b/apps/desktop/src/vault/app/vault/vault.component.ts index 2290806e307..5405a913a75 100644 --- a/apps/desktop/src/vault/app/vault/vault.component.ts +++ b/apps/desktop/src/vault/app/vault/vault.component.ts @@ -15,14 +15,14 @@ import { DialogServiceAbstraction, SimpleDialogType } from "@bitwarden/angular/s import { ModalService } from "@bitwarden/angular/services/modal.service"; import { VaultFilter } from "@bitwarden/angular/vault/vault-filter/models/vault-filter.model"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { EventType } from "@bitwarden/common/enums"; +import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; diff --git a/apps/desktop/src/vault/app/vault/view.component.ts b/apps/desktop/src/vault/app/vault/view.component.ts index 85b8930916b..1555199d0ca 100644 --- a/apps/desktop/src/vault/app/vault/view.component.ts +++ b/apps/desktop/src/vault/app/vault/view.component.ts @@ -11,17 +11,17 @@ import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog"; import { ViewComponent as BaseViewComponent } from "@bitwarden/angular/vault/components/view.component"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; import { AuditService } from "@bitwarden/common/abstractions/audit.service"; -import { BroadcasterService } from "@bitwarden/common/abstractions/broadcaster.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { EventCollectionService } from "@bitwarden/common/abstractions/event/event-collection.service"; -import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { TotpService } from "@bitwarden/common/abstractions/totp.service"; import { TokenService } from "@bitwarden/common/auth/abstractions/token.service"; +import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { FolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction"; import { PasswordRepromptService } from "@bitwarden/common/vault/abstractions/password-reprompt.service"; diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json index 3d01b5ba6fd..3721d4f211e 100644 --- a/apps/desktop/tsconfig.json +++ b/apps/desktop/tsconfig.json @@ -20,5 +20,5 @@ "strictTemplates": true, "preserveWhitespaces": true }, - "include": ["src", "../../libs/common/src/services/**/*.worker.ts"] + "include": ["src", "../../libs/common/src/platform/services/**/*.worker.ts"] } diff --git a/apps/web/config/eudevtest.json b/apps/web/config/eudevtest.json new file mode 100644 index 00000000000..faaba2177cb --- /dev/null +++ b/apps/web/config/eudevtest.json @@ -0,0 +1,11 @@ +{ + "urls": { + "icons": "https://icons.eudevtest.bitwarden.pw", + "notifications": "https://notifications.eudevtest.bitwarden.pw", + "scim": "https://scim.eudevtest.bitwarden.pw" + }, + "flags": { + "secretsManager": true, + "showPasswordless": true + } +} diff --git a/apps/web/config/selfhosted.json b/apps/web/config/selfhosted.json index 21a9d93a998..8ffbc0f9e5a 100644 --- a/apps/web/config/selfhosted.json +++ b/apps/web/config/selfhosted.json @@ -8,6 +8,6 @@ }, "flags": { "secretsManager": false, - "showPasswordless": false + "showPasswordless": true } } diff --git a/apps/web/package.json b/apps/web/package.json index 4419ddecd70..c50b4df2a85 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "@bitwarden/web-vault", - "version": "2023.4.2", + "version": "2023.5.0", "scripts": { "build:oss": "webpack", "build:bit": "webpack -c ../../bitwarden_license/bit-web/webpack.config.js", @@ -11,6 +11,7 @@ "build:bit:dev:watch": "cross-env ENV=development npm run build:bit:watch", "build:bit:qa": "cross-env NODE_ENV=production ENV=qa npm run build:bit", "build:bit:poc": "cross-env NODE_ENV=production ENV=poc npm run build:bit", + "build:bit:eudevtest": "cross-env NODE_ENV=production ENV=eudevtest npm run build:bit", "build:bit:cloud": "cross-env NODE_ENV=production ENV=cloud npm run build:bit", "build:oss:selfhost:watch": "cross-env ENV=selfhosted npm run build:oss:watch", "build:bit:selfhost:watch": "cross-env ENV=selfhosted npm run build:bit:watch", diff --git a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts b/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts index 30f5835a572..4cc9aa914f1 100644 --- a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts +++ b/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.spec.ts @@ -8,16 +8,16 @@ import { RouterTestingModule } from "@angular/router/testing"; import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject, of } from "rxjs"; -import { I18nPipe } from "@bitwarden/angular/pipes/i18n.pipe"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { I18nPipe } from "@bitwarden/angular/platform/pipes/i18n.pipe"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options"; import { PolicyResponse } from "@bitwarden/common/admin-console/models/response/policy.response"; import { PlanType } from "@bitwarden/common/billing/enums"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { RouterService } from "../../core"; diff --git a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts b/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts index 80d69f0915d..57a807c9a35 100644 --- a/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts +++ b/apps/web/src/app/accounts/trial-initiation/trial-initiation.component.ts @@ -5,9 +5,6 @@ import { UntypedFormBuilder, Validators } from "@angular/forms"; import { ActivatedRoute, Router } from "@angular/router"; import { first, Subject, takeUntil } from "rxjs"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyData } from "@bitwarden/common/admin-console/models/data/policy.data"; @@ -16,6 +13,9 @@ import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; import { PlanType } from "@bitwarden/common/billing/enums"; import { ProductType } from "@bitwarden/common/enums"; import { ReferenceEventRequest } from "@bitwarden/common/models/request/reference-event.request"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { RouterService } from "./../../core/router.service"; import { VerticalStepperComponent } from "./vertical-stepper/vertical-stepper.component"; diff --git a/apps/web/src/app/admin-console/components/organization-switcher.component.ts b/apps/web/src/app/admin-console/components/organization-switcher.component.ts index 518b99240d2..daca58d601a 100644 --- a/apps/web/src/app/admin-console/components/organization-switcher.component.ts +++ b/apps/web/src/app/admin-console/components/organization-switcher.component.ts @@ -1,13 +1,13 @@ import { Component, Input, OnInit } from "@angular/core"; import { map, Observable } from "rxjs"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { canAccessAdmin, OrganizationService, } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; @Component({ selector: "app-organization-switcher", diff --git a/apps/web/src/app/admin-console/organizations/core/services/collection-admin.service.ts b/apps/web/src/app/admin-console/organizations/core/services/collection-admin.service.ts index 45adb008426..85f3d9423f1 100644 --- a/apps/web/src/app/admin-console/organizations/core/services/collection-admin.service.ts +++ b/apps/web/src/app/admin-console/organizations/core/services/collection-admin.service.ts @@ -1,14 +1,14 @@ import { Injectable } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; import { CollectionRequest } from "@bitwarden/common/admin-console/models/request/collection.request"; import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request"; import { CollectionAccessDetailsResponse, CollectionResponse, } from "@bitwarden/common/admin-console/models/response/collection.response"; -import { EncString } from "@bitwarden/common/models/domain/enc-string"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { CoreOrganizationModule } from "../core-organization.module"; import { CollectionAdminView } from "../views/collection-admin.view"; diff --git a/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.ts b/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.ts index 8460568ea6e..10d39d110e4 100644 --- a/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.ts +++ b/apps/web/src/app/admin-console/organizations/guards/is-paid-org.guard.ts @@ -2,8 +2,8 @@ import { Injectable } from "@angular/core"; import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router"; import { DialogServiceAbstraction, SimpleDialogType } from "@bitwarden/angular/services/dialog"; -import { MessagingService } from "@bitwarden/common/abstractions/messaging.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; @Injectable({ providedIn: "root", diff --git a/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.spec.ts b/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.spec.ts index b7e64e2fec6..d599ce768df 100644 --- a/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.spec.ts +++ b/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.spec.ts @@ -6,11 +6,11 @@ import { } from "@angular/router"; import { mock, MockProxy } from "jest-mock-extended"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationUserType } from "@bitwarden/common/admin-console/enums"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; import { OrganizationPermissionsGuard } from "./org-permissions.guard"; diff --git a/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.ts b/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.ts index 26263eb8169..595f72ba86e 100644 --- a/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.ts +++ b/apps/web/src/app/admin-console/organizations/guards/org-permissions.guard.ts @@ -1,13 +1,13 @@ import { Injectable } from "@angular/core"; import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { canAccessOrgAdmin, OrganizationService, } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction"; @Injectable({ diff --git a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts index 26f2bccd3ce..d6ecb8ca94e 100644 --- a/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/entity-events.component.ts @@ -2,12 +2,12 @@ import { Component, Input, OnInit } from "@angular/core"; import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { EventResponse } from "@bitwarden/common/models/response/event.response"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { EventService } from "../../../core"; diff --git a/apps/web/src/app/admin-console/organizations/manage/entity-users.component.ts b/apps/web/src/app/admin-console/organizations/manage/entity-users.component.ts index 5f522a258e6..af0c344a29e 100644 --- a/apps/web/src/app/admin-console/organizations/manage/entity-users.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/entity-users.component.ts @@ -2,17 +2,17 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationUserUserDetailsResponse } from "@bitwarden/common/abstractions/organization-user/responses"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { OrganizationUserStatusType, OrganizationUserType, } from "@bitwarden/common/admin-console/enums"; import { SelectionReadOnlyRequest } from "@bitwarden/common/admin-console/models/request/selection-read-only.request"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; @Component({ selector: "app-entity-users", diff --git a/apps/web/src/app/admin-console/organizations/manage/events.component.ts b/apps/web/src/app/admin-console/organizations/manage/events.component.ts index df10e3c7e39..0d6e1c0f079 100644 --- a/apps/web/src/app/admin-console/organizations/manage/events.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/events.component.ts @@ -4,16 +4,16 @@ import { concatMap, Subject, takeUntil } from "rxjs"; import { UserNamePipe } from "@bitwarden/angular/pipes/user-name.pipe"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { FileDownloadService } from "@bitwarden/common/abstractions/fileDownload/fileDownload.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { ProviderService } from "@bitwarden/common/admin-console/abstractions/provider.service"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { EventSystemUser } from "@bitwarden/common/enums"; import { EventResponse } from "@bitwarden/common/models/response/event.response"; +import { FileDownloadService } from "@bitwarden/common/platform/abstractions/file-download/file-download.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { BaseEventsComponent } from "../../../common/base.events.component"; import { EventService } from "../../../core"; diff --git a/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts index d70cc061fd7..433c6049f6a 100644 --- a/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.ts @@ -5,15 +5,15 @@ import { catchError, combineLatest, from, map, of, Subject, switchMap, takeUntil import { DialogServiceAbstraction, SimpleDialogType } from "@bitwarden/angular/services/dialog"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { CollectionData } from "@bitwarden/common/admin-console/models/data/collection.data"; import { Collection } from "@bitwarden/common/admin-console/models/domain/collection"; import { CollectionDetailsResponse } from "@bitwarden/common/admin-console/models/response/collection.response"; import { ErrorResponse } from "@bitwarden/common/models/response/error.response"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { GroupService, GroupView } from "../core"; import { diff --git a/apps/web/src/app/admin-console/organizations/manage/groups.component.ts b/apps/web/src/app/admin-console/organizations/manage/groups.component.ts index 79a8d3d86b3..24eb9305858 100644 --- a/apps/web/src/app/admin-console/organizations/manage/groups.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/groups.component.ts @@ -18,9 +18,6 @@ import { SearchPipe } from "@bitwarden/angular/pipes/search.pipe"; import { DialogServiceAbstraction, SimpleDialogType } from "@bitwarden/angular/services/dialog"; import { ModalService } from "@bitwarden/angular/services/modal.service"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { SearchService } from "@bitwarden/common/abstractions/search.service"; import { CollectionService } from "@bitwarden/common/admin-console/abstractions/collection.service"; import { CollectionData } from "@bitwarden/common/admin-console/models/data/collection.data"; @@ -30,8 +27,11 @@ import { CollectionResponse, } from "@bitwarden/common/admin-console/models/response/collection.response"; import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; -import { Utils } from "@bitwarden/common/misc/utils"; import { ListResponse } from "@bitwarden/common/models/response/list.response"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { GroupService, GroupView } from "../core"; diff --git a/apps/web/src/app/admin-console/organizations/manage/user-confirm.component.ts b/apps/web/src/app/admin-console/organizations/manage/user-confirm.component.ts index 0ae5bdf8047..4d3cd0b6ede 100644 --- a/apps/web/src/app/admin-console/organizations/manage/user-confirm.component.ts +++ b/apps/web/src/app/admin-console/organizations/manage/user-confirm.component.ts @@ -1,8 +1,8 @@ import { Component, EventEmitter, Input, OnInit, Output } from "@angular/core"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { LogService } from "@bitwarden/common/abstractions/log.service"; -import { StateService } from "@bitwarden/common/abstractions/state.service"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; @Component({ selector: "app-user-confirm", diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm.component.ts b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm.component.ts index ac861249066..669a8954eee 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm.component.ts @@ -1,12 +1,12 @@ import { Component, Input, OnInit } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { CryptoService } from "@bitwarden/common/abstractions/crypto.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; import { OrganizationUserBulkConfirmRequest } from "@bitwarden/common/abstractions/organization-user/requests"; import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enums"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; import { BulkUserDetails } from "./bulk-status.component"; diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove.component.ts b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove.component.ts index 792be72920e..d083d0cd1e0 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-remove.component.ts @@ -1,8 +1,8 @@ import { Component, Input } from "@angular/core"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { BulkUserDetails } from "./bulk-status.component"; diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts index b039db78788..82f3a4d7e32 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-restore-revoke.component.ts @@ -1,8 +1,8 @@ import { Component } from "@angular/core"; import { ModalConfig } from "@bitwarden/angular/services/modal.service"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { BulkUserDetails } from "./bulk-status.component"; diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts index 894eca5547b..72833a09719 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.ts @@ -4,9 +4,7 @@ import { FormBuilder, Validators } from "@angular/forms"; import { combineLatest, of, shareReplay, Subject, switchMap, takeUntil } from "rxjs"; import { DialogServiceAbstraction, SimpleDialogType } from "@bitwarden/angular/services/dialog"; -import { I18nService } from "@bitwarden/common/abstractions/i18n.service"; import { OrganizationUserService } from "@bitwarden/common/abstractions/organization-user/organization-user.service"; -import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service"; import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; import { OrganizationUserStatusType, @@ -15,6 +13,8 @@ import { import { PermissionsApi } from "@bitwarden/common/admin-console/models/api/permissions.api"; import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; import { CollectionView } from "@bitwarden/common/admin-console/models/view/collection.view"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { flagEnabled } from "../../../../../../utils/flags"; import { diff --git a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/nested-checkbox.component.ts b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/nested-checkbox.component.ts index 278bd27fdd6..f16a932ddc1 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/nested-checkbox.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/nested-checkbox.component.ts @@ -3,7 +3,7 @@ import { Component, EventEmitter, Input, Output, OnInit, OnDestroy } from "@angu import { FormControl, FormGroup } from "@angular/forms"; import { Subject, takeUntil } from "rxjs"; -import { Utils } from "@bitwarden/common/misc/utils"; +import { Utils } from "@bitwarden/common/platform/misc/utils"; @Component({ selector: "app-nested-checkbox", diff --git a/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.html b/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.html index 60827963b4b..4116f56de79 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.html +++ b/apps/web/src/app/admin-console/organizations/members/components/reset-password.component.html @@ -3,7 +3,7 @@