diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 9dd7b5c2e6f..c0d1e0eb8ab 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -22,3 +22,6 @@ 193434461dbd9c48fe5dcbad95693470aec422ac # Jslib: Monorepository https://github.com/bitwarden/clients/pull/2824/commits/d7492e3cf320410e74ebd0e0675ab994e64bd01a d7492e3cf320410e74ebd0e0675ab994e64bd01a + +# All Clients: Apply Prettier https://github.com/bitwarden/clients/pull/7014 +28de9439beb87133c8683434df952a0c0be94100 diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7d216ac257e..38eb90b1b07 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,11 +1,9 @@ -# Please sort lines alphabetically, this will ensure we don't accidentally add duplicates. +# Please sort into logical groups with comment headers. Sort groups in order of specificity. +# For example, default owners should always be the first group. +# Sort lines alphabetically within these groups to avoid accidentally adding duplicates. # # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners -# The following owners will be the default owners for everything in the repo. -# Unless a later match takes precedence -* @bitwarden/tech-leads - ## Secrets Manager team files ## bitwarden_license/bit-web/src/app/secrets-manager @bitwarden/team-secrets-manager-dev @@ -91,30 +89,6 @@ libs/components @bitwarden/team-component-library ## Desktop native module ## apps/desktop/desktop_native @bitwarden/team-platform-dev -## Multiple file owners ## -apps/browser/package.json -apps/browser/src/manifest.json -apps/browser/src/manifest.v3.json - -apps/cli/package.json - -apps/desktop/package.json -apps/desktop/src/package-lock.json -apps/desktop/src/package.json - -/apps/web/config -/apps/web/package.json - -package.json -package-lock.json - -## Locales ## -apps/browser/src/_locales/en/messages.json -apps/browser/store/locales/en -apps/cli/src/locales/en/messages.json -apps/desktop/src/locales/en/messages.json -apps/web/src/locales/en/messages.json - ## DevOps team files ## /.github/workflows @bitwarden/dept-devops @@ -123,3 +97,10 @@ apps/web/src/locales/en/messages.json **/*.Dockerfile @bitwarden/dept-devops **/.dockerignore @bitwarden/dept-devops **/entrypoint.sh @bitwarden/dept-devops + +## Locales ## +apps/browser/src/_locales/en/messages.json +apps/browser/store/locales/en +apps/cli/src/locales/en/messages.json +apps/desktop/src/locales/en/messages.json +apps/web/src/locales/en/messages.json diff --git a/.github/renovate.json b/.github/renovate.json index bb5816d4ce3..ae86a4c5c05 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -79,7 +79,6 @@ "matchPackageNames": [ "@types/duo_web_sdk", "@types/node-ipc", - "@types/zxcvbn", "duo_web_sdk", "node-ipc", "qrious", @@ -107,6 +106,7 @@ "prettier-plugin-tailwindcss", "rimraf", "tabbable", + "tldts", "wait-on" ], "description": "Autofill owned dependencies", @@ -212,17 +212,21 @@ "@electron/rebuild", "@microsoft/signalr", "@microsoft/signalr-protocol-msgpack", + "@types/jsdom", "@types/papaparse", + "@types/zxcvbn", "electron", "electron-builder", "electron-log", "electron-reload", "electron-store", "electron-updater", + "jsdom", "jszip", + "oidc-client-ts", "papaparse", - "tldts", - "utf-8-validate" + "utf-8-validate", + "zxcvbn" ], "description": "Tools owned dependencies", "commitMessagePrefix": "[deps] Tools:", @@ -233,7 +237,6 @@ "@koa/multer", "@koa/router", "@types/inquirer", - "@types/jsdom", "@types/koa", "@types/koa__multer", "@types/koa__router", @@ -249,7 +252,6 @@ "form-data", "https-proxy-agent", "inquirer", - "jsdom", "koa", "koa-bodyparser", "koa-json", diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt index dcabbd22263..ef2ff29ed8d 100644 --- a/.github/whitelist-capital-letters.txt +++ b/.github/whitelist-capital-letters.txt @@ -40,15 +40,6 @@ ./apps/browser/README.md ./apps/browser/store/windows/AppxManifest.xml ./apps/browser/src/background/nativeMessaging.background.ts -./apps/browser/src/background/models/addLoginRuntimeMessage.ts -./apps/browser/src/background/models/addChangePasswordQueueMessage.ts -./apps/browser/src/background/models/addLoginQueueMessage.ts -./apps/browser/src/background/models/changePasswordRuntimeMessage.ts -./apps/browser/src/background/models/notificationQueueMessage.ts -./apps/browser/src/background/models/notificationQueueMessageType.ts -./apps/browser/src/background/models/lockedVaultPendingNotificationsItem.ts -./apps/browser/src/background/webRequest.background.ts -./apps/browser/src/popup/services/debounceNavigationService.ts ./apps/browser/src/models/browserComponentState.ts ./apps/browser/src/models/browserSendComponentState.ts ./apps/browser/src/models/browserGroupingsComponentState.ts diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index cb2b929d0e7..6eb00437ad5 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -44,7 +44,7 @@ jobs: run: npm run build-storybook:ci - name: Publish to Chromatic - uses: chromaui/action@d726e4e790a99e876f71b8e09d3053bfe783d6b8 + uses: chromaui/action@2f12dc37555ffc9ed980d883e96b6d03724a2d6a # v10.0.0 with: token: ${{ secrets.GITHUB_TOKEN }} projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }} diff --git a/.github/workflows/deploy-non-prod-web.yml b/.github/workflows/deploy-non-prod-web.yml index 651b6a83726..a3e6547ff49 100644 --- a/.github/workflows/deploy-non-prod-web.yml +++ b/.github/workflows/deploy-non-prod-web.yml @@ -71,6 +71,21 @@ jobs: echo "environment-url=http://vault.bitwarden.eu" >> $GITHUB_OUTPUT fi + notify-start: + name: Notify Slack with start message + runs-on: ubuntu-22.04 + if: always() + steps: + - uses: bitwarden/gh-actions/report-deployment-status-to-slack@main + with: + project: Web + environment: US ${{ inputs.environment }} Cloud + tag: ${{ github.ref_name }} + slack-channel: team-eng-qa-devops + event: 'start' + url: https://github.com/bitwarden/clients/actions/runs/${{ github.run_id }} + AZURE_KV_CI_SERVICE_PRINCIPAL: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }} + artifact-check: name: Check if Web artifact is present runs-on: ubuntu-22.04 @@ -209,6 +224,7 @@ jobs: project: Web environment: ${{ needs.setup.outputs.environment-name }} tag: ${{ github.event.inputs.tag }} - slack-channel: devops-alerts-test - failure: ${{ needs.azure-deploy.result == 'failure' }} + slack-channel: team-eng-qa-devops + event: ${{ needs.azure-deploy.result }} + url: https://github.com/bitwarden/clients/actions/runs/${{ github.run_id }} AZURE_KV_CI_SERVICE_PRINCIPAL: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }} diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx index 0bc9fc5bacb..af20dcad74e 100644 --- a/.storybook/preview.tsx +++ b/.storybook/preview.tsx @@ -48,7 +48,7 @@ const decorator = componentWrapperDecorator( }, ({ globals }) => { return { theme: `${globals["theme"]}` }; - } + }, ); const preview: Preview = { diff --git a/apps/browser/config/development.json b/apps/browser/config/development.json index eafd0ffd878..1b628c173ce 100644 --- a/apps/browser/config/development.json +++ b/apps/browser/config/development.json @@ -7,6 +7,7 @@ }, "flags": { "showPasswordless": true, - "enableCipherKeyEncryption": false + "enableCipherKeyEncryption": false, + "accountSwitching": true } } diff --git a/apps/browser/config/production.json b/apps/browser/config/production.json index f57c3d9bc38..027003f6c75 100644 --- a/apps/browser/config/production.json +++ b/apps/browser/config/production.json @@ -1,5 +1,6 @@ { "flags": { - "enableCipherKeyEncryption": false + "enableCipherKeyEncryption": false, + "accountSwitching": true } } diff --git a/apps/browser/gulpfile.js b/apps/browser/gulpfile.js index af1a2d8c7db..a8f55cdee80 100644 --- a/apps/browser/gulpfile.js +++ b/apps/browser/gulpfile.js @@ -1,13 +1,11 @@ const child = require("child_process"); const fs = require("fs"); -const del = require("del"); +const { rimraf } = require("rimraf"); const gulp = require("gulp"); -const filter = require("gulp-filter"); const gulpif = require("gulp-if"); const jeditor = require("gulp-json-editor"); const replace = require("gulp-replace"); -const zip = require("gulp-zip"); const manifest = require("./src/manifest.json"); @@ -47,7 +45,10 @@ function distFileName(browserName, ext) { return `dist-${browserName}${buildString()}.${ext}`; } -function dist(browserName, manifest) { +async function dist(browserName, manifest) { + const { default: zip } = await import("gulp-zip"); + const { default: filter } = await import("gulp-filter"); + return gulp .src(paths.build + "**/*") .pipe(filter(["**"].concat(filters.fonts).concat(filters.safari))) @@ -130,7 +131,7 @@ function distSafariApp(cb, subBuildPath) { ]; } - return del([buildPath + "**/*"]) + return rimraf([buildPath + "**/*"], { glob: true }) .then(() => safariCopyAssets(paths.safari + "**/*", buildPath)) .then(() => safariCopyBuild(paths.build + "**/*", buildPath + "safari/app")) .then(() => { @@ -144,7 +145,9 @@ function distSafariApp(cb, subBuildPath) { stdOutProc(proc); return new Promise((resolve) => proc.on("close", resolve)); }) - .then(() => { + .then(async () => { + const { default: filter } = await import("gulp-filter"); + const libs = fs .readdirSync(builtAppexFrameworkPath) .filter((p) => p.endsWith(".dylib")) @@ -168,7 +171,7 @@ function distSafariApp(cb, subBuildPath) { }, () => { return cb; - } + }, ); } @@ -179,7 +182,7 @@ function safariCopyAssets(source, dest) { .on("error", reject) .pipe(gulpif("safari/Info.plist", replace("0.0.1", manifest.version))) .pipe( - gulpif("safari/Info.plist", replace("0.0.2", process.env.BUILD_NUMBER || manifest.version)) + gulpif("safari/Info.plist", replace("0.0.2", process.env.BUILD_NUMBER || manifest.version)), ) .pipe(gulpif("desktop.xcodeproj/project.pbxproj", replace("../../../build", "../safari/app"))) .pipe(gulp.dest(dest)) @@ -187,7 +190,9 @@ function safariCopyAssets(source, dest) { }); } -function safariCopyBuild(source, dest) { +async function safariCopyBuild(source, dest) { + const { default: filter } = await import("gulp-filter"); + return new Promise((resolve, reject) => { gulp .src(source) @@ -203,8 +208,8 @@ function safariCopyBuild(source, dest) { delete manifest.optional_permissions; manifest.permissions.push("nativeMessaging"); return manifest; - }) - ) + }), + ), ) .pipe(gulp.dest(dest)) .on("end", resolve); @@ -216,7 +221,10 @@ function stdOutProc(proc) { proc.stderr.on("data", (data) => console.error(data.toString())); } -function ciCoverage(cb) { +async function ciCoverage(cb) { + const { default: zip } = await import("gulp-zip"); + const { default: filter } = await import("gulp-filter"); + return gulp .src(paths.coverage + "**/*") .pipe(filter(["**", "!coverage/coverage*.zip"])) diff --git a/apps/browser/package.json b/apps/browser/package.json index fcadb309f36..dbb2aec9bf9 100644 --- a/apps/browser/package.json +++ b/apps/browser/package.json @@ -1,6 +1,6 @@ { "name": "@bitwarden/browser", - "version": "2023.10.2", + "version": "2023.12.0", "scripts": { "build": "webpack", "build:mv3": "cross-env MANIFEST_VERSION=3 webpack", diff --git a/apps/browser/src/_locales/ar/messages.json b/apps/browser/src/_locales/ar/messages.json index 183602d4ed4..ed1a97a7fa5 100644 --- a/apps/browser/src/_locales/ar/messages.json +++ b/apps/browser/src/_locales/ar/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "أعدنّ طريقة إلغاء القُفْل لتغيير إجراء مهلة المخزن الخاص بك." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "قيِّم هذه الإضافة" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "إقفل الآن" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "حالاً" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "إظهار صورة قابلة للتعرف بجانب كل تسجيل دخول." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "إظهار عداد الشارات" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/az/messages.json b/apps/browser/src/_locales/az/messages.json index e72e1e4192b..17ec5d4354d 100644 --- a/apps/browser/src/_locales/az/messages.json +++ b/apps/browser/src/_locales/az/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Anbar vaxt bitməsi əməliyyatınızı dəyişdirmək üçün bir kilid açma üsulu qurun." }, + "unlockMethodNeeded": { + "message": "Ayarlarda bir kilid açma üsulu qurun" + }, "rateExtension": { "message": "Uzantını qiymətləndir" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "İndi kilidlə" }, + "lockAll": { + "message": "Hamısını kilidlə" + }, "immediately": { "message": "Dərhal" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Giriş etmiş bütün hesablara aiddir." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Bağlı", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Hər girişin yanında tanına bilən təsvir göstər." }, + "faviconDescAlt": { + "message": "Hər bir giriş elementinin yanında tanına bilən bir təsvir göstər. Giriş etmiş bütün hesablara aiddir." + }, "enableBadgeCounter": { "message": "Nişan sayğacını göstər" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden avto-doldurma menyusu mövcuddur. Seçmək üçün aşağı ox düyməsinə basın.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Brauzerin avto-doldurması yararsız edilsin?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Bu ayarın söndürülməsi, \"Bitwarden\"in və brauzerinizin avto-doldurma menyuları arasında ziddiyyətlərə səbəb ola bilər.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Bu ayarın söndürülməsi, \"Bitwarden\"in və brauzerinizin avto-doldurma menyuları arasında ziddiyyətlərə səbəb ola bilər. Bunu işə salmaq, Bitwarden uzantısını yenidən başladacaq.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "İşə sal" }, "ignore": { "message": "Yox say" }, - "overrideBrowserAutoFillSettings": { - "message": "Brauzerin avto-doldurma ayarlarını yararsız et", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Brauzerin avto-doldurması yararsız edilə bilmir", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden, brauzerin avto-doldurma ayarlarını yararsız etmək üçün uzantının gizlilik icazəsinə müraciət etməlidir.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Datanı daxilə köçür", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Fayl parolunu təsdiqlə" }, + "typePasskey": { + "message": "Keçid açarı" + }, "passkeyNotCopied": { "message": "Keçid açarı kopyalanmır" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "LastPass hesabınızla əlaqələndirilmiş \"YubiKey\"i kompüterinizin USB yuvasına taxın, daha sonra düyməsinə basın." + }, + "switchAccount": { + "message": "Hesabı dəyişdir" + }, + "switchAccounts": { + "message": "Hesabları dəyişdir" + }, + "switchToAccount": { + "message": "Hesaba keç" + }, + "activeAccount": { + "message": "Aktiv hesab" + }, + "accountLimitReached": { + "message": "Hesab limiti keçildi. Başqa bir hesab əlavə etmək üçün bir hesabdan çıxış edin." + }, + "active": { + "message": "aktiv" + }, + "locked": { + "message": "kilidli" + }, + "unlocked": { + "message": "kilidi açılmış" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "sahiblik edən" } } diff --git a/apps/browser/src/_locales/be/messages.json b/apps/browser/src/_locales/be/messages.json index a8ed4693c68..029288a7dea 100644 --- a/apps/browser/src/_locales/be/messages.json +++ b/apps/browser/src/_locales/be/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Ацаніць пашырэнне" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Заблакіраваць зараз" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Адразу" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Паказваць распазнавальны відарыс побач з кожным лагінам." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Паказваць лічыльнік на значку" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Пацвердзіць пароль файла" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/bg/messages.json b/apps/browser/src/_locales/bg/messages.json index 0ee3b95aad7..e2c0346dca4 100644 --- a/apps/browser/src/_locales/bg/messages.json +++ b/apps/browser/src/_locales/bg/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Задайте метод за отключване, за да може да промените действието при изтичане на времето за достъп до трезора." }, + "unlockMethodNeeded": { + "message": "Задайте метод за отключване в Настройките" + }, "rateExtension": { "message": "Оценяване на разширението" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Заключване сега" }, + "lockAll": { + "message": "Заключване на всички" + }, "immediately": { "message": "Незабавно" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Прилага се за всички регистрации, в които сте вписан(а)." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Изключено", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Показване на разпознаваемо изображение до всеки запис." }, + "faviconDescAlt": { + "message": "Показване на разпознаваемо изображение до всеки елемент. Прилага се към всички акаунти, в които сте Вписан(а)." + }, "enableBadgeCounter": { "message": "Показване на брояч в значка" }, @@ -2264,7 +2279,7 @@ "message": "Как се ползва автоматичното попълване" }, "autofillSelectInfoWithCommand": { - "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.", + "message": "Изберете елемент на този екран, използвайте комбинацията $COMMAND$ или разгледайте други опции в настройките.", "placeholders": { "command": { "content": "$1", @@ -2273,7 +2288,7 @@ } }, "autofillSelectInfoWithoutCommand": { - "message": "Select an item from this screen, or explore other options in settings." + "message": "Изберете елемент на този екран или разгледайте други опции в настройките." }, "gotIt": { "message": "Разбрано" @@ -2376,7 +2391,7 @@ "message": "Устройството е доверено" }, "inputRequired": { - "message": "Полето е задължтелно да бъде попълнено." + "message": "Полето е задължително да бъде попълнено." }, "required": { "message": "задължително" @@ -2538,36 +2553,12 @@ "message": "Има налично меню за авт. попълване на Битуорден. Натиснете стрелката надолу, за да го изберете.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Замяна на автоматичното попълване на браузъра?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Ако оставите тази настройка изключена, може да има конфликт между менюто за автоматично попълване на Битуорден и това на браузъра.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Ако оставите тази настройка изключена, може да има конфликт между менюто за автоматично попълване на Битуорден и това на браузъра. Ако я включите, разширението на Битуорден ще трябва да бъде рестартирано.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Включване" }, "ignore": { "message": "Пренебрегване" }, - "overrideBrowserAutoFillSettings": { - "message": "Настройки за замяна на автоматичното попълване на браузъра", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Автоматичното попълване на браузъра не може да бъде заменено", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Битуорден трябва да има разрешение за достъп до поверителността на разширението, за да може да замени настройките за автоматично попълване на браузъра.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Внасяне на данни", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Потвърждаване на паролата на файла" }, + "typePasskey": { + "message": "Секретен ключ" + }, "passkeyNotCopied": { "message": "Секретният ключ няма да бъде копиран" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Поставете устройството на YubiKey, което е свързано с регистрацията Ви в LastPass, в USB порт и натиснете бутона на устройството." + }, + "switchAccount": { + "message": "Превключване на регистрацията" + }, + "switchAccounts": { + "message": "Превключване на регистрациите" + }, + "switchToAccount": { + "message": "Превключване към регистрацията" + }, + "activeAccount": { + "message": "Активиране на регистрацията" + }, + "accountLimitReached": { + "message": "Достигнато е ограничението на броя регистрации. Излезте от някоя, за да добавите друга." + }, + "active": { + "message": "активно" + }, + "locked": { + "message": "заключено" + }, + "unlocked": { + "message": "отключено" + }, + "server": { + "message": "сървър" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/bn/messages.json b/apps/browser/src/_locales/bn/messages.json index 5827f01cde8..35e972a0edf 100644 --- a/apps/browser/src/_locales/bn/messages.json +++ b/apps/browser/src/_locales/bn/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "এক্সটেনশনটি মূল্যায়ন করুন" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "এখনই লক করুন" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "সঙ্গে সঙ্গে" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/bs/messages.json b/apps/browser/src/_locales/bs/messages.json index 87509233dda..6a6ccb9e0ee 100644 --- a/apps/browser/src/_locales/bs/messages.json +++ b/apps/browser/src/_locales/bs/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Rate the extension" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lock now" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Immediately" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/ca/messages.json b/apps/browser/src/_locales/ca/messages.json index f29c2532fab..aa242a632d9 100644 --- a/apps/browser/src/_locales/ca/messages.json +++ b/apps/browser/src/_locales/ca/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Configura un mètode de desbloqueig per canviar l'acció del temps d'espera de la caixa forta." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Valora aquesta extensió" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Bloqueja ara" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Immediatament" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "S'aplica a tots els comptes connectats." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Desactivat", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Mostra una imatge reconeixible al costat de cada inici de sessió." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Mostra el comptador insígnia" }, @@ -2264,7 +2279,7 @@ "message": "Com emplenar automàticament" }, "autofillSelectInfoWithCommand": { - "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.", + "message": "Seleccioneu un element d'aquesta pantalla, utilitzeu la drecera $COMMAND$ o exploreu altres opcions a la configuració.", "placeholders": { "command": { "content": "$1", @@ -2273,7 +2288,7 @@ } }, "autofillSelectInfoWithoutCommand": { - "message": "Select an item from this screen, or explore other options in settings." + "message": "Seleccioneu un element d'aquesta pantalla, o exploreu altres opcions a la configuració." }, "gotIt": { "message": "D'acord" @@ -2538,36 +2553,12 @@ "message": "El menú d'emplenament automàtic de Bitwarden està disponible. Premeu la tecla de fletxa avall per seleccionar-lo.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Voleu substituir l'emplenament automàtic del navegador?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Si deixeu aquesta configuració desactivada, és possible que hi haja conflictes entre el menú d'emplenament automàtic de Bitwarden i el del navegador.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Si deixeu aquesta configuració desactivada, és possible que hi haja conflictes entre el menú d'emplenament automàtic de Bitwarden i el del navegador. En activar-la, es reiniciarà l'extensió Bitwarden.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Activa" }, "ignore": { "message": "Ignora" }, - "overrideBrowserAutoFillSettings": { - "message": "Anul·la la configuració d'emplenament automàtic del navegador", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "No es pot anul·lar l'emplenament automàtic del navegador", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden ha de tenir accés al permís de privadesa de l'extensió per anul·lar la configuració d'emplenament automàtic del navegador.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Importa dades", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirma la contrasenya del fitxer" }, + "typePasskey": { + "message": "Clau de pas" + }, "passkeyNotCopied": { "message": "La clau de pas no es copiarà" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Inseriu la YubiKey associada al compte del LastPass al port USB de l'ordinador i, després, toqueu-ne el botó." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/cs/messages.json b/apps/browser/src/_locales/cs/messages.json index fbb18f5aadd..6310e145d3a 100644 --- a/apps/browser/src/_locales/cs/messages.json +++ b/apps/browser/src/_locales/cs/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Nastavte metodu odemknutí, abyste změnili časový limit Vašeho trezoru." }, + "unlockMethodNeeded": { + "message": "Nastavit metodu odemknutí v Nastavení" + }, "rateExtension": { "message": "Ohodnotit rozšíření" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Zamknout nyní" }, + "lockAll": { + "message": "Zamknout vše" + }, "immediately": { "message": "Okamžitě" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Použije se na všechny přihlášené účty." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Abyste se vyhnuli konfliktům, vypněte v nastavení Vašeho prohlížeče zabudovaný správce hesel." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Upravit nastavení prohlížeče" + }, "autofillOverlayVisibilityOff": { "message": "VYP.", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Zobrazí rozeznatelný obrázek vedle každého přihlášení." }, + "faviconDescAlt": { + "message": "Zobrazí rozeznatelný obrázek vedle každého přihlášení. Platí pro všechny přihlášené účty." + }, "enableBadgeCounter": { "message": "Zobrazovat počet uložených přihlašovacích údajů na stránce" }, @@ -2538,36 +2553,12 @@ "message": "Nabídka automatického vyplňování Bitwardenu. Pro výběr stiskněte šipku dolů.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Přepsat automatické vyplnění prohlížeče?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Ponechání tohoto nastavení ve vypnutém stavu může způsobit konflikty mezi nabídkou automatického vyplňování Bitwardenu a Vaším prohlížečem.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Ponechání tohoto nastavení ve vypnutém stavu může způsobit konflikty mezi nabídkou automatického vyplňování Bitwardenu a Vaším prohlížečem. Zapnutím tohoto rozšíření dojde k restartování doplňku Bitwardenu.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Zapnout" }, "ignore": { "message": "Ignorovat" }, - "overrideBrowserAutoFillSettings": { - "message": "Přepsat nastavení automatického vyplnění prohlížeče", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Nelze přepsat automatické vyplnění prohlížeče", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden musí mít přístup k ochraně osobních údajů doplňku pro přepsání nastavení automatického vyplňování prohlížeče.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Importovat data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Potvrzení hesla souboru" }, + "typePasskey": { + "message": "Přístupový klíč" + }, "passkeyNotCopied": { "message": "Přístupový klíč nebude zkopírován" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Vložte YubiKey spojený s Vaším účtem LastPass do USB portu Vašeho počítače a stiskněte jeho tlačítko." + }, + "switchAccount": { + "message": "Přepnout účet" + }, + "switchAccounts": { + "message": "Přepnout účty" + }, + "switchToAccount": { + "message": "Přepnout na účet" + }, + "activeAccount": { + "message": "Aktivní účet" + }, + "accountLimitReached": { + "message": "Byl dosažen limit účtu. Pro přidání dalšího účtu se odhlaste." + }, + "active": { + "message": "aktivní" + }, + "locked": { + "message": "uzamčeno" + }, + "unlocked": { + "message": "odemčeno" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hostováno na" } } diff --git a/apps/browser/src/_locales/cy/messages.json b/apps/browser/src/_locales/cy/messages.json index 23c6d581569..5b1a8d90104 100644 --- a/apps/browser/src/_locales/cy/messages.json +++ b/apps/browser/src/_locales/cy/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Rate the extension" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Cloi nawr" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "ar unwaith" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Dangos delwedd adnabyddadwy wrth ymyl pob eitem." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/da/messages.json b/apps/browser/src/_locales/da/messages.json index d3463f567c0..922f4ca5f2e 100644 --- a/apps/browser/src/_locales/da/messages.json +++ b/apps/browser/src/_locales/da/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Opsæt en oplåsningsmetode til at ændre bokstimeouthandlingen." }, + "unlockMethodNeeded": { + "message": "Opsæt en oplåsningsmetode i Indstillinger" + }, "rateExtension": { "message": "Bedøm udvidelsen" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lås nu" }, + "lockAll": { + "message": "Lås alle" + }, "immediately": { "message": "Straks" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Gælder for alle indloggede konti." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Fra", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Vis et genkendeligt billede ud for hvert login." }, + "faviconDescAlt": { + "message": "Vis et genkendeligt billede ved siden af hvert login. Gælder for alle indloggede konti." + }, "enableBadgeCounter": { "message": "Vis badge-tæller" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden autoudfyld-menu tilgængelig. Tryk på pil ned-tasten for at vælge.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Tilsidesæt browser-autoudfyldning?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Lades denne indstilling deaktiveret, kan det forårsage konflikter mellem Bitwardens autoudfyld-menu og webbrowsere.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Lades denne indstilling deaktiveret, kan det forårsage konflikter mellem Bitwardens autoudfyld-menu og webbrowsere. Aktiveres indstillingen, genstartes Bitwarden-udvidelsen.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Slå til" }, "ignore": { "message": "Ignorér" }, - "overrideBrowserAutoFillSettings": { - "message": "Tilsidesæt webbrowser autoudfyld-indstillinger", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Kan ikke tilsidesætte webbrowser-autoudfyld", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden skal kunne tilgå udvidelsens fortrolighedstilladelse for at tilsidesætte indstillinger for webbrowser-autoudfyld.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Importér data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Bekræft filadgangskode" }, + "typePasskey": { + "message": "Adgangsnøgle" + }, "passkeyNotCopied": { "message": "Adgangsnøglen kopieres ikke" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Indsæt den til LastPass-kontoen tilknyttede YubiKey i computers USB-port, og tryk dernæst på dens knap." + }, + "switchAccount": { + "message": "Skift konto" + }, + "switchAccounts": { + "message": "Skift konti" + }, + "switchToAccount": { + "message": "Skift til konto" + }, + "activeAccount": { + "message": "Aktiv konto" + }, + "accountLimitReached": { + "message": "Kontokvote nået. Log ud af en konto for at tilføje en anden." + }, + "active": { + "message": "aktiv" + }, + "locked": { + "message": "låst" + }, + "unlocked": { + "message": "oplåst" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hostet hos" } } diff --git a/apps/browser/src/_locales/de/messages.json b/apps/browser/src/_locales/de/messages.json index 1b94bf0270f..70ca03db882 100644 --- a/apps/browser/src/_locales/de/messages.json +++ b/apps/browser/src/_locales/de/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Richte eine Entsperrmethode ein, um deine Aktion bei Timeout-Timeout zu ändern." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Erweiterung bewerten" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Jetzt sperren" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Sofort" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Gilt für alle angemeldeten Konten." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Aus", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Ein wiedererkennbares Bild neben jeden Zugangsdaten anzeigen." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Badge-Zähler anzeigen" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden Auto-Ausfüllen Menü verfügbar. Drücke die Pfeiltaste nach unten zum Auswählen.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Auto-Ausfüllen Funktion des Browsers überschreiben?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Wenn du diese Einstellung deaktivierst, kann dies zu Konflikten zwischen dem Bitwarden Auto-Ausfüllen Menü und dem des Browsers führen.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Wenn du diese Einstellung deaktivierst, kann es zu Konflikten zwischen dem Bitwarden Auto-Ausfüllen Menü und dem des Browsers kommen. Wenn du diese Einstellung aktivierst, wird die Bitwarden-Erweiterung neu gestartet.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Einschalten" }, "ignore": { "message": "Ignorieren" }, - "overrideBrowserAutoFillSettings": { - "message": "Auto-Ausfüllen Einstellungen des Browsers überschreiben", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Konnte Auto-Ausfüllen Einstellungen des Browsers nicht überschreiben", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden muss Zugriff auf die Datenschutz-Berechtigung der Erweiterung haben, um die Auto-Ausfüllen-Einstellungen des Browsers zu überschreiben.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Daten importieren", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Dateipasswort bestätigen" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey wird nicht kopiert" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Stecke den YubiKey, der mit deinem LastPass Konto verknüpft ist, in den USB-Port deines Computers und drücke dann den Knopf des YubiKey." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/el/messages.json b/apps/browser/src/_locales/el/messages.json index 8eb2367779a..e6a920d3e90 100644 --- a/apps/browser/src/_locales/el/messages.json +++ b/apps/browser/src/_locales/el/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Ρυθμίστε μια μέθοδο ξεκλειδώματος για να αλλάξετε την ενέργεια χρονικού ορίου θησαυ/κιου." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Βαθμολογήστε την επέκταση" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Κλείδωμα Τώρα" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Άμεσα" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Εμφάνιση μιας αναγνωρίσιμης εικόνας δίπλα σε κάθε σύνδεση." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Εμφάνιση μετρητή εμβλημάτων" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Εισαγωγή δεδομένων", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Επιβεβαίωση κωδικού πρόσβασης αρχείου" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json index b07f9307255..a6aff9e455b 100644 --- a/apps/browser/src/_locales/en/messages.json +++ b/apps/browser/src/_locales/en/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Rate the extension" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lock now" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Immediately" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2796,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/en_GB/messages.json b/apps/browser/src/_locales/en_GB/messages.json index ae38637c278..b2b927b0243 100644 --- a/apps/browser/src/_locales/en_GB/messages.json +++ b/apps/browser/src/_locales/en_GB/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Rate the extension" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lock now" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Immediately" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognisable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognisable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/en_IN/messages.json b/apps/browser/src/_locales/en_IN/messages.json index 9848dad0ed3..26272877ad2 100644 --- a/apps/browser/src/_locales/en_IN/messages.json +++ b/apps/browser/src/_locales/en_IN/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Rate the extension" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lock now" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Immediately" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/es/messages.json b/apps/browser/src/_locales/es/messages.json index f3da2ad615d..58cd79f2559 100644 --- a/apps/browser/src/_locales/es/messages.json +++ b/apps/browser/src/_locales/es/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Configura un método de desbloqueo para cambiar tu acción de cierre de la bóveda." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Valora la extensión" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Bloquear" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Inmediatamente" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Mostrar una imagen reconocible junto a cada inicio de sesión." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Mostrar el contador numérico" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Importar datos", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirmar contraseña del archivo" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "La clave de acceso no se copiará" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/et/messages.json b/apps/browser/src/_locales/et/messages.json index 561d5e9fbca..618c52757be 100644 --- a/apps/browser/src/_locales/et/messages.json +++ b/apps/browser/src/_locales/et/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Hoidla ajalõpu tegevuse muutmiseks vali esmalt lahtilukustamise meetod." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Hinda seda laiendust" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lukusta paroolihoidla" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Koheselt" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Kuvab iga kirje kõrval lehekülje ikooni." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Kuva kirjete arvu" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Pääsukoodi ei kopeerita" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/eu/messages.json b/apps/browser/src/_locales/eu/messages.json index 1da1301e48b..483c40a9a8f 100644 --- a/apps/browser/src/_locales/eu/messages.json +++ b/apps/browser/src/_locales/eu/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Baloratu gehigarria" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Blokeatu orain" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Berehala" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Erakutsi irudi bat saio-hasiera bakoitzaren ondoan." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Erakutsi txartelen kontagailua" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/fa/messages.json b/apps/browser/src/_locales/fa/messages.json index 4ab6946cbaf..d024a4b3ae3 100644 --- a/apps/browser/src/_locales/fa/messages.json +++ b/apps/browser/src/_locales/fa/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "یک روش بازگشایی برای پایان زمان مجاز تنظیم کنید." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "به این افزونه امتیاز دهید" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "الان قفل شود" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "بلافاصله" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "یک تصویر قابل تشخیص در کنار هر ورود نشان دهید." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "نمایش شمارنده نشان" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "کلید عبور کپی نمی‌شود" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/fi/messages.json b/apps/browser/src/_locales/fi/messages.json index d1d186200dd..bf98a2fa5e9 100644 --- a/apps/browser/src/_locales/fi/messages.json +++ b/apps/browser/src/_locales/fi/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Muuta holvisi aikakatkaisutoimintoa määrittämällä lukituksen avaustapa." }, + "unlockMethodNeeded": { + "message": "Määritä avaustapa asetuksista" + }, "rateExtension": { "message": "Arvioi laajennus" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lukitse nyt" }, + "lockAll": { + "message": "Lukitse kaikki" + }, "immediately": { "message": "Välittömästi" }, @@ -658,10 +664,10 @@ "message": "Ask to update a login's password when a change is detected on a website. Applies to all logged in accounts." }, "enableUsePasskeys": { - "message": "Ask to save and use passkeys" + "message": "Pyydä tallentamaan ja käyttämään salausavaimia" }, "usePasskeysDesc": { - "message": "Ask to save new passkeys or log in with passkeys stored in your vault. Applies to all logged in accounts." + "message": "Pyydä tallentamaan uusia salausavaimia tai kirjaudu sisään holviisi tallennetuilla salausavaimilla. Koskee kaikkia sisäänkirjautuneita tilejä." }, "notificationChangeDesc": { "message": "Haluatko päivittää salasanan Bitwardeniin?" @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Näytä tunnistettava kuva jokaiselle kirjautumistiedolle." }, + "faviconDescAlt": { + "message": "Näytä tunnistettava kuva jokaisen kirjautumistiedon vieressä. Koskee kaikkia kirjautuneita tilejä." + }, "enableBadgeCounter": { "message": "Näytä laskuri" }, @@ -2511,7 +2526,7 @@ "description": "Text to display in overlay when the account is locked." }, "unlockAccount": { - "message": "Unlock account", + "message": "Avaa tili", "description": "Button text to display in overlay when the account is locked." }, "fillCredentialsFor": { @@ -2519,54 +2534,30 @@ "description": "Screen reader text for when overlay item is in focused" }, "partialUsername": { - "message": "Partial username", + "message": "Osittainen käyttäjätunnus", "description": "Screen reader text for when a login item is focused where a partial username is displayed. SR will announce this phrase before reading the text of the partial username" }, "noItemsToShow": { - "message": "No items to show", + "message": "Ei näytettäviä kohteita", "description": "Text to show in overlay if there are no matching items" }, "newItem": { - "message": "New item", + "message": "Uusi kohde", "description": "Button text to display in overlay when there are no matching items" }, "addNewVaultItem": { - "message": "Add new vault item", + "message": "Lisää uusi holvikohde", "description": "Screen reader text (aria-label) for new item button in overlay" }, "bitwardenOverlayMenuAvailable": { "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { - "message": "Turn on" + "message": "Ota käyttöön" }, "ignore": { - "message": "Ignore" - }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" + "message": "Ohita" }, "importData": { "message": "Tuo tietoja", @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Vahvista tiedoston salasana" }, + "typePasskey": { + "message": "Suojausavain" + }, "passkeyNotCopied": { "message": "Suojausavainta ei kopioida" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Kytke LastPass-tiliisi liitetty YubiKey tietokoneen USB-porttiin ja kosketa sen painiketta." + }, + "switchAccount": { + "message": "Vaihda tiliä" + }, + "switchAccounts": { + "message": "Vaihda tilejä" + }, + "switchToAccount": { + "message": "Vaihda tiliin" + }, + "activeAccount": { + "message": "Aktiivinen tili" + }, + "accountLimitReached": { + "message": "Tilien enimmäismäärä on saavutettu. Kirjaa jokin niistä ulos lisätäksesi tilin." + }, + "active": { + "message": "aktiivinen" + }, + "locked": { + "message": "lukittu" + }, + "unlocked": { + "message": "avoin" + }, + "server": { + "message": "palvelin" + }, + "hostedAt": { + "message": "palvelimelta" } } diff --git a/apps/browser/src/_locales/fil/messages.json b/apps/browser/src/_locales/fil/messages.json index fe689bf797c..f54a20d88ae 100644 --- a/apps/browser/src/_locales/fil/messages.json +++ b/apps/browser/src/_locales/fil/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Mag-set up ng paraan ng pag-unlock upang baguhin ang iyong pagkilos sa pag-timeout ng vault." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "I-rate ang extension" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Mag-kandado Na" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Kaagad" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Nakasara", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Ipakita ang isang kilalang larawan sa tabi ng bawat login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Ipakita ang badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/fr/messages.json b/apps/browser/src/_locales/fr/messages.json index eff9cad4687..84991609bda 100644 --- a/apps/browser/src/_locales/fr/messages.json +++ b/apps/browser/src/_locales/fr/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Configurez une méthode de déverrouillage pour changer le délai d'attente de votre coffre." }, + "unlockMethodNeeded": { + "message": "Configurer une méthode de déverrouillage dans Paramètres" + }, "rateExtension": { "message": "Noter l'extension" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Verrouiller maintenant" }, + "lockAll": { + "message": "Tout verrouiller" + }, "immediately": { "message": "Immédiatement" }, @@ -698,7 +704,7 @@ "message": "Modifier le thème de couleur de l'application." }, "themeDescAlt": { - "message": "Change the application's color theme. Applies to all logged in accounts." + "message": "Modifier le thème de couleur de l'application. S'applique à tous les comptes connectés." }, "dark": { "message": "Sombre", @@ -1021,12 +1027,18 @@ "message": "Les URLs d'environnement ont été enregistrées." }, "showAutoFillMenuOnFormFields": { - "message": "Show auto-fill menu on form fields", + "message": "Afficher le menu de saisie automatique sur les champs du formulaire", "description": "Represents the message for allowing the user to enable the auto-fill overlay" }, "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Appliquer à tous les comptes connectés." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1036,7 +1048,7 @@ "description": "Overlay appearance select option for showing the field on focus of the input element" }, "autofillOverlayVisibilityOnButtonClick": { - "message": "When auto-fill icon is selected", + "message": "Lorsque l'icône de saisie automatique est sélectionnée", "description": "Overlay appearance select option for showing the field on click of the overlay icon" }, "enableAutoFillOnPageLoad": { @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Afficher une image reconnaissable à côté de chaque identifiant." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Afficher le compteur de badge" }, @@ -2495,7 +2510,7 @@ "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item." }, "bitwardenOverlayButton": { - "message": "Bitwarden auto-fill menu button", + "message": "Bouton menu de saisie automatique Bitwarden", "description": "Page title for the iframe containing the overlay button" }, "toggleBitwardenVaultOverlay": { @@ -2519,7 +2534,7 @@ "description": "Screen reader text for when overlay item is in focused" }, "partialUsername": { - "message": "Partial username", + "message": "Nom d'utilisateur partiel", "description": "Screen reader text for when a login item is focused where a partial username is displayed. SR will announce this phrase before reading the text of the partial username" }, "noItemsToShow": { @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Activer" }, "ignore": { "message": "Ignorer" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirmez le mot de passe du fichier" }, + "typePasskey": { + "message": "Clé d'accès" + }, "passkeyNotCopied": { "message": "La clé d'accès ne sera pas copiée" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insérez la YubiKey associée à votre compte LastPass dans le port USB de votre ordinateur, puis appuyez sur son bouton." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/gl/messages.json b/apps/browser/src/_locales/gl/messages.json index 5f243afe040..ab3933bf5b7 100644 --- a/apps/browser/src/_locales/gl/messages.json +++ b/apps/browser/src/_locales/gl/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Rate the extension" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lock now" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Immediately" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/he/messages.json b/apps/browser/src/_locales/he/messages.json index 2bd5216f861..c195d4cb960 100644 --- a/apps/browser/src/_locales/he/messages.json +++ b/apps/browser/src/_locales/he/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "דירוג הרחבה" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "נעל עכשיו" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "באופן מיידי" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "ייבוא נתונים", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/hi/messages.json b/apps/browser/src/_locales/hi/messages.json index d24eacb14b0..99b9dfa3cbf 100644 --- a/apps/browser/src/_locales/hi/messages.json +++ b/apps/browser/src/_locales/hi/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Rate the Extension" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lock Now" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "तत्‍काल" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "प्रत्येक लॉगिन के आगे एक पहचानने योग्य छवि दिखाएं।" }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "बैज काउंटर दिखाएं" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/hr/messages.json b/apps/browser/src/_locales/hr/messages.json index 571351bfd46..c338a11edfe 100644 --- a/apps/browser/src/_locales/hr/messages.json +++ b/apps/browser/src/_locales/hr/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Za promjenu vremena isteka trezora, odredi način otključavanja." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Ocijeni proširenje" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Zaključaj sada" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Odmah" }, @@ -620,7 +626,7 @@ "message": "Upit za dodavanje prijave pojavljuje se kada se otkrije prva prijava na neko web mjesto. Bitwarden će te pitatati želiš li uneseno korisničko ime i lozinku spremiti u svoj trezor." }, "addLoginNotificationDescAlt": { - "message": "Ask to add an item if one isn't found in your vault. Applies to all logged in accounts." + "message": "Pitaj za dodavanje stavke ako nije pronađena u tvojem trezoru. Primjenjuje se na sve prijavljene račune." }, "showCardsCurrentTab": { "message": "Prikaži platne kartice" @@ -655,13 +661,13 @@ "message": "Upitaj za ažuriranje lozinke prijave ako se otkrije promjena na web stranici." }, "changedPasswordNotificationDescAlt": { - "message": "Ask to update a login's password when a change is detected on a website. Applies to all logged in accounts." + "message": "Pitaj za ažuriranje lozinke za prijavu kada se otkrije promjena na web stranici. Primjenjuje se na sve prijavljene račune." }, "enableUsePasskeys": { - "message": "Ask to save and use passkeys" + "message": "Pitaj za spremanje i korištenje pristupnih ključeva" }, "usePasskeysDesc": { - "message": "Ask to save new passkeys or log in with passkeys stored in your vault. Applies to all logged in accounts." + "message": "Pitaj za spremanje novih pristupnih ključeva ili se prijavi pomoću pristupnih ključeva pohranjenih u tvojem trezoru. Primjenjuje se na sve prijavljene račune." }, "notificationChangeDesc": { "message": "Želiš li ovu lozinku ažurirati u Bitwarden-u?" @@ -682,7 +688,7 @@ "message": "Koristi sekundarni klik za pristup generatoru lozinki i pripadajućim prijavama trenunte web stranice. " }, "contextMenuItemDescAlt": { - "message": "Use a secondary click to access password generation and matching logins for the website. Applies to all logged in accounts." + "message": "Koristi sekundarni klik za pristup generiranju lozinki i odgovarajućim prijavama za mrežno mjesto. Primjenjuje se na sve prijavljene račune." }, "defaultUriMatchDetection": { "message": "Zadano otkrivanje URI podudaranja", @@ -698,7 +704,7 @@ "message": "Promijeni temu boja." }, "themeDescAlt": { - "message": "Change the application's color theme. Applies to all logged in accounts." + "message": "Promijeni boju aplikacije. Primjenjuje se na sve prijavljene račune." }, "dark": { "message": "Tamna", @@ -1021,22 +1027,28 @@ "message": "URL-ovi okoline su spremljeni." }, "showAutoFillMenuOnFormFields": { - "message": "Show auto-fill menu on form fields", + "message": "Prikaži izbornik za auto-ispunu u poljima obrasca", "description": "Represents the message for allowing the user to enable the auto-fill overlay" }, "showAutoFillMenuOnFormFieldsDescAlt": { - "message": "Applies to all logged in accounts." + "message": "Primjenjuje se na sve prijavljene račune." + }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." }, "autofillOverlayVisibilityOff": { - "message": "Off", + "message": "Isključeno", "description": "Overlay setting select option for disabling autofill overlay" }, "autofillOverlayVisibilityOnFieldFocus": { - "message": "When field is selected (on focus)", + "message": "Kada je odabrano polje (u fokusu)", "description": "Overlay appearance select option for showing the field on focus of the input element" }, "autofillOverlayVisibilityOnButtonClick": { - "message": "When auto-fill icon is selected", + "message": "Kada je odabrana ikona auto-ispune", "description": "Overlay appearance select option for showing the field on click of the overlay icon" }, "enableAutoFillOnPageLoad": { @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Prikaži prepoznatljivu sliku pored svake prijave." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Prikaži značku brojača" }, @@ -1700,7 +1715,7 @@ "message": "Bitwarden neće pitati treba li spremiti prijavne podatke za ove domene. Za primjenu promjena, potrebno je osvježiti stranicu." }, "excludedDomainsDescAlt": { - "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect." + "message": "Bitwarden neće tražiti spremanje podataka za prijavu za ove domene za sve prijavljene račune. Moraš osvježiti stranicu kako bi promjene stupile na snagu." }, "excludedDomainsInvalidDomain": { "message": "$DOMAIN$ nije valjana domena", @@ -2264,7 +2279,7 @@ "message": "Kako auto-ispuniti" }, "autofillSelectInfoWithCommand": { - "message": "Select an item from this screen, use the shortcut $COMMAND$, or explore other options in settings.", + "message": "Odaberi stavku s ovog zaslona, upotrijebi prečac $COMMAND$ ili istraži druge opcije u postavkama.", "placeholders": { "command": { "content": "$1", @@ -2273,7 +2288,7 @@ } }, "autofillSelectInfoWithoutCommand": { - "message": "Select an item from this screen, or explore other options in settings." + "message": "Odaberi stavku s ovog zaslona ili istraži druge opcije u postavkama." }, "gotIt": { "message": "U redu" @@ -2495,78 +2510,54 @@ "description": "Message appearing below the autofill on load message when master password reprompt is set for a vault item." }, "bitwardenOverlayButton": { - "message": "Bitwarden auto-fill menu button", + "message": "Tipka izbornika Bitwarden auto-ispune", "description": "Page title for the iframe containing the overlay button" }, "toggleBitwardenVaultOverlay": { - "message": "Toggle Bitwarden auto-fill menu", + "message": "U/isključivanje izbornika Bitwarden auto-ispune", "description": "Screen reader and tool tip label for the overlay button" }, "bitwardenVault": { - "message": "Bitwarden auto-fill menu", + "message": "Izbornik Bitwarden auto-ispune", "description": "Page title in overlay" }, "unlockYourAccountToViewMatchingLogins": { - "message": "Unlock your account to view matching logins", + "message": "Otklučaj svoj račun za prikaz podudarnih prijava", "description": "Text to display in overlay when the account is locked." }, "unlockAccount": { - "message": "Unlock account", + "message": "Otključaj račun", "description": "Button text to display in overlay when the account is locked." }, "fillCredentialsFor": { - "message": "Fill credentials for", + "message": "Unesi vjerodajnice za", "description": "Screen reader text for when overlay item is in focused" }, "partialUsername": { - "message": "Partial username", + "message": "Djelomično korisničko ime", "description": "Screen reader text for when a login item is focused where a partial username is displayed. SR will announce this phrase before reading the text of the partial username" }, "noItemsToShow": { - "message": "No items to show", + "message": "Nema stavki za prikaz", "description": "Text to show in overlay if there are no matching items" }, "newItem": { - "message": "New item", + "message": "Nova stavka", "description": "Button text to display in overlay when there are no matching items" }, "addNewVaultItem": { - "message": "Add new vault item", + "message": "Dodaj novu stavku trezora", "description": "Screen reader text (aria-label) for new item button in overlay" }, "bitwardenOverlayMenuAvailable": { - "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", + "message": "Dostupan je Bitwarden izbornik auto-ispune. Pritisni tipku sa strelicom prema dolje za odabir.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { - "message": "Turn on" + "message": "Uključi" }, "ignore": { - "message": "Ignore" - }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" + "message": "Zanemari" }, "importData": { "message": "Uvezi podatke", @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Potvrdi lozinku datoteke" }, + "typePasskey": { + "message": "Pristupni ključ" + }, "passkeyNotCopied": { "message": "Pristupni ključ neće biti kopiran" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Umetni YubiKey pridružen svojem LastPass računu u USB priključak račuanala, a zatim dodirni njegovu tipku." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/hu/messages.json b/apps/browser/src/_locales/hu/messages.json index db8ec6ec104..7bd6558daa7 100644 --- a/apps/browser/src/_locales/hu/messages.json +++ b/apps/browser/src/_locales/hu/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Állítsunk be egy feloldási módot a széf időkifutási műveletének módosításához." }, + "unlockMethodNeeded": { + "message": "Feloldási mód beállítása a Beállításokban" + }, "rateExtension": { "message": "Bővítmény értékelése" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Zárolás most" }, + "lockAll": { + "message": "Összes zárolása" + }, "immediately": { "message": "Azonnal" }, @@ -658,10 +664,10 @@ "message": "A bejelentkezési jelszó frissítésének kérése, ha változást lett érzékelve egy webhelyen. Minden bejelentkezett fiókra vonatkozik." }, "enableUsePasskeys": { - "message": "Kérés a jelszó mentésére és használatára" + "message": "Kérés a jhozzáférési kulcs mentésére és használatára" }, "usePasskeysDesc": { - "message": "Kérés az új jelszavak mentésére vagy bejelentkezés a széfben tárolt jelszavakkal. Minden bejelentkezett fiókra vonatkozik." + "message": "Kérés az új hozzáféréi kulcsok mentésére vagy bejelentkezés a széfben tárolt hozzáférési kulcsokkal. Minden bejelentkezett fiókra vonatkozik." }, "notificationChangeDesc": { "message": "Frissítésre kerüljön a jelszó a Bitwardenben?" @@ -1021,14 +1027,20 @@ "message": "A környezeti webcímek mentésre kerültek." }, "showAutoFillMenuOnFormFields": { - "message": "Show auto-fill menu on form fields", + "message": "Automatikus kitöltés menü megjelenítése az űrlapmezőkön", "description": "Represents the message for allowing the user to enable the auto-fill overlay" }, "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Minden bejelentkezett fiókra vonatkozik." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { - "message": "Off", + "message": "Ki", "description": "Overlay setting select option for disabling autofill overlay" }, "autofillOverlayVisibilityOnFieldFocus": { @@ -1036,7 +1048,7 @@ "description": "Overlay appearance select option for showing the field on focus of the input element" }, "autofillOverlayVisibilityOnButtonClick": { - "message": "When auto-fill icon is selected", + "message": "Ha az automatikus kitöltés menü került kiválasztásra", "description": "Overlay appearance select option for showing the field on click of the overlay icon" }, "enableAutoFillOnPageLoad": { @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Felismerhető kép megjelenítése minden bejelentkezés mellett." }, + "faviconDescAlt": { + "message": "Minden bejelentkezés mellett egy felismerhető kép megjelenítése. Minden bejelentkezett fiókra vonatkozik." + }, "enableBadgeCounter": { "message": "Számláló jelvény megjelenítése" }, @@ -2503,7 +2518,7 @@ "description": "Screen reader and tool tip label for the overlay button" }, "bitwardenVault": { - "message": "Bitwarden auto-fill menu", + "message": "Bitwarden automatikus kitöltési menü", "description": "Page title in overlay" }, "unlockYourAccountToViewMatchingLogins": { @@ -2511,62 +2526,38 @@ "description": "Text to display in overlay when the account is locked." }, "unlockAccount": { - "message": "Unlock account", + "message": "Fiók feloldása", "description": "Button text to display in overlay when the account is locked." }, "fillCredentialsFor": { - "message": "Fill credentials for", + "message": "Töltse kia hitelesítő adatokat", "description": "Screen reader text for when overlay item is in focused" }, "partialUsername": { - "message": "Partial username", + "message": "Részleges felhasználónév", "description": "Screen reader text for when a login item is focused where a partial username is displayed. SR will announce this phrase before reading the text of the partial username" }, "noItemsToShow": { - "message": "No items to show", + "message": "Nincsenek megjeleníthető elemek", "description": "Text to show in overlay if there are no matching items" }, "newItem": { - "message": "New item", + "message": "Új elem", "description": "Button text to display in overlay when there are no matching items" }, "addNewVaultItem": { - "message": "Add new vault item", + "message": "Elem hozzáadása", "description": "Screen reader text (aria-label) for new item button in overlay" }, "bitwardenOverlayMenuAvailable": { "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { - "message": "Turn on" + "message": "Bekapcsolás" }, "ignore": { - "message": "Ignore" - }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" + "message": "Mellőz" }, "importData": { "message": "Adatok importálása", @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Fájl jelszó megerősítés" }, + "typePasskey": { + "message": "Hozzáférési kulcs" + }, "passkeyNotCopied": { "message": "A hozzáférési kulcs nem kerül másolásra." }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Illesszük be a LastPass-fiókhoz társított YubiKey eszközt a számítógép USB portjába, majd érintsük meg annak gombját." + }, + "switchAccount": { + "message": "Fiók váltása" + }, + "switchAccounts": { + "message": "Fiókok váltása" + }, + "switchToAccount": { + "message": "Váltás fiókra" + }, + "activeAccount": { + "message": "Aktív fiók" + }, + "accountLimitReached": { + "message": "A fiók korlát elérésre került. Jelentkezzünk ki egy fiókból egy másik hozzáadásához." + }, + "active": { + "message": "aktív" + }, + "locked": { + "message": "zárolt" + }, + "unlocked": { + "message": "feloldott" + }, + "server": { + "message": "szerver" + }, + "hostedAt": { + "message": "tárolva:" } } diff --git a/apps/browser/src/_locales/id/messages.json b/apps/browser/src/_locales/id/messages.json index 0108ec505c4..3b3a39da4f9 100644 --- a/apps/browser/src/_locales/id/messages.json +++ b/apps/browser/src/_locales/id/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Nilai Ekstensi" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Kunci Sekarang" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Segera" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/it/messages.json b/apps/browser/src/_locales/it/messages.json index 841d8b249fc..f7b7b09dd8b 100644 --- a/apps/browser/src/_locales/it/messages.json +++ b/apps/browser/src/_locales/it/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Imposta un metodo di sblocco per modificare l'azione timeout cassaforte." }, + "unlockMethodNeeded": { + "message": "Imposta un metodo di sblocco in Impostazioni" + }, "rateExtension": { "message": "Valuta l'estensione" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Blocca ora" }, + "lockAll": { + "message": "Blocca tutto" + }, "immediately": { "message": "Immediatamente" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "No", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Mostra un piccolo logo riconoscibile accanto a ogni login." }, + "faviconDescAlt": { + "message": "Mostra un piccolo logo riconoscibile accanto a ogni login. Si applica a tutti gli account connessi." + }, "enableBadgeCounter": { "message": "Mostra badge contatore" }, @@ -2538,36 +2553,12 @@ "message": "Il menu di riempimento automatico di Bitwarden è disponibile. Premi il tasto freccia giù per selezionare.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Ignora il riempimento automatico del browser?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Se questa opzione è disattivata potrebbe causare conflitti tra il menu di riempimento automatico di Bitwarden e quello del tuo browser.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Se questa opzione è disattivata potrebbe causare conflitti tra il menu di riempimento automatico di Bitwarden e quello del tuo browser. Attivandola, l'estensione di Bitwarden si riavvierà.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Attiva" }, "ignore": { "message": "Ignora" }, - "overrideBrowserAutoFillSettings": { - "message": "Ignora il riempimento automatico del browser", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Impossibile ignorare il riempimento automatico del browser", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden deve avere accesso all'autorizzazione alla privacy dell'estensione per modificare le impostazioni di riempimento automatico del browser.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Importa dati", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Conferma password del file" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "La passkey non sarà copiata" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Inserisci la tua YubiKey associata al tuo account LastPass nella porta USB del computer, poi premi il suo bottone." + }, + "switchAccount": { + "message": "Cambia account" + }, + "switchAccounts": { + "message": "Cambia account" + }, + "switchToAccount": { + "message": "Passa all'account" + }, + "activeAccount": { + "message": "Account attivo" + }, + "accountLimitReached": { + "message": "Limite di account raggiunto. Esci da un account per aggiungerne un altro." + }, + "active": { + "message": "attivo" + }, + "locked": { + "message": "bloccato" + }, + "unlocked": { + "message": "sbloccato" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted in" } } diff --git a/apps/browser/src/_locales/ja/messages.json b/apps/browser/src/_locales/ja/messages.json index 0572e2b6462..400ee49b33c 100644 --- a/apps/browser/src/_locales/ja/messages.json +++ b/apps/browser/src/_locales/ja/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "保管庫のタイムアウト動作を変更するには、ロック解除方法を設定してください。" }, + "unlockMethodNeeded": { + "message": "設定でロック解除方法をセットアップ" + }, "rateExtension": { "message": "拡張機能の評価" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "今すぐロック" }, + "lockAll": { + "message": "すべてロック" + }, "immediately": { "message": "すぐに" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "ログインしているすべてのアカウントに適用されます。" }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "競合を避けるために、ブラウザーのパスワード管理設定をオフにしてください。" + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "ブラウザーの設定を編集してください。" + }, "autofillOverlayVisibilityOff": { "message": "オフ", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "ログイン情報の隣にアイコン画像を表示します" }, + "faviconDescAlt": { + "message": "各ログインの横に認識可能な画像を表示します。すべてのログイン済みアカウントに適用されます。" + }, "enableBadgeCounter": { "message": "バッジカウンターを表示" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden 自動入力メニューがあります。下矢印キーを押すと選択できます。", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "ブラウザの自動入力を上書きしますか？", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "この設定をオフにすると、Bitwarden 自動入力メニューとブラウザの間で競合が発生する可能性があります。", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "この設定をオフにすると、Bitwarden 自動入力メニューとブラウザの間で競合が発生する可能性があります。これをオンにすると、 Bitwarden 拡張機能は再起動します。", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "オンにする" }, "ignore": { "message": "無視" }, - "overrideBrowserAutoFillSettings": { - "message": "ブラウザの自動入力設定を上書きする", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "ブラウザの自動入力を上書きできません", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden はブラウザの自動入力設定を上書きするために、拡張機能のプライバシー権限にアクセスする必要があります。", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "データのインポート", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "ファイルパスワードの確認" }, + "typePasskey": { + "message": "パスキー" + }, "passkeyNotCopied": { "message": "パスキーはコピーされません" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "LastPass アカウントに関連付けられた YubiKey を USB ポートに挿入し、ボタンをタッチしてください。" + }, + "switchAccount": { + "message": "アカウントの切り替え" + }, + "switchAccounts": { + "message": "アカウントの切り替え" + }, + "switchToAccount": { + "message": "アカウントに切り替え" + }, + "activeAccount": { + "message": "アクティブなアカウント" + }, + "accountLimitReached": { + "message": "アカウントの制限に達しました。別のアカウントを追加するにはまずログアウトしてください。" + }, + "active": { + "message": "アクティブ" + }, + "locked": { + "message": "ロック中" + }, + "unlocked": { + "message": "ロック解除済み" + }, + "server": { + "message": "サーバー" + }, + "hostedAt": { + "message": "ホスト" } } diff --git a/apps/browser/src/_locales/ka/messages.json b/apps/browser/src/_locales/ka/messages.json index 1f5e2d81400..edd30fd436e 100644 --- a/apps/browser/src/_locales/ka/messages.json +++ b/apps/browser/src/_locales/ka/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Rate the extension" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lock now" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "დაუყონებლივ" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/km/messages.json b/apps/browser/src/_locales/km/messages.json index 5f243afe040..ab3933bf5b7 100644 --- a/apps/browser/src/_locales/km/messages.json +++ b/apps/browser/src/_locales/km/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Rate the extension" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lock now" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Immediately" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/kn/messages.json b/apps/browser/src/_locales/kn/messages.json index a743076b158..289cc9c36d8 100644 --- a/apps/browser/src/_locales/kn/messages.json +++ b/apps/browser/src/_locales/kn/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "ವಿಸ್ತರಣೆಯನ್ನು ರೇಟ್ ಮಾಡಿ" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "ಈಗ ಲಾಕ್ ಮಾಡಿ" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "ತಕ್ಷಣ" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/ko/messages.json b/apps/browser/src/_locales/ko/messages.json index 4837698c64c..309ed96aff0 100644 --- a/apps/browser/src/_locales/ko/messages.json +++ b/apps/browser/src/_locales/ko/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "확장 프로그램 평가" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "지금 잠그기" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "즉시" }, @@ -445,7 +451,7 @@ "message": "브라우저 다시 시작 시" }, "never": { - "message": "잠그지 않음" + "message": "안함" }, "security": { "message": "보안" @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/lt/messages.json b/apps/browser/src/_locales/lt/messages.json index 2b3e5c13ebd..11b6b88a245 100644 --- a/apps/browser/src/_locales/lt/messages.json +++ b/apps/browser/src/_locales/lt/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Nustatyk atrakinimo būdą, kad pakeistum saugyklos laiko limito veiksmą." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Įvertinkite šį plėtinį" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Užrakinti dabar" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Nedelsiant" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Rodyti ženkliukų skaitiklį" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Prieigos raktas" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Su LastPass paskyra susietą YubiKey įkišk į kompiuterio USB jungtį, tada paliesk jo mygtuką." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/lv/messages.json b/apps/browser/src/_locales/lv/messages.json index 21163a395ad..a8cdcae5c4a 100644 --- a/apps/browser/src/_locales/lv/messages.json +++ b/apps/browser/src/_locales/lv/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Jāuzstāda atslēgšanas veids, lai mainītu glabātavas noildzes darbību." }, + "unlockMethodNeeded": { + "message": "Jāuzstāda atslēgšanas veids iestatījumos" + }, "rateExtension": { "message": "Novērtēt paplašinājumu" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Aizslēgt" }, + "lockAll": { + "message": "Aizslēgt visu" + }, "immediately": { "message": "Nekavējoties" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Attiecas uz visiem pieslēgtajiem kontiem." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Jāizslēdz sava pārlūka iebūvētā paroļu pārvaldnieka iestatījumi, lai izvairītos no nesaderībām." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Mainīt pārlūka iestatījumus." + }, "autofillOverlayVisibilityOff": { "message": "Izslēgts", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Attēlot atpazīstamu attēlu pie katra pieteikšanās vienuma." }, + "faviconDescAlt": { + "message": "Parādīt atpazīstamu attēlu pie katra pieteikšanās vienuma. Attiecas uz visiem kontiem, kuros ir notikusi pieteikšanās." + }, "enableBadgeCounter": { "message": "Rādīt skaita nozīmīti" }, @@ -2538,36 +2553,12 @@ "message": "Ir pieejama Bitwarden automātiskās aizpildes izvēlne. Jānospiež poga ar bultu uz leju, lai atlasītu.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Aizvietot pārlūka automātisko aizpildi?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Šī iestatījuma neieslēgšana var radīt nesaderības starp Bitwarden automātiskās aizpildes izvēlni un pārlūku.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Šī iestatījuma neieslēgšana var radīt nesaderības starp Bitwarden automātiskās aizpildes izvēlni un pārlūku. Ieslēgšana pārsāknēs Bitwarden paplašinājumu.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Ieslēgt" }, "ignore": { "message": "Neņemt vērā" }, - "overrideBrowserAutoFillSettings": { - "message": "Aizvietot pārlūka automātiskās aizpildes iestatījumus", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Nebija iespējams aizvietot pārlūka automātisko aizpildi", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden ir jābūt piekļuvei paplašinājuma privātuma atļaujai, lai aizvietotu pārlūka automātiskās aizpildes iestatījumus.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Ievietot datus", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Apstiprināt datnes paroli" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Piekļuves atslēga netiks ievietota starpliktuvē" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Jāievieto ar LastPass kontu sasaistītā YubiKey datora USB ligzdā, tad jāpieskaras tās pogai." + }, + "switchAccount": { + "message": "Pārslēgties starp kontiem" + }, + "switchAccounts": { + "message": "Pārslēgties starp kontiem" + }, + "switchToAccount": { + "message": "Pārslēgties uz kontu" + }, + "activeAccount": { + "message": "Pašlaik izmantotais konts" + }, + "accountLimitReached": { + "message": "Sasniegti konta ierobežojumi. Jāizrakstās no konta, lai pievienotu citu." + }, + "active": { + "message": "izmantots" + }, + "locked": { + "message": "aizslēgts" + }, + "unlocked": { + "message": "atslēgta" + }, + "server": { + "message": "serveris" + }, + "hostedAt": { + "message": "izvietots" } } diff --git a/apps/browser/src/_locales/ml/messages.json b/apps/browser/src/_locales/ml/messages.json index 129952598d8..466c6d519d6 100644 --- a/apps/browser/src/_locales/ml/messages.json +++ b/apps/browser/src/_locales/ml/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "എക്സ്റ്റൻഷൻ റേറ്റ് ചെയ്യുക " }, @@ -405,6 +408,9 @@ "lockNow": { "message": "ഇപ്പോൾ ലോക്കുചെയ്യുക" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "ഉടന്‍തന്നെ" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/mr/messages.json b/apps/browser/src/_locales/mr/messages.json index 54908aec4cf..c3747416e90 100644 --- a/apps/browser/src/_locales/mr/messages.json +++ b/apps/browser/src/_locales/mr/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "विस्तारकाचे मूल्यांकन करा" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lock now" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Immediately" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/my/messages.json b/apps/browser/src/_locales/my/messages.json index 5f243afe040..ab3933bf5b7 100644 --- a/apps/browser/src/_locales/my/messages.json +++ b/apps/browser/src/_locales/my/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Rate the extension" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lock now" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Immediately" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/nb/messages.json b/apps/browser/src/_locales/nb/messages.json index ea42337a129..5bccc8e6fd3 100644 --- a/apps/browser/src/_locales/nb/messages.json +++ b/apps/browser/src/_locales/nb/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Gi denne utvidelsen en vurdering" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lås nå" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Umiddelbart" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Vis et gjenkjennelig bilde ved siden av hver innlogging." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Vis merke-teller" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/ne/messages.json b/apps/browser/src/_locales/ne/messages.json index 5f243afe040..ab3933bf5b7 100644 --- a/apps/browser/src/_locales/ne/messages.json +++ b/apps/browser/src/_locales/ne/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Rate the extension" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lock now" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Immediately" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/nl/messages.json b/apps/browser/src/_locales/nl/messages.json index 7303f8f5080..696b808ec86 100644 --- a/apps/browser/src/_locales/nl/messages.json +++ b/apps/browser/src/_locales/nl/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Stel een ontgrendelingsmethode in om je kluis time-out actie te wijzigen." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Deze extensie beoordelen" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Nu vergrendelen" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Onmiddellijk" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Schakel de ingebouwde wachtwoordbeheerinstellingen van je browser uit om conflicten te voorkomen." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Browserinstellingen bewerken." + }, "autofillOverlayVisibilityOff": { "message": "Uit", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Een herkenbare afbeelding naast iedere login weergeven." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Teller weergeven" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-invulmenu beschikbaar. Druk op de pijltjestoets omlaag om te selecteren.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Auto-fill instellingen van browser overschrijven?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Als je deze instelling uitschakelt, kunnen er conflicten ontstaan tussen het automatisch invullen van Bitwarden en dat van je browser.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Als je deze instelling uitschakelt, kunnen er conflicten ontstaan tussen het automatische invulmenu van Bitwarden en je browser. Als je dit inschakelt, wordt de Bitwarden-extensie opnieuw opgestart.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Inschakelen" }, "ignore": { "message": "Negeren" }, - "overrideBrowserAutoFillSettings": { - "message": "Autofill instellingen van browser overschrijven", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Kan automatisch aanvullen van browser niet overschrijven", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden moet toegang hebben tot de privacy-rechten van de extensie om browser auto-fill instellingen te overschrijven.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Data importeren", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Bestandswachtwoord bevestigen" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey wordt niet gekopieerd" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/nn/messages.json b/apps/browser/src/_locales/nn/messages.json index 5f243afe040..ab3933bf5b7 100644 --- a/apps/browser/src/_locales/nn/messages.json +++ b/apps/browser/src/_locales/nn/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Rate the extension" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lock now" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Immediately" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/or/messages.json b/apps/browser/src/_locales/or/messages.json index 5f243afe040..ab3933bf5b7 100644 --- a/apps/browser/src/_locales/or/messages.json +++ b/apps/browser/src/_locales/or/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Rate the extension" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lock now" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Immediately" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/pl/messages.json b/apps/browser/src/_locales/pl/messages.json index 6ed75cbf58f..7ffe729d951 100644 --- a/apps/browser/src/_locales/pl/messages.json +++ b/apps/browser/src/_locales/pl/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Ustaw metodę odblokowania, aby zmienić czas blokowania sejfu." }, + "unlockMethodNeeded": { + "message": "Ustaw metodę odblokowania w Ustawieniach" + }, "rateExtension": { "message": "Oceń rozszerzenie" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Zablokuj" }, + "lockAll": { + "message": "Zablokuj wszystko" + }, "immediately": { "message": "Natychmiast" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Dotyczy wszystkich zalogowanych kont." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Wyłącz wbudowany w przeglądarkę menedżera haseł, aby uniknąć konfliktów." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edytuj ustawienia przeglądarki." + }, "autofillOverlayVisibilityOff": { "message": "Wył.", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Pokaż rozpoznawalny obraz obok danych logowania." }, + "faviconDescAlt": { + "message": "Pokaż rozpoznawalny obraz obok każdego logowania. Dotyczy wszystkich zalogowanych kont." + }, "enableBadgeCounter": { "message": "Pokaż licznik na ikonie" }, @@ -2538,36 +2553,12 @@ "message": "Dostępne menu autouzupełniania Bitwarden. Naciśnij przycisk strzałki w dół, aby wybrać.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Zastąpić automatyczne wypełnianie przeglądarki?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Pozostawienie tego ustawienia jako wyłączonego może spowodować konflikty pomiędzy menu autouzupełniania Bitwarden a przeglądarką.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Pozostawienie tego ustawienia jako wyłączonego może spowodować konflikty pomiędzy menu autouzupełniania Bitwarden a przeglądarką. Włączenie tego spowoduje ponowne uruchomienie rozszerzenia Bitwarden.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Włącz" }, "ignore": { "message": "Ignoruj" }, - "overrideBrowserAutoFillSettings": { - "message": "Nadpisz ustawienia autouzupełniania przeglądarki", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Nie można napisać autouzupełniania przeglądarki", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden musi mieć dostęp do uprawnień prywatności rozszerzenia, aby nadpisać ustawienia autouzupełniania przeglądarki.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Importuj dane", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Potwierdź hasło pliku" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey nie zostanie skopiowany" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Włóż YubiKey powiązany z Twoim kontem LastPass do portu USB komputera, a następnie naciśnij jego przycisk." + }, + "switchAccount": { + "message": "Przełącz konto" + }, + "switchAccounts": { + "message": "Przełącz konta" + }, + "switchToAccount": { + "message": "Przełącz na konto" + }, + "activeAccount": { + "message": "Aktywne konto" + }, + "accountLimitReached": { + "message": "Limit kont został osiągnięty. Wyloguj się z konta, aby dodać inne." + }, + "active": { + "message": "aktywne" + }, + "locked": { + "message": "zablokowane" + }, + "unlocked": { + "message": "odblokowane" + }, + "server": { + "message": "serwer" + }, + "hostedAt": { + "message": "hostowany w" } } diff --git a/apps/browser/src/_locales/pt_BR/messages.json b/apps/browser/src/_locales/pt_BR/messages.json index 9d5bab1cd5c..0658070feeb 100644 --- a/apps/browser/src/_locales/pt_BR/messages.json +++ b/apps/browser/src/_locales/pt_BR/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Avaliar a Extensão" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Bloquear Agora" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Imediatamente" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Mostrar uma imagem reconhecível ao lado de cada login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Mostrar contador de insígnia" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/pt_PT/messages.json b/apps/browser/src/_locales/pt_PT/messages.json index 8759e14e70d..1467ee0b147 100644 --- a/apps/browser/src/_locales/pt_PT/messages.json +++ b/apps/browser/src/_locales/pt_PT/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Configure um método de desbloqueio para alterar a ação de tempo limite do seu cofre." }, + "unlockMethodNeeded": { + "message": "Definir um método de desbloqueio nas Definições" + }, "rateExtension": { "message": "Avaliar a extensão" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Bloquear agora" }, + "lockAll": { + "message": "Bloquear tudo" + }, "immediately": { "message": "Imediatamente" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Aplica-se a todas as contas com sessão iniciada." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Desative as definições do gestor de palavras-passe incorporado do seu navegador para evitar conflitos." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Editar as definições do navegador." + }, "autofillOverlayVisibilityOff": { "message": "Desligado", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Mostrar uma imagem reconhecível junto a cada credencial." }, + "faviconDescAlt": { + "message": "Mostrar uma imagem reconhecível junto a cada credencial. Aplica-se a todas as contas com sessão iniciada." + }, "enableBadgeCounter": { "message": "Mostrar distintivo de contador" }, @@ -2538,36 +2553,12 @@ "message": "Menu de preenchimento automático Bitwarden disponível. Prima a tecla de seta para baixo para selecionar.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Anular o preenchimento automático do navegador?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Deixar esta definição desativada pode causar conflitos entre o menu de preenchimento automático do Bitwarden e o do seu navegador.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Deixar esta configuração desativada pode causar conflitos entre o menu de preenchimento automático do Bitwarden e o do seu navegador. Ativar esta opção reiniciará a extensão Bitwarden.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Ativar" }, "ignore": { "message": "Ignorar" }, - "overrideBrowserAutoFillSettings": { - "message": "Substituir as definições de preenchimento automático do navegador", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Não é possível anular o preenchimento automático do navegador", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "O Bitwarden deve ter acesso à permissão de privacidade da extensão para substituir as definições de preenchimento automático do navegador.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Importar dados", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirmar a palavra-passe do ficheiro" }, + "typePasskey": { + "message": "Chave de acesso" + }, "passkeyNotCopied": { "message": "A chave de acesso não será copiada" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insira a YubiKey associada à sua conta LastPass na porta USB do seu computador e, em seguida, toque no respetivo botão." + }, + "switchAccount": { + "message": "Mudar de conta" + }, + "switchAccounts": { + "message": "Mudar de contas" + }, + "switchToAccount": { + "message": "Mudar para conta" + }, + "activeAccount": { + "message": "Conta ativa" + }, + "accountLimitReached": { + "message": "Limite de contas atingido. Termine a sessão de uma das contas para adicionar outra." + }, + "active": { + "message": "ativa" + }, + "locked": { + "message": "bloqueado" + }, + "unlocked": { + "message": "desbloqueado" + }, + "server": { + "message": "servidor" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/ro/messages.json b/apps/browser/src/_locales/ro/messages.json index 3c655c51e5d..20848362c2f 100644 --- a/apps/browser/src/_locales/ro/messages.json +++ b/apps/browser/src/_locales/ro/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Configurați metoda de deblocare care să schimbe acțiunea de expirare a seifului." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Evaluare extensie" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Blocare imediată" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Imediat" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Afișează o imagine ușor de recunoscut lângă fiecare autentificare." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Afișați contorul de insigne" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/ru/messages.json b/apps/browser/src/_locales/ru/messages.json index e12c2448949..4db426571f1 100644 --- a/apps/browser/src/_locales/ru/messages.json +++ b/apps/browser/src/_locales/ru/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Настройте способ разблокировки для изменения действия по тайм-ауту хранилища." }, + "unlockMethodNeeded": { + "message": "Установите способ разблокировки в настройках" + }, "rateExtension": { "message": "Оценить расширение" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Заблокировать" }, + "lockAll": { + "message": "Заблокировать все" + }, "immediately": { "message": "Немедленно" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Применяется ко всем авторизованным аккаунтам." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Выкл", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Отображать узнаваемое изображение рядом с каждым логином." }, + "faviconDescAlt": { + "message": "Показывать узнаваемое изображение рядом с каждым логином. Применяется ко всем авторизованным аккаунтам." + }, "enableBadgeCounter": { "message": "Показать счетчик на значке" }, @@ -2538,36 +2553,12 @@ "message": "Доступно меню автозаполнения Bitwarden. Для выбора нажмите клавишу со стрелкой вниз.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Переопределить автозаполнение браузера?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Отключение этого параметра может привести к конфликту между меню автозаполнения Bitwarden и меню вашего браузера.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Отключение этого параметра может привести к конфликту между меню автозаполнения Bitwarden и меню браузера. Включение этого параметра приведет к перезапуску расширения Bitwarden.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Включить" }, "ignore": { "message": "Игнорировать" }, - "overrideBrowserAutoFillSettings": { - "message": "Переопределить настройки автозаполнения браузера", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Невозможно переопределить автозаполнение браузера", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden должен иметь доступ к полномочиям конфиденциальности расширения для переопределения настроек автозаполнения браузера.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Импорт данных", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Подтвердите пароль к файлу" }, + "typePasskey": { + "message": "Ключ доступа" + }, "passkeyNotCopied": { "message": "Ключ доступа не будет скопирован" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Вставьте YubiKey, связанный с аккаунтом LastPass, в USB-порт компьютера и нажмите на его кнопку." + }, + "switchAccount": { + "message": "Сменить аккаунт" + }, + "switchAccounts": { + "message": "Сменить аккаунты" + }, + "switchToAccount": { + "message": "Переключиться на аккаунт" + }, + "activeAccount": { + "message": "Активный аккаунт" + }, + "accountLimitReached": { + "message": "Достигнут лимит аккаунтов. Выйдите, чтобы добавить другой." + }, + "active": { + "message": "активный" + }, + "locked": { + "message": "заблокирован" + }, + "unlocked": { + "message": "разблокирован" + }, + "server": { + "message": "сервер" + }, + "hostedAt": { + "message": "под управлением" } } diff --git a/apps/browser/src/_locales/si/messages.json b/apps/browser/src/_locales/si/messages.json index c8c192f54e3..f0ca959e3b8 100644 --- a/apps/browser/src/_locales/si/messages.json +++ b/apps/browser/src/_locales/si/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "දිගුව අනුපාතය" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "දැන් අගුලුදමන්න" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "වහාම" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/sk/messages.json b/apps/browser/src/_locales/sk/messages.json index ca75f2eeefd..c120c23dd52 100644 --- a/apps/browser/src/_locales/sk/messages.json +++ b/apps/browser/src/_locales/sk/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Nastavte metódu odomknutia, aby ste zmenili akciu pri vypršaní času trezoru." }, + "unlockMethodNeeded": { + "message": "Nastavte metódu odomknutia v Nastaveniach" + }, "rateExtension": { "message": "Ohodnotiť rozšírenie" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Uzamknúť teraz" }, + "lockAll": { + "message": "Uzamknúť všetky" + }, "immediately": { "message": "Okamžite" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Platí pre všetky prihlásené účty." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Vypnuté", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Pri každom prihlásení zobrazí rozpoznateľný obrázok." }, + "faviconDescAlt": { + "message": "Vedľa každého účtu zobraziť rozpoznateľný obrázok. Použije sa na všetky prihlásené účty." + }, "enableBadgeCounter": { "message": "Zobraziť počítadlo na ikone" }, @@ -2538,36 +2553,12 @@ "message": "K dispozícii je ponuka automatického vyplňovania Bitwardenu. Stlačte tlačidlo so šípkou nadol a vyberte.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Prepísať automatické vypĺňanie prehliadača?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Ak necháte toto nastavenie vypnuté, môže to spôsobiť konflikty medzi ponukou automatického vypĺňania Bitwardenu a ponukou vášho prehliadača.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Ak necháte toto nastavenie vypnuté, môže to spôsobiť konflikty medzi ponukou automatického vypĺňania Bitwardenu a ponukou vášho prehliadača. Zapnutím nastavenia sa rozšírenie Bitwarden reštartuje.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Zapnúť" }, "ignore": { "message": "Ignorovať" }, - "overrideBrowserAutoFillSettings": { - "message": "Prepísať automatické vypĺňanie prehliadača", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Nedá sa prepísať automatické vypĺňanie prehliadača", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden musí mať povolenie rozšírenia na nastavenie súkromia, aby mohol zrušiť nastavenia automatického vypĺňania prehliadača.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import údajov", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Potvrdiť heslo súboru" }, + "typePasskey": { + "message": "Prístupový kľúč" + }, "passkeyNotCopied": { "message": "Prístupový kód sa neskopíruje" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Vložte kľúč YubiKey priradený k vášmu účtu LastPass do USB portu počítača a potom sa dotknite jeho tlačidla." + }, + "switchAccount": { + "message": "Prepnúť účet" + }, + "switchAccounts": { + "message": "Prepnúť účty" + }, + "switchToAccount": { + "message": "Prepnúť na účet" + }, + "activeAccount": { + "message": "Aktívny účet" + }, + "accountLimitReached": { + "message": "Dosiahnutý limit účtu. Odhláste sa z účtu, ak chcete pridať ďalší." + }, + "active": { + "message": "aktívne" + }, + "locked": { + "message": "zamknuté" + }, + "unlocked": { + "message": "odomknuté" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hotované na" } } diff --git a/apps/browser/src/_locales/sl/messages.json b/apps/browser/src/_locales/sl/messages.json index a2cff114f7b..dc9f1b554e8 100644 --- a/apps/browser/src/_locales/sl/messages.json +++ b/apps/browser/src/_locales/sl/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Da spremenite časovne omejitve trezorja, nastavite metodo odklepanja." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Ocenite to razširitev" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Zakleni zdaj" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Takoj" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/sr/messages.json b/apps/browser/src/_locales/sr/messages.json index 5a7a76a728d..bf4280cee90 100644 --- a/apps/browser/src/_locales/sr/messages.json +++ b/apps/browser/src/_locales/sr/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Подесите метод откључавања да бисте променили радњу временског ограничења сефа." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Оцени овај додатак" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Закључај одмах" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Одмах" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Односи се на све пријављене налоге." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Искључено", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Прикажи препознатљиву слику поред сваке ставке за пријаву." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Прикажи бедж са бројачем" }, @@ -2538,36 +2553,12 @@ "message": "Мени ауто-попуњавања Bitwarden-а је доступан. Притисните тастер са стрелицом надоле да бисте изабрали.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Заменити ауто-попуњавање прегледача?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Ако ову поставку оставите искљученом, може доћи до сукоба између Bitwarden менија ауто-попуњавања и вашег претраживача.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Ако ову поставку оставите искљученом, може доћи до сукоба између Битварден менија аутоматског попуњавања и вашег претраживача. Ако упалите, то ће поново покренути Bitwarden додатак.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Укључи" }, "ignore": { "message": "Игнориши" }, - "overrideBrowserAutoFillSettings": { - "message": "Заменити ауто-попуњавање прегледача", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Није могуће заменити ауто-попуњавање прегледача", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden мора имати приступ дозволи приватности екстензије да би заменио подешавања ауто-попуњавања прегледача.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Увези податке", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Потврдити лозинку датотеке" }, + "typePasskey": { + "message": "Приступачни кључ" + }, "passkeyNotCopied": { "message": "Приступачни кључ неће бити копиран" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Унети YubiKey који је асоциран са LastPass налогом у УСБ порт вашег рачунара, и затим додирните његово дугме." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/sv/messages.json b/apps/browser/src/_locales/sv/messages.json index 67dadff95ae..a4cda54c073 100644 --- a/apps/browser/src/_locales/sv/messages.json +++ b/apps/browser/src/_locales/sv/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Betygsätt tillägget" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lås nu" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Omedelbart" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Visa en identifierbar bild bredvid varje inloggning." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Visa aktivitetsräknaren" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignorera" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Importera data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/te/messages.json b/apps/browser/src/_locales/te/messages.json index 5f243afe040..ab3933bf5b7 100644 --- a/apps/browser/src/_locales/te/messages.json +++ b/apps/browser/src/_locales/te/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Rate the extension" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lock now" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Immediately" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/th/messages.json b/apps/browser/src/_locales/th/messages.json index cc03c106e31..938a206a62c 100644 --- a/apps/browser/src/_locales/th/messages.json +++ b/apps/browser/src/_locales/th/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Rate the Extension" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Lock Now" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "ทันที" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Show a recognizable image next to each login." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Show badge counter" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/tr/messages.json b/apps/browser/src/_locales/tr/messages.json index af6f2053972..04ec9976bf4 100644 --- a/apps/browser/src/_locales/tr/messages.json +++ b/apps/browser/src/_locales/tr/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Kasa zaman aşımı eyleminizi değiştirmek için kilit açma yönteminizi ayarlayın." }, + "unlockMethodNeeded": { + "message": "Ayarlar'da bir kilit açma yöntemi ayarlayın" + }, "rateExtension": { "message": "Uzantıyı değerlendirin" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Şimdi kilitle" }, + "lockAll": { + "message": "Tümünü kilitle" + }, "immediately": { "message": "Hemen" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Oturum açmış tüm hesaplara uygulanır." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Kapalı", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Hesapların yanında tanıdık görseller göster." }, + "faviconDescAlt": { + "message": "Her hesabın yanında tanınabilir bir resim göster. Oturum açmış tüm hesaplar için geçerlidir." + }, "enableBadgeCounter": { "message": "Rozet sayacını göster" }, @@ -2499,7 +2514,7 @@ "description": "Page title for the iframe containing the overlay button" }, "toggleBitwardenVaultOverlay": { - "message": "Toggle Bitwarden auto-fill menu", + "message": "Bitwarden otomatik doldurma menüsünü aç/kapat", "description": "Screen reader and tool tip label for the overlay button" }, "bitwardenVault": { @@ -2507,15 +2522,15 @@ "description": "Page title in overlay" }, "unlockYourAccountToViewMatchingLogins": { - "message": "Eşleşen giriş bilgilerini görüntülemek için hesabınızın kilidini açın", + "message": "Eşleşen hesaplarınızı görmek için hesabınızın kilidini açın", "description": "Text to display in overlay when the account is locked." }, "unlockAccount": { - "message": "Hesabın kilidini açın", + "message": "Hesap kilidini aç", "description": "Button text to display in overlay when the account is locked." }, "fillCredentialsFor": { - "message": "Kimlik bilgilerini doldurun", + "message": "Bilgileri doldur", "description": "Screen reader text for when overlay item is in focused" }, "partialUsername": { @@ -2523,50 +2538,26 @@ "description": "Screen reader text for when a login item is focused where a partial username is displayed. SR will announce this phrase before reading the text of the partial username" }, "noItemsToShow": { - "message": "Gösterilecek öğe yok", + "message": "Gösterilecek kayıt yok", "description": "Text to show in overlay if there are no matching items" }, "newItem": { - "message": "Yeni öge", + "message": "Yeni kayıt", "description": "Button text to display in overlay when there are no matching items" }, "addNewVaultItem": { - "message": "Add new vault item", + "message": "Kasaya yeni kayıt ekle", "description": "Screen reader text (aria-label) for new item button in overlay" }, "bitwardenOverlayMenuAvailable": { "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Bu ayarı kapalı bırakmak, Bitwarden otomatik doldurma menüsü ile tarayıcınızınki arasında çakışmalara neden olabilir.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { - "message": "Turn on" + "message": "Aç" }, "ignore": { - "message": "Yoksay" - }, - "overrideBrowserAutoFillSettings": { - "message": "Tarayıcının otomatik doldurma ayarlarını geçersiz kıl", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" + "message": "Yok say" }, "importData": { "message": "Verileri içe aktar", @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Dosya parolasını onaylayın" }, + "typePasskey": { + "message": "Geçiş anahtarı" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "LastPass hesabınızla ilişkili YubiKey'i bilgisayarınızın USB bağlantı noktasına takın ve ardından düğmesine dokunun." + }, + "switchAccount": { + "message": "Hesabı değiştir" + }, + "switchAccounts": { + "message": "Hesapları değiştir" + }, + "switchToAccount": { + "message": "Hesaba geç" + }, + "activeAccount": { + "message": "Aktif hesap" + }, + "accountLimitReached": { + "message": "Hesap sınırına ulaştınız. Yeni hesap eklemek için hesaplardan birinden çıkış yapın." + }, + "active": { + "message": "aktif" + }, + "locked": { + "message": "kilitli" + }, + "unlocked": { + "message": "kilitli değil" + }, + "server": { + "message": "sunucu" + }, + "hostedAt": { + "message": "konum" } } diff --git a/apps/browser/src/_locales/uk/messages.json b/apps/browser/src/_locales/uk/messages.json index 295b51dc2fa..279bd8c28ba 100644 --- a/apps/browser/src/_locales/uk/messages.json +++ b/apps/browser/src/_locales/uk/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Налаштуйте спосіб розблокування, щоб змінити час очікування сховища." }, + "unlockMethodNeeded": { + "message": "Встановіть спосіб розблокування в налаштуваннях" + }, "rateExtension": { "message": "Оцінити розширення" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Блокувати зараз" }, + "lockAll": { + "message": "Заблокувати все" + }, "immediately": { "message": "Негайно" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Застосовується для всіх облікових записів, до яких виконано вхід." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Вимк", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Показувати впізнаване зображення біля кожного запису." }, + "faviconDescAlt": { + "message": "Показати впізнаване зображення поруч з кожним записом. Застосовується для всіх облікових записів, до яких виконано вхід." + }, "enableBadgeCounter": { "message": "Показувати лічильник" }, @@ -2538,36 +2553,12 @@ "message": "Доступне меню автозаповнення Bitwarden. Натисніть клавішу стрілки для вибору.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Перевизначити автозаповнення браузера?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Якщо залишити цей параметр вимкненим, може виникнути конфлікт між меню автозаповнення Bitwarden та вашого браузера.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Якщо залишити цей параметр вимкненим, може виникнути конфлікт між меню автозаповнення Bitwarden та вашого браузера. Якщо увімкнути, розширення Bitwarden перезапуститься.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Увімкнути" }, "ignore": { "message": "Ігнорувати" }, - "overrideBrowserAutoFillSettings": { - "message": "Перевизначити налаштування автозаповнення браузера", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Неможливо перевизначити автозаповнення браузера", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden повинен мати доступ до дозволу приватності розширення, щоб перевизначати налаштування автозаповнення браузера.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Імпортувати дані", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Підтвердьте пароль файлу" }, + "typePasskey": { + "message": "Ключ доступу" + }, "passkeyNotCopied": { "message": "Ключ доступу не буде скопійовано" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Вставте YubiKey пов'язаний з обліковим записом LastPass в USB порт вашого комп'ютера, потім торкніться його кнопки." + }, + "switchAccount": { + "message": "Перемкнути обліковий запис" + }, + "switchAccounts": { + "message": "Перемкнути облікові записи" + }, + "switchToAccount": { + "message": "Перемкнути на обліковий запис" + }, + "activeAccount": { + "message": "Активний обліковий запис" + }, + "accountLimitReached": { + "message": "Досягнуто обмеження облікового запису. Вийдіть, щоб додати інший обліковий запис." + }, + "active": { + "message": "активний" + }, + "locked": { + "message": "заблокований" + }, + "unlocked": { + "message": "розблокований" + }, + "server": { + "message": "сервер" + }, + "hostedAt": { + "message": "розміщений на" } } diff --git a/apps/browser/src/_locales/vi/messages.json b/apps/browser/src/_locales/vi/messages.json index 46b9e71df67..4aa9aca6d4d 100644 --- a/apps/browser/src/_locales/vi/messages.json +++ b/apps/browser/src/_locales/vi/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Set up an unlock method to change your vault timeout action." }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "Đánh giá tiện ích mở rộng" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "Khóa ngay" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "Ngay lập tức" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "Applies to all logged in accounts." }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "Hiển thị một ảnh nhận dạng bên cạnh mỗi lần đăng nhập." }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "Hiển thị biểu tượng bộ đếm" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden auto-fill menu available. Press the down arrow key to select.", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "Override browser auto-fill?", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "Leaving this setting off may cause conflicts between the Bitwarden auto-fill menu and your browser’s. Turning this on will restart the Bitwarden extension.", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "Turn on" }, "ignore": { "message": "Ignore" }, - "overrideBrowserAutoFillSettings": { - "message": "Override browser auto-fill settings", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "Unable to override browser auto-fill", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden must have access to the extension's privacy permission to override browser auto-fill settings.", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "Import data", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "Confirm file password" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "Passkey will not be copied" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } diff --git a/apps/browser/src/_locales/zh_CN/messages.json b/apps/browser/src/_locales/zh_CN/messages.json index 6f3d57c77e7..8db5c7fb35c 100644 --- a/apps/browser/src/_locales/zh_CN/messages.json +++ b/apps/browser/src/_locales/zh_CN/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "设置一个解锁方式以更改您的密码库超时动作。" }, + "unlockMethodNeeded": { + "message": "在设置中设置解锁方法" + }, "rateExtension": { "message": "为本扩展打分" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "立即锁定" }, + "lockAll": { + "message": "全部锁定" + }, "immediately": { "message": "立即" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "适用于所有已登录的账户。" }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "编辑浏览器设置。" + }, "autofillOverlayVisibilityOff": { "message": "关闭", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "在每个登录项目旁边显示一个可识别的图像。" }, + "faviconDescAlt": { + "message": "在每个登录的旁边显示一个可识别的图像。适用于所有已登录的账户。" + }, "enableBadgeCounter": { "message": "显示角标计数器" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden 自动填充菜单可用。按向下箭头键进行选择。", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "覆盖浏览器自动填充吗？", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "关闭此设置可能会导致 Bitwarden 自动填充菜单与浏览器菜单发生冲突。", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "关闭此设置可能会导致 Bitwarden 自动填充菜单与浏览器菜单发生冲突。打开此选项将重新启动 Bitwarden 扩展。", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "开启" }, "ignore": { "message": "忽略" }, - "overrideBrowserAutoFillSettings": { - "message": "覆盖浏览器的自动填充设置", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "无法覆盖浏览器自动填充", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden 必须拥有访问扩展隐私的权限，才能覆盖浏览器的自动填充设置。", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "导入数据", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "确认文件密码" }, + "typePasskey": { + "message": "通行密钥" + }, "passkeyNotCopied": { "message": "通行密钥不会被复制" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "将与您的 LastPass 账户关联的 YubiKey 插入计算机的 USB 端口，然后触摸其按钮。" + }, + "switchAccount": { + "message": "切换账户" + }, + "switchAccounts": { + "message": "切换账户" + }, + "switchToAccount": { + "message": "切换到账户" + }, + "activeAccount": { + "message": "活动账户" + }, + "accountLimitReached": { + "message": "已达到账户上限。请注销一个账户后再添加其他账户。" + }, + "active": { + "message": "已生效" + }, + "locked": { + "message": "已锁定" + }, + "unlocked": { + "message": "已解锁" + }, + "server": { + "message": "服务器" + }, + "hostedAt": { + "message": "托管于" } } diff --git a/apps/browser/src/_locales/zh_TW/messages.json b/apps/browser/src/_locales/zh_TW/messages.json index 492d6aec22a..51c319611b9 100644 --- a/apps/browser/src/_locales/zh_TW/messages.json +++ b/apps/browser/src/_locales/zh_TW/messages.json @@ -365,6 +365,9 @@ "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "設定一個解鎖方式來變更您的密碼庫逾時動作。" }, + "unlockMethodNeeded": { + "message": "Set up an unlock method in Settings" + }, "rateExtension": { "message": "為本套件評分" }, @@ -405,6 +408,9 @@ "lockNow": { "message": "立即鎖定" }, + "lockAll": { + "message": "Lock all" + }, "immediately": { "message": "立即" }, @@ -1027,6 +1033,12 @@ "showAutoFillMenuOnFormFieldsDescAlt": { "message": "適用於所有已登入的帳戶。" }, + "turnOffBrowserBuiltInPasswordManagerSettings": { + "message": "Turn off your browser’s built in password manager settings to avoid conflicts." + }, + "turnOffBrowserBuiltInPasswordManagerSettingsLink": { + "message": "Edit browser settings." + }, "autofillOverlayVisibilityOff": { "message": "關閉", "description": "Overlay setting select option for disabling autofill overlay" @@ -1131,6 +1143,9 @@ "faviconDesc": { "message": "在每個登入資料旁顯示一個可辨識的圖片。" }, + "faviconDescAlt": { + "message": "Show a recognizable image next to each login. Applies to all logged in accounts." + }, "enableBadgeCounter": { "message": "顯示圖示計數器" }, @@ -2538,36 +2553,12 @@ "message": "Bitwarden 自動填入選單可用。按下箭頭鍵來選擇。", "description": "Screen reader text for announcing when the overlay opens on the page" }, - "overrideBrowserAutofillTitle": { - "message": "覆蓋瀏覽器的自動填入？", - "description": "Dialog title facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillDescription": { - "message": "關閉此設定可能會導致 Bitwarden 自動填入選單與您的瀏覽器產生衝突。", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, - "overrideBrowserAutofillPrivacyRequiredDescription": { - "message": "關閉此設定可能會導致 Bitwarden 自動填入選單與您的瀏覽器產生衝突。開啟此選項將會重新啟動 Bitwarden 擴充功能。", - "description": "Dialog message facilitating the ability to override a chrome browser's default autofill behavior" - }, "turnOn": { "message": "開啟" }, "ignore": { "message": "忽略" }, - "overrideBrowserAutoFillSettings": { - "message": "覆蓋瀏覽器的自動填入設定", - "description": "Label for the setting that allows overriding the default browser autofill settings" - }, - "extensionPrivacyPermissionNotGrantedTitle": { - "message": "無法覆蓋瀏覽器的自動填入", - "description": "Title for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, - "extensionPrivacyPermissionNotGrantedDescription": { - "message": "Bitwarden 必須取得擴充功能的隱私權限才能覆蓋瀏覽器的自動填入設定。", - "description": "Description for the dialog that appears when the user has not granted the extension permission to set privacy settings" - }, "importData": { "message": "匯入資料", "description": "Used for the header of the import dialog, the import button and within the file-password-prompt" @@ -2679,6 +2670,9 @@ "confirmFilePassword": { "message": "確認檔案密碼" }, + "typePasskey": { + "message": "Passkey" + }, "passkeyNotCopied": { "message": "密碼金鑰不會被複製" }, @@ -2793,5 +2787,35 @@ }, "lastPassYubikeyDesc": { "message": "將與您的 LastPass 帳戶關聯的 YubiKey 插入電腦的 USB 連接埠，然後觸摸其按鈕。" + }, + "switchAccount": { + "message": "Switch account" + }, + "switchAccounts": { + "message": "Switch accounts" + }, + "switchToAccount": { + "message": "Switch to account" + }, + "activeAccount": { + "message": "Active account" + }, + "accountLimitReached": { + "message": "Account limit reached. Log out of an account to add another." + }, + "active": { + "message": "active" + }, + "locked": { + "message": "locked" + }, + "unlocked": { + "message": "unlocked" + }, + "server": { + "message": "server" + }, + "hostedAt": { + "message": "hosted at" } } 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 a050dc22ecc..0b9dc08ad2c 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 @@ -18,12 +18,12 @@ export type OrganizationServiceInitOptions = OrganizationServiceFactoryOptions & export function organizationServiceFactory( cache: { organizationService?: AbstractOrganizationService } & CachedServices, - opts: OrganizationServiceInitOptions + opts: OrganizationServiceInitOptions, ): Promise { return factory( cache, "organizationService", opts, - async () => new BrowserOrganizationService(await stateServiceFactory(cache, opts)) + async () => new BrowserOrganizationService(await stateServiceFactory(cache, opts)), ); } 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 89f4a667f8d..6d4e8995942 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 @@ -24,7 +24,7 @@ export type PolicyServiceInitOptions = PolicyServiceFactoryOptions & export function policyServiceFactory( cache: { policyService?: AbstractPolicyService } & CachedServices, - opts: PolicyServiceInitOptions + opts: PolicyServiceInitOptions, ): Promise { return factory( cache, @@ -33,7 +33,7 @@ export function policyServiceFactory( async () => new BrowserPolicyService( await stateServiceFactory(cache, opts), - await organizationServiceFactory(cache, opts) - ) + await organizationServiceFactory(cache, opts), + ), ); } 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 74aa0f546af..0fc924fc243 100644 --- a/apps/browser/src/admin-console/services/browser-policy.service.ts +++ b/apps/browser/src/admin-console/services/browser-policy.service.ts @@ -38,7 +38,7 @@ export class BrowserPolicyService extends PolicyService { if (activated === undefined) { this.stateService.setActivateAutoFillOnPageLoadFromPolicy(!autofillEnabled); } - }) + }), ); } } diff --git a/apps/browser/src/auth/background/service-factories/account-service.factory.ts b/apps/browser/src/auth/background/service-factories/account-service.factory.ts index 3a180df1564..9b7ad05ec49 100644 --- a/apps/browser/src/auth/background/service-factories/account-service.factory.ts +++ b/apps/browser/src/auth/background/service-factories/account-service.factory.ts @@ -28,7 +28,7 @@ export type AccountServiceInitOptions = AccountServiceFactoryOptions & export function accountServiceFactory( cache: { accountService?: AccountService } & CachedServices, - opts: AccountServiceInitOptions + opts: AccountServiceInitOptions, ): Promise { return factory( cache, @@ -38,7 +38,7 @@ export function accountServiceFactory( new AccountServiceImplementation( await messagingServiceFactory(cache, opts), await logServiceFactory(cache, opts), - await globalStateProviderFactory(cache, opts) - ) + await globalStateProviderFactory(cache, opts), + ), ); } diff --git a/apps/browser/src/auth/background/service-factories/auth-request-crypto-service.factory.ts b/apps/browser/src/auth/background/service-factories/auth-request-crypto-service.factory.ts index e1757f98129..ce6c0d78f03 100644 --- a/apps/browser/src/auth/background/service-factories/auth-request-crypto-service.factory.ts +++ b/apps/browser/src/auth/background/service-factories/auth-request-crypto-service.factory.ts @@ -18,12 +18,12 @@ export type AuthRequestCryptoServiceInitOptions = AuthRequestCryptoServiceFactor export function authRequestCryptoServiceFactory( cache: { authRequestCryptoService?: AuthRequestCryptoServiceAbstraction } & CachedServices, - opts: AuthRequestCryptoServiceInitOptions + opts: AuthRequestCryptoServiceInitOptions, ): Promise { return factory( cache, "authRequestCryptoService", opts, - async () => new AuthRequestCryptoServiceImplementation(await cryptoServiceFactory(cache, opts)) + async () => new AuthRequestCryptoServiceImplementation(await cryptoServiceFactory(cache, opts)), ); } 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 6aaeb476369..31d338fecc7 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 @@ -89,7 +89,7 @@ export type AuthServiceInitOptions = AuthServiceFactoyOptions & export function authServiceFactory( cache: { authService?: AbstractAuthService } & CachedServices, - opts: AuthServiceInitOptions + opts: AuthServiceInitOptions, ): Promise { return factory( cache, @@ -113,7 +113,7 @@ export function authServiceFactory( await passwordStrengthServiceFactory(cache, opts), await policyServiceFactory(cache, opts), await deviceTrustCryptoServiceFactory(cache, opts), - await authRequestCryptoServiceFactory(cache, opts) - ) + await authRequestCryptoServiceFactory(cache, opts), + ), ); } diff --git a/apps/browser/src/auth/background/service-factories/device-trust-crypto-service.factory.ts b/apps/browser/src/auth/background/service-factories/device-trust-crypto-service.factory.ts index 430d50fea75..8458c40b9bb 100644 --- a/apps/browser/src/auth/background/service-factories/device-trust-crypto-service.factory.ts +++ b/apps/browser/src/auth/background/service-factories/device-trust-crypto-service.factory.ts @@ -53,7 +53,7 @@ export type DeviceTrustCryptoServiceInitOptions = DeviceTrustCryptoServiceFactor export function deviceTrustCryptoServiceFactory( cache: { deviceTrustCryptoService?: DeviceTrustCryptoServiceAbstraction } & CachedServices, - opts: DeviceTrustCryptoServiceInitOptions + opts: DeviceTrustCryptoServiceInitOptions, ): Promise { return factory( cache, @@ -68,7 +68,7 @@ export function deviceTrustCryptoServiceFactory( await appIdServiceFactory(cache, opts), await devicesApiServiceFactory(cache, opts), await i18nServiceFactory(cache, opts), - await platformUtilsServiceFactory(cache, opts) - ) + await platformUtilsServiceFactory(cache, opts), + ), ); } 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 25eb85e5568..625a14e30ea 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 @@ -50,7 +50,7 @@ export type KeyConnectorServiceInitOptions = KeyConnectorServiceFactoryOptions & export function keyConnectorServiceFactory( cache: { keyConnectorService?: AbstractKeyConnectorService } & CachedServices, - opts: KeyConnectorServiceInitOptions + opts: KeyConnectorServiceInitOptions, ): Promise { return factory( cache, @@ -65,7 +65,7 @@ export function keyConnectorServiceFactory( await logServiceFactory(cache, opts), await organizationServiceFactory(cache, opts), await cryptoFunctionServiceFactory(cache, opts), - opts.keyConnectorServiceOptions.logoutCallback - ) + opts.keyConnectorServiceOptions.logoutCallback, + ), ); } 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 389f8d1541a..476b8e2d785 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 @@ -17,12 +17,12 @@ export type TokenServiceInitOptions = TokenServiceFactoryOptions & StateServiceI export function tokenServiceFactory( cache: { tokenService?: AbstractTokenService } & CachedServices, - opts: TokenServiceInitOptions + opts: TokenServiceInitOptions, ): Promise { return factory( cache, "tokenService", opts, - async () => new TokenService(await stateServiceFactory(cache, opts)) + async () => new TokenService(await stateServiceFactory(cache, opts)), ); } 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 040a5edfb4a..1d79bbbaf1d 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 @@ -23,7 +23,7 @@ export type TwoFactorServiceInitOptions = TwoFactorServiceFactoryOptions & export async function twoFactorServiceFactory( cache: { twoFactorService?: AbstractTwoFactorService } & CachedServices, - opts: TwoFactorServiceInitOptions + opts: TwoFactorServiceInitOptions, ): Promise { const service = await factory( cache, @@ -32,8 +32,8 @@ export async function twoFactorServiceFactory( async () => new TwoFactorService( await i18nServiceFactory(cache, opts), - await platformUtilsServiceFactory(cache, opts) - ) + await platformUtilsServiceFactory(cache, opts), + ), ); service.init(); return service; diff --git a/apps/browser/src/auth/background/service-factories/user-verification-api-service.factory.ts b/apps/browser/src/auth/background/service-factories/user-verification-api-service.factory.ts index 01bfb0f13cb..f8d43877632 100644 --- a/apps/browser/src/auth/background/service-factories/user-verification-api-service.factory.ts +++ b/apps/browser/src/auth/background/service-factories/user-verification-api-service.factory.ts @@ -18,12 +18,12 @@ export type UserVerificationApiServiceInitOptions = UserVerificationApiServiceFa export function userVerificationApiServiceFactory( cache: { userVerificationApiService?: UserVerificationApiServiceAbstraction } & CachedServices, - opts: UserVerificationApiServiceInitOptions + opts: UserVerificationApiServiceInitOptions, ): Promise { return factory( cache, "userVerificationApiService", opts, - async () => new UserVerificationApiService(await apiServiceFactory(cache, opts)) + async () => new UserVerificationApiService(await apiServiceFactory(cache, opts)), ); } diff --git a/apps/browser/src/auth/background/service-factories/user-verification-service.factory.ts b/apps/browser/src/auth/background/service-factories/user-verification-service.factory.ts index 79d327c9485..d0cdfff9932 100644 --- a/apps/browser/src/auth/background/service-factories/user-verification-service.factory.ts +++ b/apps/browser/src/auth/background/service-factories/user-verification-service.factory.ts @@ -34,7 +34,7 @@ export type UserVerificationServiceInitOptions = UserVerificationServiceFactoryO export function userVerificationServiceFactory( cache: { userVerificationService?: AbstractUserVerificationService } & CachedServices, - opts: UserVerificationServiceInitOptions + opts: UserVerificationServiceInitOptions, ): Promise { return factory( cache, @@ -45,7 +45,7 @@ export function userVerificationServiceFactory( await stateServiceFactory(cache, opts), await cryptoServiceFactory(cache, opts), await i18nServiceFactory(cache, opts), - await userVerificationApiServiceFactory(cache, opts) - ) + await userVerificationApiServiceFactory(cache, opts), + ), ); } diff --git a/apps/browser/src/auth/guards/fido2-auth.guard.ts b/apps/browser/src/auth/guards/fido2-auth.guard.ts index 7ff0060663d..f6b560c71d6 100644 --- a/apps/browser/src/auth/guards/fido2-auth.guard.ts +++ b/apps/browser/src/auth/guards/fido2-auth.guard.ts @@ -17,7 +17,7 @@ import { BrowserRouterService } from "../../platform/popup/services/browser-rout */ export const fido2AuthGuard: CanActivateFn = async ( route: ActivatedRouteSnapshot, - state: RouterStateSnapshot + state: RouterStateSnapshot, ) => { const routerService = inject(BrowserRouterService); const authService = inject(AuthService); diff --git a/apps/browser/src/auth/popup/account-switching/account-switcher.component.html b/apps/browser/src/auth/popup/account-switching/account-switcher.component.html index bde9c3f6a02..f7421870143 100644 --- a/apps/browser/src/auth/popup/account-switching/account-switcher.component.html +++ b/apps/browser/src/auth/popup/account-switching/account-switcher.component.html @@ -1,7 +1,70 @@ -
-
- + +
+
-
+
{{ "switchAccounts" | i18n }}
+ + +
+ +
+
+
+
+
    +
  • + +
    • +
+ +

+ {{ "accountLimitReached" | i18n }} +

+
+ +
+
{{ "options" | i18n }}
+
+ + + +
+
+
+
diff --git a/apps/browser/src/auth/popup/account-switching/account-switcher.component.ts b/apps/browser/src/auth/popup/account-switching/account-switcher.component.ts index 8d4777c30d8..d7661fa9d44 100644 --- a/apps/browser/src/auth/popup/account-switching/account-switcher.component.ts +++ b/apps/browser/src/auth/popup/account-switching/account-switcher.component.ts @@ -1,20 +1,113 @@ -import { Component } from "@angular/core"; +import { Location } from "@angular/common"; +import { Component, OnDestroy, OnInit } from "@angular/core"; import { Router } from "@angular/router"; +import { Subject, firstValueFrom, map, switchMap, takeUntil } from "rxjs"; -import { AccountSwitcherService } from "../services/account-switcher.service"; +import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service"; +import { VaultTimeoutService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout.service"; +import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; +import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; +import { VaultTimeoutAction } from "@bitwarden/common/enums/vault-timeout-action.enum"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { DialogService } from "@bitwarden/components"; + +import { AccountSwitcherService } from "./services/account-switcher.service"; @Component({ templateUrl: "account-switcher.component.html", }) -export class AccountSwitcherComponent { - constructor(private accountSwitcherService: AccountSwitcherService, private router: Router) {} +export class AccountSwitcherComponent implements OnInit, OnDestroy { + readonly lockedStatus = AuthenticationStatus.Locked; + private destroy$ = new Subject(); - get accountOptions$() { - return this.accountSwitcherService.accountOptions$; + loading = false; + activeUserCanLock = false; + + constructor( + private accountSwitcherService: AccountSwitcherService, + private accountService: AccountService, + private vaultTimeoutService: VaultTimeoutService, + private messagingService: MessagingService, + private dialogService: DialogService, + private location: Location, + private router: Router, + private vaultTimeoutSettingsService: VaultTimeoutSettingsService, + ) {} + + get accountLimit() { + return this.accountSwitcherService.ACCOUNT_LIMIT; } - async selectAccount(id: string) { - await this.accountSwitcherService.selectAccount(id); - this.router.navigate(["/home"]); + get specialAddAccountId() { + return this.accountSwitcherService.SPECIAL_ADD_ACCOUNT_ID; + } + + get availableAccounts$() { + return this.accountSwitcherService.availableAccounts$; + } + + get currentAccount$() { + return this.accountService.activeAccount$; + } + + async ngOnInit() { + const availableVaultTimeoutActions = await firstValueFrom( + this.vaultTimeoutSettingsService.availableVaultTimeoutActions$(), + ); + this.activeUserCanLock = availableVaultTimeoutActions.includes(VaultTimeoutAction.Lock); + } + + back() { + this.location.back(); + } + + async lock(userId?: string) { + this.loading = true; + await this.vaultTimeoutService.lock(userId ? userId : null); + this.router.navigate(["lock"]); + } + + async lockAll() { + this.loading = true; + this.availableAccounts$ + .pipe( + map((accounts) => + accounts + .filter((account) => account.id !== this.specialAddAccountId) + .sort((a, b) => (a.isActive ? -1 : b.isActive ? 1 : 0)) // Log out of the active account first + .map((account) => account.id), + ), + switchMap(async (accountIds) => { + if (accountIds.length === 0) { + return; + } + + // Must lock active (first) account first, then order doesn't matter + await this.vaultTimeoutService.lock(accountIds.shift()); + await Promise.all(accountIds.map((id) => this.vaultTimeoutService.lock(id))); + }), + takeUntil(this.destroy$), + ) + .subscribe(() => this.router.navigate(["lock"])); + } + + async logOut() { + this.loading = true; + const confirmed = await this.dialogService.openSimpleDialog({ + title: { key: "logOut" }, + content: { key: "logOutConfirmation" }, + type: "info", + }); + + if (confirmed) { + this.messagingService.send("logout"); + } + + this.router.navigate(["account-switcher"]); + } + + ngOnDestroy() { + this.destroy$.next(); + this.destroy$.complete(); } } diff --git a/apps/browser/src/auth/popup/account-switching/account.component.html b/apps/browser/src/auth/popup/account-switching/account.component.html new file mode 100644 index 00000000000..52edeabc7b5 --- /dev/null +++ b/apps/browser/src/auth/popup/account-switching/account.component.html @@ -0,0 +1,49 @@ + + + diff --git a/apps/browser/src/auth/popup/account-switching/account.component.ts b/apps/browser/src/auth/popup/account-switching/account.component.ts new file mode 100644 index 00000000000..2455aee1b86 --- /dev/null +++ b/apps/browser/src/auth/popup/account-switching/account.component.ts @@ -0,0 +1,55 @@ +import { CommonModule, Location } from "@angular/common"; +import { Component, EventEmitter, Input, Output } from "@angular/core"; +import { Router } from "@angular/router"; + +import { JslibModule } from "@bitwarden/angular/jslib.module"; +import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { AvatarModule } from "@bitwarden/components"; + +import { AccountSwitcherService, AvailableAccount } from "./services/account-switcher.service"; + +@Component({ + standalone: true, + selector: "auth-account", + templateUrl: "account.component.html", + imports: [CommonModule, JslibModule, AvatarModule], +}) +export class AccountComponent { + @Input() account: AvailableAccount; + @Output() loading = new EventEmitter(); + + constructor( + private accountSwitcherService: AccountSwitcherService, + private router: Router, + private location: Location, + private i18nService: I18nService, + ) {} + + get specialAccountAddId() { + return this.accountSwitcherService.SPECIAL_ADD_ACCOUNT_ID; + } + + async selectAccount(id: string) { + this.loading.emit(true); + await this.accountSwitcherService.selectAccount(id); + + if (id === this.specialAccountAddId) { + this.router.navigate(["home"]); + } else { + this.location.back(); + } + } + + get status() { + if (this.account.isActive && this.account.status !== AuthenticationStatus.Locked) { + return { text: this.i18nService.t("active"), icon: "bwi-check-circle" }; + } + + if (this.account.status === AuthenticationStatus.Unlocked) { + return { text: this.i18nService.t("unlocked"), icon: "bwi-unlock" }; + } + + return { text: this.i18nService.t("locked"), icon: "bwi-lock" }; + } +} diff --git a/apps/browser/src/auth/popup/account-switching/current-account.component.html b/apps/browser/src/auth/popup/account-switching/current-account.component.html index bb482347e72..777d3af3047 100644 --- a/apps/browser/src/auth/popup/account-switching/current-account.component.html +++ b/apps/browser/src/auth/popup/account-switching/current-account.component.html @@ -1,5 +1,35 @@ -
-
- -
+
+ + + +
diff --git a/apps/browser/src/auth/popup/account-switching/current-account.component.ts b/apps/browser/src/auth/popup/account-switching/current-account.component.ts index cf50ab2798d..df6cb322507 100644 --- a/apps/browser/src/auth/popup/account-switching/current-account.component.ts +++ b/apps/browser/src/auth/popup/account-switching/current-account.component.ts @@ -1,20 +1,30 @@ +import { Location } from "@angular/common"; import { Component } from "@angular/core"; -import { Router } from "@angular/router"; +import { ActivatedRoute, Router } from "@angular/router"; -import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; +import { CurrentAccountService } from "./services/current-account.service"; @Component({ selector: "app-current-account", templateUrl: "current-account.component.html", }) export class CurrentAccountComponent { - constructor(private accountService: AccountService, private router: Router) {} + constructor( + private currentAccountService: CurrentAccountService, + private router: Router, + private location: Location, + private route: ActivatedRoute, + ) {} get currentAccount$() { - return this.accountService.activeAccount$; + return this.currentAccountService.currentAccount$; } - currentAccountClicked() { - this.router.navigate(["/account-switcher"]); + async currentAccountClicked() { + if (this.route.snapshot.data.state.includes("account-switcher")) { + this.location.back(); + } else { + this.router.navigate(["/account-switcher"]); + } } } diff --git a/apps/browser/src/auth/popup/services/account-switcher.service.spec.ts b/apps/browser/src/auth/popup/account-switching/services/account-switcher.service.spec.ts similarity index 61% rename from apps/browser/src/auth/popup/services/account-switcher.service.spec.ts rename to apps/browser/src/auth/popup/account-switching/services/account-switcher.service.spec.ts index d60166e9b40..9845fac1dad 100644 --- a/apps/browser/src/auth/popup/services/account-switcher.service.spec.ts +++ b/apps/browser/src/auth/popup/account-switching/services/account-switcher.service.spec.ts @@ -3,6 +3,8 @@ import { BehaviorSubject, firstValueFrom, timeout } from "rxjs"; import { AccountInfo, AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { UserId } from "@bitwarden/common/types/guid"; @@ -16,6 +18,8 @@ describe("AccountSwitcherService", () => { const accountService = mock(); const stateService = mock(); const messagingService = mock(); + const environmentService = mock(); + const logService = mock(); let accountSwitcherService: AccountSwitcherService; @@ -26,11 +30,13 @@ describe("AccountSwitcherService", () => { accountSwitcherService = new AccountSwitcherService( accountService, stateService, - messagingService + messagingService, + environmentService, + logService, ); }); - describe("accountOptions$", () => { + describe("availableAccounts$", () => { it("should return all accounts and an add account option when accounts are less than 5", async () => { const user1AccountInfo: AccountInfo = { name: "Test User 1", @@ -45,14 +51,14 @@ describe("AccountSwitcherService", () => { activeAccountSubject.next(Object.assign(user1AccountInfo, { id: "1" as UserId })); const accounts = await firstValueFrom( - accountSwitcherService.accountOptions$.pipe(timeout(20)) + accountSwitcherService.availableAccounts$.pipe(timeout(20)), ); expect(accounts).toHaveLength(2); expect(accounts[0].id).toBe("1"); - expect(accounts[0].isSelected).toBeTruthy(); + expect(accounts[0].isActive).toBeTruthy(); expect(accounts[1].id).toBe("addAccount"); - expect(accounts[1].isSelected).toBeFalsy(); + expect(accounts[1].isActive).toBeFalsy(); }); it.each([5, 6])( @@ -68,39 +74,70 @@ describe("AccountSwitcherService", () => { } accountsSubject.next(seedAccounts); activeAccountSubject.next( - Object.assign(seedAccounts["1" as UserId], { id: "1" as UserId }) + Object.assign(seedAccounts["1" as UserId], { id: "1" as UserId }), ); - const accounts = await firstValueFrom(accountSwitcherService.accountOptions$); + const accounts = await firstValueFrom(accountSwitcherService.availableAccounts$); expect(accounts).toHaveLength(numberOfAccounts); accounts.forEach((account) => { expect(account.id).not.toBe("addAccount"); }); - } + }, ); }); describe("selectAccount", () => { it("initiates an add account logic when add account is selected", async () => { - await accountSwitcherService.selectAccount("addAccount"); + let listener: ( + message: { command: string; userId: string }, + sender: unknown, + sendResponse: unknown, + ) => void = null; + jest.spyOn(chrome.runtime.onMessage, "addListener").mockImplementation((addedListener) => { + listener = addedListener; + }); - expect(stateService.setActiveUser).toBeCalledWith(null); - expect(stateService.setRememberedEmail).toBeCalledWith(null); + const removeListenerSpy = jest.spyOn(chrome.runtime.onMessage, "removeListener"); - expect(accountService.switchAccount).not.toBeCalled(); + const selectAccountPromise = accountSwitcherService.selectAccount("addAccount"); + + expect(listener).not.toBeNull(); + listener({ command: "switchAccountFinish", userId: null }, undefined, undefined); + + await selectAccountPromise; + + expect(accountService.switchAccount).toBeCalledWith(null); + + expect(removeListenerSpy).toBeCalledTimes(1); }); it("initiates an account switch with an account id", async () => { - await accountSwitcherService.selectAccount("1"); + let listener: ( + message: { command: string; userId: string }, + sender: unknown, + sendResponse: unknown, + ) => void; + jest.spyOn(chrome.runtime.onMessage, "addListener").mockImplementation((addedListener) => { + listener = addedListener; + }); + + const removeListenerSpy = jest.spyOn(chrome.runtime.onMessage, "removeListener"); + + const selectAccountPromise = accountSwitcherService.selectAccount("1"); + + listener({ command: "switchAccountFinish", userId: "1" }, undefined, undefined); + + await selectAccountPromise; expect(accountService.switchAccount).toBeCalledWith("1"); expect(messagingService.send).toBeCalledWith( "switchAccount", matches((payload) => { return payload.userId === "1"; - }) + }), ); + expect(removeListenerSpy).toBeCalledTimes(1); }); }); }); diff --git a/apps/browser/src/auth/popup/account-switching/services/account-switcher.service.ts b/apps/browser/src/auth/popup/account-switching/services/account-switcher.service.ts new file mode 100644 index 00000000000..19ede98e2c3 --- /dev/null +++ b/apps/browser/src/auth/popup/account-switching/services/account-switcher.service.ts @@ -0,0 +1,139 @@ +import { Injectable } from "@angular/core"; +import { + Observable, + combineLatest, + filter, + firstValueFrom, + map, + switchMap, + throwError, + timeout, +} from "rxjs"; + +import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; +import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; +import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; +import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; +import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { UserId } from "@bitwarden/common/types/guid"; + +import { fromChromeEvent } from "../../../../platform/browser/from-chrome-event"; + +export type AvailableAccount = { + name: string; + email?: string; + id: string; + isActive: boolean; + server?: string; + status?: AuthenticationStatus; + avatarColor?: string; +}; + +@Injectable({ + providedIn: "root", +}) +export class AccountSwitcherService { + static incompleteAccountSwitchError = "Account switch did not complete."; + + ACCOUNT_LIMIT = 5; + SPECIAL_ADD_ACCOUNT_ID = "addAccount"; + availableAccounts$: Observable; + + switchAccountFinished$: Observable; + + constructor( + private accountService: AccountService, + private stateService: StateService, + private messagingService: MessagingService, + private environmentService: EnvironmentService, + private logService: LogService, + ) { + this.availableAccounts$ = combineLatest([ + this.accountService.accounts$, + this.accountService.activeAccount$, + ]).pipe( + switchMap(async ([accounts, activeAccount]) => { + const accountEntries = Object.entries(accounts).filter( + ([_, account]) => account.status !== AuthenticationStatus.LoggedOut, + ); + // Accounts shouldn't ever be more than ACCOUNT_LIMIT but just in case do a greater than + const hasMaxAccounts = accountEntries.length >= this.ACCOUNT_LIMIT; + const options: AvailableAccount[] = await Promise.all( + accountEntries.map(async ([id, account]) => { + return { + name: account.name ?? account.email, + email: account.email, + id: id, + server: await this.environmentService.getHost(id), + status: account.status, + isActive: id === activeAccount?.id, + avatarColor: await this.stateService.getAvatarColor({ userId: id }), + }; + }), + ); + + if (!hasMaxAccounts) { + options.push({ + name: "Add account", + id: this.SPECIAL_ADD_ACCOUNT_ID, + isActive: activeAccount?.id == null, + }); + } + + return options; + }), + ); + + // Create a reusable observable that listens to the the switchAccountFinish message and returns the userId from the message + this.switchAccountFinished$ = fromChromeEvent<[message: { command: string; userId: string }]>( + chrome.runtime.onMessage, + ).pipe( + filter(([message]) => message.command === "switchAccountFinish"), + map(([message]) => message.userId), + ); + } + + get specialAccountAddId() { + return this.SPECIAL_ADD_ACCOUNT_ID; + } + + async selectAccount(id: string) { + if (id === this.SPECIAL_ADD_ACCOUNT_ID) { + id = null; + } + + // Creates a subscription to the switchAccountFinished observable but further + // filters it to only care about the current userId. + const switchAccountFinishedPromise = firstValueFrom( + this.switchAccountFinished$.pipe( + filter((userId) => userId === id), + timeout({ + // Much longer than account switching is expected to take for normal accounts + // but the account switching process includes a possible full sync so we need to account + // for very large accounts and want to still have a timeout + // to avoid a promise that might never resolve/reject + first: 60_000, + with: () => + throwError(() => new Error(AccountSwitcherService.incompleteAccountSwitchError)), + }), + ), + ); + + // Initiate the actions required to make account switching happen + await this.accountService.switchAccount(id as UserId); + this.messagingService.send("switchAccount", { userId: id }); // This message should cause switchAccountFinish to be sent + + // Wait until we recieve the switchAccountFinished message + await switchAccountFinishedPromise.catch((err) => { + if ( + err instanceof Error && + err.message === AccountSwitcherService.incompleteAccountSwitchError + ) { + this.logService.warning("message 'switchAccount' never responded."); + return; + } + throw err; + }); + } +} diff --git a/apps/browser/src/auth/popup/account-switching/services/current-account.service.ts b/apps/browser/src/auth/popup/account-switching/services/current-account.service.ts new file mode 100644 index 00000000000..21fc3bdac43 --- /dev/null +++ b/apps/browser/src/auth/popup/account-switching/services/current-account.service.ts @@ -0,0 +1,44 @@ +import { Injectable } from "@angular/core"; +import { Observable, switchMap } from "rxjs"; + +import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; +import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; +import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { UserId } from "@bitwarden/common/types/guid"; + +export type CurrentAccount = { + id: UserId; + name: string | undefined; + email: string; + status: AuthenticationStatus; + avatarColor: string; +}; + +@Injectable({ + providedIn: "root", +}) +export class CurrentAccountService { + currentAccount$: Observable; + + constructor( + private accountService: AccountService, + private stateService: StateService, + ) { + this.currentAccount$ = this.accountService.activeAccount$.pipe( + switchMap(async (account) => { + if (account == null) { + return null; + } + const currentAccount: CurrentAccount = { + id: account.id, + name: account.name || account.email, + email: account.email, + status: account.status, + avatarColor: await this.stateService.getAvatarColor({ userId: account.id }), + }; + + return currentAccount; + }), + ); + } +} diff --git a/apps/browser/src/auth/popup/environment.component.ts b/apps/browser/src/auth/popup/environment.component.ts index a5cbfe7c34b..6246aaf5db1 100644 --- a/apps/browser/src/auth/popup/environment.component.ts +++ b/apps/browser/src/auth/popup/environment.component.ts @@ -20,7 +20,7 @@ export class EnvironmentComponent extends BaseEnvironmentComponent implements On public environmentService: BrowserEnvironmentService, i18nService: I18nService, private router: Router, - modalService: ModalService + modalService: ModalService, ) { super(platformUtilsService, environmentService, i18nService, modalService); this.showCustom = true; diff --git a/apps/browser/src/auth/popup/hint.component.ts b/apps/browser/src/auth/popup/hint.component.ts index a743dc7da24..6de2c35301f 100644 --- a/apps/browser/src/auth/popup/hint.component.ts +++ b/apps/browser/src/auth/popup/hint.component.ts @@ -20,7 +20,7 @@ export class HintComponent extends BaseHintComponent { apiService: ApiService, logService: LogService, private route: ActivatedRoute, - loginService: LoginService + loginService: LoginService, ) { super(router, i18nService, apiService, platformUtilsService, logService, loginService); diff --git a/apps/browser/src/auth/popup/home.component.html b/apps/browser/src/auth/popup/home.component.html index 42fe3106ffb..f70a4c6d030 100644 --- a/apps/browser/src/auth/popup/home.component.html +++ b/apps/browser/src/auth/popup/home.component.html @@ -1,4 +1,4 @@ - +
diff --git a/apps/browser/src/auth/popup/lock.component.ts b/apps/browser/src/auth/popup/lock.component.ts index 4a0c752a5d2..0379886bc24 100644 --- a/apps/browser/src/auth/popup/lock.component.ts +++ b/apps/browser/src/auth/popup/lock.component.ts @@ -56,7 +56,7 @@ export class LockComponent extends BaseLockComponent { dialogService: DialogService, deviceTrustCryptoService: DeviceTrustCryptoServiceAbstraction, userVerificationService: UserVerificationService, - private routerService: BrowserRouterService + private routerService: BrowserRouterService, ) { super( router, @@ -76,7 +76,7 @@ export class LockComponent extends BaseLockComponent { passwordStrengthService, dialogService, deviceTrustCryptoService, - userVerificationService + userVerificationService, ); this.successRoute = "/tabs/current"; this.isInitialLockScreen = (window as any).previousPopupUrl == null; diff --git a/apps/browser/src/auth/popup/login-via-auth-request.component.ts b/apps/browser/src/auth/popup/login-via-auth-request.component.ts index b041f3fdd62..b5ff436f14a 100644 --- a/apps/browser/src/auth/popup/login-via-auth-request.component.ts +++ b/apps/browser/src/auth/popup/login-via-auth-request.component.ts @@ -48,7 +48,7 @@ export class LoginViaAuthRequestComponent syncService: SyncService, deviceTrustCryptoService: DeviceTrustCryptoServiceAbstraction, authReqCryptoService: AuthRequestCryptoServiceAbstraction, - private location: Location + private location: Location, ) { super( router, @@ -67,7 +67,7 @@ export class LoginViaAuthRequestComponent stateService, loginService, deviceTrustCryptoService, - authReqCryptoService + authReqCryptoService, ); super.onSuccessfulLogin = async () => { await syncService.fullSync(true); diff --git a/apps/browser/src/auth/popup/login.component.ts b/apps/browser/src/auth/popup/login.component.ts index b930f2747de..0d191c3bc49 100644 --- a/apps/browser/src/auth/popup/login.component.ts +++ b/apps/browser/src/auth/popup/login.component.ts @@ -45,7 +45,7 @@ export class LoginComponent extends BaseLoginComponent { formValidationErrorService: FormValidationErrorsService, route: ActivatedRoute, loginService: LoginService, - webAuthnLoginService: WebAuthnLoginServiceAbstraction + webAuthnLoginService: WebAuthnLoginServiceAbstraction, ) { super( devicesApiService, @@ -64,7 +64,7 @@ export class LoginComponent extends BaseLoginComponent { formValidationErrorService, route, loginService, - webAuthnLoginService + webAuthnLoginService, ); super.onSuccessfulLogin = async () => { await syncService.fullSync(true); @@ -123,7 +123,7 @@ export class LoginComponent extends BaseLoginComponent { "&codeChallenge=" + codeChallenge + "&email=" + - encodeURIComponent(this.formGroup.controls.email.value) + encodeURIComponent(this.formGroup.controls.email.value), ); } } diff --git a/apps/browser/src/auth/popup/register.component.ts b/apps/browser/src/auth/popup/register.component.ts index 837fcb2160f..4752c885728 100644 --- a/apps/browser/src/auth/popup/register.component.ts +++ b/apps/browser/src/auth/popup/register.component.ts @@ -38,7 +38,7 @@ export class RegisterComponent extends BaseRegisterComponent { environmentService: EnvironmentService, logService: LogService, auditService: AuditService, - dialogService: DialogService + dialogService: DialogService, ) { super( formValidationErrorService, @@ -54,7 +54,7 @@ export class RegisterComponent extends BaseRegisterComponent { environmentService, logService, auditService, - dialogService + dialogService, ); } } diff --git a/apps/browser/src/auth/popup/remove-password.component.html b/apps/browser/src/auth/popup/remove-password.component.html index 8024023976f..793bcff3e09 100644 --- a/apps/browser/src/auth/popup/remove-password.component.html +++ b/apps/browser/src/auth/popup/remove-password.component.html @@ -10,7 +10,7 @@
-

{{ "convertOrganizationEncryptionDesc" | i18n : organization.name }}

+

{{ "convertOrganizationEncryptionDesc" | i18n: organization.name }}

diff --git a/apps/browser/src/auth/popup/two-factor.component.ts b/apps/browser/src/auth/popup/two-factor.component.ts index a78f3d3de58..fde6f4ffc99 100644 --- a/apps/browser/src/auth/popup/two-factor.component.ts +++ b/apps/browser/src/auth/popup/two-factor.component.ts @@ -51,7 +51,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent { loginService: LoginService, configService: ConfigServiceAbstraction, private dialogService: DialogService, - @Inject(WINDOW) protected win: Window + @Inject(WINDOW) protected win: Window, ) { super( authService, @@ -67,7 +67,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent { twoFactorService, appIdService, loginService, - configService + configService, ); super.onSuccessfulLogin = async () => { syncService.fullSync(true); diff --git a/apps/browser/src/auth/popup/utils/auth-popout-window.spec.ts b/apps/browser/src/auth/popup/utils/auth-popout-window.spec.ts index e682181454e..673e9d5c335 100644 --- a/apps/browser/src/auth/popup/utils/auth-popout-window.spec.ts +++ b/apps/browser/src/auth/popup/utils/auth-popout-window.spec.ts @@ -103,7 +103,7 @@ describe("AuthPopoutWindow", () => { expect(openPopoutSpy).toHaveBeenCalledWith( "popup/index.html#/2fa;webAuthnResponse=data;remember=remember", - { singleActionKey: AuthPopoutType.twoFactorAuth } + { singleActionKey: AuthPopoutType.twoFactorAuth }, ); }); }); diff --git a/apps/browser/src/auth/popup/utils/auth-popout-window.ts b/apps/browser/src/auth/popup/utils/auth-popout-window.ts index d436aeb73eb..d01f9ad25e8 100644 --- a/apps/browser/src/auth/popup/utils/auth-popout-window.ts +++ b/apps/browser/src/auth/popup/utils/auth-popout-window.ts @@ -47,7 +47,7 @@ async function closeUnlockPopout() { async function openSsoAuthResultPopout(resultData: { code: string; state: string }) { const { code, state } = resultData; const authResultUrl = `popup/index.html#/sso?code=${encodeURIComponent( - code + code, )}&state=${encodeURIComponent(state)}`; await BrowserPopupUtils.openPopout(authResultUrl, { diff --git a/apps/browser/src/autofill/background/abstractions/overlay.background.ts b/apps/browser/src/autofill/background/abstractions/overlay.background.ts index 58aaa425ac3..3c2b70bb475 100644 --- a/apps/browser/src/autofill/background/abstractions/overlay.background.ts +++ b/apps/browser/src/autofill/background/abstractions/overlay.background.ts @@ -96,6 +96,7 @@ type OverlayButtonPortMessageHandlers = { [key: string]: CallableFunction; overlayButtonClicked: ({ port }: PortConnectionParam) => void; closeAutofillOverlay: ({ port }: PortConnectionParam) => void; + forceCloseAutofillOverlay: ({ port }: PortConnectionParam) => void; overlayPageBlurred: () => void; redirectOverlayFocusOut: ({ message, port }: PortOnMessageHandlerParams) => void; }; @@ -103,6 +104,7 @@ type OverlayButtonPortMessageHandlers = { type OverlayListPortMessageHandlers = { [key: string]: CallableFunction; checkAutofillOverlayButtonFocused: () => void; + forceCloseAutofillOverlay: ({ port }: PortConnectionParam) => void; overlayPageBlurred: () => void; unlockVault: ({ port }: PortConnectionParam) => void; fillSelectedListItem: ({ message, port }: PortOnMessageHandlerParams) => void; diff --git a/apps/browser/src/autofill/background/context-menus.background.ts b/apps/browser/src/autofill/background/context-menus.background.ts index add392f3293..af43c2500df 100644 --- a/apps/browser/src/autofill/background/context-menus.background.ts +++ b/apps/browser/src/autofill/background/context-menus.background.ts @@ -1,6 +1,6 @@ -import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem"; import { BrowserApi } from "../../platform/browser/browser-api"; import { ContextMenuClickedHandler } from "../browser/context-menu-clicked-handler"; +import LockedVaultPendingNotificationsItem from "../notification/models/locked-vault-pending-notifications-item"; export default class ContextMenusBackground { private contextMenus: typeof chrome.contextMenus; @@ -15,14 +15,14 @@ export default class ContextMenusBackground { } this.contextMenus.onClicked.addListener((info, tab) => - this.contextMenuClickedHandler.run(info, tab) + this.contextMenuClickedHandler.run(info, tab), ); BrowserApi.messageListener( "contextmenus.background", ( msg: { command: string; data: LockedVaultPendingNotificationsItem }, - sender: chrome.runtime.MessageSender + sender: chrome.runtime.MessageSender, ) => { if (msg.command === "unlockCompleted" && msg.data.target === "contextmenus.background") { this.contextMenuClickedHandler @@ -31,7 +31,7 @@ export default class ContextMenusBackground { BrowserApi.tabSendMessageData(sender.tab, "closeNotificationBar"); }); } - } + }, ); } } diff --git a/apps/browser/src/autofill/background/notification.background.spec.ts b/apps/browser/src/autofill/background/notification.background.spec.ts index 6a0a4a7345a..1a898666794 100644 --- a/apps/browser/src/autofill/background/notification.background.spec.ts +++ b/apps/browser/src/autofill/background/notification.background.spec.ts @@ -30,7 +30,7 @@ describe("NotificationBackground", () => { policyService, folderService, stateService, - environmentService + environmentService, ); }); diff --git a/apps/browser/src/autofill/background/notification.background.ts b/apps/browser/src/autofill/background/notification.background.ts index b4768e10e78..5f6522f59f7 100644 --- a/apps/browser/src/autofill/background/notification.background.ts +++ b/apps/browser/src/autofill/background/notification.background.ts @@ -13,17 +13,17 @@ import { CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { openUnlockPopout } from "../../auth/popup/utils/auth-popout-window"; -import AddUnlockVaultQueueMessage from "../../background/models/add-unlock-vault-queue-message"; -import AddChangePasswordQueueMessage from "../../background/models/addChangePasswordQueueMessage"; -import AddLoginQueueMessage from "../../background/models/addLoginQueueMessage"; -import AddLoginRuntimeMessage from "../../background/models/addLoginRuntimeMessage"; -import ChangePasswordRuntimeMessage from "../../background/models/changePasswordRuntimeMessage"; -import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem"; -import { NotificationQueueMessageType } from "../../background/models/notificationQueueMessageType"; import { BrowserApi } from "../../platform/browser/browser-api"; import { BrowserStateService } from "../../platform/services/abstractions/browser-state.service"; import { openAddEditVaultItemPopout } from "../../vault/popup/utils/vault-popout-window"; import { NOTIFICATION_BAR_LIFESPAN_MS } from "../constants"; +import AddChangePasswordQueueMessage from "../notification/models/add-change-password-queue-message"; +import AddLoginQueueMessage from "../notification/models/add-login-queue-message"; +import AddLoginRuntimeMessage from "../notification/models/add-login-runtime-message"; +import AddUnlockVaultQueueMessage from "../notification/models/add-unlock-vault-queue-message"; +import ChangePasswordRuntimeMessage from "../notification/models/change-password-runtime-message"; +import LockedVaultPendingNotificationsItem from "../notification/models/locked-vault-pending-notifications-item"; +import { NotificationQueueMessageType } from "../notification/models/notification-queue-message-type"; import { AutofillService } from "../services/abstractions/autofill.service"; export default class NotificationBackground { @@ -40,7 +40,7 @@ export default class NotificationBackground { private policyService: PolicyService, private folderService: FolderService, private stateService: BrowserStateService, - private environmentService: EnvironmentService + private environmentService: EnvironmentService, ) {} async init() { @@ -52,7 +52,7 @@ export default class NotificationBackground { "notification.background", (msg: any, sender: chrome.runtime.MessageSender) => { this.processMessage(msg, sender); - } + }, ); this.cleanupNotificationQueue(); @@ -97,7 +97,7 @@ export default class NotificationBackground { await BrowserApi.tabSendMessageData( sender.tab, "addToLockedVaultPendingNotifications", - retryMessage + retryMessage, ); await openUnlockPopout(sender.tab); return; @@ -259,7 +259,7 @@ export default class NotificationBackground { const ciphers = await this.cipherService.getAllDecryptedForUrl(loginInfo.url); const usernameMatches = ciphers.filter( - (c) => c.login.username != null && c.login.username.toLowerCase() === normalizedUsername + (c) => c.login.username != null && c.login.username.toLowerCase() === normalizedUsername, ); if (usernameMatches.length === 0) { if (disabledAddLogin) { @@ -284,7 +284,7 @@ export default class NotificationBackground { loginDomain: string, loginInfo: AddLoginRuntimeMessage, tab: chrome.tabs.Tab, - isVaultLocked = false + isVaultLocked = false, ) { // remove any old messages for this tab this.removeTabFromNotificationQueue(tab); @@ -317,7 +317,7 @@ export default class NotificationBackground { const ciphers = await this.cipherService.getAllDecryptedForUrl(changeData.url); if (changeData.currentPassword != null) { const passwordMatches = ciphers.filter( - (c) => c.login.password === changeData.currentPassword + (c) => c.login.password === changeData.currentPassword, ); if (passwordMatches.length === 1) { id = passwordMatches[0].id; @@ -339,7 +339,7 @@ export default class NotificationBackground { */ private async unlockVault( message: { data?: { skipNotification?: boolean } }, - tab: chrome.tabs.Tab + tab: chrome.tabs.Tab, ) { if (message.data?.skipNotification) { return; @@ -363,7 +363,7 @@ export default class NotificationBackground { loginDomain: string, newPassword: string, tab: chrome.tabs.Tab, - isVaultLocked = false + isVaultLocked = false, ) { // remove any old messages for this tab this.removeTabFromNotificationQueue(tab); @@ -421,7 +421,7 @@ export default class NotificationBackground { const allCiphers = await this.cipherService.getAllDecryptedForUrl(queueMessage.uri); const existingCipher = allCiphers.find( (c) => - c.login.username != null && c.login.username.toLowerCase() === queueMessage.username + c.login.username != null && c.login.username.toLowerCase() === queueMessage.username, ); if (existingCipher != null) { @@ -449,7 +449,7 @@ export default class NotificationBackground { cipherView: CipherView, newPassword: string, edit: boolean, - tab: chrome.tabs.Tab + tab: chrome.tabs.Tab, ) { cipherView.login.password = newPassword; @@ -525,13 +525,13 @@ export default class NotificationBackground { private async removeIndividualVault(): Promise { return await firstValueFrom( - this.policyService.policyAppliesToActiveUser$(PolicyType.PersonalOwnership) + this.policyService.policyAppliesToActiveUser$(PolicyType.PersonalOwnership), ); } private async handleUnlockCompleted( messageData: LockedVaultPendingNotificationsItem, - sender: chrome.runtime.MessageSender + sender: chrome.runtime.MessageSender, ): Promise { if (messageData.commandToRetry.msg.command === "autofill_login") { await BrowserApi.tabSendMessageData(sender.tab, "closeNotificationBar"); @@ -543,7 +543,7 @@ export default class NotificationBackground { await this.processMessage( messageData.commandToRetry.msg.command, - messageData.commandToRetry.sender + messageData.commandToRetry.sender, ); } } diff --git a/apps/browser/src/autofill/background/overlay.background.spec.ts b/apps/browser/src/autofill/background/overlay.background.spec.ts index bc9c2374d56..92f0cc1380b 100644 --- a/apps/browser/src/autofill/background/overlay.background.spec.ts +++ b/apps/browser/src/autofill/background/overlay.background.spec.ts @@ -70,7 +70,7 @@ describe("OverlayBackground", () => { environmentService, settingsService, stateService, - i18nService + i18nService, ); overlayBackground.init(); }); @@ -163,7 +163,7 @@ describe("OverlayBackground", () => { new Map([ ["overlay-cipher-0", cipher2], ["overlay-cipher-1", cipher1], - ]) + ]), ); expect(overlayBackground["getOverlayCipherData"]).toHaveBeenCalled(); }); @@ -219,7 +219,7 @@ describe("OverlayBackground", () => { expect(BrowserApi.tabSendMessageData).toHaveBeenCalledWith( tab, "updateIsOverlayCiphersPopulated", - { isOverlayCiphersPopulated: true } + { isOverlayCiphersPopulated: true }, ); }); }); @@ -489,7 +489,7 @@ describe("OverlayBackground", () => { const returnValue = overlayBackground["handleExtensionMessage"]( message, sender, - sendResponse + sendResponse, ); expect(returnValue).toBe(undefined); @@ -507,7 +507,7 @@ describe("OverlayBackground", () => { const returnValue = overlayBackground["handleExtensionMessage"]( message, sender, - sendResponse + sendResponse, ); expect(returnValue).toBe(undefined); @@ -526,7 +526,7 @@ describe("OverlayBackground", () => { const returnValue = overlayBackground["handleExtensionMessage"]( message, sender, - sendResponse + sendResponse, ); expect(returnValue).toBe(true); @@ -555,7 +555,7 @@ describe("OverlayBackground", () => { isFocusingFieldElement: false, isOpeningFullOverlay: false, authStatus: AuthenticationStatus.Unlocked, - } + }, ); }); }); @@ -614,7 +614,7 @@ describe("OverlayBackground", () => { password: "password", }, }, - sender + sender, ); await flushPromises(); @@ -635,7 +635,7 @@ describe("OverlayBackground", () => { await flushPromises(); expect(overlayBackground["overlayVisibility"]).toBe( - AutofillOverlayVisibility.OnFieldFocus + AutofillOverlayVisibility.OnFieldFocus, ); }); @@ -645,7 +645,7 @@ describe("OverlayBackground", () => { sendExtensionRuntimeMessage( { command: "getAutofillOverlayVisibility" }, undefined, - sendMessageSpy + sendMessageSpy, ); await flushPromises(); @@ -851,7 +851,7 @@ describe("OverlayBackground", () => { it("stores the page details provided by the message by the tab id of the sender", () => { sendExtensionRuntimeMessage( { command: "collectPageDetailsResponse", details: pageDetails1 }, - sender + sender, ); expect(overlayBackground["pageDetailsForTab"][sender.tab.id]).toStrictEqual([ @@ -870,7 +870,7 @@ describe("OverlayBackground", () => { sendExtensionRuntimeMessage( { command: "collectPageDetailsResponse", details: pageDetails2 }, - sender + sender, ); expect(overlayBackground["pageDetailsForTab"][sender.tab.id]).toStrictEqual([ @@ -930,7 +930,7 @@ describe("OverlayBackground", () => { isFocusingFieldElement: true, isOpeningFullOverlay: false, authStatus: AuthenticationStatus.Unlocked, - } + }, ); }); }); @@ -1056,13 +1056,29 @@ describe("OverlayBackground", () => { describe("closeAutofillOverlay", () => { it("sends a `closeOverlay` message to the sender tab", () => { - jest.spyOn(BrowserApi, "tabSendMessage"); + jest.spyOn(BrowserApi, "tabSendMessageData"); sendPortMessage(buttonPortSpy, { command: "closeAutofillOverlay" }); - expect(BrowserApi.tabSendMessage).toHaveBeenCalledWith(buttonPortSpy.sender.tab, { - command: "closeAutofillOverlay", - }); + expect(BrowserApi.tabSendMessageData).toHaveBeenCalledWith( + buttonPortSpy.sender.tab, + "closeAutofillOverlay", + { forceCloseOverlay: false }, + ); + }); + }); + + describe("forceCloseAutofillOverlay", () => { + it("sends a `closeOverlay` message to the sender tab with a `forceCloseOverlay` flag of `true` set", () => { + jest.spyOn(BrowserApi, "tabSendMessageData"); + + sendPortMessage(buttonPortSpy, { command: "forceCloseAutofillOverlay" }); + + expect(BrowserApi.tabSendMessageData).toHaveBeenCalledWith( + buttonPortSpy.sender.tab, + "closeAutofillOverlay", + { forceCloseOverlay: true }, + ); }); }); @@ -1096,7 +1112,7 @@ describe("OverlayBackground", () => { expect(BrowserApi.tabSendMessageData).toHaveBeenCalledWith( buttonPortSpy.sender.tab, "redirectOverlayFocusOut", - { direction: RedirectFocusDirection.Next } + { direction: RedirectFocusDirection.Next }, ); }); }); @@ -1113,6 +1129,20 @@ describe("OverlayBackground", () => { }); }); + describe("forceCloseAutofillOverlay", () => { + it("sends a `closeOverlay` message to the sender tab with a `forceCloseOverlay` flag of `true` set", () => { + jest.spyOn(BrowserApi, "tabSendMessageData"); + + sendPortMessage(listPortSpy, { command: "forceCloseAutofillOverlay" }); + + expect(BrowserApi.tabSendMessageData).toHaveBeenCalledWith( + listPortSpy.sender.tab, + "closeAutofillOverlay", + { forceCloseOverlay: true }, + ); + }); + }); + describe("overlayPageBlurred", () => { it("checks on the focus state of the overlay button", () => { jest.spyOn(overlayBackground as any, "checkOverlayButtonFocused").mockImplementation(); @@ -1142,11 +1172,11 @@ describe("OverlayBackground", () => { sender: listPortSpy.sender, }, target: "overlay.background", - } + }, ); expect(overlayBackground["openUnlockPopout"]).toHaveBeenCalledWith( listPortSpy.sender.tab, - true + true, ); }); }); @@ -1160,7 +1190,7 @@ describe("OverlayBackground", () => { getLoginCiphersSpy = jest.spyOn(overlayBackground["overlayLoginCiphers"], "get"); isPasswordRepromptRequiredSpy = jest.spyOn( overlayBackground["autofillService"], - "isPasswordRepromptRequired" + "isPasswordRepromptRequired", ); doAutoFillSpy = jest.spyOn(overlayBackground["autofillService"], "doAutoFill"); }); @@ -1192,7 +1222,7 @@ describe("OverlayBackground", () => { expect(getLoginCiphersSpy).toHaveBeenCalled(); expect(isPasswordRepromptRequiredSpy).toHaveBeenCalledWith( cipher, - listPortSpy.sender.tab + listPortSpy.sender.tab, ); expect(doAutoFillSpy).not.toHaveBeenCalled(); }); @@ -1216,7 +1246,7 @@ describe("OverlayBackground", () => { expect(isPasswordRepromptRequiredSpy).toHaveBeenCalledWith( cipher2, - listPortSpy.sender.tab + listPortSpy.sender.tab, ); expect(doAutoFillSpy).toHaveBeenCalledWith({ tab: listPortSpy.sender.tab, @@ -1230,7 +1260,7 @@ describe("OverlayBackground", () => { ["overlay-cipher-2", cipher2], ["overlay-cipher-1", cipher1], ["overlay-cipher-3", cipher3], - ]).entries() + ]).entries(), ); }); }); @@ -1289,7 +1319,7 @@ describe("OverlayBackground", () => { { cipherId: cipher.id, action: SHOW_AUTOFILL_BUTTON, - } + }, ); }); }); @@ -1302,7 +1332,7 @@ describe("OverlayBackground", () => { }; const redirectOverlayFocusOutSpy = jest.spyOn( overlayBackground as any, - "redirectOverlayFocusOut" + "redirectOverlayFocusOut", ); sendPortMessage(listPortSpy, message); diff --git a/apps/browser/src/autofill/background/overlay.background.ts b/apps/browser/src/autofill/background/overlay.background.ts index 38554ee8aca..3d6f00ec10f 100644 --- a/apps/browser/src/autofill/background/overlay.background.ts +++ b/apps/browser/src/autofill/background/overlay.background.ts @@ -14,13 +14,13 @@ import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; import { openUnlockPopout } from "../../auth/popup/utils/auth-popout-window"; -import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem"; import { BrowserApi } from "../../platform/browser/browser-api"; import { openViewVaultItemPopout, openAddEditVaultItemPopout, } from "../../vault/popup/utils/vault-popout-window"; import { SHOW_AUTOFILL_BUTTON } from "../constants"; +import LockedVaultPendingNotificationsItem from "../notification/models/locked-vault-pending-notifications-item"; import { AutofillService, PageDetail } from "../services/abstractions/autofill.service"; import { AutofillOverlayElement, AutofillOverlayPort } from "../utils/autofill-overlay.enum"; @@ -68,11 +68,13 @@ class OverlayBackground implements OverlayBackgroundInterface { private readonly overlayButtonPortMessageHandlers: OverlayButtonPortMessageHandlers = { overlayButtonClicked: ({ port }) => this.handleOverlayButtonClicked(port), closeAutofillOverlay: ({ port }) => this.closeOverlay(port), + forceCloseAutofillOverlay: ({ port }) => this.closeOverlay(port, true), overlayPageBlurred: () => this.checkOverlayListFocused(), redirectOverlayFocusOut: ({ message, port }) => this.redirectOverlayFocusOut(message, port), }; private readonly overlayListPortMessageHandlers: OverlayListPortMessageHandlers = { checkAutofillOverlayButtonFocused: () => this.checkOverlayButtonFocused(), + forceCloseAutofillOverlay: ({ port }) => this.closeOverlay(port, true), overlayPageBlurred: () => this.checkOverlayButtonFocused(), unlockVault: ({ port }) => this.unlockVault(port), fillSelectedListItem: ({ message, port }) => this.fillSelectedOverlayListItem(message, port), @@ -88,7 +90,7 @@ class OverlayBackground implements OverlayBackgroundInterface { private environmentService: EnvironmentService, private settingsService: SettingsService, private stateService: StateService, - private i18nService: I18nService + private i18nService: I18nService, ) { this.iconsServerUrl = this.environmentService.getIconsUrl(); } @@ -130,7 +132,7 @@ class OverlayBackground implements OverlayBackgroundInterface { this.overlayLoginCiphers = new Map(); const ciphersViews = (await this.cipherService.getAllDecryptedForUrl(currentTab.url)).sort( - (a, b) => this.cipherService.sortCiphersByLastUsedThenName(a, b) + (a, b) => this.cipherService.sortCiphersByLastUsedThenName(a, b), ); for (let cipherIndex = 0; cipherIndex < ciphersViews.length; cipherIndex++) { this.overlayLoginCiphers.set(`overlay-cipher-${cipherIndex}`, ciphersViews[cipherIndex]); @@ -189,7 +191,7 @@ class OverlayBackground implements OverlayBackgroundInterface { */ private storePageDetails( message: OverlayBackgroundExtensionMessage, - sender: chrome.runtime.MessageSender + sender: chrome.runtime.MessageSender, ) { const pageDetails = { frameId: sender.frameId, @@ -214,7 +216,7 @@ class OverlayBackground implements OverlayBackgroundInterface { */ private async fillSelectedOverlayListItem( { overlayCipherId }: OverlayPortMessage, - { sender }: chrome.runtime.Port + { sender }: chrome.runtime.Port, ) { if (!overlayCipherId) { return; @@ -268,9 +270,10 @@ class OverlayBackground implements OverlayBackgroundInterface { * Sends a message to the sender tab to close the autofill overlay. * * @param sender - The sender of the port message + * @param forceCloseOverlay - Identifies whether the overlay should be force closed */ - private closeOverlay({ sender }: chrome.runtime.Port) { - BrowserApi.tabSendMessage(sender.tab, { command: "closeAutofillOverlay" }); + private closeOverlay({ sender }: chrome.runtime.Port, forceCloseOverlay = false) { + BrowserApi.tabSendMessageData(sender.tab, "closeAutofillOverlay", { forceCloseOverlay }); } /** @@ -528,7 +531,7 @@ class OverlayBackground implements OverlayBackgroundInterface { await BrowserApi.tabSendMessageData( sender.tab, "addToLockedVaultPendingNotifications", - retryMessage + retryMessage, ); await this.openUnlockPopout(sender.tab, true); } @@ -541,7 +544,7 @@ class OverlayBackground implements OverlayBackgroundInterface { */ private async viewSelectedCipher( { overlayCipherId }: OverlayPortMessage, - { sender }: chrome.runtime.Port + { sender }: chrome.runtime.Port, ) { const cipher = this.overlayLoginCiphers.get(overlayCipherId); if (!cipher) { @@ -609,7 +612,7 @@ class OverlayBackground implements OverlayBackgroundInterface { */ private redirectOverlayFocusOut( { direction }: OverlayPortMessage, - { sender }: chrome.runtime.Port + { sender }: chrome.runtime.Port, ) { if (!direction) { return; @@ -637,7 +640,7 @@ class OverlayBackground implements OverlayBackgroundInterface { */ private async addNewVaultItem( { login }: OverlayAddNewItemMessage, - sender: chrome.runtime.MessageSender + sender: chrome.runtime.MessageSender, ) { if (!login) { return; @@ -683,7 +686,7 @@ class OverlayBackground implements OverlayBackgroundInterface { private handleExtensionMessage = ( message: OverlayBackgroundExtensionMessage, sender: chrome.runtime.MessageSender, - sendResponse: (response?: any) => void + sendResponse: (response?: any) => void, ) => { const handler: CallableFunction | undefined = this.extensionMessageHandlers[message?.command]; if (!handler) { @@ -742,7 +745,7 @@ class OverlayBackground implements OverlayBackgroundInterface { */ private handleOverlayElementPortMessage = ( message: OverlayBackgroundExtensionMessage, - port: chrome.runtime.Port + port: chrome.runtime.Port, ) => { const command = message?.command; let handler: CallableFunction | undefined; 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 4050d000817..acd9be2a8ea 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 @@ -47,7 +47,7 @@ export type AutoFillServiceInitOptions = AutoFillServiceOptions & export function autofillServiceFactory( cache: { autofillService?: AbstractAutoFillService } & CachedServices, - opts: AutoFillServiceInitOptions + opts: AutoFillServiceInitOptions, ): Promise { return factory( cache, @@ -61,7 +61,7 @@ export function autofillServiceFactory( await eventCollectionServiceFactory(cache, opts), await logServiceFactory(cache, opts), await settingsServiceFactory(cache, opts), - await userVerificationServiceFactory(cache, opts) - ) + await userVerificationServiceFactory(cache, opts), + ), ); } diff --git a/apps/browser/src/autofill/background/tabs.background.spec.ts b/apps/browser/src/autofill/background/tabs.background.spec.ts index e320f22248e..b3de1e96ce3 100644 --- a/apps/browser/src/autofill/background/tabs.background.spec.ts +++ b/apps/browser/src/autofill/background/tabs.background.spec.ts @@ -36,13 +36,13 @@ describe("TabsBackground", () => { it("sets up a window on focusChanged listener", () => { const handleWindowOnFocusChangedSpy = jest.spyOn( tabsBackgorund as any, - "handleWindowOnFocusChanged" + "handleWindowOnFocusChanged", ); tabsBackgorund.init(); expect(chrome.windows.onFocusChanged.addListener).toHaveBeenCalledWith( - handleWindowOnFocusChangedSpy + handleWindowOnFocusChangedSpy, ); }); }); diff --git a/apps/browser/src/autofill/background/tabs.background.ts b/apps/browser/src/autofill/background/tabs.background.ts index c47ef76f665..b095f99ce20 100644 --- a/apps/browser/src/autofill/background/tabs.background.ts +++ b/apps/browser/src/autofill/background/tabs.background.ts @@ -7,7 +7,7 @@ export default class TabsBackground { constructor( private main: MainBackground, private notificationBackground: NotificationBackground, - private overlayBackground: OverlayBackground + private overlayBackground: OverlayBackground, ) {} private focusedWindowId: number; @@ -74,7 +74,7 @@ export default class TabsBackground { private handleTabOnUpdated = async ( tabId: number, changeInfo: chrome.tabs.TabChangeInfo, - tab: chrome.tabs.Tab + tab: chrome.tabs.Tab, ) => { const removePageDetailsStatus = new Set(["loading", "unloaded"]); if (removePageDetailsStatus.has(changeInfo.status)) { diff --git a/apps/browser/src/background/webRequest.background.ts b/apps/browser/src/autofill/background/web-request.background.ts similarity index 93% rename from apps/browser/src/background/webRequest.background.ts rename to apps/browser/src/autofill/background/web-request.background.ts index a4ad0d37dc0..7bb3e679c79 100644 --- a/apps/browser/src/background/webRequest.background.ts +++ b/apps/browser/src/autofill/background/web-request.background.ts @@ -4,7 +4,7 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; import { UriMatchType } from "@bitwarden/common/vault/enums"; -import { BrowserApi } from "../platform/browser/browser-api"; +import { BrowserApi } from "../../platform/browser/browser-api"; export default class WebRequestBackground { private pendingAuthRequests: any[] = []; @@ -14,7 +14,7 @@ export default class WebRequestBackground { constructor( platformUtilsService: PlatformUtilsService, private cipherService: CipherService, - private authService: AuthService + private authService: AuthService, ) { if (BrowserApi.manifestVersion === 2) { this.webRequest = (window as any).chrome.webRequest; @@ -48,7 +48,7 @@ export default class WebRequestBackground { } }, { urls: ["http://*/*", "https://*/*"] }, - [this.isFirefox ? "blocking" : "asyncBlocking"] + [this.isFirefox ? "blocking" : "asyncBlocking"], ); this.webRequest.onCompleted.addListener((details: any) => this.completeAuthRequest(details), { @@ -58,7 +58,7 @@ export default class WebRequestBackground { (details: any) => this.completeAuthRequest(details), { urls: ["http://*/*"], - } + }, ); } @@ -73,7 +73,7 @@ export default class WebRequestBackground { const ciphers = await this.cipherService.getAllDecryptedForUrl( domain, null, - UriMatchType.Host + UriMatchType.Host, ); if (ciphers == null || ciphers.length !== 1) { error(); diff --git a/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts b/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts index 70820f23ce4..ceec27a34e3 100644 --- a/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts +++ b/apps/browser/src/autofill/browser/cipher-context-menu-handler.spec.ts @@ -120,19 +120,19 @@ describe("CipherContextMenuHandler", () => { expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledWith( "Test Cipher (Test Username)", "5", - loginCipher + loginCipher, ); expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledWith( "Test Reprompt Cipher (Test Username)", "6", - repromptLoginCipher + repromptLoginCipher, ); expect(mainContextMenuHandler.loadOptions).toHaveBeenCalledWith( "Test Card Cipher", "7", - cardCipher + cardCipher, ); }); }); 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 ae2f22e244c..cfb966f87ec 100644 --- a/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts +++ b/apps/browser/src/autofill/browser/cipher-context-menu-handler.ts @@ -38,7 +38,7 @@ export class CipherContextMenuHandler { constructor( private mainContextMenuHandler: MainContextMenuHandler, private authService: AuthService, - private cipherService: CipherService + private cipherService: CipherService, ) {} static async create(cachedServices: CachedServices) { @@ -74,7 +74,7 @@ export class CipherContextMenuHandler { return new CipherContextMenuHandler( await MainContextMenuHandler.mv3Create(cachedServices), await authServiceFactory(cachedServices, serviceOptions), - await cipherServiceFactory(cachedServices, serviceOptions) + await cipherServiceFactory(cachedServices, serviceOptions), ); } @@ -86,7 +86,7 @@ export class CipherContextMenuHandler { static async tabsOnActivatedListener( activeInfo: chrome.tabs.TabActiveInfo, - serviceCache: CachedServices + serviceCache: CachedServices, ) { const cipherContextMenuHandler = await CipherContextMenuHandler.create(serviceCache); const tab = await BrowserApi.getTab(activeInfo.tabId); @@ -96,7 +96,7 @@ export class CipherContextMenuHandler { static async tabsOnReplacedListener( addedTabId: number, removedTabId: number, - serviceCache: CachedServices + serviceCache: CachedServices, ) { const cipherContextMenuHandler = await CipherContextMenuHandler.create(serviceCache); const tab = await BrowserApi.getTab(addedTabId); @@ -107,7 +107,7 @@ export class CipherContextMenuHandler { tabId: number, changeInfo: chrome.tabs.TabChangeInfo, tab: chrome.tabs.Tab, - serviceCache: CachedServices + serviceCache: CachedServices, ) { if (changeInfo.status !== "complete") { return; @@ -119,7 +119,7 @@ export class CipherContextMenuHandler { static async messageListener( message: { command: string }, sender: chrome.runtime.MessageSender, - cachedServices: CachedServices + cachedServices: CachedServices, ) { if (!CipherContextMenuHandler.shouldListen(message)) { return; @@ -183,7 +183,7 @@ export class CipherContextMenuHandler { [CipherType.Login]: [], [CipherType.Card]: [], [CipherType.Identity]: [], - } + }, ); if (groupedCiphers[CipherType.Login].length === 0) { diff --git a/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts b/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts index ae5436f71a2..f2312a0d665 100644 --- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts +++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.spec.ts @@ -31,7 +31,7 @@ import { describe("ContextMenuClickedHandler", () => { const createData = ( menuItemId: chrome.contextMenus.OnClickData["menuItemId"], - parentMenuItemId?: chrome.contextMenus.OnClickData["parentMenuItemId"] + parentMenuItemId?: chrome.contextMenus.OnClickData["parentMenuItemId"], ): chrome.contextMenus.OnClickData => { return { menuItemId: menuItemId, @@ -52,7 +52,7 @@ describe("ContextMenuClickedHandler", () => { new Cipher({ id: id ?? "1", type: CipherType.Login, - } as any) + } as any), ); cipherView.login.username = username ?? "USERNAME"; @@ -92,7 +92,7 @@ describe("ContextMenuClickedHandler", () => { stateService, totpService, eventCollectionService, - userVerificationService + userVerificationService, ); }); 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 19643eb5e5f..0de2009bbe1 100644 --- a/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts +++ b/apps/browser/src/autofill/browser/context-menu-clicked-handler.ts @@ -18,7 +18,6 @@ import { } from "../../auth/background/service-factories/auth-service.factory"; import { userVerificationServiceFactory } from "../../auth/background/service-factories/user-verification-service.factory"; import { openUnlockPopout } from "../../auth/popup/utils/auth-popout-window"; -import LockedVaultPendingNotificationsItem from "../../background/models/lockedVaultPendingNotificationsItem"; import { eventCollectionServiceFactory } from "../../background/service-factories/event-collection-service.factory"; import { Account } from "../../models/account"; import { CachedServices } from "../../platform/background/service-factories/factory-options"; @@ -51,6 +50,7 @@ import { GENERATE_PASSWORD_ID, NOOP_COMMAND_SUFFIX, } from "../constants"; +import LockedVaultPendingNotificationsItem from "../notification/models/locked-vault-pending-notifications-item"; import { AutofillCipherTypeId } from "../types"; export type CopyToClipboardOptions = { text: string; tab: chrome.tabs.Tab }; @@ -72,7 +72,7 @@ export class ContextMenuClickedHandler { private stateService: StateService, private totpService: TotpService, private eventCollectionService: EventCollectionService, - private userVerificationService: UserVerificationService + private userVerificationService: UserVerificationService, ) {} static async mv3Create(cachedServices: CachedServices) { @@ -108,11 +108,11 @@ export class ContextMenuClickedHandler { const generatePasswordToClipboardCommand = new GeneratePasswordToClipboardCommand( await passwordGenerationServiceFactory(cachedServices, serviceOptions), - await stateServiceFactory(cachedServices, serviceOptions) + await stateServiceFactory(cachedServices, serviceOptions), ); const autofillCommand = new AutofillTabCommand( - await autofillServiceFactory(cachedServices, serviceOptions) + await autofillServiceFactory(cachedServices, serviceOptions), ); return new ContextMenuClickedHandler( @@ -124,14 +124,14 @@ export class ContextMenuClickedHandler { await stateServiceFactory(cachedServices, serviceOptions), await totpServiceFactory(cachedServices, serviceOptions), await eventCollectionServiceFactory(cachedServices, serviceOptions), - await userVerificationServiceFactory(cachedServices, serviceOptions) + await userVerificationServiceFactory(cachedServices, serviceOptions), ); } static async onClickedListener( info: chrome.contextMenus.OnClickData, tab?: chrome.tabs.Tab, - cachedServices: CachedServices = {} + cachedServices: CachedServices = {}, ) { const contextMenuClickedHandler = await ContextMenuClickedHandler.mv3Create(cachedServices); await contextMenuClickedHandler.run(info, tab); @@ -140,7 +140,7 @@ export class ContextMenuClickedHandler { static async messageListener( message: { command: string; data: LockedVaultPendingNotificationsItem }, sender: chrome.runtime.MessageSender, - cachedServices: CachedServices + cachedServices: CachedServices, ) { if ( message.command !== "unlockCompleted" || @@ -152,7 +152,7 @@ export class ContextMenuClickedHandler { const contextMenuClickedHandler = await ContextMenuClickedHandler.mv3Create(cachedServices); await contextMenuClickedHandler.run( message.data.commandToRetry.msg.data, - message.data.commandToRetry.sender.tab + message.data.commandToRetry.sender.tab, ); } @@ -189,7 +189,7 @@ export class ContextMenuClickedHandler { await BrowserApi.tabSendMessageData( tab, "addToLockedVaultPendingNotifications", - retryMessage + retryMessage, ); await openUnlockPopout(tab); @@ -201,7 +201,7 @@ export class ContextMenuClickedHandler { const menuItemId = (info.menuItemId as string).split("_")[1]; // We create all the ids, we can guarantee they are strings let cipher: CipherView | undefined; const isCreateCipherAction = [CREATE_LOGIN_ID, CREATE_IDENTITY_ID, CREATE_CARD_ID].includes( - menuItemId as string + menuItemId as string, ); if (isCreateCipherAction) { @@ -211,15 +211,15 @@ export class ContextMenuClickedHandler { info.parentMenuItemId === AUTOFILL_IDENTITY_ID ? [CipherType.Identity] : info.parentMenuItemId === AUTOFILL_CARD_ID - ? [CipherType.Card] - : []; + ? [CipherType.Card] + : []; // This NOOP item has come through which is generally only for no access state but since we got here // we are actually unlocked we will do our best to find a good match of an item to autofill this is useful // in scenarios like unlock on autofill const ciphers = await this.cipherService.getAllDecryptedForUrl( tab.url, - additionalCiphersToGet + additionalCiphersToGet, ); cipher = ciphers[0]; @@ -314,10 +314,10 @@ export class ContextMenuClickedHandler { return menuItemId === CREATE_IDENTITY_ID ? CipherType.Identity : menuItemId === CREATE_CARD_ID - ? CipherType.Card - : menuItemId === CREATE_LOGIN_ID - ? CipherType.Login - : null; + ? CipherType.Card + : menuItemId === CREATE_LOGIN_ID + ? CipherType.Login + : null; } private async getIdentifier(tab: chrome.tabs.Tab, info: chrome.contextMenus.OnClickData) { @@ -333,7 +333,7 @@ export class ContextMenuClickedHandler { } resolve(identifier); - } + }, ); }); } 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 aa5f43fbc94..8617d657e83 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 @@ -88,7 +88,7 @@ describe("context-menu", () => { id: id ?? "1", type: CipherType.Login, viewPassword: viewPassword ?? true, - } as any) + } as any), ); cipherView.login.username = username ?? "USERNAME"; cipherView.login.password = password ?? "PASSWORD"; @@ -113,7 +113,7 @@ describe("context-menu", () => { username: "", totp: "", viewPassword: false, - }) + }), ); expect(createSpy).toHaveBeenCalledTimes(1); 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 1e90e90d0d1..f1686452ac4 100644 --- a/apps/browser/src/autofill/browser/main-context-menu-handler.ts +++ b/apps/browser/src/autofill/browser/main-context-menu-handler.ts @@ -46,7 +46,7 @@ export class MainContextMenuHandler { constructor( private stateService: BrowserStateService, private i18nService: I18nService, - private logService: LogService + private logService: LogService, ) { if (chrome.contextMenus) { this.create = (options) => { @@ -89,7 +89,7 @@ export class MainContextMenuHandler { return new MainContextMenuHandler( await stateServiceFactory(cachedServices, serviceOptions), await i18nServiceFactory(cachedServices, serviceOptions), - await logServiceFactory(cachedServices, serviceOptions) + await logServiceFactory(cachedServices, serviceOptions), ); } @@ -274,7 +274,7 @@ export class MainContextMenuHandler { const authed = await this.stateService.getIsAuthenticated(); await this.loadOptions( this.i18nService.t(authed ? "unlockVaultMenu" : "loginToVaultMenu"), - NOOP_COMMAND_SUFFIX + NOOP_COMMAND_SUFFIX, ); } } 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 62110166658..5094f6701ab 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 @@ -9,7 +9,7 @@ import { copyToClipboard } from "./copy-to-clipboard-command"; export class GeneratePasswordToClipboardCommand { constructor( private passwordGenerationService: PasswordGenerationServiceAbstraction, - private stateService: BrowserStateService + private stateService: BrowserStateService, ) {} async generatePasswordToClipboard(tab: chrome.tabs.Tab) { diff --git a/apps/browser/src/autofill/commands/autofill-tab-command.ts b/apps/browser/src/autofill/commands/autofill-tab-command.ts index b51edd929ee..16ce40ff3d7 100644 --- a/apps/browser/src/autofill/commands/autofill-tab-command.ts +++ b/apps/browser/src/autofill/commands/autofill-tab-command.ts @@ -21,7 +21,7 @@ export class AutofillTabCommand { }, ], tab, - true + true, ); } @@ -64,7 +64,7 @@ export class AutofillTabCommand { } resolve(response); - } + }, ); }); } diff --git a/apps/browser/src/autofill/content/abstractions/autofill-init.ts b/apps/browser/src/autofill/content/abstractions/autofill-init.ts index e15cac15331..139099a4d58 100644 --- a/apps/browser/src/autofill/content/abstractions/autofill-init.ts +++ b/apps/browser/src/autofill/content/abstractions/autofill-init.ts @@ -16,6 +16,7 @@ type AutofillExtensionMessage = { isOverlayCiphersPopulated?: boolean; direction?: "previous" | "next"; isOpeningFullOverlay?: boolean; + forceCloseOverlay?: boolean; }; }; @@ -27,7 +28,7 @@ type AutofillExtensionMessageHandlers = { collectPageDetailsImmediately: ({ message }: AutofillExtensionMessageParam) => void; fillForm: ({ message }: AutofillExtensionMessageParam) => void; openAutofillOverlay: ({ message }: AutofillExtensionMessageParam) => void; - closeAutofillOverlay: () => void; + closeAutofillOverlay: ({ message }: AutofillExtensionMessageParam) => void; addNewVaultItemFromOverlay: () => void; redirectOverlayFocusOut: ({ message }: AutofillExtensionMessageParam) => void; updateIsOverlayCiphersPopulated: ({ message }: AutofillExtensionMessageParam) => void; diff --git a/apps/browser/src/autofill/content/autofill-init.spec.ts b/apps/browser/src/autofill/content/autofill-init.spec.ts index 93614970ec5..1524fdce100 100644 --- a/apps/browser/src/autofill/content/autofill-init.spec.ts +++ b/apps/browser/src/autofill/content/autofill-init.spec.ts @@ -41,7 +41,7 @@ describe("AutofillInit", () => { autofillInit["setupExtensionMessageListeners"](); expect(chrome.runtime.onMessage.addListener).toHaveBeenCalledWith( - autofillInit["handleExtensionMessage"] + autofillInit["handleExtensionMessage"], ); }); }); @@ -157,7 +157,7 @@ describe("AutofillInit", () => { sendExtensionRuntimeMessage( { command: "collectPageDetailsImmediately" }, sender, - sendResponse + sendResponse, ); await flushPromises(); @@ -186,7 +186,7 @@ describe("AutofillInit", () => { await flushPromises(); expect(autofillInit["insertAutofillContentService"].fillForm).not.toHaveBeenCalledWith( - fillScript + fillScript, ); }); @@ -199,7 +199,7 @@ describe("AutofillInit", () => { await flushPromises(); expect(autofillInit["insertAutofillContentService"].fillForm).toHaveBeenCalledWith( - fillScript + fillScript, ); }); @@ -220,11 +220,11 @@ describe("AutofillInit", () => { expect(autofillInit["updateOverlayIsCurrentlyFilling"]).toHaveBeenNthCalledWith(1, true); expect(autofillInit["insertAutofillContentService"].fillForm).toHaveBeenCalledWith( - fillScript + fillScript, ); expect(autofillInit["updateOverlayIsCurrentlyFilling"]).toHaveBeenNthCalledWith(2, false); expect( - autofillInit["autofillOverlayContentService"].focusMostRecentOverlayField + autofillInit["autofillOverlayContentService"].focusMostRecentOverlayField, ).toHaveBeenCalled(); }); @@ -247,14 +247,14 @@ describe("AutofillInit", () => { expect(newAutofillInit["updateOverlayIsCurrentlyFilling"]).toHaveBeenNthCalledWith( 1, - true + true, ); expect(newAutofillInit["insertAutofillContentService"].fillForm).toHaveBeenCalledWith( - fillScript + fillScript, ); expect(newAutofillInit["updateOverlayIsCurrentlyFilling"]).not.toHaveBeenNthCalledWith( 2, - false + false, ); }); }); @@ -282,7 +282,7 @@ describe("AutofillInit", () => { sendExtensionRuntimeMessage(message); expect( - autofillInit["autofillOverlayContentService"].openAutofillOverlay + autofillInit["autofillOverlayContentService"].openAutofillOverlay, ).toHaveBeenCalledWith({ isFocusingFieldElement: message.data.isFocusingFieldElement, isOpeningFullOverlay: message.data.isOpeningFullOverlay, @@ -297,16 +297,40 @@ describe("AutofillInit", () => { autofillInit["autofillOverlayContentService"].isCurrentlyFilling = false; }); + it("skips attempting to remove the overlay if the autofillOverlayContentService is not present", () => { + const newAutofillInit = new AutofillInit(undefined); + newAutofillInit.init(); + jest.spyOn(newAutofillInit as any, "removeAutofillOverlay"); + + sendExtensionRuntimeMessage({ + command: "closeAutofillOverlay", + data: { forceCloseOverlay: false }, + }); + + expect(newAutofillInit["autofillOverlayContentService"]).toBe(undefined); + }); + + it("removes the autofill overlay if the message flags a forced closure", () => { + sendExtensionRuntimeMessage({ + command: "closeAutofillOverlay", + data: { forceCloseOverlay: true }, + }); + + expect( + autofillInit["autofillOverlayContentService"].removeAutofillOverlay, + ).toHaveBeenCalled(); + }); + it("ignores the message if a field is currently focused", () => { autofillInit["autofillOverlayContentService"].isFieldCurrentlyFocused = true; sendExtensionRuntimeMessage({ command: "closeAutofillOverlay" }); expect( - autofillInit["autofillOverlayContentService"].removeAutofillOverlayList + autofillInit["autofillOverlayContentService"].removeAutofillOverlayList, ).not.toHaveBeenCalled(); expect( - autofillInit["autofillOverlayContentService"].removeAutofillOverlay + autofillInit["autofillOverlayContentService"].removeAutofillOverlay, ).not.toHaveBeenCalled(); }); @@ -316,10 +340,10 @@ describe("AutofillInit", () => { sendExtensionRuntimeMessage({ command: "closeAutofillOverlay" }); expect( - autofillInit["autofillOverlayContentService"].removeAutofillOverlayList + autofillInit["autofillOverlayContentService"].removeAutofillOverlayList, ).toHaveBeenCalled(); expect( - autofillInit["autofillOverlayContentService"].removeAutofillOverlay + autofillInit["autofillOverlayContentService"].removeAutofillOverlay, ).not.toHaveBeenCalled(); }); @@ -327,10 +351,10 @@ describe("AutofillInit", () => { sendExtensionRuntimeMessage({ command: "closeAutofillOverlay" }); expect( - autofillInit["autofillOverlayContentService"].removeAutofillOverlayList + autofillInit["autofillOverlayContentService"].removeAutofillOverlayList, ).not.toHaveBeenCalled(); expect( - autofillInit["autofillOverlayContentService"].removeAutofillOverlay + autofillInit["autofillOverlayContentService"].removeAutofillOverlay, ).toHaveBeenCalled(); }); }); @@ -373,7 +397,7 @@ describe("AutofillInit", () => { sendExtensionRuntimeMessage(message); expect( - autofillInit["autofillOverlayContentService"].redirectOverlayFocusOut + autofillInit["autofillOverlayContentService"].redirectOverlayFocusOut, ).toHaveBeenCalledWith(message.data.direction); }); }); @@ -399,7 +423,7 @@ describe("AutofillInit", () => { sendExtensionRuntimeMessage(message); expect(autofillInit["autofillOverlayContentService"].isOverlayCiphersPopulated).toEqual( - message.data.isOverlayCiphersPopulated + message.data.isOverlayCiphersPopulated, ); }); }); @@ -423,7 +447,7 @@ describe("AutofillInit", () => { sendExtensionRuntimeMessage({ command: "bgUnlockPopoutOpened" }); expect( - autofillInit["autofillOverlayContentService"].blurMostRecentOverlayField + autofillInit["autofillOverlayContentService"].blurMostRecentOverlayField, ).toHaveBeenCalled(); expect(autofillInit["removeAutofillOverlay"]).toHaveBeenCalled(); }); @@ -448,7 +472,7 @@ describe("AutofillInit", () => { sendExtensionRuntimeMessage({ command: "bgVaultItemRepromptPopoutOpened" }); expect( - autofillInit["autofillOverlayContentService"].blurMostRecentOverlayField + autofillInit["autofillOverlayContentService"].blurMostRecentOverlayField, ).toHaveBeenCalled(); expect(autofillInit["removeAutofillOverlay"]).toHaveBeenCalled(); }); diff --git a/apps/browser/src/autofill/content/autofill-init.ts b/apps/browser/src/autofill/content/autofill-init.ts index 0bd04edee4b..9b23305377c 100644 --- a/apps/browser/src/autofill/content/autofill-init.ts +++ b/apps/browser/src/autofill/content/autofill-init.ts @@ -20,7 +20,7 @@ class AutofillInit implements AutofillInitInterface { collectPageDetailsImmediately: ({ message }) => this.collectPageDetails(message, true), fillForm: ({ message }) => this.fillForm(message), openAutofillOverlay: ({ message }) => this.openAutofillOverlay(message), - closeAutofillOverlay: () => this.removeAutofillOverlay(), + closeAutofillOverlay: ({ message }) => this.removeAutofillOverlay(message), addNewVaultItemFromOverlay: () => this.addNewVaultItemFromOverlay(), redirectOverlayFocusOut: ({ message }) => this.redirectOverlayFocusOut(message), updateIsOverlayCiphersPopulated: ({ message }) => this.updateIsOverlayCiphersPopulated(message), @@ -39,11 +39,11 @@ class AutofillInit implements AutofillInitInterface { this.domElementVisibilityService = new DomElementVisibilityService(); this.collectAutofillContentService = new CollectAutofillContentService( this.domElementVisibilityService, - this.autofillOverlayContentService + this.autofillOverlayContentService, ); this.insertAutofillContentService = new InsertAutofillContentService( this.domElementVisibilityService, - this.collectAutofillContentService + this.collectAutofillContentService, ); } @@ -69,7 +69,7 @@ class AutofillInit implements AutofillInitInterface { */ private async collectPageDetails( message: AutofillExtensionMessage, - sendDetailsInResponse = false + sendDetailsInResponse = false, ): Promise { const pageDetails: AutofillPageDetails = await this.collectAutofillContentService.getPageDetails(); @@ -153,7 +153,12 @@ class AutofillInit implements AutofillInitInterface { * If the autofill is currently filling, only the overlay list will be * removed. */ - private removeAutofillOverlay() { + private removeAutofillOverlay(message?: AutofillExtensionMessage) { + if (message?.data?.forceCloseOverlay) { + this.autofillOverlayContentService?.removeAutofillOverlay(); + return; + } + if ( !this.autofillOverlayContentService || this.autofillOverlayContentService.isFieldCurrentlyFocused @@ -205,7 +210,7 @@ class AutofillInit implements AutofillInitInterface { } this.autofillOverlayContentService.isOverlayCiphersPopulated = Boolean( - data?.isOverlayCiphersPopulated + data?.isOverlayCiphersPopulated, ); } @@ -226,7 +231,7 @@ class AutofillInit implements AutofillInitInterface { private handleExtensionMessage = ( message: AutofillExtensionMessage, sender: chrome.runtime.MessageSender, - sendResponse: (response?: any) => void + sendResponse: (response?: any) => void, ): boolean => { const command: string = message.command; const handler: CallableFunction | undefined = this.extensionMessageHandlers[command]; diff --git a/apps/browser/src/autofill/content/message_handler.ts b/apps/browser/src/autofill/content/message_handler.ts index c2c5c4d3196..9bf48e3b17d 100644 --- a/apps/browser/src/autofill/content/message_handler.ts +++ b/apps/browser/src/autofill/content/message_handler.ts @@ -24,7 +24,7 @@ window.addEventListener( }); } }, - false + false, ); const forwardCommands = [ diff --git a/apps/browser/src/autofill/content/misc-utils.ts b/apps/browser/src/autofill/content/misc-utils.ts index b34a27a30a5..7fe884f1d51 100644 --- a/apps/browser/src/autofill/content/misc-utils.ts +++ b/apps/browser/src/autofill/content/misc-utils.ts @@ -7,7 +7,7 @@ async function copyText(text: string) { async function onMessageListener( msg: TabMessage, sender: chrome.runtime.MessageSender, - responseCallback: (response: unknown) => void + responseCallback: (response: unknown) => void, ) { switch (msg.command) { case "copyText": diff --git a/apps/browser/src/autofill/content/notification-bar.ts b/apps/browser/src/autofill/content/notification-bar.ts index 223d6ab1ddf..92e8f599385 100644 --- a/apps/browser/src/autofill/content/notification-bar.ts +++ b/apps/browser/src/autofill/content/notification-bar.ts @@ -1,7 +1,7 @@ -import AddLoginRuntimeMessage from "../../background/models/addLoginRuntimeMessage"; -import ChangePasswordRuntimeMessage from "../../background/models/changePasswordRuntimeMessage"; import AutofillField from "../models/autofill-field"; import { WatchedForm } from "../models/watched-form"; +import AddLoginRuntimeMessage from "../notification/models/add-login-runtime-message"; +import ChangePasswordRuntimeMessage from "../notification/models/change-password-runtime-message"; import { FormData } from "../services/abstractions/autofill.service"; import { GlobalSettings, UserSettings } from "../types"; @@ -445,7 +445,7 @@ async function loadNotificationBar() { // know what type of form we are watching const submitButton = getSubmitButton( form, - unionSets(logInButtonNames, changePasswordButtonNames) + unionSets(logInButtonNames, changePasswordButtonNames), ); if (submitButton != null) { @@ -475,7 +475,7 @@ async function loadNotificationBar() { watchedForm.formEl, watchedForm.data.password, inputs, - true // Only do fallback if we have expect to find a single password field + true, // Only do fallback if we have expect to find a single password field ); } else if (watchedForm.data.passwords != null) { // if we didn't find a username field, try to locate multiple password fields @@ -499,7 +499,7 @@ async function loadNotificationBar() { form: HTMLFormElement, passwordData: AutofillField, inputs: HTMLInputElement[], - doLastFallback: boolean + doLastFallback: boolean, ): HTMLInputElement { let el = locateField(form, passwordData, inputs); if (el != null && el.type !== "password") { @@ -521,7 +521,7 @@ async function loadNotificationBar() { function locateField( form: HTMLFormElement, fieldData: AutofillField, - inputs: HTMLInputElement[] + inputs: HTMLInputElement[], ): HTMLInputElement | null { // If we have no field data, we cannot locate the field if (fieldData == null) { @@ -667,7 +667,7 @@ async function loadNotificationBar() { // Check if the submit button contains any of the change password button names as a safeguard const buttonText = getButtonText(getSubmitButton(form, changePasswordButtonNames)); const matches = Array.from(changePasswordButtonContainsNames).filter( - (n) => buttonText.indexOf(n) > -1 + (n) => buttonText.indexOf(n) > -1, ); if (matches.length > 0) { @@ -744,8 +744,8 @@ async function loadNotificationBar() { if (submitButton == null) { const possibleSubmitButtons = Array.from( wrappingEl.querySelectorAll( - 'a, span, button[type="button"], ' + 'input[type="button"], button:not([type])' - ) + 'a, span, button[type="button"], ' + 'input[type="button"], button:not([type])', + ), ) as HTMLElement[]; let typelessButton: HTMLElement = null; // Loop through all possible submit buttons and find the first one that matches a submit button name diff --git a/apps/browser/src/autofill/jest/autofill-mocks.ts b/apps/browser/src/autofill/jest/autofill-mocks.ts index 6d8c727dd51..de84cef2494 100644 --- a/apps/browser/src/autofill/jest/autofill-mocks.ts +++ b/apps/browser/src/autofill/jest/autofill-mocks.ts @@ -106,7 +106,7 @@ function createGenerateFillScriptOptionsMock(customFields = {}): GenerateFillScr function createAutofillScriptMock( customFields = {}, - scriptTypes?: Record + scriptTypes?: Record, ): AutofillScript { let script: FillScript[] = [ ["click_on_opid", "default-field"], @@ -152,7 +152,7 @@ const overlayPagesTranslations = { addNewVaultItem: "addNewVaultItem", }; function createInitAutofillOverlayButtonMessageMock( - customFields = {} + customFields = {}, ): InitAutofillOverlayButtonMessage { return { command: "initAutofillOverlayButton", @@ -181,7 +181,7 @@ function createAutofillOverlayCipherDataMock(index: number, customFields = {}): } function createInitAutofillOverlayListMessageMock( - customFields = {} + customFields = {}, ): InitAutofillOverlayListMessage { return { command: "initAutofillOverlayList", diff --git a/apps/browser/src/autofill/jest/testing-utils.ts b/apps/browser/src/autofill/jest/testing-utils.ts index c3fe951a8ee..e0972e3d90d 100644 --- a/apps/browser/src/autofill/jest/testing-utils.ts +++ b/apps/browser/src/autofill/jest/testing-utils.ts @@ -18,7 +18,7 @@ function postWindowMessage(data: any, origin = "https://localhost/") { function sendExtensionRuntimeMessage( message: any, sender?: chrome.runtime.MessageSender, - sendResponse?: CallableFunction + sendResponse?: CallableFunction, ) { (chrome.runtime.onMessage.addListener as unknown as jest.SpyInstance).mock.calls.forEach( (call) => { @@ -26,9 +26,9 @@ function sendExtensionRuntimeMessage( callback( message || {}, sender || mock(), - sendResponse || jest.fn() + sendResponse || jest.fn(), ); - } + }, ); } @@ -51,7 +51,7 @@ function triggerWindowOnFocusedChangedEvent(windowId: number) { (call) => { const callback = call[0]; callback(windowId); - } + }, ); } @@ -60,7 +60,7 @@ function triggerTabOnActivatedEvent(activeInfo: chrome.tabs.TabActiveInfo) { (call) => { const callback = call[0]; callback(activeInfo); - } + }, ); } @@ -74,7 +74,7 @@ function triggerTabOnReplacedEvent(addedTabId: number, removedTabId: number) { function triggerTabOnUpdatedEvent( tabId: number, changeInfo: chrome.tabs.TabChangeInfo, - tab: chrome.tabs.Tab + tab: chrome.tabs.Tab, ) { (chrome.tabs.onUpdated.addListener as unknown as jest.SpyInstance).mock.calls.forEach((call) => { const callback = call[0]; diff --git a/apps/browser/src/autofill/notification/bar.html b/apps/browser/src/autofill/notification/bar.html index a6be58de70a..0b7e4c8e0ec 100644 --- a/apps/browser/src/autofill/notification/bar.html +++ b/apps/browser/src/autofill/notification/bar.html @@ -1,4 +1,4 @@ - + Bitwarden diff --git a/apps/browser/src/background/models/addChangePasswordQueueMessage.ts b/apps/browser/src/autofill/notification/models/add-change-password-queue-message.ts similarity index 55% rename from apps/browser/src/background/models/addChangePasswordQueueMessage.ts rename to apps/browser/src/autofill/notification/models/add-change-password-queue-message.ts index 16491032e9b..f1d5bebdc9e 100644 --- a/apps/browser/src/background/models/addChangePasswordQueueMessage.ts +++ b/apps/browser/src/autofill/notification/models/add-change-password-queue-message.ts @@ -1,5 +1,5 @@ -import NotificationQueueMessage from "./notificationQueueMessage"; -import { NotificationQueueMessageType } from "./notificationQueueMessageType"; +import NotificationQueueMessage from "./notification-queue-message"; +import { NotificationQueueMessageType } from "./notification-queue-message-type"; export default class AddChangePasswordQueueMessage extends NotificationQueueMessage { type: NotificationQueueMessageType.ChangePassword; diff --git a/apps/browser/src/background/models/addLoginQueueMessage.ts b/apps/browser/src/autofill/notification/models/add-login-queue-message.ts similarity index 88% rename from apps/browser/src/background/models/addLoginQueueMessage.ts rename to apps/browser/src/autofill/notification/models/add-login-queue-message.ts index 1f727f40a5c..0d4a23f76fc 100644 --- a/apps/browser/src/background/models/addLoginQueueMessage.ts +++ b/apps/browser/src/autofill/notification/models/add-login-queue-message.ts @@ -4,8 +4,8 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { LoginUriView } from "@bitwarden/common/vault/models/view/login-uri.view"; import { LoginView } from "@bitwarden/common/vault/models/view/login.view"; -import NotificationQueueMessage from "./notificationQueueMessage"; -import { NotificationQueueMessageType } from "./notificationQueueMessageType"; +import NotificationQueueMessage from "./notification-queue-message"; +import { NotificationQueueMessageType } from "./notification-queue-message-type"; export default class AddLoginQueueMessage extends NotificationQueueMessage { type: NotificationQueueMessageType.AddLogin; diff --git a/apps/browser/src/background/models/addLoginRuntimeMessage.ts b/apps/browser/src/autofill/notification/models/add-login-runtime-message.ts similarity index 100% rename from apps/browser/src/background/models/addLoginRuntimeMessage.ts rename to apps/browser/src/autofill/notification/models/add-login-runtime-message.ts diff --git a/apps/browser/src/autofill/notification/models/add-unlock-vault-queue-message.ts b/apps/browser/src/autofill/notification/models/add-unlock-vault-queue-message.ts new file mode 100644 index 00000000000..602e9f6c444 --- /dev/null +++ b/apps/browser/src/autofill/notification/models/add-unlock-vault-queue-message.ts @@ -0,0 +1,6 @@ +import NotificationQueueMessage from "./notification-queue-message"; +import { NotificationQueueMessageType } from "./notification-queue-message-type"; + +export default class AddUnlockVaultQueueMessage extends NotificationQueueMessage { + type: NotificationQueueMessageType.UnlockVault; +} diff --git a/apps/browser/src/background/models/changePasswordRuntimeMessage.ts b/apps/browser/src/autofill/notification/models/change-password-runtime-message.ts similarity index 100% rename from apps/browser/src/background/models/changePasswordRuntimeMessage.ts rename to apps/browser/src/autofill/notification/models/change-password-runtime-message.ts diff --git a/apps/browser/src/background/models/lockedVaultPendingNotificationsItem.ts b/apps/browser/src/autofill/notification/models/locked-vault-pending-notifications-item.ts similarity index 100% rename from apps/browser/src/background/models/lockedVaultPendingNotificationsItem.ts rename to apps/browser/src/autofill/notification/models/locked-vault-pending-notifications-item.ts diff --git a/apps/browser/src/background/models/notificationQueueMessageType.ts b/apps/browser/src/autofill/notification/models/notification-queue-message-type.ts similarity index 100% rename from apps/browser/src/background/models/notificationQueueMessageType.ts rename to apps/browser/src/autofill/notification/models/notification-queue-message-type.ts diff --git a/apps/browser/src/background/models/notificationQueueMessage.ts b/apps/browser/src/autofill/notification/models/notification-queue-message.ts similarity index 68% rename from apps/browser/src/background/models/notificationQueueMessage.ts rename to apps/browser/src/autofill/notification/models/notification-queue-message.ts index 3c6a582ee54..b5e5c3b2e47 100644 --- a/apps/browser/src/background/models/notificationQueueMessage.ts +++ b/apps/browser/src/autofill/notification/models/notification-queue-message.ts @@ -1,4 +1,4 @@ -import { NotificationQueueMessageType } from "./notificationQueueMessageType"; +import { NotificationQueueMessageType } from "./notification-queue-message-type"; export default class NotificationQueueMessage { type: NotificationQueueMessageType; diff --git a/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-button-iframe.ts b/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-button-iframe.ts index 125a53c01de..813d8054704 100644 --- a/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-button-iframe.ts +++ b/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-button-iframe.ts @@ -12,7 +12,7 @@ class AutofillOverlayButtonIframe extends AutofillOverlayIframeElement { border: "none", }, chrome.i18n.getMessage("bitwardenOverlayButton"), - chrome.i18n.getMessage("bitwardenOverlayMenuAvailable") + chrome.i18n.getMessage("bitwardenOverlayMenuAvailable"), ); } } diff --git a/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-iframe-element.ts b/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-iframe-element.ts index 7f84c07870d..209834410f9 100644 --- a/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-iframe-element.ts +++ b/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-iframe-element.ts @@ -6,7 +6,7 @@ class AutofillOverlayIframeElement extends HTMLElement { portName: string, initStyles: Partial, iframeTitle: string, - ariaAlert?: string + ariaAlert?: string, ) { super(); @@ -14,7 +14,7 @@ class AutofillOverlayIframeElement extends HTMLElement { const autofillOverlayIframeService = new AutofillOverlayIframeService( iframePath, portName, - shadow + shadow, ); autofillOverlayIframeService.initOverlayIframe(initStyles, iframeTitle, ariaAlert); } diff --git a/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-iframe.service.spec.ts b/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-iframe.service.spec.ts index 432f1a548ab..26dc50ecd09 100644 --- a/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-iframe.service.spec.ts +++ b/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-iframe.service.spec.ts @@ -23,17 +23,17 @@ describe("AutofillOverlayIframeService", () => { autofillOverlayIframeService = new AutofillOverlayIframeService( iframePath, AutofillOverlayPort.Button, - shadow + shadow, ); shadowAppendSpy = jest.spyOn(shadow, "appendChild"); handlePortDisconnectSpy = jest.spyOn( autofillOverlayIframeService as any, - "handlePortDisconnect" + "handlePortDisconnect", ); handlePortMessageSpy = jest.spyOn(autofillOverlayIframeService as any, "handlePortMessage"); handleWindowMessageSpy = jest.spyOn(autofillOverlayIframeService as any, "handleWindowMessage"); chrome.runtime.connect = jest.fn((connectInfo: chrome.runtime.ConnectInfo) => - createPortSpyMock(connectInfo.name) + createPortSpyMock(connectInfo.name), ) as unknown as typeof chrome.runtime.connect; }); @@ -54,7 +54,7 @@ describe("AutofillOverlayIframeService", () => { autofillOverlayIframeService.initOverlayIframe({}, "title"); expect(autofillOverlayIframeService["shadow"].appendChild).toBeCalledWith( - autofillOverlayIframeService["iframe"] + autofillOverlayIframeService["iframe"], ); }); @@ -147,7 +147,7 @@ describe("AutofillOverlayIframeService", () => { expect(globalThis.removeEventListener).toBeCalledWith( EVENTS.MESSAGE, - handleWindowMessageSpy + handleWindowMessageSpy, ); }); @@ -186,7 +186,7 @@ describe("AutofillOverlayIframeService", () => { expect(autofillOverlayIframeService["iframe"].contentWindow.postMessage).toBeCalledWith( message, - "*" + "*", ); }); @@ -204,7 +204,7 @@ describe("AutofillOverlayIframeService", () => { beforeEach(() => { updateElementStylesSpy = jest.spyOn( autofillOverlayIframeService as any, - "updateElementStyles" + "updateElementStyles", ); }); @@ -219,7 +219,7 @@ describe("AutofillOverlayIframeService", () => { expect(updateElementStylesSpy).not.toBeCalled(); expect(autofillOverlayIframeService["iframe"].contentWindow.postMessage).toBeCalledWith( message, - "*" + "*", ); }); @@ -344,7 +344,7 @@ describe("AutofillOverlayIframeService", () => { new MessageEvent("message", { data: {}, source: window, - }) + }), ); expect(portSpy.postMessage).not.toBeCalled(); @@ -356,7 +356,7 @@ describe("AutofillOverlayIframeService", () => { data: {}, source: autofillOverlayIframeService["iframe"].contentWindow, origin: "https://www.google.com", - }) + }), ); expect(portSpy.postMessage).not.toBeCalled(); @@ -368,7 +368,7 @@ describe("AutofillOverlayIframeService", () => { data: { command: "not-a-handled-command" }, source: autofillOverlayIframeService["iframe"].contentWindow, origin: "chrome-extension://id", - }) + }), ); expect(portSpy.postMessage).toBeCalledWith({ command: "not-a-handled-command" }); @@ -380,7 +380,7 @@ describe("AutofillOverlayIframeService", () => { data: { command: "updateAutofillOverlayListHeight", styles: { height: "300px" } }, source: autofillOverlayIframeService["iframe"].contentWindow, origin: "chrome-extension://id", - }) + }), ); expect(autofillOverlayIframeService["iframe"].style.height).toBe("300px"); @@ -392,6 +392,23 @@ describe("AutofillOverlayIframeService", () => { beforeEach(() => { autofillOverlayIframeService.initOverlayIframe({ height: "0px" }, "title", "ariaAlert"); autofillOverlayIframeService["iframe"].dispatchEvent(new Event(EVENTS.LOAD)); + portSpy = autofillOverlayIframeService["port"]; + }); + + it("skips handling found mutations if excessive mutations are triggering", async () => { + jest.useFakeTimers(); + jest + .spyOn( + autofillOverlayIframeService as any, + "isTriggeringExcessiveMutationObserverIterations", + ) + .mockReturnValue(true); + jest.spyOn(autofillOverlayIframeService as any, "updateElementStyles"); + + autofillOverlayIframeService["iframe"].style.visibility = "hidden"; + await flushPromises(); + + expect(autofillOverlayIframeService["updateElementStyles"]).not.toBeCalled(); }); it("reverts any styles changes made directly to the iframe", async () => { @@ -402,5 +419,47 @@ describe("AutofillOverlayIframeService", () => { expect(autofillOverlayIframeService["iframe"].style.visibility).toBe("visible"); }); + + it("force closes the autofill overlay if more than 9 foreign mutations are triggered", async () => { + jest.useFakeTimers(); + autofillOverlayIframeService["foreignMutationsCount"] = 10; + + autofillOverlayIframeService["iframe"].src = "http://malicious-site.com"; + await flushPromises(); + + expect(portSpy.postMessage).toBeCalledWith({ command: "forceCloseAutofillOverlay" }); + }); + + it("force closes the autofill overlay if excessive mutations are being triggered", async () => { + jest.useFakeTimers(); + autofillOverlayIframeService["mutationObserverIterations"] = 20; + + autofillOverlayIframeService["iframe"].src = "http://malicious-site.com"; + await flushPromises(); + + expect(portSpy.postMessage).toBeCalledWith({ command: "forceCloseAutofillOverlay" }); + }); + + it("resets the excessive mutations and foreign mutation counters", async () => { + jest.useFakeTimers(); + autofillOverlayIframeService["foreignMutationsCount"] = 9; + autofillOverlayIframeService["mutationObserverIterations"] = 19; + + autofillOverlayIframeService["iframe"].src = "http://malicious-site.com"; + jest.advanceTimersByTime(2001); + await flushPromises(); + + expect(autofillOverlayIframeService["foreignMutationsCount"]).toBe(0); + expect(autofillOverlayIframeService["mutationObserverIterations"]).toBe(0); + }); + + it("resets any mutated default attributes for the iframe", async () => { + jest.useFakeTimers(); + + autofillOverlayIframeService["iframe"].title = "some-other-title"; + await flushPromises(); + + expect(autofillOverlayIframeService["iframe"].title).toBe("title"); + }); }); }); diff --git a/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-iframe.service.ts b/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-iframe.service.ts index 2ec2bc0aa3b..20f5aa830fc 100644 --- a/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-iframe.service.ts +++ b/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-iframe.service.ts @@ -30,6 +30,16 @@ class AutofillOverlayIframeService implements AutofillOverlayIframeServiceInterf colorScheme: "normal", opacity: "0", }; + private defaultIframeAttributes: Record = { + src: "", + title: "", + sandbox: "allow-scripts", + allowtransparency: "true", + tabIndex: "-1", + }; + private foreignMutationsCount = 0; + private mutationObserverIterations = 0; + private mutationObserverIterationsResetTimeout: NodeJS.Timeout; private readonly windowMessageHandlers: AutofillOverlayIframeWindowMessageHandlers = { updateAutofillOverlayListHeight: (message) => this.updateElementStyles(this.iframe, message.styles), @@ -40,7 +50,11 @@ class AutofillOverlayIframeService implements AutofillOverlayIframeServiceInterf updateOverlayHidden: ({ message }) => this.updateElementStyles(this.iframe, message.styles), }; - constructor(private iframePath: string, private portName: string, private shadow: ShadowRoot) { + constructor( + private iframePath: string, + private portName: string, + private shadow: ShadowRoot, + ) { this.extensionOriginsSet = new Set([ chrome.runtime.getURL("").slice(0, -1).toLowerCase(), // Remove the trailing slash and normalize the extension url to lowercase "null", @@ -65,15 +79,16 @@ class AutofillOverlayIframeService implements AutofillOverlayIframeServiceInterf initOverlayIframe( initStyles: Partial, iframeTitle: string, - ariaAlert?: string + ariaAlert?: string, ) { + this.defaultIframeAttributes.src = chrome.runtime.getURL(this.iframePath); + this.defaultIframeAttributes.title = iframeTitle; + this.iframe = globalThis.document.createElement("iframe"); - this.iframe.src = chrome.runtime.getURL(this.iframePath); this.updateElementStyles(this.iframe, { ...this.iframeStyles, ...initStyles }); - this.iframe.tabIndex = -1; - this.iframe.setAttribute("title", iframeTitle); - this.iframe.setAttribute("sandbox", "allow-scripts"); - this.iframe.setAttribute("allowtransparency", "true"); + for (const [attribute, value] of Object.entries(this.defaultIframeAttributes)) { + this.iframe.setAttribute(attribute, value); + } this.iframe.addEventListener(EVENTS.LOAD, this.setupPortMessageListener); if (ariaAlert) { @@ -167,7 +182,7 @@ class AutofillOverlayIframeService implements AutofillOverlayIframeServiceInterf */ private handlePortMessage = ( message: AutofillOverlayIframeExtensionMessage, - port: chrome.runtime.Port + port: chrome.runtime.Port, ) => { if (port.name !== this.portName) { return; @@ -286,9 +301,20 @@ class AutofillOverlayIframeService implements AutofillOverlayIframeServiceInterf * @param mutations - The mutations to the iframe element */ private handleMutations = (mutations: MutationRecord[]) => { + if (this.isTriggeringExcessiveMutationObserverIterations()) { + return; + } + for (let index = 0; index < mutations.length; index++) { const mutation = mutations[index]; - if (mutation.type !== "attributes" || mutation.attributeName !== "style") { + if (mutation.type !== "attributes") { + continue; + } + + const element = mutation.target as HTMLElement; + if (mutation.attributeName !== "style") { + this.handleElementAttributeMutation(element); + continue; } @@ -297,6 +323,41 @@ class AutofillOverlayIframeService implements AutofillOverlayIframeServiceInterf } }; + /** + * Handles mutations to the iframe element's attributes. This ensures that + * the iframe element's attributes are not modified by a third party source. + * + * @param element - The element to handle attribute mutations for + */ + private handleElementAttributeMutation(element: HTMLElement) { + const attributes = Array.from(element.attributes); + for (let attributeIndex = 0; attributeIndex < attributes.length; attributeIndex++) { + const attribute = attributes[attributeIndex]; + if (attribute.name === "style") { + continue; + } + + if (this.foreignMutationsCount >= 10) { + this.port?.postMessage({ command: "forceCloseAutofillOverlay" }); + break; + } + + const defaultIframeAttribute = this.defaultIframeAttributes[attribute.name]; + if (!defaultIframeAttribute) { + this.iframe.removeAttribute(attribute.name); + this.foreignMutationsCount++; + continue; + } + + if (attribute.value === defaultIframeAttribute) { + continue; + } + + this.iframe.setAttribute(attribute.name, defaultIframeAttribute); + this.foreignMutationsCount++; + } + } + /** * Observes the iframe element for mutations to its style attribute. */ @@ -310,6 +371,35 @@ class AutofillOverlayIframeService implements AutofillOverlayIframeServiceInterf private unobserveIframe() { this.iframeMutationObserver.disconnect(); } + + /** + * Identifies if the mutation observer is triggering excessive iterations. + * Will remove the autofill overlay if any set mutation observer is + * triggering excessive iterations. + */ + private isTriggeringExcessiveMutationObserverIterations() { + const resetCounters = () => { + this.mutationObserverIterations = 0; + this.foreignMutationsCount = 0; + }; + + if (this.mutationObserverIterationsResetTimeout) { + clearTimeout(this.mutationObserverIterationsResetTimeout); + } + + this.mutationObserverIterations++; + this.mutationObserverIterationsResetTimeout = setTimeout(() => resetCounters(), 2000); + + if (this.mutationObserverIterations > 20) { + clearTimeout(this.mutationObserverIterationsResetTimeout); + resetCounters(); + this.port?.postMessage({ command: "forceCloseAutofillOverlay" }); + + return true; + } + + return false; + } } export default AutofillOverlayIframeService; diff --git a/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-list-iframe.ts b/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-list-iframe.ts index 26a0ed2765e..b60b618e4e7 100644 --- a/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-list-iframe.ts +++ b/apps/browser/src/autofill/overlay/iframe-content/autofill-overlay-list-iframe.ts @@ -17,7 +17,7 @@ class AutofillOverlayListIframe extends AutofillOverlayIframeElement { borderStyle: "solid", borderColor: "rgb(206, 212, 220)", }, - chrome.i18n.getMessage("bitwardenVault") + chrome.i18n.getMessage("bitwardenVault"), ); } } diff --git a/apps/browser/src/autofill/overlay/pages/button/autofill-overlay-button.spec.ts b/apps/browser/src/autofill/overlay/pages/button/autofill-overlay-button.spec.ts index a4d0b336225..c4927f4a971 100644 --- a/apps/browser/src/autofill/overlay/pages/button/autofill-overlay-button.spec.ts +++ b/apps/browser/src/autofill/overlay/pages/button/autofill-overlay-button.spec.ts @@ -25,12 +25,12 @@ describe("AutofillOverlayButton", () => { describe("initAutofillOverlayButton", () => { it("creates the button element with the locked icon when the user's auth status is not Unlocked", () => { postWindowMessage( - createInitAutofillOverlayButtonMessageMock({ authStatus: AuthenticationStatus.Locked }) + createInitAutofillOverlayButtonMessageMock({ authStatus: AuthenticationStatus.Locked }), ); expect(autofillOverlayButton["buttonElement"]).toMatchSnapshot(); expect(autofillOverlayButton["buttonElement"].querySelector("svg")).toBe( - autofillOverlayButton["logoLockedIconElement"] + autofillOverlayButton["logoLockedIconElement"], ); }); @@ -39,7 +39,7 @@ describe("AutofillOverlayButton", () => { expect(autofillOverlayButton["buttonElement"]).toMatchSnapshot(); expect(autofillOverlayButton["buttonElement"].querySelector("svg")).toBe( - autofillOverlayButton["logoIconElement"] + autofillOverlayButton["logoIconElement"], ); }); @@ -49,7 +49,7 @@ describe("AutofillOverlayButton", () => { expect(globalThis.parent.postMessage).toHaveBeenCalledWith( { command: "overlayButtonClicked" }, - "https://localhost/" + "https://localhost/", ); }); }); @@ -74,7 +74,7 @@ describe("AutofillOverlayButton", () => { expect(globalThis.parent.postMessage).toHaveBeenCalledWith( { command: "closeAutofillOverlay" }, - "https://localhost/" + "https://localhost/", ); }); diff --git a/apps/browser/src/autofill/overlay/pages/button/autofill-overlay-button.ts b/apps/browser/src/autofill/overlay/pages/button/autofill-overlay-button.ts index 7b3acdac9e5..94c0772fd2b 100644 --- a/apps/browser/src/autofill/overlay/pages/button/autofill-overlay-button.ts +++ b/apps/browser/src/autofill/overlay/pages/button/autofill-overlay-button.ts @@ -58,7 +58,7 @@ class AutofillOverlayButton extends AutofillOverlayPageElement { this.buttonElement.classList.add("overlay-button"); this.buttonElement.setAttribute( "aria-label", - this.getTranslation("toggleBitwardenVaultOverlay") + this.getTranslation("toggleBitwardenVaultOverlay"), ); this.buttonElement.addEventListener(EVENTS.CLICK, this.handleButtonElementClick); diff --git a/apps/browser/src/autofill/overlay/pages/button/button.html b/apps/browser/src/autofill/overlay/pages/button/button.html index de553e008d9..6cbd1332743 100644 --- a/apps/browser/src/autofill/overlay/pages/button/button.html +++ b/apps/browser/src/autofill/overlay/pages/button/button.html @@ -1,4 +1,4 @@ - + Bitwarden overlay button diff --git a/apps/browser/src/autofill/overlay/pages/list/autofill-overlay-list.spec.ts b/apps/browser/src/autofill/overlay/pages/list/autofill-overlay-list.spec.ts index 358b003401d..f26dc2bab0f 100644 --- a/apps/browser/src/autofill/overlay/pages/list/autofill-overlay-list.spec.ts +++ b/apps/browser/src/autofill/overlay/pages/list/autofill-overlay-list.spec.ts @@ -36,7 +36,7 @@ describe("AutofillOverlayList", () => { createInitAutofillOverlayListMessageMock({ authStatus: AuthenticationStatus.Locked, cipherList: [], - }) + }), ); }); @@ -52,7 +52,7 @@ describe("AutofillOverlayList", () => { expect(globalThis.parent.postMessage).toHaveBeenCalledWith( { command: "unlockVault" }, - "https://localhost/" + "https://localhost/", ); }); }); @@ -63,7 +63,7 @@ describe("AutofillOverlayList", () => { createInitAutofillOverlayListMessageMock({ authStatus: AuthenticationStatus.Unlocked, ciphers: [], - }) + }), ); }); @@ -79,7 +79,7 @@ describe("AutofillOverlayList", () => { expect(globalThis.parent.postMessage).toHaveBeenCalledWith( { command: "addNewVaultItem" }, - "https://localhost/" + "https://localhost/", ); }); }); @@ -113,7 +113,7 @@ describe("AutofillOverlayList", () => { autofillOverlayList["cipherListScrollDebounceTimeout"] = setTimeout(jest.fn, 0); const handleDebouncedScrollEventSpy = jest.spyOn( autofillOverlayList as any, - "handleDebouncedScrollEvent" + "handleDebouncedScrollEvent", ); autofillOverlayList["handleCiphersListScrollEvent"](); @@ -139,7 +139,7 @@ describe("AutofillOverlayList", () => { expect(globalThis.parent.postMessage).toHaveBeenCalledWith( { command: "fillSelectedListItem", overlayCipherId: "1" }, - "https://localhost/" + "https://localhost/", ); }); @@ -227,7 +227,7 @@ describe("AutofillOverlayList", () => { expect(globalThis.parent.postMessage).toHaveBeenCalledWith( { command: "viewSelectedCipher", overlayCipherId: "1" }, - "https://localhost/" + "https://localhost/", ); }); @@ -298,7 +298,7 @@ describe("AutofillOverlayList", () => { expect(globalThis.parent.postMessage).toHaveBeenCalledWith( { command: "checkAutofillOverlayButtonFocused" }, - "https://localhost/" + "https://localhost/", ); }); @@ -317,7 +317,7 @@ describe("AutofillOverlayList", () => { createInitAutofillOverlayListMessageMock({ authStatus: AuthenticationStatus.Locked, cipherList: [], - }) + }), ); const unlockButton = autofillOverlayList["overlayListContainer"].querySelector("#unlock-button"); @@ -382,7 +382,7 @@ describe("AutofillOverlayList", () => { expect(globalThis.parent.postMessage).toHaveBeenCalledWith( { command: "updateAutofillOverlayListHeight", styles: { height: "300px" } }, - "https://localhost/" + "https://localhost/", ); }); }); diff --git a/apps/browser/src/autofill/overlay/pages/list/autofill-overlay-list.ts b/apps/browser/src/autofill/overlay/pages/list/autofill-overlay-list.ts index 77ddd56b34d..053fddb9c13 100644 --- a/apps/browser/src/autofill/overlay/pages/list/autofill-overlay-list.ts +++ b/apps/browser/src/autofill/overlay/pages/list/autofill-overlay-list.ts @@ -89,7 +89,7 @@ class AutofillOverlayList extends AutofillOverlayPageElement { unlockButtonElement.textContent = this.getTranslation("unlockAccount"); unlockButtonElement.setAttribute( "aria-label", - `${this.getTranslation("unlockAccount")}, ${this.getTranslation("opensInANewWindow")}` + `${this.getTranslation("unlockAccount")}, ${this.getTranslation("opensInANewWindow")}`, ); unlockButtonElement.prepend(buildSvgDomElement(lockIcon)); unlockButtonElement.addEventListener(EVENTS.CLICK, this.handleUnlockButtonClick); @@ -118,7 +118,9 @@ class AutofillOverlayList extends AutofillOverlayPageElement { private updateListItems(ciphers: OverlayCipherData[]) { this.ciphers = ciphers; this.currentCipherIndex = 0; - this.overlayListContainer.innerHTML = ""; + if (this.overlayListContainer) { + this.overlayListContainer.innerHTML = ""; + } if (!ciphers?.length) { this.buildNoResultsOverlayList(); @@ -151,7 +153,7 @@ class AutofillOverlayList extends AutofillOverlayPageElement { newItemButton.textContent = this.getTranslation("newItem"); newItemButton.setAttribute( "aria-label", - `${this.getTranslation("addNewVaultItem")}, ${this.getTranslation("opensInANewWindow")}` + `${this.getTranslation("addNewVaultItem")}, ${this.getTranslation("opensInANewWindow")}`, ); newItemButton.prepend(buildSvgDomElement(plusIcon)); newItemButton.addEventListener(EVENTS.CLICK, this.handeNewItemButtonClick); @@ -177,7 +179,7 @@ class AutofillOverlayList extends AutofillOverlayPageElement { private loadPageOfCiphers() { const lastIndex = Math.min( this.currentCipherIndex + this.showCiphersPerPage, - this.ciphers.length + this.ciphers.length, ); for (let cipherIndex = this.currentCipherIndex; cipherIndex < lastIndex; cipherIndex++) { this.ciphersList.appendChild(this.buildOverlayActionsListItem(this.ciphers[cipherIndex])); @@ -253,11 +255,11 @@ class AutofillOverlayList extends AutofillOverlayPageElement { fillCipherElement.classList.add("fill-cipher-button"); fillCipherElement.setAttribute( "aria-label", - `${this.getTranslation("fillCredentialsFor")} ${cipher.name}` + `${this.getTranslation("fillCredentialsFor")} ${cipher.name}`, ); fillCipherElement.setAttribute( "aria-description", - `${this.getTranslation("partialUsername")}, ${cipher.login.username}` + `${this.getTranslation("partialUsername")}, ${cipher.login.username}`, ); fillCipherElement.append(cipherIcon, cipherDetailsElement); fillCipherElement.addEventListener(EVENTS.CLICK, this.handleFillCipherClickEvent(cipher)); @@ -279,7 +281,7 @@ class AutofillOverlayList extends AutofillOverlayPageElement { command: "fillSelectedListItem", overlayCipherId: cipher.id, }), - `${cipher.id}-fill-cipher-button-click-handler` + `${cipher.id}-fill-cipher-button-click-handler`, ); }; @@ -323,7 +325,7 @@ class AutofillOverlayList extends AutofillOverlayPageElement { viewCipherElement.classList.add("view-cipher-button"); viewCipherElement.setAttribute( "aria-label", - `${this.getTranslation("view")} ${cipher.name}, ${this.getTranslation("opensInANewWindow")}` + `${this.getTranslation("view")} ${cipher.name}, ${this.getTranslation("opensInANewWindow")}`, ); viewCipherElement.append(buildSvgDomElement(viewCipherIcon)); viewCipherElement.addEventListener(EVENTS.CLICK, this.handleViewCipherClickEvent(cipher)); @@ -341,7 +343,7 @@ class AutofillOverlayList extends AutofillOverlayPageElement { private handleViewCipherClickEvent = (cipher: OverlayCipherData) => { return this.useEventHandlersMemo( () => this.postMessageToParent({ command: "viewSelectedCipher", overlayCipherId: cipher.id }), - `${cipher.id}-view-cipher-button-click-handler` + `${cipher.id}-view-cipher-button-click-handler`, ); }; @@ -485,7 +487,7 @@ class AutofillOverlayList extends AutofillOverlayPageElement { */ private focusOverlayList() { const unlockButtonElement = this.overlayListContainer.querySelector( - "#unlock-button" + "#unlock-button", ) as HTMLElement; if (unlockButtonElement) { unlockButtonElement.focus(); @@ -493,7 +495,7 @@ class AutofillOverlayList extends AutofillOverlayPageElement { } const newItemButtonElement = this.overlayListContainer.querySelector( - "#new-item-button" + "#new-item-button", ) as HTMLElement; if (newItemButtonElement) { newItemButtonElement.focus(); @@ -501,7 +503,7 @@ class AutofillOverlayList extends AutofillOverlayPageElement { } const firstCipherElement = this.overlayListContainer.querySelector( - ".fill-cipher-button" + ".fill-cipher-button", ) as HTMLElement; firstCipherElement?.focus(); } diff --git a/apps/browser/src/autofill/overlay/pages/list/list.html b/apps/browser/src/autofill/overlay/pages/list/list.html index 5678a3e4f38..8e63de67374 100644 --- a/apps/browser/src/autofill/overlay/pages/list/list.html +++ b/apps/browser/src/autofill/overlay/pages/list/list.html @@ -1,4 +1,4 @@ - + Bitwarden vault diff --git a/apps/browser/src/autofill/overlay/pages/shared/autofill-overlay-page-element.spec.ts b/apps/browser/src/autofill/overlay/pages/shared/autofill-overlay-page-element.spec.ts index 1c0587ce861..c70892cfcad 100644 --- a/apps/browser/src/autofill/overlay/pages/shared/autofill-overlay-page-element.spec.ts +++ b/apps/browser/src/autofill/overlay/pages/shared/autofill-overlay-page-element.spec.ts @@ -35,12 +35,12 @@ describe("AutofillOverlayPageElement", () => { const linkElement = autofillOverlayPageElement["initOverlayPage"]( "button", "https://jest-testing-website.com", - translations + translations, ); expect(globalThis.document.documentElement.setAttribute).toHaveBeenCalledWith( "lang", - translations.locale + translations.locale, ); expect(globalThis.document.head.title).toEqual(translations.buttonPageTitle); expect(globalThis.document.createElement).toHaveBeenCalledWith("link"); @@ -62,7 +62,7 @@ describe("AutofillOverlayPageElement", () => { expect(globalThis.parent.postMessage).toHaveBeenCalledWith( { command: "test" }, - "https://jest-testing-website.com" + "https://jest-testing-website.com", ); }); }); @@ -79,25 +79,25 @@ describe("AutofillOverlayPageElement", () => { it("sets up global event listeners", () => { const handleWindowMessageSpy = jest.spyOn( autofillOverlayPageElement as any, - "handleWindowMessage" + "handleWindowMessage", ); const handleWindowBlurEventSpy = jest.spyOn( autofillOverlayPageElement as any, - "handleWindowBlurEvent" + "handleWindowBlurEvent", ); const handleDocumentKeyDownEventSpy = jest.spyOn( autofillOverlayPageElement as any, - "handleDocumentKeyDownEvent" + "handleDocumentKeyDownEvent", ); autofillOverlayPageElement["setupGlobalListeners"]( - mock() + mock(), ); expect(globalThis.addEventListener).toHaveBeenCalledWith("message", handleWindowMessageSpy); expect(globalThis.addEventListener).toHaveBeenCalledWith("blur", handleWindowBlurEventSpy); expect(globalThis.document.addEventListener).toHaveBeenCalledWith( "keydown", - handleDocumentKeyDownEventSpy + handleDocumentKeyDownEventSpy, ); }); @@ -106,18 +106,18 @@ describe("AutofillOverlayPageElement", () => { autofillOverlayPageElement["setupGlobalListeners"]( mock({ initAutofillOverlayButton: initAutofillOverlayButtonSpy, - }) + }), ); globalThis.dispatchEvent( new MessageEvent("message", { data: { command: "initAutofillOverlayButton" }, origin: "https://jest-testing-website.com", - }) + }), ); expect(autofillOverlayPageElement["messageOrigin"]).toEqual( - "https://jest-testing-website.com" + "https://jest-testing-website.com", ); }); @@ -126,7 +126,7 @@ describe("AutofillOverlayPageElement", () => { autofillOverlayPageElement["setupGlobalListeners"]( mock({ initAutofillOverlayButton: initAutofillOverlayButtonSpy, - }) + }), ); const data = { command: "initAutofillOverlayButton" }; @@ -140,7 +140,7 @@ describe("AutofillOverlayPageElement", () => { autofillOverlayPageElement["setupGlobalListeners"]( mock({ initAutofillOverlayButton: initAutofillOverlayButtonSpy, - }) + }), ); globalThis.dispatchEvent(new MessageEvent("message", { data: { command: "test" } })); @@ -151,20 +151,20 @@ describe("AutofillOverlayPageElement", () => { it("posts a message to the parent when the window is blurred", () => { autofillOverlayPageElement["messageOrigin"] = "https://jest-testing-website.com"; autofillOverlayPageElement["setupGlobalListeners"]( - mock() + mock(), ); globalThis.dispatchEvent(new Event("blur")); expect(globalThis.parent.postMessage).toHaveBeenCalledWith( { command: "overlayPageBlurred" }, - "https://jest-testing-website.com" + "https://jest-testing-website.com", ); }); it("skips redirecting keyboard focus when a KeyDown event triggers and the key is not a `Tab` or `Escape` key", () => { autofillOverlayPageElement["setupGlobalListeners"]( - mock() + mock(), ); globalThis.document.dispatchEvent(new KeyboardEvent("keydown", { code: "test" })); @@ -175,44 +175,44 @@ describe("AutofillOverlayPageElement", () => { it("redirects the overlay focus out to the previous element on KeyDown of the `Tab+Shift` keys", () => { autofillOverlayPageElement["messageOrigin"] = "https://jest-testing-website.com"; autofillOverlayPageElement["setupGlobalListeners"]( - mock() + mock(), ); globalThis.document.dispatchEvent( - new KeyboardEvent("keydown", { code: "Tab", shiftKey: true }) + new KeyboardEvent("keydown", { code: "Tab", shiftKey: true }), ); expect(globalThis.parent.postMessage).toHaveBeenCalledWith( { command: "redirectOverlayFocusOut", direction: "previous" }, - "https://jest-testing-website.com" + "https://jest-testing-website.com", ); }); it("redirects the overlay focus out to the next element on KeyDown of the `Tab` key", () => { autofillOverlayPageElement["messageOrigin"] = "https://jest-testing-website.com"; autofillOverlayPageElement["setupGlobalListeners"]( - mock() + mock(), ); globalThis.document.dispatchEvent(new KeyboardEvent("keydown", { code: "Tab" })); expect(globalThis.parent.postMessage).toHaveBeenCalledWith( { command: "redirectOverlayFocusOut", direction: "next" }, - "https://jest-testing-website.com" + "https://jest-testing-website.com", ); }); it("redirects the overlay focus out to the current element on KeyDown of the `Escape` key", () => { autofillOverlayPageElement["messageOrigin"] = "https://jest-testing-website.com"; autofillOverlayPageElement["setupGlobalListeners"]( - mock() + mock(), ); globalThis.document.dispatchEvent(new KeyboardEvent("keydown", { code: "Escape" })); expect(globalThis.parent.postMessage).toHaveBeenCalledWith( { command: "redirectOverlayFocusOut", direction: "current" }, - "https://jest-testing-website.com" + "https://jest-testing-website.com", ); }); }); diff --git a/apps/browser/src/autofill/overlay/pages/shared/autofill-overlay-page-element.ts b/apps/browser/src/autofill/overlay/pages/shared/autofill-overlay-page-element.ts index 692803a7529..cca96555b2a 100644 --- a/apps/browser/src/autofill/overlay/pages/shared/autofill-overlay-page-element.ts +++ b/apps/browser/src/autofill/overlay/pages/shared/autofill-overlay-page-element.ts @@ -28,7 +28,7 @@ class AutofillOverlayPageElement extends HTMLElement { protected initOverlayPage( elementName: "button" | "list", styleSheetUrl: string, - translations: Record + translations: Record, ): HTMLLinkElement { this.translations = translations; globalThis.document.documentElement.setAttribute("lang", this.getTranslation("locale")); @@ -127,7 +127,7 @@ class AutofillOverlayPageElement extends HTMLElement { if (event.code === "Tab") { this.redirectOverlayFocusOutMessage( - event.shiftKey ? RedirectFocusDirection.Previous : RedirectFocusDirection.Next + event.shiftKey ? RedirectFocusDirection.Previous : RedirectFocusDirection.Next, ); return; } diff --git a/apps/browser/src/popup/settings/autofill.component.html b/apps/browser/src/autofill/popup/settings/autofill.component.html similarity index 89% rename from apps/browser/src/popup/settings/autofill.component.html rename to apps/browser/src/autofill/popup/settings/autofill.component.html index 9204add4458..d675615ac8d 100644 --- a/apps/browser/src/popup/settings/autofill.component.html +++ b/apps/browser/src/autofill/popup/settings/autofill.component.html @@ -45,22 +45,20 @@
{{ "showAutoFillMenuOnFormFieldsDescAlt" | i18n }}
+
+ {{ "turnOffBrowserBuiltInPasswordManagerSettings" | i18n }} + + {{ "turnOffBrowserBuiltInPasswordManagerSettingsLink" | i18n }} + +
-
-
-
- - -
-
-
diff --git a/apps/browser/src/popup/settings/autofill.component.ts b/apps/browser/src/autofill/popup/settings/autofill.component.ts similarity index 63% rename from apps/browser/src/popup/settings/autofill.component.ts rename to apps/browser/src/autofill/popup/settings/autofill.component.ts index fb544d7526a..d9038b0eb27 100644 --- a/apps/browser/src/popup/settings/autofill.component.ts +++ b/apps/browser/src/autofill/popup/settings/autofill.component.ts @@ -7,22 +7,20 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { UriMatchType } from "@bitwarden/common/vault/enums"; -import { DialogService } from "@bitwarden/components"; -import { AutofillOverlayVisibility } from "../../autofill/utils/autofill-overlay.enum"; -import { BrowserApi } from "../../platform/browser/browser-api"; -import { flagEnabled } from "../../platform/flags"; +import { BrowserApi } from "../../../platform/browser/browser-api"; +import { flagEnabled } from "../../../platform/flags"; +import { AutofillOverlayVisibility } from "../../utils/autofill-overlay.enum"; @Component({ selector: "app-autofill", templateUrl: "autofill.component.html", }) export class AutofillComponent implements OnInit { - protected canOverrideBrowserAutofillSetting = false; - protected defaultBrowserAutofillDisabled = false; protected isAutoFillOverlayFlagEnabled = false; protected autoFillOverlayVisibility: number; protected autoFillOverlayVisibilityOptions: any[]; + protected disablePasswordManagerLink: string; enableAutoFillOnPageLoad = false; autoFillOnPageLoadDefault = false; autoFillOnPageLoadOptions: any[]; @@ -37,7 +35,6 @@ export class AutofillComponent implements OnInit { private platformUtilsService: PlatformUtilsService, private configService: ConfigServiceAbstraction, private settingsService: SettingsService, - private dialogService: DialogService ) { this.autoFillOverlayVisibilityOptions = [ { @@ -67,15 +64,12 @@ export class AutofillComponent implements OnInit { ]; this.accountSwitcherEnabled = flagEnabled("accountSwitching"); + this.disablePasswordManagerLink = this.getDisablePasswordManagerLink(); } async ngOnInit() { - this.canOverrideBrowserAutofillSetting = this.platformUtilsService.isChrome(); - - this.defaultBrowserAutofillDisabled = await this.browserAutofillSettingCurrentlyOverridden(); - this.isAutoFillOverlayFlagEnabled = await this.configService.getFeatureFlag( - FeatureFlag.AutofillOverlay + FeatureFlag.AutofillOverlay, ); this.autoFillOverlayVisibility = (await this.settingsService.getAutoFillOverlayVisibility()) || AutofillOverlayVisibility.Off; @@ -91,54 +85,8 @@ export class AutofillComponent implements OnInit { await this.setAutofillKeyboardHelperText(command); } - async updateDefaultBrowserAutofillDisabled() { - const privacyPermissionGranted = await this.privacyPermissionGranted(); - if (!this.defaultBrowserAutofillDisabled && !privacyPermissionGranted) { - return; - } - - if ( - !privacyPermissionGranted && - !(await BrowserApi.requestPermission({ permissions: ["privacy"] })) - ) { - await this.dialogService.openSimpleDialog({ - title: { key: "extensionPrivacyPermissionNotGrantedTitle" }, - content: { key: "extensionPrivacyPermissionNotGrantedDescription" }, - acceptButtonText: { key: "ok" }, - cancelButtonText: null, - type: "warning", - }); - this.defaultBrowserAutofillDisabled = false; - - return; - } - - await BrowserApi.updateDefaultBrowserAutofillSettings(!this.defaultBrowserAutofillDisabled); - } - async updateAutoFillOverlayVisibility() { await this.settingsService.setAutoFillOverlayVisibility(this.autoFillOverlayVisibility); - - if ( - this.autoFillOverlayVisibility === AutofillOverlayVisibility.Off || - !this.canOverrideBrowserAutofillSetting || - (await this.browserAutofillSettingCurrentlyOverridden()) - ) { - return; - } - - const permissionGranted = await this.privacyPermissionGranted(); - const contentKey = permissionGranted - ? "overrideBrowserAutofillDescription" - : "overrideBrowserAutofillPrivacyRequiredDescription"; - await this.dialogService.openSimpleDialog({ - title: { key: "overrideBrowserAutofillTitle" }, - content: { key: contentKey }, - acceptButtonText: { key: "turnOn" }, - acceptAction: async () => await this.handleOverrideDialogAccept(), - cancelButtonText: { key: "ignore" }, - type: "info", - }); } async updateAutoFillOnPageLoad() { @@ -175,24 +123,25 @@ export class AutofillComponent implements OnInit { } } - private handleOverrideDialogAccept = async () => { - this.defaultBrowserAutofillDisabled = true; - await this.updateDefaultBrowserAutofillDisabled(); - }; - - async browserAutofillSettingCurrentlyOverridden() { - if (!this.canOverrideBrowserAutofillSetting) { - return false; + private getDisablePasswordManagerLink(): string { + if (this.platformUtilsService.isChrome()) { + return "chrome://settings/autofill"; + } + if (this.platformUtilsService.isOpera()) { + return "opera://settings/autofill"; + } + if (this.platformUtilsService.isEdge()) { + return "edge://settings/passwords"; + } + if (this.platformUtilsService.isVivaldi()) { + return "vivaldi://settings/autofill"; } - if (!(await this.privacyPermissionGranted())) { - return false; - } - - return await BrowserApi.browserAutofillSettingsOverridden(); + return "https://bitwarden.com/help/disable-browser-autofill/"; } - async privacyPermissionGranted(): Promise { - return await BrowserApi.permissionsGranted(["privacy"]); + protected openDisablePasswordManagerLink(event: Event) { + event.preventDefault(); + BrowserApi.createNewTab(this.disablePasswordManagerLink); } } diff --git a/apps/browser/src/autofill/services/abstractions/autofill-overlay-content.service.ts b/apps/browser/src/autofill/services/abstractions/autofill-overlay-content.service.ts index 1cfde6e6274..ac7d55a54d4 100644 --- a/apps/browser/src/autofill/services/abstractions/autofill-overlay-content.service.ts +++ b/apps/browser/src/autofill/services/abstractions/autofill-overlay-content.service.ts @@ -17,7 +17,7 @@ interface AutofillOverlayContentService { init(): void; setupAutofillOverlayListenerOnField( autofillFieldElement: ElementWithOpId, - autofillFieldData: AutofillField + autofillFieldData: AutofillField, ): Promise; openAutofillOverlay(options: OpenAutofillOverlayOptions): void; removeAutofillOverlay(): void; diff --git a/apps/browser/src/autofill/services/abstractions/autofill.service.ts b/apps/browser/src/autofill/services/abstractions/autofill.service.ts index 3e8472f2c1a..a0959db72cb 100644 --- a/apps/browser/src/autofill/services/abstractions/autofill.service.ts +++ b/apps/browser/src/autofill/services/abstractions/autofill.service.ts @@ -47,19 +47,19 @@ export abstract class AutofillService { injectAutofillScripts: ( sender: chrome.runtime.MessageSender, autofillV2?: boolean, - autofillOverlay?: boolean + autofillOverlay?: boolean, ) => Promise; getFormsWithPasswordFields: (pageDetails: AutofillPageDetails) => FormData[]; doAutoFill: (options: AutoFillOptions) => Promise; doAutoFillOnTab: ( pageDetails: PageDetail[], tab: chrome.tabs.Tab, - fromCommand: boolean + fromCommand: boolean, ) => Promise; doAutoFillActiveTab: ( pageDetails: PageDetail[], fromCommand: boolean, - cipherType?: CipherType + cipherType?: CipherType, ) => Promise; isPasswordRepromptRequired: (cipher: CipherView, tab: chrome.tabs.Tab) => Promise; } diff --git a/apps/browser/src/autofill/services/abstractions/collect-autofill-content.service.ts b/apps/browser/src/autofill/services/abstractions/collect-autofill-content.service.ts index e4a409eb599..78befa7bc61 100644 --- a/apps/browser/src/autofill/services/abstractions/collect-autofill-content.service.ts +++ b/apps/browser/src/autofill/services/abstractions/collect-autofill-content.service.ts @@ -20,7 +20,7 @@ interface CollectAutofillContentService { queryAllTreeWalkerNodes( rootNode: Node, filterCallback: CallableFunction, - isObservingShadowRoot?: boolean + isObservingShadowRoot?: boolean, ): Node[]; } diff --git a/apps/browser/src/autofill/services/autofill-overlay-content.service.spec.ts b/apps/browser/src/autofill/services/autofill-overlay-content.service.spec.ts index 12b9f19e030..7753a4b2672 100644 --- a/apps/browser/src/autofill/services/autofill-overlay-content.service.spec.ts +++ b/apps/browser/src/autofill/services/autofill-overlay-content.service.spec.ts @@ -58,11 +58,11 @@ describe("AutofillOverlayContentService", () => { jest.spyOn(window, "addEventListener"); setupGlobalEventListenersSpy = jest.spyOn( autofillOverlayContentService as any, - "setupGlobalEventListeners" + "setupGlobalEventListeners", ); setupMutationObserverSpy = jest.spyOn( autofillOverlayContentService as any, - "setupMutationObserver" + "setupMutationObserver", ); }); @@ -76,7 +76,7 @@ describe("AutofillOverlayContentService", () => { expect(document.addEventListener).toHaveBeenCalledWith( "DOMContentLoaded", - setupGlobalEventListenersSpy + setupGlobalEventListenersSpy, ); expect(setupGlobalEventListenersSpy).not.toHaveBeenCalled(); }); @@ -84,21 +84,21 @@ describe("AutofillOverlayContentService", () => { it("sets up a visibility change listener for the DOM", () => { const handleVisibilityChangeEventSpy = jest.spyOn( autofillOverlayContentService as any, - "handleVisibilityChangeEvent" + "handleVisibilityChangeEvent", ); autofillOverlayContentService.init(); expect(document.addEventListener).toHaveBeenCalledWith( "visibilitychange", - handleVisibilityChangeEventSpy + handleVisibilityChangeEventSpy, ); }); it("sets up a focus out listener for the window", () => { const handleFormFieldBlurEventSpy = jest.spyOn( autofillOverlayContentService as any, - "handleFormFieldBlurEvent" + "handleFormFieldBlurEvent", ); autofillOverlayContentService.init(); @@ -112,15 +112,15 @@ describe("AutofillOverlayContentService", () => { .mockImplementation(() => mock({ observe: jest.fn() })); const handleOverlayElementMutationObserverUpdateSpy = jest.spyOn( autofillOverlayContentService as any, - "handleOverlayElementMutationObserverUpdate" + "handleOverlayElementMutationObserverUpdate", ); const handleBodyElementMutationObserverUpdateSpy = jest.spyOn( autofillOverlayContentService as any, - "handleBodyElementMutationObserverUpdate" + "handleBodyElementMutationObserverUpdate", ); const handleDocumentElementMutationObserverUpdateSpy = jest.spyOn( autofillOverlayContentService as any, - "handleDocumentElementMutationObserverUpdate" + "handleDocumentElementMutationObserverUpdate", ); autofillOverlayContentService.init(); @@ -128,15 +128,15 @@ describe("AutofillOverlayContentService", () => { expect(setupMutationObserverSpy).toHaveBeenCalledTimes(1); expect(globalThis.MutationObserver).toHaveBeenNthCalledWith( 1, - handleOverlayElementMutationObserverUpdateSpy + handleOverlayElementMutationObserverUpdateSpy, ); expect(globalThis.MutationObserver).toHaveBeenNthCalledWith( 2, - handleBodyElementMutationObserverUpdateSpy + handleBodyElementMutationObserverUpdateSpy, ); expect(globalThis.MutationObserver).toHaveBeenNthCalledWith( 3, - handleDocumentElementMutationObserverUpdateSpy + handleDocumentElementMutationObserverUpdateSpy, ); }); }); @@ -154,7 +154,7 @@ describe("AutofillOverlayContentService", () => { `; autofillFieldElement = document.getElementById( - "username-field" + "username-field", ) as ElementWithOpId; autofillFieldElement.opid = "op-1"; jest.spyOn(autofillFieldElement, "addEventListener"); @@ -176,7 +176,7 @@ describe("AutofillOverlayContentService", () => { autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); expect(autofillFieldElement.addEventListener).not.toHaveBeenCalled(); @@ -187,7 +187,7 @@ describe("AutofillOverlayContentService", () => { autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); expect(autofillFieldElement.addEventListener).not.toHaveBeenCalled(); @@ -198,7 +198,7 @@ describe("AutofillOverlayContentService", () => { autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); expect(autofillFieldElement.addEventListener).not.toHaveBeenCalled(); @@ -210,7 +210,7 @@ describe("AutofillOverlayContentService", () => { autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); expect(autofillFieldElement.addEventListener).not.toHaveBeenCalled(); @@ -222,7 +222,7 @@ describe("AutofillOverlayContentService", () => { autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); expect(autofillFieldElement.addEventListener).not.toHaveBeenCalled(); @@ -233,7 +233,7 @@ describe("AutofillOverlayContentService", () => { autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); expect(autofillFieldElement.addEventListener).not.toHaveBeenCalled(); @@ -244,7 +244,7 @@ describe("AutofillOverlayContentService", () => { autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); expect(autofillFieldElement.addEventListener).not.toHaveBeenCalled(); @@ -258,12 +258,12 @@ describe("AutofillOverlayContentService", () => { await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); expect(sendExtensionMessageSpy).toHaveBeenCalledWith("getAutofillOverlayVisibility"); expect(autofillOverlayContentService["autofillOverlayVisibility"]).toEqual( - AutofillOverlayVisibility.OnFieldFocus + AutofillOverlayVisibility.OnFieldFocus, ); }); @@ -273,11 +273,11 @@ describe("AutofillOverlayContentService", () => { await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); expect(autofillOverlayContentService["autofillOverlayVisibility"]).toEqual( - AutofillOverlayVisibility.OnFieldFocus + AutofillOverlayVisibility.OnFieldFocus, ); }); }); @@ -296,23 +296,23 @@ describe("AutofillOverlayContentService", () => { await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); expect(autofillFieldElement.removeEventListener).toHaveBeenNthCalledWith( 1, "input", - inputHandler + inputHandler, ); expect(autofillFieldElement.removeEventListener).toHaveBeenNthCalledWith( 2, "click", - clickHandler + clickHandler, ); expect(autofillFieldElement.removeEventListener).toHaveBeenNthCalledWith( 3, "focus", - focusHandler + focusHandler, ); }); @@ -320,7 +320,7 @@ describe("AutofillOverlayContentService", () => { beforeEach(async () => { await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); }); @@ -343,7 +343,7 @@ describe("AutofillOverlayContentService", () => { beforeEach(async () => { await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); jest.spyOn(globalThis.customElements, "define").mockImplementation(); }); @@ -359,7 +359,7 @@ describe("AutofillOverlayContentService", () => { it("repositions the overlay if autofill is not currently filling when the `Enter` key is pressed", () => { const handleOverlayRepositionEventSpy = jest.spyOn( autofillOverlayContentService as any, - "handleOverlayRepositionEvent" + "handleOverlayRepositionEvent", ); autofillOverlayContentService["isCurrentlyFilling"] = false; @@ -371,7 +371,7 @@ describe("AutofillOverlayContentService", () => { it("skips repositioning the overlay if autofill is currently filling when the `Enter` key is pressed", () => { const handleOverlayRepositionEventSpy = jest.spyOn( autofillOverlayContentService as any, - "handleOverlayRepositionEvent" + "handleOverlayRepositionEvent", ); autofillOverlayContentService["isCurrentlyFilling"] = true; @@ -384,11 +384,11 @@ describe("AutofillOverlayContentService", () => { jest.useFakeTimers(); const updateMostRecentlyFocusedFieldSpy = jest.spyOn( autofillOverlayContentService as any, - "updateMostRecentlyFocusedField" + "updateMostRecentlyFocusedField", ); const openAutofillOverlaySpy = jest.spyOn( autofillOverlayContentService as any, - "openAutofillOverlay" + "openAutofillOverlay", ); autofillOverlayContentService["isOverlayListVisible"] = false; @@ -420,13 +420,13 @@ describe("AutofillOverlayContentService", () => { it("ignores span elements that trigger the listener", async () => { const spanAutofillFieldElement = document.createElement( - "span" + "span", ) as ElementWithOpId; jest.spyOn(autofillOverlayContentService as any, "storeModifiedFormElement"); await autofillOverlayContentService.setupAutofillOverlayListenerOnField( spanAutofillFieldElement, - autofillFieldData + autofillFieldData, ); spanAutofillFieldElement.dispatchEvent(new Event("input")); @@ -437,28 +437,28 @@ describe("AutofillOverlayContentService", () => { it("stores the field as a user filled field if the form field data indicates that it is for a username", async () => { await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); autofillFieldElement.dispatchEvent(new Event("input")); expect(autofillOverlayContentService["userFilledFields"].username).toEqual( - autofillFieldElement + autofillFieldElement, ); }); it("stores the field as a user filled field if the form field is of type password", async () => { const passwordFieldElement = document.getElementById( - "password-field" + "password-field", ) as ElementWithOpId; await autofillOverlayContentService.setupAutofillOverlayListenerOnField( passwordFieldElement, - autofillFieldData + autofillFieldData, ); passwordFieldElement.dispatchEvent(new Event("input")); expect(autofillOverlayContentService["userFilledFields"].password).toEqual( - passwordFieldElement + passwordFieldElement, ); }); @@ -466,13 +466,13 @@ describe("AutofillOverlayContentService", () => { jest.spyOn(autofillOverlayContentService as any, "isUserAuthed").mockReturnValue(false); const removeAutofillOverlayListSpy = jest.spyOn( autofillOverlayContentService as any, - "removeAutofillOverlayList" + "removeAutofillOverlayList", ); (autofillFieldElement as HTMLInputElement).value = "test"; await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); autofillFieldElement.dispatchEvent(new Event("input")); @@ -484,13 +484,13 @@ describe("AutofillOverlayContentService", () => { autofillOverlayContentService["isOverlayCiphersPopulated"] = true; const removeAutofillOverlayListSpy = jest.spyOn( autofillOverlayContentService as any, - "removeAutofillOverlayList" + "removeAutofillOverlayList", ); (autofillFieldElement as HTMLInputElement).value = "test"; await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); autofillFieldElement.dispatchEvent(new Event("input")); @@ -503,7 +503,7 @@ describe("AutofillOverlayContentService", () => { await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); autofillFieldElement.dispatchEvent(new Event("input")); @@ -517,7 +517,7 @@ describe("AutofillOverlayContentService", () => { await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); autofillFieldElement.dispatchEvent(new Event("input")); @@ -532,7 +532,7 @@ describe("AutofillOverlayContentService", () => { await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); autofillFieldElement.dispatchEvent(new Event("input")); @@ -549,7 +549,7 @@ describe("AutofillOverlayContentService", () => { autofillOverlayContentService["isOverlayListVisible"] = false; await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); }); @@ -565,7 +565,7 @@ describe("AutofillOverlayContentService", () => { autofillFieldElement.dispatchEvent(new Event("click")); expect( - autofillOverlayContentService["triggerFormFieldFocusedAction"] + autofillOverlayContentService["triggerFormFieldFocusedAction"], ).not.toHaveBeenCalled(); }); @@ -575,7 +575,7 @@ describe("AutofillOverlayContentService", () => { autofillFieldElement.dispatchEvent(new Event("click")); expect( - autofillOverlayContentService["triggerFormFieldFocusedAction"] + autofillOverlayContentService["triggerFormFieldFocusedAction"], ).not.toHaveBeenCalled(); }); }); @@ -587,7 +587,7 @@ describe("AutofillOverlayContentService", () => { jest.spyOn(globalThis.customElements, "define").mockImplementation(); updateMostRecentlyFocusedFieldSpy = jest.spyOn( autofillOverlayContentService as any, - "updateMostRecentlyFocusedField" + "updateMostRecentlyFocusedField", ); autofillOverlayContentService["isCurrentlyFilling"] = false; }); @@ -599,7 +599,7 @@ describe("AutofillOverlayContentService", () => { AutofillOverlayVisibility.OnFieldFocus; await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); autofillFieldElement.dispatchEvent(new Event("focus")); @@ -610,14 +610,14 @@ describe("AutofillOverlayContentService", () => { it("updates the most recently focused field", async () => { await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); autofillFieldElement.dispatchEvent(new Event("focus")); expect(updateMostRecentlyFocusedFieldSpy).toHaveBeenCalledWith(autofillFieldElement); expect(autofillOverlayContentService["mostRecentlyFocusedField"]).toEqual( - autofillFieldElement + autofillFieldElement, ); }); @@ -627,7 +627,7 @@ describe("AutofillOverlayContentService", () => { AutofillOverlayVisibility.OnButtonClick; await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); autofillFieldElement.dispatchEvent(new Event("focus")); @@ -641,12 +641,12 @@ describe("AutofillOverlayContentService", () => { it("removes the overlay list if the form element has a value and the focused field is newly focused", async () => { autofillOverlayContentService["overlayListElement"] = document.createElement("div"); autofillOverlayContentService["mostRecentlyFocusedField"] = document.createElement( - "input" + "input", ) as ElementWithOpId; (autofillFieldElement as HTMLInputElement).value = "test"; await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); autofillFieldElement.dispatchEvent(new Event("focus")); @@ -664,7 +664,7 @@ describe("AutofillOverlayContentService", () => { AutofillOverlayVisibility.OnFieldFocus; await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); autofillFieldElement.dispatchEvent(new Event("focus")); @@ -681,7 +681,7 @@ describe("AutofillOverlayContentService", () => { jest.spyOn(autofillOverlayContentService as any, "isUserAuthed").mockReturnValue(true); await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); autofillFieldElement.dispatchEvent(new Event("focus")); @@ -697,7 +697,7 @@ describe("AutofillOverlayContentService", () => { autofillOverlayContentService["isOverlayCiphersPopulated"] = true; await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); autofillFieldElement.dispatchEvent(new Event("focus")); @@ -719,12 +719,12 @@ describe("AutofillOverlayContentService", () => { await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); expect(sendExtensionMessageSpy).toHaveBeenCalledWith("openAutofillOverlay"); expect(autofillOverlayContentService["mostRecentlyFocusedField"]).toEqual( - autofillFieldElement + autofillFieldElement, ); }); @@ -733,11 +733,11 @@ describe("AutofillOverlayContentService", () => { await autofillOverlayContentService.setupAutofillOverlayListenerOnField( autofillFieldElement, - autofillFieldData + autofillFieldData, ); expect(autofillOverlayContentService["mostRecentlyFocusedField"]).toEqual( - autofillFieldElement + autofillFieldElement, ); }); }); @@ -754,7 +754,7 @@ describe("AutofillOverlayContentService", () => { `; autofillFieldElement = document.getElementById( - "username-field" + "username-field", ) as ElementWithOpId; autofillFieldElement.opid = "op-1"; autofillOverlayContentService["mostRecentlyFocusedField"] = autofillFieldElement; @@ -776,7 +776,7 @@ describe("AutofillOverlayContentService", () => { }); const focusMostRecentOverlayFieldSpy = jest.spyOn( autofillOverlayContentService as any, - "focusMostRecentOverlayField" + "focusMostRecentOverlayField", ); autofillOverlayContentService["openAutofillOverlay"]({ isFocusingFieldElement: true }); @@ -792,7 +792,7 @@ describe("AutofillOverlayContentService", () => { }); const focusMostRecentOverlayFieldSpy = jest.spyOn( autofillOverlayContentService as any, - "focusMostRecentOverlayField" + "focusMostRecentOverlayField", ); autofillOverlayContentService["openAutofillOverlay"]({ isFocusingFieldElement: true }); @@ -866,7 +866,7 @@ describe("AutofillOverlayContentService", () => { describe("focusMostRecentOverlayField", () => { it("focuses the most recently focused overlay field", () => { const mostRecentlyFocusedField = document.createElement( - "input" + "input", ) as ElementWithOpId; autofillOverlayContentService["mostRecentlyFocusedField"] = mostRecentlyFocusedField; jest.spyOn(mostRecentlyFocusedField, "focus"); @@ -880,7 +880,7 @@ describe("AutofillOverlayContentService", () => { describe("blurMostRecentOverlayField", () => { it("removes focus from the most recently focused overlay field", () => { const mostRecentlyFocusedField = document.createElement( - "input" + "input", ) as ElementWithOpId; autofillOverlayContentService["mostRecentlyFocusedField"] = mostRecentlyFocusedField; jest.spyOn(mostRecentlyFocusedField, "blur"); @@ -906,7 +906,7 @@ describe("AutofillOverlayContentService", () => { beforeEach(() => { document.body.innerHTML = `
`; autofillOverlayContentService["overlayButtonElement"] = document.querySelector( - ".overlay-button" + ".overlay-button", ) as HTMLElement; }); @@ -933,7 +933,7 @@ describe("AutofillOverlayContentService", () => { jest.spyOn(globalThis, "removeEventListener"); const handleOverlayRepositionEventSpy = jest.spyOn( autofillOverlayContentService as any, - "handleOverlayRepositionEvent" + "handleOverlayRepositionEvent", ); autofillOverlayContentService.removeAutofillOverlay(); @@ -943,11 +943,11 @@ describe("AutofillOverlayContentService", () => { handleOverlayRepositionEventSpy, { capture: true, - } + }, ); expect(globalThis.removeEventListener).toHaveBeenCalledWith( EVENTS.RESIZE, - handleOverlayRepositionEventSpy + handleOverlayRepositionEventSpy, ); }); }); @@ -956,7 +956,7 @@ describe("AutofillOverlayContentService", () => { beforeEach(() => { document.body.innerHTML = `
`; autofillOverlayContentService["overlayListElement"] = document.querySelector( - ".overlay-list" + ".overlay-list", ) as HTMLElement; }); @@ -1011,10 +1011,10 @@ describe("AutofillOverlayContentService", () => { `; const usernameField = document.getElementById( - "username-field" + "username-field", ) as ElementWithOpId; const passwordField = document.getElementById( - "password-field" + "password-field", ) as ElementWithOpId; usernameField.value = "test-username"; passwordField.value = "test-password"; @@ -1054,11 +1054,11 @@ describe("AutofillOverlayContentService", () => {
`; autofillFieldElement = document.getElementById( - "username-field" + "username-field", ) as ElementWithOpId; autofillFieldElement.opid = "op-1"; previousFocusableElement = document.querySelector( - ".previous-focusable-element" + ".previous-focusable-element", ) as HTMLElement; nextFocusableElement = document.querySelector(".next-focusable-element") as HTMLElement; autofillFieldFocusSpy = jest.spyOn(autofillFieldElement, "focus"); @@ -1099,7 +1099,7 @@ describe("AutofillOverlayContentService", () => { jest.useFakeTimers(); const removeAutofillOverlaySpy = jest.spyOn( autofillOverlayContentService as any, - "removeAutofillOverlay" + "removeAutofillOverlay", ); autofillOverlayContentService.redirectOverlayFocusOut(RedirectFocusDirection.Current); @@ -1149,7 +1149,7 @@ describe("AutofillOverlayContentService", () => { `; const usernameField = document.getElementById( - "username-field" + "username-field", ) as ElementWithOpId; autofillOverlayContentService["mostRecentlyFocusedField"] = usernameField; autofillOverlayContentService["setOverlayRepositionEventListeners"](); @@ -1196,7 +1196,7 @@ describe("AutofillOverlayContentService", () => { .mockReturnValue(false); const removeAutofillOverlaySpy = jest.spyOn( autofillOverlayContentService as any, - "removeAutofillOverlay" + "removeAutofillOverlay", ); autofillOverlayContentService["mostRecentlyFocusedField"] = undefined; @@ -1225,7 +1225,7 @@ describe("AutofillOverlayContentService", () => { }); const clearUserInteractionEventTimeoutSpy = jest.spyOn( autofillOverlayContentService as any, - "clearUserInteractionEventTimeout" + "clearUserInteractionEventTimeout", ); globalThis.dispatchEvent(new Event(EVENTS.SCROLL)); @@ -1255,7 +1255,7 @@ describe("AutofillOverlayContentService", () => { }); const removeAutofillOverlaySpy = jest.spyOn( autofillOverlayContentService as any, - "removeAutofillOverlay" + "removeAutofillOverlay", ); globalThis.dispatchEvent(new Event(EVENTS.SCROLL)); @@ -1277,7 +1277,7 @@ describe("AutofillOverlayContentService", () => { `; usernameField = document.getElementById( - "username-field" + "username-field", ) as ElementWithOpId; usernameField.style.setProperty("display", "block", "important"); jest.spyOn(usernameField, "removeAttribute"); @@ -1285,7 +1285,7 @@ describe("AutofillOverlayContentService", () => { jest .spyOn( autofillOverlayContentService as any, - "isTriggeringExcessiveMutationObserverIterations" + "isTriggeringExcessiveMutationObserverIterations", ) .mockReturnValue(false); }); @@ -1294,7 +1294,7 @@ describe("AutofillOverlayContentService", () => { jest .spyOn( autofillOverlayContentService as any, - "isTriggeringExcessiveMutationObserverIterations" + "isTriggeringExcessiveMutationObserverIterations", ) .mockReturnValue(true); @@ -1344,7 +1344,7 @@ describe("AutofillOverlayContentService", () => { expect(usernameField.style.setProperty).toHaveBeenCalledWith( "position", "fixed", - "important" + "important", ); expect(usernameField.style.setProperty).toHaveBeenCalledWith("display", "block", "important"); }); @@ -1368,7 +1368,7 @@ describe("AutofillOverlayContentService", () => { jest .spyOn( autofillOverlayContentService as any, - "isTriggeringExcessiveMutationObserverIterations" + "isTriggeringExcessiveMutationObserverIterations", ) .mockReturnValue(false); }); @@ -1386,7 +1386,7 @@ describe("AutofillOverlayContentService", () => { jest .spyOn( autofillOverlayContentService as any, - "isTriggeringExcessiveMutationObserverIterations" + "isTriggeringExcessiveMutationObserverIterations", ) .mockReturnValue(true); @@ -1418,7 +1418,7 @@ describe("AutofillOverlayContentService", () => { expect(globalThis.document.body.insertBefore).toHaveBeenCalledWith( overlayButtonElement, - overlayListElement + overlayListElement, ); }); @@ -1429,7 +1429,7 @@ describe("AutofillOverlayContentService", () => { expect(globalThis.document.body.insertBefore).toHaveBeenCalledWith( overlayButtonElement, - overlayListElement + overlayListElement, ); }); @@ -1441,7 +1441,7 @@ describe("AutofillOverlayContentService", () => { expect(globalThis.document.body.insertBefore).toHaveBeenCalledWith( injectedElement, - overlayButtonElement + overlayButtonElement, ); }); }); @@ -1465,7 +1465,7 @@ describe("AutofillOverlayContentService", () => { jest .spyOn( autofillOverlayContentService as any, - "isTriggeringExcessiveMutationObserverIterations" + "isTriggeringExcessiveMutationObserverIterations", ) .mockReturnValue(false); }); @@ -1485,7 +1485,7 @@ describe("AutofillOverlayContentService", () => { jest .spyOn( autofillOverlayContentService as any, - "isTriggeringExcessiveMutationObserverIterations" + "isTriggeringExcessiveMutationObserverIterations", ) .mockReturnValue(true); @@ -1551,7 +1551,7 @@ describe("AutofillOverlayContentService", () => { const clearTimeoutSpy = jest.spyOn(globalThis, "clearTimeout"); autofillOverlayContentService["mutationObserverIterationsResetTimeout"] = setTimeout( jest.fn(), - 123 + 123, ); autofillOverlayContentService["isTriggeringExcessiveMutationObserverIterations"](); @@ -1573,11 +1573,11 @@ describe("AutofillOverlayContentService", () => { autofillOverlayContentService["mutationObserverIterations"] = 101; const blurMostRecentOverlayFieldSpy = jest.spyOn( autofillOverlayContentService as any, - "blurMostRecentOverlayField" + "blurMostRecentOverlayField", ); const removeAutofillOverlaySpy = jest.spyOn( autofillOverlayContentService as any, - "removeAutofillOverlay" + "removeAutofillOverlay", ); autofillOverlayContentService["isTriggeringExcessiveMutationObserverIterations"](); diff --git a/apps/browser/src/autofill/services/autofill-overlay-content.service.ts b/apps/browser/src/autofill/services/autofill-overlay-content.service.ts index fc1136a368b..9e5acae887c 100644 --- a/apps/browser/src/autofill/services/autofill-overlay-content.service.ts +++ b/apps/browser/src/autofill/services/autofill-overlay-content.service.ts @@ -80,7 +80,7 @@ class AutofillOverlayContentService implements AutofillOverlayContentServiceInte */ async setupAutofillOverlayListenerOnField( formFieldElement: ElementWithOpId, - autofillFieldData: AutofillField + autofillFieldData: AutofillField, ) { if (this.isIgnoredField(autofillFieldData)) { return; @@ -241,7 +241,7 @@ class AutofillOverlayContentService implements AutofillOverlayContentServiceInte } const focusedElementIndex = this.focusableElements.findIndex( - (element) => element === this.mostRecentlyFocusedField + (element) => element === this.mostRecentlyFocusedField, ); const indexOffset = direction === RedirectFocusDirection.Previous ? -1 : 1; @@ -263,15 +263,15 @@ class AutofillOverlayContentService implements AutofillOverlayContentServiceInte formFieldElement.addEventListener(EVENTS.KEYUP, this.handleFormFieldKeyupEvent); formFieldElement.addEventListener( EVENTS.INPUT, - this.handleFormFieldInputEvent(formFieldElement) + this.handleFormFieldInputEvent(formFieldElement), ); formFieldElement.addEventListener( EVENTS.CLICK, - this.handleFormFieldClickEvent(formFieldElement) + this.handleFormFieldClickEvent(formFieldElement), ); formFieldElement.addEventListener( EVENTS.FOCUS, - this.handleFormFieldFocusEvent(formFieldElement) + this.handleFormFieldFocusEvent(formFieldElement), ); } @@ -314,7 +314,7 @@ class AutofillOverlayContentService implements AutofillOverlayContentServiceInte */ private getFormFieldHandlerMemoIndex( formFieldElement: ElementWithOpId, - event: string + event: string, ) { return `${formFieldElement.opid}-${formFieldElement.id}-${event}-handler`; } @@ -381,7 +381,7 @@ class AutofillOverlayContentService implements AutofillOverlayContentServiceInte private handleFormFieldInputEvent = (formFieldElement: ElementWithOpId) => { return this.useEventHandlersMemo( () => this.triggerFormFieldInput(formFieldElement), - this.getFormFieldHandlerMemoIndex(formFieldElement, EVENTS.INPUT) + this.getFormFieldHandlerMemoIndex(formFieldElement, EVENTS.INPUT), ); }; @@ -436,7 +436,7 @@ class AutofillOverlayContentService implements AutofillOverlayContentServiceInte private handleFormFieldClickEvent = (formFieldElement: ElementWithOpId) => { return this.useEventHandlersMemo( () => this.triggerFormFieldClickedAction(formFieldElement), - this.getFormFieldHandlerMemoIndex(formFieldElement, EVENTS.CLICK) + this.getFormFieldHandlerMemoIndex(formFieldElement, EVENTS.CLICK), ); }; @@ -462,7 +462,7 @@ class AutofillOverlayContentService implements AutofillOverlayContentServiceInte private handleFormFieldFocusEvent = (formFieldElement: ElementWithOpId) => { return this.useEventHandlersMemo( () => this.triggerFormFieldFocusedAction(formFieldElement), - this.getFormFieldHandlerMemoIndex(formFieldElement, EVENTS.FOCUS) + this.getFormFieldHandlerMemoIndex(formFieldElement, EVENTS.FOCUS), ); }; @@ -637,13 +637,12 @@ class AutofillOverlayContentService implements AutofillOverlayContentServiceInte * @param formFieldElement - The form field element that triggered the focus event. */ private async updateMostRecentlyFocusedField( - formFieldElement: ElementWithOpId + formFieldElement: ElementWithOpId, ) { this.mostRecentlyFocusedField = formFieldElement; const { paddingRight, paddingLeft } = globalThis.getComputedStyle(formFieldElement); - const { width, height, top, left } = await this.getMostRecentlyFocusedFieldRects( - formFieldElement - ); + const { width, height, top, left } = + await this.getMostRecentlyFocusedFieldRects(formFieldElement); this.focusedFieldData = { focusedFieldStyles: { paddingRight, paddingLeft }, focusedFieldRects: { width, height, top, left }, @@ -664,11 +663,10 @@ class AutofillOverlayContentService implements AutofillOverlayContentServiceInte * @param formFieldElement - The form field element that triggered the focus event. */ private async getMostRecentlyFocusedFieldRects( - formFieldElement: ElementWithOpId + formFieldElement: ElementWithOpId, ) { - const focusedFieldRects = await this.getBoundingClientRectFromIntersectionObserver( - formFieldElement - ); + const focusedFieldRects = + await this.getBoundingClientRectFromIntersectionObserver(formFieldElement); if (focusedFieldRects) { return focusedFieldRects; } @@ -682,7 +680,7 @@ class AutofillOverlayContentService implements AutofillOverlayContentServiceInte * @param formFieldElement - The form field element that triggered the focus event. */ private async getBoundingClientRectFromIntersectionObserver( - formFieldElement: ElementWithOpId + formFieldElement: ElementWithOpId, ): Promise { if (!("IntersectionObserver" in window) && !("IntersectionObserverEntry" in window)) { return null; @@ -703,7 +701,7 @@ class AutofillOverlayContentService implements AutofillOverlayContentServiceInte root: globalThis.document.body, rootMargin: "0px", threshold: 0.9999, // Safari doesn't seem to function properly with a threshold of 1 - } + }, ); intersectionObserver.observe(formFieldElement); }); @@ -896,15 +894,15 @@ class AutofillOverlayContentService implements AutofillOverlayContentServiceInte */ private setupMutationObserver = () => { this.overlayElementsMutationObserver = new MutationObserver( - this.handleOverlayElementMutationObserverUpdate + this.handleOverlayElementMutationObserverUpdate, ); this.bodyElementMutationObserver = new MutationObserver( - this.handleBodyElementMutationObserverUpdate + this.handleBodyElementMutationObserverUpdate, ); const documentElementMutationObserver = new MutationObserver( - this.handleDocumentElementMutationObserverUpdate + this.handleDocumentElementMutationObserverUpdate, ); documentElementMutationObserver.observe(globalThis.document.documentElement, { childList: true, @@ -1095,7 +1093,7 @@ class AutofillOverlayContentService implements AutofillOverlayContentServiceInte this.mutationObserverIterations++; this.mutationObserverIterationsResetTimeout = setTimeout( () => (this.mutationObserverIterations = 0), - 2000 + 2000, ); if (this.mutationObserverIterations > 100) { diff --git a/apps/browser/src/autofill/services/autofill.service.spec.ts b/apps/browser/src/autofill/services/autofill.service.spec.ts index c4bea144d2b..aa9232c791f 100644 --- a/apps/browser/src/autofill/services/autofill.service.spec.ts +++ b/apps/browser/src/autofill/services/autofill.service.spec.ts @@ -63,7 +63,7 @@ describe("AutofillService", () => { eventCollectionService, logService, settingsService, - userVerificationService + userVerificationService, ); }); @@ -178,7 +178,7 @@ describe("AutofillService", () => { true, true, false, - true + true, ); expect(formData).toStrictEqual([]); }); @@ -280,7 +280,7 @@ describe("AutofillService", () => { passwordInputField, true, true, - false + false, ); expect(formData).toStrictEqual([ { @@ -415,7 +415,7 @@ describe("AutofillService", () => { cipher: autofillOptions.cipher, tabUrl: autofillOptions.tab.url, defaultUriMatch: 0, - } + }, ); expect(autofillService["generateLoginFillScript"]).toHaveBeenCalled(); expect(logService.info).not.toHaveBeenCalled(); @@ -448,11 +448,11 @@ describe("AutofillService", () => { { frameId: currentAutofillPageDetails.frameId, }, - expect.any(Function) + expect.any(Function), ); expect(eventCollectionService.collect).toHaveBeenCalledWith( EventType.Cipher_ClientAutofilled, - autofillOptions.cipher.id + autofillOptions.cipher.id, ); expect(autofillResult).toBeNull(); }); @@ -479,7 +479,7 @@ describe("AutofillService", () => { expect(chrome.tabs.sendMessage).toHaveBeenCalled(); expect(eventCollectionService.collect).toHaveBeenCalledWith( EventType.Cipher_ClientAutofilled, - autofillOptions.cipher.id + autofillOptions.cipher.id, ); }); @@ -507,7 +507,7 @@ describe("AutofillService", () => { expect(chrome.tabs.sendMessage).toHaveBeenCalled(); expect(eventCollectionService.collect).toHaveBeenCalledWith( EventType.Cipher_ClientAutofilled, - autofillOptions.cipher.id + autofillOptions.cipher.id, ); }); @@ -521,7 +521,7 @@ describe("AutofillService", () => { triggerTestFailure(); } catch (error) { expect(logService.info).toHaveBeenCalledWith( - "Auto-fill on page load was blocked due to an untrusted iframe." + "Auto-fill on page load was blocked due to an untrusted iframe.", ); expect(error.message).toBe(didNotAutofillError); } @@ -535,7 +535,7 @@ describe("AutofillService", () => { await autofillService.doAutoFill(autofillOptions); expect(logService.info).not.toHaveBeenCalledWith( - "Auto-fill on page load was blocked due to an untrusted iframe." + "Auto-fill on page load was blocked due to an untrusted iframe.", ); }); @@ -891,7 +891,7 @@ describe("AutofillService", () => { const result = await autofillService.doAutoFillActiveTab( pageDetails, fromCommand, - CipherType.Login + CipherType.Login, ); expect(autofillService["getActiveTab"]).toHaveBeenCalled(); @@ -981,7 +981,7 @@ describe("AutofillService", () => { await autofillService.doAutoFillActiveTab( identityFormPageDetails, false, - CipherType.Identity + CipherType.Identity, ); expect(autofillService["cipherService"].getAllDecryptedForUrl).toHaveBeenCalled(); @@ -1066,7 +1066,7 @@ describe("AutofillService", () => { it("returns null if the page details are not provided", async () => { const value = await autofillService["generateFillScript"]( undefined, - generateFillScriptOptions + generateFillScriptOptions, ); expect(value).toBeNull(); @@ -1077,7 +1077,7 @@ describe("AutofillService", () => { const value = await autofillService["generateFillScript"]( pageDetail, - generateFillScriptOptions + generateFillScriptOptions, ); expect(value).toBeNull(); @@ -1101,7 +1101,7 @@ describe("AutofillService", () => { expect(AutofillService.fillByOpid).not.toHaveBeenCalledWith( expect.anything(), duplicateUsernameField, - duplicateUsernameField.value + duplicateUsernameField.value, ); }); @@ -1114,7 +1114,7 @@ describe("AutofillService", () => { expect(AutofillService.fillByOpid).not.toHaveBeenCalledWith( expect.anything(), defaultUsernameField, - defaultUsernameField.value + defaultUsernameField.value, ); }); @@ -1129,7 +1129,7 @@ describe("AutofillService", () => { 1, expect.anything(), defaultUsernameField, - defaultUsernameField.value + defaultUsernameField.value, ); }); @@ -1142,7 +1142,7 @@ describe("AutofillService", () => { expect(AutofillService.fillByOpid).not.toHaveBeenCalledWith( expect.anything(), defaultUsernameField, - defaultUsernameField.value + defaultUsernameField.value, ); }); @@ -1159,13 +1159,13 @@ describe("AutofillService", () => { 1, expect.anything(), defaultUsernameField, - defaultUsernameField.value + defaultUsernameField.value, ); expect(AutofillService.fillByOpid).toHaveBeenNthCalledWith( 2, expect.anything(), defaultPasswordField, - defaultPasswordField.value + defaultPasswordField.value, ); }); @@ -1183,19 +1183,19 @@ describe("AutofillService", () => { expect(generateFillScriptOptions.cipher.linkedFieldValue).toHaveBeenCalledTimes(1); expect(generateFillScriptOptions.cipher.linkedFieldValue).toHaveBeenCalledWith( - fieldLinkedId + fieldLinkedId, ); expect(AutofillService.fillByOpid).toHaveBeenNthCalledWith( 1, expect.anything(), defaultUsernameField, - linkedFieldValue + linkedFieldValue, ); expect(AutofillService.fillByOpid).toHaveBeenNthCalledWith( 2, expect.anything(), defaultPasswordField, - defaultPasswordField.value + defaultPasswordField.value, ); }); @@ -1212,7 +1212,7 @@ describe("AutofillService", () => { 1, expect.anything(), defaultUsernameField, - defaultUsernameFieldView.value + defaultUsernameFieldView.value, ); }); @@ -1227,7 +1227,7 @@ describe("AutofillService", () => { 1, expect.anything(), defaultUsernameField, - "false" + "false", ); }); }); @@ -1235,7 +1235,7 @@ describe("AutofillService", () => { it("returns a fill script generated for a login autofill", async () => { const fillScriptMock = createAutofillScriptMock( {}, - { "username-field": "username-value", "password-value": "password-value" } + { "username-field": "username-value", "password-value": "password-value" }, ); generateFillScriptOptions.cipher.type = CipherType.Login; jest @@ -1244,7 +1244,7 @@ describe("AutofillService", () => { const value = await autofillService["generateFillScript"]( pageDetail, - generateFillScriptOptions + generateFillScriptOptions, ); expect(autofillService["generateLoginFillScript"]).toHaveBeenCalledWith( @@ -1266,7 +1266,7 @@ describe("AutofillService", () => { "password-field": defaultPasswordField, "username-field": defaultUsernameField, }, - generateFillScriptOptions + generateFillScriptOptions, ); expect(value).toBe(fillScriptMock); }); @@ -1274,7 +1274,7 @@ describe("AutofillService", () => { it("returns a fill script generated for a card autofill", async () => { const fillScriptMock = createAutofillScriptMock( {}, - { "first-name-field": "first-name-value", "last-name-value": "last-name-value" } + { "first-name-field": "first-name-value", "last-name-value": "last-name-value" }, ); generateFillScriptOptions.cipher.type = CipherType.Card; jest @@ -1283,7 +1283,7 @@ describe("AutofillService", () => { const value = await autofillService["generateFillScript"]( pageDetail, - generateFillScriptOptions + generateFillScriptOptions, ); expect(autofillService["generateCardFillScript"]).toHaveBeenCalledWith( @@ -1305,7 +1305,7 @@ describe("AutofillService", () => { "password-field": defaultPasswordField, "username-field": defaultUsernameField, }, - generateFillScriptOptions + generateFillScriptOptions, ); expect(value).toBe(fillScriptMock); }); @@ -1313,7 +1313,7 @@ describe("AutofillService", () => { it("returns a fill script generated for an identity autofill", async () => { const fillScriptMock = createAutofillScriptMock( {}, - { "first-name-field": "first-name-value", "last-name-value": "last-name-value" } + { "first-name-field": "first-name-value", "last-name-value": "last-name-value" }, ); generateFillScriptOptions.cipher.type = CipherType.Identity; jest @@ -1322,7 +1322,7 @@ describe("AutofillService", () => { const value = await autofillService["generateFillScript"]( pageDetail, - generateFillScriptOptions + generateFillScriptOptions, ); expect(autofillService["generateIdentityFillScript"]).toHaveBeenCalledWith( @@ -1344,7 +1344,7 @@ describe("AutofillService", () => { "password-field": defaultPasswordField, "username-field": defaultUsernameField, }, - generateFillScriptOptions + generateFillScriptOptions, ); expect(value).toBe(fillScriptMock); }); @@ -1354,7 +1354,7 @@ describe("AutofillService", () => { const value = await autofillService["generateFillScript"]( pageDetail, - generateFillScriptOptions + generateFillScriptOptions, ); expect(value).toBeNull(); @@ -1412,7 +1412,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(autofillService["inUntrustedIframe"]).not.toHaveBeenCalled(); @@ -1432,7 +1432,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value.savedUrls).toStrictEqual([]); @@ -1451,7 +1451,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value.savedUrls).toStrictEqual([ @@ -1475,7 +1475,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value.savedUrls).toStrictEqual([defaultLoginUriView.uri, secondUriView.uri]); @@ -1542,7 +1542,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService.loadPasswordFields).toHaveBeenCalledTimes(2); @@ -1552,7 +1552,7 @@ describe("AutofillService", () => { false, false, options.onlyEmptyFields, - options.fillNewPassword + options.fillNewPassword, ); expect(AutofillService.loadPasswordFields).toHaveBeenNthCalledWith( 2, @@ -1560,7 +1560,7 @@ describe("AutofillService", () => { true, true, options.onlyEmptyFields, - options.fillNewPassword + options.fillNewPassword, ); }); @@ -1579,7 +1579,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(autofillService["findUsernameField"]).toHaveBeenCalledTimes(2); @@ -1589,7 +1589,7 @@ describe("AutofillService", () => { passwordField, false, false, - false + false, ); expect(autofillService["findUsernameField"]).toHaveBeenNthCalledWith( 2, @@ -1597,7 +1597,7 @@ describe("AutofillService", () => { passwordField, true, true, - false + false, ); }); @@ -1608,7 +1608,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(autofillService["findUsernameField"]).toHaveBeenCalledTimes(1); @@ -1618,7 +1618,7 @@ describe("AutofillService", () => { passwordField, false, false, - false + false, ); expect(autofillService["findUsernameField"]).not.toHaveBeenNthCalledWith( 2, @@ -1626,7 +1626,7 @@ describe("AutofillService", () => { passwordField, true, true, - false + false, ); }); @@ -1636,7 +1636,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(autofillService["findTotpField"]).toHaveBeenCalledTimes(2); @@ -1646,7 +1646,7 @@ describe("AutofillService", () => { passwordField, false, false, - false + false, ); expect(autofillService["findTotpField"]).toHaveBeenNthCalledWith( 2, @@ -1654,7 +1654,7 @@ describe("AutofillService", () => { passwordField, true, true, - false + false, ); }); @@ -1666,7 +1666,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(autofillService["findTotpField"]).toHaveBeenCalledTimes(1); @@ -1676,7 +1676,7 @@ describe("AutofillService", () => { passwordField, false, false, - false + false, ); expect(autofillService["findTotpField"]).not.toHaveBeenNthCalledWith( 2, @@ -1684,7 +1684,7 @@ describe("AutofillService", () => { passwordField, true, true, - false + false, ); }); @@ -1695,7 +1695,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(autofillService["findTotpField"]).not.toHaveBeenCalled(); @@ -1714,7 +1714,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(autofillService["findUsernameField"]).toHaveBeenCalledTimes(1); @@ -1723,7 +1723,7 @@ describe("AutofillService", () => { passwordField, false, false, - true + true, ); }); @@ -1735,7 +1735,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(autofillService["findUsernameField"]).toHaveBeenCalledTimes(2); @@ -1745,7 +1745,7 @@ describe("AutofillService", () => { passwordField, false, false, - true + true, ); expect(autofillService["findUsernameField"]).toHaveBeenNthCalledWith( 2, @@ -1753,7 +1753,7 @@ describe("AutofillService", () => { passwordField, true, true, - true + true, ); }); @@ -1766,7 +1766,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(autofillService["findUsernameField"]).toHaveBeenCalledTimes(1); @@ -1776,7 +1776,7 @@ describe("AutofillService", () => { passwordField, false, false, - true + true, ); expect(autofillService["findUsernameField"]).not.toHaveBeenNthCalledWith( 2, @@ -1784,7 +1784,7 @@ describe("AutofillService", () => { passwordField, true, true, - true + true, ); }); @@ -1795,7 +1795,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(autofillService["findTotpField"]).toHaveBeenCalledTimes(1); @@ -1804,7 +1804,7 @@ describe("AutofillService", () => { passwordField, false, false, - true + true, ); }); @@ -1818,7 +1818,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(autofillService["findTotpField"]).toHaveBeenCalledTimes(2); @@ -1828,7 +1828,7 @@ describe("AutofillService", () => { passwordField, false, false, - true + true, ); expect(autofillService["findTotpField"]).toHaveBeenNthCalledWith( 2, @@ -1836,7 +1836,7 @@ describe("AutofillService", () => { passwordField, true, true, - true + true, ); }); }); @@ -1913,40 +1913,40 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService.fieldIsFuzzyMatch).toHaveBeenCalledTimes(4); expect(AutofillService.fieldIsFuzzyMatch).toHaveBeenNthCalledWith( 1, usernameField, - AutoFillConstants.UsernameFieldNames + AutoFillConstants.UsernameFieldNames, ); expect(AutofillService.fieldIsFuzzyMatch).toHaveBeenNthCalledWith( 2, emailField, - AutoFillConstants.UsernameFieldNames + AutoFillConstants.UsernameFieldNames, ); expect(AutofillService.fieldIsFuzzyMatch).toHaveBeenNthCalledWith( 3, telephoneField, - AutoFillConstants.UsernameFieldNames + AutoFillConstants.UsernameFieldNames, ); expect(AutofillService.fieldIsFuzzyMatch).toHaveBeenNthCalledWith( 4, totpField, - AutoFillConstants.UsernameFieldNames + AutoFillConstants.UsernameFieldNames, ); expect(AutofillService.fieldIsFuzzyMatch).not.toHaveBeenNthCalledWith( 5, nonViewableField, - AutoFillConstants.UsernameFieldNames + AutoFillConstants.UsernameFieldNames, ); expect(AutofillService.fillByOpid).toHaveBeenCalledTimes(1); expect(AutofillService.fillByOpid).toHaveBeenCalledWith( fillScript, usernameField, - options.cipher.login.username + options.cipher.login.username, ); }); @@ -1957,12 +1957,12 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService.fieldIsFuzzyMatch).not.toHaveBeenCalledWith( expect.anything(), - AutoFillConstants.UsernameFieldNames + AutoFillConstants.UsernameFieldNames, ); }); @@ -1973,12 +1973,12 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService.fieldIsFuzzyMatch).toHaveBeenCalledWith( expect.anything(), - AutoFillConstants.TotpFieldNames + AutoFillConstants.TotpFieldNames, ); }); @@ -1989,12 +1989,12 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService.fieldIsFuzzyMatch).not.toHaveBeenCalledWith( expect.anything(), - AutoFillConstants.TotpFieldNames + AutoFillConstants.TotpFieldNames, ); }); }); @@ -2006,7 +2006,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value.untrustedIframe).toBe(true); @@ -2024,7 +2024,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(autofillService["inUntrustedIframe"]).toHaveBeenCalledWith(pageDetails.url, options); @@ -2033,14 +2033,14 @@ describe("AutofillService", () => { false, false, options.onlyEmptyFields, - options.fillNewPassword + options.fillNewPassword, ); expect(autofillService["findUsernameField"]).toHaveBeenCalledWith( pageDetails, passwordField, false, false, - false + false, ); expect(AutofillService.fieldIsFuzzyMatch).not.toHaveBeenCalled(); expect(AutofillService.fillByOpid).toHaveBeenCalledTimes(2); @@ -2048,17 +2048,17 @@ describe("AutofillService", () => { 1, fillScript, usernameField, - options.cipher.login.username + options.cipher.login.username, ); expect(AutofillService.fillByOpid).toHaveBeenNthCalledWith( 2, fillScript, passwordField, - options.cipher.login.password + options.cipher.login.password, ); expect(AutofillService.setFillScriptForFocus).toHaveBeenCalledWith( filledFields, - fillScript + fillScript, ); expect(value).toStrictEqual({ autosubmit: null, @@ -2138,7 +2138,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value).toBeNull(); @@ -2171,7 +2171,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService.forCustomFieldsOnly).toHaveBeenCalledWith(spanField); @@ -2196,13 +2196,13 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService.forCustomFieldsOnly).toHaveBeenCalledWith(invalidField); expect(autofillService["isExcludedType"]).toHaveBeenCalledWith( invalidField.type, - AutoFillConstants.ExcludedAutofillTypes + AutoFillConstants.ExcludedAutofillTypes, ); expect(value).toStrictEqual(unmodifiedFillScriptValues); }); @@ -2225,7 +2225,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService.forCustomFieldsOnly).toHaveBeenCalledWith(notViewableField); @@ -2328,7 +2328,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService.forCustomFieldsOnly).toHaveBeenCalledTimes(6); @@ -2413,7 +2413,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value.script[2]).toStrictEqual(["fill_by_opid", expMonthField.opid, testValue]); @@ -2428,7 +2428,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value.script[2]).toStrictEqual(["fill_by_opid", expMonthField.opid, testValue]); @@ -2443,7 +2443,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value.script[2]).toStrictEqual(["fill_by_opid", expMonthField.opid, testValue]); @@ -2459,7 +2459,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value.script[2]).toStrictEqual(["fill_by_opid", expMonthField.opid, "05"]); @@ -2499,7 +2499,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value.script[2]).toStrictEqual(["fill_by_opid", expYearField.opid, someTestValue]); @@ -2510,7 +2510,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value.script[2]).toStrictEqual(["fill_by_opid", expYearField.opid, someTestValue]); @@ -2525,7 +2525,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value.script[2]).toStrictEqual(["fill_by_opid", expYearField.opid, yearValue]); @@ -2541,7 +2541,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value.script[2]).toStrictEqual([ @@ -2562,7 +2562,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value.script[2]).toStrictEqual([ @@ -2583,7 +2583,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value.script[2]).toStrictEqual(["fill_by_opid", expYearField.opid, yearValue]); @@ -2637,7 +2637,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value.script[2]).toStrictEqual(["fill_by_opid", "expirationDate", dateFormat[1]]); @@ -2649,7 +2649,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value.script[2]).toStrictEqual(["fill_by_opid", "expirationDate", "2024-05"]); @@ -2686,7 +2686,7 @@ describe("AutofillService", () => { expect(generateFillScriptOptions.cipher.login.matchesUri).toHaveBeenCalledWith( pageUrl, equivalentDomains, - generateFillScriptOptions.defaultUriMatch + generateFillScriptOptions.defaultUriMatch, ); expect(result).toBe(false); }); @@ -2705,7 +2705,7 @@ describe("AutofillService", () => { expect(generateFillScriptOptions.cipher.login.matchesUri).toHaveBeenCalledWith( pageUrl, equivalentDomains, - generateFillScriptOptions.defaultUriMatch + generateFillScriptOptions.defaultUriMatch, ); expect(result).toBe(true); }); @@ -2765,7 +2765,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(value).toBeNull(); @@ -2795,7 +2795,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService.forCustomFieldsOnly).toHaveBeenCalledWith(customField); @@ -2812,13 +2812,13 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService.forCustomFieldsOnly).toHaveBeenCalledWith(excludedField); expect(autofillService["isExcludedType"]).toHaveBeenCalledWith( excludedField.type, - AutoFillConstants.ExcludedAutofillTypes + AutoFillConstants.ExcludedAutofillTypes, ); expect(AutofillService["isFieldMatch"]).not.toHaveBeenCalled(); expect(value.script).toStrictEqual([]); @@ -2832,7 +2832,7 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService.forCustomFieldsOnly).toHaveBeenCalledWith(viewableField); @@ -2852,19 +2852,19 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( fullNameField.htmlName, IdentityAutoFillConstants.FullNameFieldNames, - IdentityAutoFillConstants.FullNameFieldNameValues + IdentityAutoFillConstants.FullNameFieldNameValues, ); expect(autofillService["makeScriptActionWithValue"]).toHaveBeenCalledWith( fillScript, `${firstName} ${middleName} ${lastName}`, fullNameField, - filledFields + filledFields, ); expect(value.script[2]).toStrictEqual([ "fill_by_opid", @@ -2884,19 +2884,19 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( fullNameField.htmlName, IdentityAutoFillConstants.FullNameFieldNames, - IdentityAutoFillConstants.FullNameFieldNameValues + IdentityAutoFillConstants.FullNameFieldNameValues, ); expect(autofillService["makeScriptActionWithValue"]).toHaveBeenCalledWith( fillScript, lastName, fullNameField, - filledFields + filledFields, ); expect(value.script[2]).toStrictEqual(["fill_by_opid", fullNameField.opid, lastName]); }); @@ -2920,41 +2920,41 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( firstNameField.htmlName, - IdentityAutoFillConstants.FirstnameFieldNames + IdentityAutoFillConstants.FirstnameFieldNames, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( middleNameField.htmlName, - IdentityAutoFillConstants.MiddlenameFieldNames + IdentityAutoFillConstants.MiddlenameFieldNames, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( lastNameField.htmlName, - IdentityAutoFillConstants.LastnameFieldNames + IdentityAutoFillConstants.LastnameFieldNames, ); expect(autofillService["makeScriptAction"]).toHaveBeenCalledWith( fillScript, options.cipher.identity, expect.anything(), filledFields, - firstNameField.opid + firstNameField.opid, ); expect(autofillService["makeScriptAction"]).toHaveBeenCalledWith( fillScript, options.cipher.identity, expect.anything(), filledFields, - middleNameField.opid + middleNameField.opid, ); expect(autofillService["makeScriptAction"]).toHaveBeenCalledWith( fillScript, options.cipher.identity, expect.anything(), filledFields, - lastNameField.opid + lastNameField.opid, ); expect(value.script[2]).toStrictEqual(["fill_by_opid", firstNameField.opid, firstName]); expect(value.script[5]).toStrictEqual(["fill_by_opid", middleNameField.opid, middleName]); @@ -2974,30 +2974,30 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( titleField.htmlName, - IdentityAutoFillConstants.TitleFieldNames + IdentityAutoFillConstants.TitleFieldNames, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( emailField.htmlName, - IdentityAutoFillConstants.EmailFieldNames + IdentityAutoFillConstants.EmailFieldNames, ); expect(autofillService["makeScriptAction"]).toHaveBeenCalledWith( fillScript, options.cipher.identity, expect.anything(), filledFields, - titleField.opid + titleField.opid, ); expect(autofillService["makeScriptAction"]).toHaveBeenCalledWith( fillScript, options.cipher.identity, expect.anything(), filledFields, - emailField.opid + emailField.opid, ); expect(value.script[2]).toStrictEqual(["fill_by_opid", titleField.opid, title]); expect(value.script[5]).toStrictEqual(["fill_by_opid", emailField.opid, email]); @@ -3020,19 +3020,19 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( fullAddressField.htmlName, IdentityAutoFillConstants.AddressFieldNames, - IdentityAutoFillConstants.AddressFieldNameValues + IdentityAutoFillConstants.AddressFieldNameValues, ); expect(autofillService["makeScriptActionWithValue"]).toHaveBeenCalledWith( fillScript, `${address1}, ${address2}, ${address3}`, fullAddressField, - filledFields + filledFields, ); expect(value.script[2]).toStrictEqual([ "fill_by_opid", @@ -3092,48 +3092,48 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( address1Field.htmlName, - IdentityAutoFillConstants.Address1FieldNames + IdentityAutoFillConstants.Address1FieldNames, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( address2Field.htmlName, - IdentityAutoFillConstants.Address2FieldNames + IdentityAutoFillConstants.Address2FieldNames, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( address3Field.htmlName, - IdentityAutoFillConstants.Address3FieldNames + IdentityAutoFillConstants.Address3FieldNames, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( postalCodeField.htmlName, - IdentityAutoFillConstants.PostalCodeFieldNames + IdentityAutoFillConstants.PostalCodeFieldNames, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( cityField.htmlName, - IdentityAutoFillConstants.CityFieldNames + IdentityAutoFillConstants.CityFieldNames, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( stateField.htmlName, - IdentityAutoFillConstants.StateFieldNames + IdentityAutoFillConstants.StateFieldNames, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( countryField.htmlName, - IdentityAutoFillConstants.CountryFieldNames + IdentityAutoFillConstants.CountryFieldNames, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( phoneField.htmlName, - IdentityAutoFillConstants.PhoneFieldNames + IdentityAutoFillConstants.PhoneFieldNames, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( usernameField.htmlName, - IdentityAutoFillConstants.UserNameFieldNames + IdentityAutoFillConstants.UserNameFieldNames, ); expect(AutofillService["isFieldMatch"]).toHaveBeenCalledWith( companyField.htmlName, - IdentityAutoFillConstants.CompanyFieldNames + IdentityAutoFillConstants.CompanyFieldNames, ); expect(autofillService["makeScriptAction"]).toHaveBeenCalled(); expect(value.script[2]).toStrictEqual(["fill_by_opid", address1Field.opid, address1]); @@ -3158,14 +3158,14 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(autofillService["makeScriptActionWithValue"]).toHaveBeenCalledWith( fillScript, "CA", expect.anything(), - expect.anything() + expect.anything(), ); expect(value.script[2]).toStrictEqual(["fill_by_opid", stateField.opid, "CA"]); }); @@ -3180,14 +3180,14 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(autofillService["makeScriptActionWithValue"]).toHaveBeenCalledWith( fillScript, "ON", expect.anything(), - expect.anything() + expect.anything(), ); expect(value.script[2]).toStrictEqual(["fill_by_opid", stateField.opid, "ON"]); }); @@ -3202,14 +3202,14 @@ describe("AutofillService", () => { fillScript, pageDetails, filledFields, - options + options, ); expect(autofillService["makeScriptActionWithValue"]).toHaveBeenCalledWith( fillScript, "SO", expect.anything(), - expect.anything() + expect.anything(), ); expect(value.script[2]).toStrictEqual(["fill_by_opid", countryField.opid, "SO"]); }); @@ -3220,7 +3220,7 @@ describe("AutofillService", () => { it("returns true if the passed type is within the excluded type list", () => { const value = autofillService["isExcludedType"]( "hidden", - AutoFillConstants.ExcludedAutofillTypes + AutoFillConstants.ExcludedAutofillTypes, ); expect(value).toBe(true); @@ -3229,7 +3229,7 @@ describe("AutofillService", () => { it("returns true if the passed type is within the excluded type list", () => { const value = autofillService["isExcludedType"]( "text", - AutoFillConstants.ExcludedAutofillTypes + AutoFillConstants.ExcludedAutofillTypes, ); expect(value).toBe(false); @@ -3254,7 +3254,7 @@ describe("AutofillService", () => { const value = AutofillService["isFieldMatch"]( passedAttribute, passedOptions, - containsOptions + containsOptions, ); expect(value).toBe(true); @@ -3268,7 +3268,7 @@ describe("AutofillService", () => { const value = AutofillService["isFieldMatch"]( passedAttribute, passedOptions, - containsOptions + containsOptions, ); expect(value).toBe(false); @@ -3301,14 +3301,14 @@ describe("AutofillService", () => { options.cipher.login, fillFields, filledFields, - dataProp + dataProp, ); expect(autofillService["makeScriptActionWithValue"]).toHaveBeenCalledWith( fillScript, mockLoginView[dataProp], fillFields[dataProp], - filledFields + filledFields, ); }); @@ -3322,14 +3322,14 @@ describe("AutofillService", () => { fillFields, filledFields, dataProp, - fieldProp + fieldProp, ); expect(autofillService["makeScriptActionWithValue"]).toHaveBeenCalledWith( fillScript, mockLoginView[dataProp], fillFields[fieldProp], - filledFields + filledFields, ); }); }); @@ -3361,7 +3361,7 @@ describe("AutofillService", () => { fillScript, dataValue, fillFields["username-field"], - filledFields + filledFields, ); expect(AutofillService.hasValue).toHaveBeenCalledWith(dataValue); @@ -3384,14 +3384,14 @@ describe("AutofillService", () => { fillScript, dataValue, fillFields["username-field"], - filledFields + filledFields, ); expect(AutofillService.hasValue).toHaveBeenCalledWith(dataValue); expect(AutofillService.fillByOpid).toHaveBeenCalledWith( fillScript, fillFields["username-field"], - dataValue + dataValue, ); }); @@ -3411,7 +3411,7 @@ describe("AutofillService", () => { fillScript, dataValue, selectField, - filledFields + filledFields, ); expect(AutofillService.hasValue).toHaveBeenCalledWith(dataValue); @@ -3433,14 +3433,14 @@ describe("AutofillService", () => { fillScript, dataValue, selectField, - filledFields + filledFields, ); expect(AutofillService.hasValue).toHaveBeenCalledWith(dataValue); expect(AutofillService.fillByOpid).toHaveBeenCalledWith( fillScript, selectField, - "Some Other Username Value" + "Some Other Username Value", ); }); }); @@ -3681,7 +3681,7 @@ describe("AutofillService", () => { passwordField, false, false, - false + false, ); expect(result).toBe(null); @@ -3695,7 +3695,7 @@ describe("AutofillService", () => { passwordField, false, false, - false + false, ); expect(result).toBe(null); @@ -3712,7 +3712,7 @@ describe("AutofillService", () => { passwordField, false, false, - false + false, ); expect(result).toBe(null); @@ -3724,7 +3724,7 @@ describe("AutofillService", () => { passwordField, false, true, - false + false, ); expect(result).toBe(usernameField); @@ -3743,7 +3743,7 @@ describe("AutofillService", () => { passwordField, false, false, - false + false, ); expect(result).toBe(null); @@ -3755,7 +3755,7 @@ describe("AutofillService", () => { passwordField, false, false, - true + true, ); expect(result).toBe(usernameField); @@ -3774,7 +3774,7 @@ describe("AutofillService", () => { passwordField, false, false, - false + false, ); expect(result).toBe(null); @@ -3786,7 +3786,7 @@ describe("AutofillService", () => { passwordField, true, false, - false + false, ); expect(result).toBe(usernameField); @@ -3801,7 +3801,7 @@ describe("AutofillService", () => { passwordField, false, false, - false + false, ); expect(result).toBe(null); @@ -3829,14 +3829,14 @@ describe("AutofillService", () => { passwordField, false, false, - false + false, ); expect(result).toBe(usernameField2); expect(autofillService["findMatchingFieldIndex"]).toHaveBeenCalledTimes(2); expect(autofillService["findMatchingFieldIndex"]).not.toHaveBeenCalledWith( usernameField3, - AutoFillConstants.UsernameFieldNames + AutoFillConstants.UsernameFieldNames, ); }); }); @@ -3885,7 +3885,7 @@ describe("AutofillService", () => { passwordField, false, false, - false + false, ); expect(result).toBe(null); @@ -3902,7 +3902,7 @@ describe("AutofillService", () => { passwordField, false, false, - false + false, ); expect(result).toBe(null); @@ -3914,7 +3914,7 @@ describe("AutofillService", () => { passwordField, false, true, - false + false, ); expect(result).toBe(totpField); @@ -3932,7 +3932,7 @@ describe("AutofillService", () => { passwordField, false, false, - false + false, ); expect(result).toBe(null); @@ -3944,7 +3944,7 @@ describe("AutofillService", () => { passwordField, false, false, - true + true, ); expect(result).toBe(totpField); @@ -3963,7 +3963,7 @@ describe("AutofillService", () => { passwordField, false, false, - false + false, ); expect(result).toBe(null); @@ -3975,7 +3975,7 @@ describe("AutofillService", () => { passwordField, true, false, - false + false, ); expect(result).toBe(totpField); @@ -3990,7 +3990,7 @@ describe("AutofillService", () => { passwordField, false, false, - false + false, ); expect(result).toBe(null); @@ -4005,7 +4005,7 @@ describe("AutofillService", () => { passwordField, false, false, - false + false, ); expect(result).toBe(totpField); @@ -4039,7 +4039,7 @@ describe("AutofillService", () => { expect(autofillService["fieldPropertyIsMatch"]).toHaveBeenCalledWith( field, attribute[0], - value + value, ); expect(result).toBe(0); }); @@ -4075,7 +4075,7 @@ describe("AutofillService", () => { field, "htmlID", "id=username", - "id" + "id", ); expect(result).toBe(true); @@ -4088,7 +4088,7 @@ describe("AutofillService", () => { field, "htmlID", "id=some-othername", - "id" + "id", ); expect(result).toBe(false); @@ -4164,7 +4164,7 @@ describe("AutofillService", () => { const result = autofillService["fieldPropertyIsMatch"]( field, "htmlID", - "csv=some-value,some-other-value,some-third-value" + "csv=some-value,some-other-value,some-third-value", ); expect(result).toBe(false); @@ -4176,7 +4176,7 @@ describe("AutofillService", () => { const result = autofillService["fieldPropertyIsMatch"]( field, "htmlID", - "csv=some-value,some-other-value,some-third-value" + "csv=some-value,some-other-value,some-third-value", ); expect(result).toBe(true); @@ -4223,7 +4223,7 @@ describe("AutofillService", () => { expect(AutofillService.hasValue).toHaveBeenCalled(); expect(AutofillService["fuzzyMatch"]).toHaveBeenCalledWith( ["some-value"], - "some-false-value" + "some-false-value", ); expect(result).toBe(false); @@ -4280,7 +4280,7 @@ describe("AutofillService", () => { it("returns true if the passed value is within the options array", () => { const result = AutofillService["fuzzyMatch"]( ["some-other-value", "some-value"], - "some-value" + "some-value", ); expect(result).toBe(true); diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts index b2672e86762..a1ef5a47a1c 100644 --- a/apps/browser/src/autofill/services/autofill.service.ts +++ b/apps/browser/src/autofill/services/autofill.service.ts @@ -43,7 +43,7 @@ export default class AutofillService implements AutofillServiceInterface { private eventCollectionService: EventCollectionService, private logService: LogService, private settingsService: SettingsService, - private userVerificationService: UserVerificationService + private userVerificationService: UserVerificationService, ) {} /** @@ -59,7 +59,7 @@ export default class AutofillService implements AutofillServiceInterface { async injectAutofillScripts( sender: chrome.runtime.MessageSender, autofillV2 = false, - autofillOverlay = false + autofillOverlay = false, ) { let mainAutofillScript = "autofill.js"; @@ -226,7 +226,7 @@ export default class AutofillService implements AutofillServiceInterface { url: tab.url, pageDetailsUrl: pd.details.url, }, - { frameId: pd.frameId } + { frameId: pd.frameId }, ); // Skip getting the TOTP code for clipboard in these cases @@ -245,7 +245,7 @@ export default class AutofillService implements AutofillServiceInterface { } return null; }); - }) + }), ); if (didAutofill) { @@ -270,7 +270,7 @@ export default class AutofillService implements AutofillServiceInterface { async doAutoFillOnTab( pageDetails: PageDetail[], tab: chrome.tabs.Tab, - fromCommand: boolean + fromCommand: boolean, ): Promise { let cipher: CipherView; if (fromCommand) { @@ -347,7 +347,7 @@ export default class AutofillService implements AutofillServiceInterface { async doAutoFillActiveTab( pageDetails: PageDetail[], fromCommand: boolean, - cipherType?: CipherType + cipherType?: CipherType, ): Promise { if (!pageDetails[0]?.details?.fields?.length) { return null; @@ -410,7 +410,7 @@ export default class AutofillService implements AutofillServiceInterface { */ private async generateFillScript( pageDetails: AutofillPageDetails, - options: GenerateFillScriptOptions + options: GenerateFillScriptOptions, ): Promise { if (!pageDetails || !options.cipher) { return null; @@ -465,7 +465,7 @@ export default class AutofillService implements AutofillServiceInterface { fillScript, pageDetails, filledFields, - options + options, ); break; case CipherType.Card: @@ -476,7 +476,7 @@ export default class AutofillService implements AutofillServiceInterface { fillScript, pageDetails, filledFields, - options + options, ); break; default: @@ -499,7 +499,7 @@ export default class AutofillService implements AutofillServiceInterface { fillScript: AutofillScript, pageDetails: AutofillPageDetails, filledFields: { [id: string]: AutofillField }, - options: GenerateFillScriptOptions + options: GenerateFillScriptOptions, ): Promise { if (!options.cipher.login) { return null; @@ -522,7 +522,7 @@ export default class AutofillService implements AutofillServiceInterface { false, false, options.onlyEmptyFields, - options.fillNewPassword + options.fillNewPassword, ); if (!passwordFields.length && !options.onlyVisibleFields) { // not able to find any viewable password fields. maybe there are some "hidden" ones? @@ -531,7 +531,7 @@ export default class AutofillService implements AutofillServiceInterface { true, true, options.onlyEmptyFields, - options.fillNewPassword + options.fillNewPassword, ); } @@ -661,7 +661,7 @@ export default class AutofillService implements AutofillServiceInterface { filledFields[t.opid] = t; const totpValue = await this.totpService.getCode(login.totp); AutofillService.fillByOpid(fillScript, t, totpValue); - }) + }), ); } @@ -682,7 +682,7 @@ export default class AutofillService implements AutofillServiceInterface { fillScript: AutofillScript, pageDetails: AutofillPageDetails, filledFields: { [id: string]: AutofillField }, - options: GenerateFillScriptOptions + options: GenerateFillScriptOptions, ): AutofillScript | null { if (!options.cipher.card) { return null; @@ -713,7 +713,7 @@ export default class AutofillService implements AutofillServiceInterface { AutofillService.isFieldMatch( f[attr], CreditCardAutoFillConstants.CardHolderFieldNames, - CreditCardAutoFillConstants.CardHolderFieldNameValues + CreditCardAutoFillConstants.CardHolderFieldNameValues, ) ) { fillFields.cardholderName = f; @@ -723,7 +723,7 @@ export default class AutofillService implements AutofillServiceInterface { AutofillService.isFieldMatch( f[attr], CreditCardAutoFillConstants.CardNumberFieldNames, - CreditCardAutoFillConstants.CardNumberFieldNameValues + CreditCardAutoFillConstants.CardNumberFieldNameValues, ) ) { fillFields.number = f; @@ -733,7 +733,7 @@ export default class AutofillService implements AutofillServiceInterface { AutofillService.isFieldMatch( f[attr], CreditCardAutoFillConstants.CardExpiryFieldNames, - CreditCardAutoFillConstants.CardExpiryFieldNameValues + CreditCardAutoFillConstants.CardExpiryFieldNameValues, ) ) { fillFields.exp = f; @@ -879,7 +879,7 @@ export default class AutofillService implements AutofillServiceInterface { fillFields.exp, CreditCardAutoFillConstants.MonthAbbr[i] + "/" + - CreditCardAutoFillConstants.YearAbbrLong[i] + CreditCardAutoFillConstants.YearAbbrLong[i], ) ) { exp = fullMonth + "/" + fullYear; @@ -888,7 +888,7 @@ export default class AutofillService implements AutofillServiceInterface { fillFields.exp, CreditCardAutoFillConstants.MonthAbbr[i] + "/" + - CreditCardAutoFillConstants.YearAbbrShort[i] + CreditCardAutoFillConstants.YearAbbrShort[i], ) && partYear != null ) { @@ -898,7 +898,7 @@ export default class AutofillService implements AutofillServiceInterface { fillFields.exp, CreditCardAutoFillConstants.YearAbbrLong[i] + "/" + - CreditCardAutoFillConstants.MonthAbbr[i] + CreditCardAutoFillConstants.MonthAbbr[i], ) ) { exp = fullYear + "/" + fullMonth; @@ -907,7 +907,7 @@ export default class AutofillService implements AutofillServiceInterface { fillFields.exp, CreditCardAutoFillConstants.YearAbbrShort[i] + "/" + - CreditCardAutoFillConstants.MonthAbbr[i] + CreditCardAutoFillConstants.MonthAbbr[i], ) && partYear != null ) { @@ -917,7 +917,7 @@ export default class AutofillService implements AutofillServiceInterface { fillFields.exp, CreditCardAutoFillConstants.MonthAbbr[i] + "-" + - CreditCardAutoFillConstants.YearAbbrLong[i] + CreditCardAutoFillConstants.YearAbbrLong[i], ) ) { exp = fullMonth + "-" + fullYear; @@ -926,7 +926,7 @@ export default class AutofillService implements AutofillServiceInterface { fillFields.exp, CreditCardAutoFillConstants.MonthAbbr[i] + "-" + - CreditCardAutoFillConstants.YearAbbrShort[i] + CreditCardAutoFillConstants.YearAbbrShort[i], ) && partYear != null ) { @@ -936,7 +936,7 @@ export default class AutofillService implements AutofillServiceInterface { fillFields.exp, CreditCardAutoFillConstants.YearAbbrLong[i] + "-" + - CreditCardAutoFillConstants.MonthAbbr[i] + CreditCardAutoFillConstants.MonthAbbr[i], ) ) { exp = fullYear + "-" + fullMonth; @@ -945,7 +945,7 @@ export default class AutofillService implements AutofillServiceInterface { fillFields.exp, CreditCardAutoFillConstants.YearAbbrShort[i] + "-" + - CreditCardAutoFillConstants.MonthAbbr[i] + CreditCardAutoFillConstants.MonthAbbr[i], ) && partYear != null ) { @@ -953,14 +953,14 @@ export default class AutofillService implements AutofillServiceInterface { } else if ( this.fieldAttrsContain( fillFields.exp, - CreditCardAutoFillConstants.YearAbbrLong[i] + CreditCardAutoFillConstants.MonthAbbr[i] + CreditCardAutoFillConstants.YearAbbrLong[i] + CreditCardAutoFillConstants.MonthAbbr[i], ) ) { exp = fullYear + fullMonth; } else if ( this.fieldAttrsContain( fillFields.exp, - CreditCardAutoFillConstants.YearAbbrShort[i] + CreditCardAutoFillConstants.MonthAbbr[i] + CreditCardAutoFillConstants.YearAbbrShort[i] + CreditCardAutoFillConstants.MonthAbbr[i], ) && partYear != null ) { @@ -968,14 +968,14 @@ export default class AutofillService implements AutofillServiceInterface { } else if ( this.fieldAttrsContain( fillFields.exp, - CreditCardAutoFillConstants.MonthAbbr[i] + CreditCardAutoFillConstants.YearAbbrLong[i] + CreditCardAutoFillConstants.MonthAbbr[i] + CreditCardAutoFillConstants.YearAbbrLong[i], ) ) { exp = fullMonth + fullYear; } else if ( this.fieldAttrsContain( fillFields.exp, - CreditCardAutoFillConstants.MonthAbbr[i] + CreditCardAutoFillConstants.YearAbbrShort[i] + CreditCardAutoFillConstants.MonthAbbr[i] + CreditCardAutoFillConstants.YearAbbrShort[i], ) && partYear != null ) { @@ -1018,7 +1018,7 @@ export default class AutofillService implements AutofillServiceInterface { const matchesUri = options.cipher.login.matchesUri( pageUrl, equivalentDomains, - options.defaultUriMatch + options.defaultUriMatch, ); return !matchesUri; } @@ -1064,7 +1064,7 @@ export default class AutofillService implements AutofillServiceInterface { fillScript: AutofillScript, pageDetails: AutofillPageDetails, filledFields: { [id: string]: AutofillField }, - options: GenerateFillScriptOptions + options: GenerateFillScriptOptions, ): AutofillScript { if (!options.cipher.identity) { return null; @@ -1095,7 +1095,7 @@ export default class AutofillService implements AutofillServiceInterface { AutofillService.isFieldMatch( f[attr], IdentityAutoFillConstants.FullNameFieldNames, - IdentityAutoFillConstants.FullNameFieldNameValues + IdentityAutoFillConstants.FullNameFieldNameValues, ) ) { fillFields.name = f; @@ -1135,7 +1135,7 @@ export default class AutofillService implements AutofillServiceInterface { AutofillService.isFieldMatch( f[attr], IdentityAutoFillConstants.AddressFieldNames, - IdentityAutoFillConstants.AddressFieldNameValues + IdentityAutoFillConstants.AddressFieldNameValues, ) ) { fillFields.address = f; @@ -1320,7 +1320,7 @@ export default class AutofillService implements AutofillServiceInterface { private static isFieldMatch( value: string, options: string[], - containsOptions?: string[] + containsOptions?: string[], ): boolean { value = value .trim() @@ -1355,14 +1355,14 @@ export default class AutofillService implements AutofillServiceInterface { fillFields: { [id: string]: AutofillField }, filledFields: { [id: string]: AutofillField }, dataProp: string, - fieldProp?: string + fieldProp?: string, ) { fieldProp = fieldProp || dataProp; this.makeScriptActionWithValue( fillScript, cipherData[dataProp], fillFields[fieldProp], - filledFields + filledFields, ); } @@ -1381,7 +1381,7 @@ export default class AutofillService implements AutofillServiceInterface { fillScript: AutofillScript, dataValue: any, field: AutofillField, - filledFields: { [id: string]: AutofillField } + filledFields: { [id: string]: AutofillField }, ) { let doFill = false; if (AutofillService.hasValue(dataValue) && field) { @@ -1431,7 +1431,7 @@ export default class AutofillService implements AutofillServiceInterface { canBeHidden: boolean, canBeReadOnly: boolean, mustBeEmpty: boolean, - fillNewPassword: boolean + fillNewPassword: boolean, ) { const arr: AutofillField[] = []; pageDetails.fields.forEach((f) => { @@ -1503,7 +1503,7 @@ export default class AutofillService implements AutofillServiceInterface { passwordField: AutofillField, canBeHidden: boolean, canBeReadOnly: boolean, - withoutForm: boolean + withoutForm: boolean, ): AutofillField | null { let usernameField: AutofillField = null; for (let i = 0; i < pageDetails.fields.length; i++) { @@ -1551,7 +1551,7 @@ export default class AutofillService implements AutofillServiceInterface { passwordField: AutofillField, canBeHidden: boolean, canBeReadOnly: boolean, - withoutForm: boolean + withoutForm: boolean, ): AutofillField | null { let totpField: AutofillField = null; for (let i = 0; i < pageDetails.fields.length; i++) { @@ -1659,7 +1659,7 @@ export default class AutofillService implements AutofillServiceInterface { property: string, name: string, prefix: string, - separator = "=" + separator = "=", ): boolean { if (name.indexOf(prefix + separator) === 0) { const sepIndex = name.indexOf(separator); @@ -1806,7 +1806,7 @@ export default class AutofillService implements AutofillServiceInterface { */ static setFillScriptForFocus( filledFields: { [id: string]: AutofillField }, - fillScript: AutofillScript + fillScript: AutofillScript, ): AutofillScript { let lastField: AutofillField = null; let lastPasswordField: AutofillField = null; diff --git a/apps/browser/src/autofill/services/collect-autofill-content.service.spec.ts b/apps/browser/src/autofill/services/collect-autofill-content.service.spec.ts index b58f31507ba..e300b65acc2 100644 --- a/apps/browser/src/autofill/services/collect-autofill-content.service.spec.ts +++ b/apps/browser/src/autofill/services/collect-autofill-content.service.spec.ts @@ -31,7 +31,7 @@ describe("CollectAutofillContentService", () => { document.body.innerHTML = mockLoginForm; collectAutofillContentService = new CollectAutofillContentService( domElementVisibilityService, - autofillOverlayContentService + autofillOverlayContentService, ); }); @@ -68,7 +68,7 @@ describe("CollectAutofillContentService", () => { expect(collectAutofillContentService["getFormattedPageDetails"]).toHaveBeenCalledWith({}, []); expect( - collectAutofillContentService["queryAutofillFormAndFieldElements"] + collectAutofillContentService["queryAutofillFormAndFieldElements"], ).not.toHaveBeenCalled(); expect(collectAutofillContentService["buildAutofillFormsData"]).not.toHaveBeenCalled(); expect(collectAutofillContentService["buildAutofillFieldsData"]).not.toHaveBeenCalled(); @@ -102,7 +102,7 @@ describe("CollectAutofillContentService", () => { htmlMethod: formMethod, }; const fieldElement = document.getElementById( - usernameFieldId + usernameFieldId, ) as ElementWithOpId; const autofillField: AutofillField = { opid: "__0", @@ -156,7 +156,7 @@ describe("CollectAutofillContentService", () => { expect(collectAutofillContentService["getFormattedAutofillFormsData"]).toHaveBeenCalled(); expect(collectAutofillContentService["getFormattedAutofillFieldsData"]).toHaveBeenCalled(); expect( - collectAutofillContentService["queryAutofillFormAndFieldElements"] + collectAutofillContentService["queryAutofillFormAndFieldElements"], ).not.toHaveBeenCalled(); expect(collectAutofillContentService["buildAutofillFormsData"]).not.toHaveBeenCalled(); expect(collectAutofillContentService["buildAutofillFieldsData"]).not.toHaveBeenCalled(); @@ -294,7 +294,7 @@ describe("CollectAutofillContentService", () => { it("returns the element with the opid property value matching the passed value", () => { const textInput = document.querySelector('input[type="text"]') as FormElementWithAttribute; const passwordInput = document.querySelector( - 'input[type="password"]' + 'input[type="password"]', ) as FormElementWithAttribute; textInput.opid = "__0"; passwordInput.opid = "__1"; @@ -311,7 +311,7 @@ describe("CollectAutofillContentService", () => { it("returns the first of the element with an `opid` value matching the passed value and emits a console warning if multiple fields contain the same `opid`", () => { const textInput = document.querySelector('input[type="text"]') as FormElementWithAttribute; const passwordInput = document.querySelector( - 'input[type="password"]' + 'input[type="password"]', ) as FormElementWithAttribute; jest.spyOn(console, "warn").mockImplementationOnce(jest.fn()); textInput.opid = "__1"; @@ -330,7 +330,7 @@ describe("CollectAutofillContentService", () => { it("returns the element at the index position (parsed from passed opid) of all AutofillField elements when the passed opid value cannot be found", () => { const textInput = document.querySelector('input[type="text"]') as FormElementWithAttribute; const passwordInput = document.querySelector( - 'input[type="password"]' + 'input[type="password"]', ) as FormElementWithAttribute; textInput.opid = undefined; passwordInput.opid = "__1"; @@ -387,7 +387,7 @@ describe("CollectAutofillContentService", () => { jest.spyOn(collectAutofillContentService as any, "getFormActionAttribute"); const autofillFormsData = collectAutofillContentService["buildAutofillFormsData"]( - formElements as Node[] + formElements as Node[], ); expect(collectAutofillContentService["getFormActionAttribute"]).not.toHaveBeenCalled(); @@ -452,13 +452,13 @@ describe("CollectAutofillContentService", () => { const { formFieldElements } = collectAutofillContentService["queryAutofillFormAndFieldElements"](); const autofillFieldsPromise = collectAutofillContentService["buildAutofillFieldsData"]( - formFieldElements as FormFieldElement[] + formFieldElements as FormFieldElement[], ); const autofillFieldsData = await Promise.resolve(autofillFieldsPromise); expect(collectAutofillContentService["getAutofillFieldElements"]).toHaveBeenCalledWith( 100, - formFieldElements + formFieldElements, ); expect(collectAutofillContentService["buildAutofillFieldItem"]).toHaveBeenCalledTimes(2); expect(autofillFieldsPromise).toBeInstanceOf(Promise); @@ -595,12 +595,12 @@ describe("CollectAutofillContentService", () => { expect(collectAutofillContentService["getPropertyOrAttribute"]).toHaveBeenNthCalledWith( 1, spanElement, - "type" + "type", ); expect(collectAutofillContentService["getPropertyOrAttribute"]).toHaveBeenNthCalledWith( 2, textAreaInput, - "type" + "type", ); expect(formElements).toEqual([spanElement, textAreaInput]); }); @@ -799,7 +799,7 @@ describe("CollectAutofillContentService", () => { viewable: true, }; const usernameInput = document.getElementById( - usernameField.id + usernameField.id, ) as ElementWithOpId; usernameInput.opid = "__0"; collectAutofillContentService["autofillFieldElements"].set(usernameInput, existingFieldData); @@ -812,12 +812,12 @@ describe("CollectAutofillContentService", () => { const autofillFieldItem = await collectAutofillContentService["buildAutofillFieldItem"]( usernameInput, - 0 + 0, ); expect(collectAutofillContentService["getAutofillFieldMaxLength"]).not.toHaveBeenCalled(); expect( - collectAutofillContentService["domElementVisibilityService"].isFormFieldViewable + collectAutofillContentService["domElementVisibilityService"].isFormFieldViewable, ).not.toHaveBeenCalled(); expect(collectAutofillContentService["getPropertyOrAttribute"]).not.toHaveBeenCalled(); expect(collectAutofillContentService["getElementValue"]).not.toHaveBeenCalled(); @@ -834,7 +834,7 @@ describe("CollectAutofillContentService", () => { Span Element `; const spanElement = document.getElementById( - spanElementId + spanElementId, ) as ElementWithOpId; jest.spyOn(collectAutofillContentService as any, "getAutofillFieldMaxLength"); jest @@ -845,44 +845,44 @@ describe("CollectAutofillContentService", () => { const autofillFieldItem = await collectAutofillContentService["buildAutofillFieldItem"]( spanElement, - index + index, ); expect(collectAutofillContentService["getAutofillFieldMaxLength"]).toHaveBeenCalledWith( - spanElement + spanElement, ); expect( - collectAutofillContentService["domElementVisibilityService"].isFormFieldViewable + collectAutofillContentService["domElementVisibilityService"].isFormFieldViewable, ).toHaveBeenCalledWith(spanElement); expect(collectAutofillContentService["getPropertyOrAttribute"]).toHaveBeenNthCalledWith( 1, spanElement, - "id" + "id", ); expect(collectAutofillContentService["getPropertyOrAttribute"]).toHaveBeenNthCalledWith( 2, spanElement, - "name" + "name", ); expect(collectAutofillContentService["getPropertyOrAttribute"]).toHaveBeenNthCalledWith( 3, spanElement, - "class" + "class", ); expect(collectAutofillContentService["getPropertyOrAttribute"]).toHaveBeenNthCalledWith( 4, spanElement, - "tabindex" + "tabindex", ); expect(collectAutofillContentService["getPropertyOrAttribute"]).toHaveBeenNthCalledWith( 5, spanElement, - "title" + "title", ); expect(collectAutofillContentService["getPropertyOrAttribute"]).toHaveBeenNthCalledWith( 6, spanElement, - "tagName" + "tagName", ); expect(collectAutofillContentService["getElementValue"]).not.toHaveBeenCalled(); expect(autofillFieldItem).toEqual({ @@ -942,7 +942,7 @@ describe("CollectAutofillContentService", () => { const formElement = document.querySelector("form"); formElement.opid = "form-opid"; const usernameInput = document.getElementById( - usernameField.id + usernameField.id, ) as ElementWithOpId; jest.spyOn(collectAutofillContentService as any, "getAutofillFieldMaxLength"); jest @@ -953,7 +953,7 @@ describe("CollectAutofillContentService", () => { const autofillFieldItem = await collectAutofillContentService["buildAutofillFieldItem"]( usernameInput, - index + index, ); expect(autofillFieldItem).toEqual({ @@ -1027,7 +1027,7 @@ describe("CollectAutofillContentService", () => { const formElement = document.querySelector("form"); formElement.opid = "form-opid"; const hiddenInput = document.getElementById( - hiddenField.id + hiddenField.id, ) as ElementWithOpId; jest.spyOn(collectAutofillContentService as any, "getAutofillFieldMaxLength"); jest @@ -1038,7 +1038,7 @@ describe("CollectAutofillContentService", () => { const autofillFieldItem = await collectAutofillContentService["buildAutofillFieldItem"]( hiddenInput, - index + index, ); expect(autofillFieldItem).toEqual({ @@ -1086,7 +1086,7 @@ describe("CollectAutofillContentService", () => { const labelTag = collectAutofillContentService["createAutofillFieldLabelTag"](element); expect(collectAutofillContentService["createLabelElementsTag"]).toHaveBeenCalledWith( - new Set(element.labels) + new Set(element.labels), ); expect(document.querySelectorAll).not.toHaveBeenCalled(); expect(labelTag).toEqual("Username"); @@ -1104,7 +1104,7 @@ describe("CollectAutofillContentService", () => { expect(document.querySelectorAll).toHaveBeenCalledWith(`label[for="${element.id}"]`); expect(collectAutofillContentService["createLabelElementsTag"]).toHaveBeenCalledWith( - new Set([elementLabel]) + new Set([elementLabel]), ); expect(labelTag).toEqual("Country"); }); @@ -1122,7 +1122,7 @@ describe("CollectAutofillContentService", () => { expect(document.querySelectorAll).not.toHaveBeenCalledWith(`label[for="${element.id}"]`); expect(document.querySelectorAll).toHaveBeenCalledWith(`label[for="${element.name}"]`); expect(collectAutofillContentService["createLabelElementsTag"]).toHaveBeenCalledWith( - new Set([elementLabel]) + new Set([elementLabel]), ); expect(labelTag).toEqual("Country"); }); @@ -1139,10 +1139,10 @@ describe("CollectAutofillContentService", () => { const labelTag = collectAutofillContentService["createAutofillFieldLabelTag"](element); expect(document.querySelectorAll).toHaveBeenCalledWith( - `label[for="${element.id}"], label[for="${element.name}"]` + `label[for="${element.id}"], label[for="${element.name}"]`, ); expect(collectAutofillContentService["createLabelElementsTag"]).toHaveBeenCalledWith( - new Set([elementLabel]) + new Set([elementLabel]), ); expect(labelTag).toEqual("Country"); }); @@ -1158,7 +1158,7 @@ describe("CollectAutofillContentService", () => { const labelTag = collectAutofillContentService["createAutofillFieldLabelTag"](element); expect(collectAutofillContentService["createLabelElementsTag"]).toHaveBeenCalledWith( - new Set([elementLabel]) + new Set([elementLabel]), ); expect(labelTag).toEqual("Username"); }); @@ -1178,7 +1178,7 @@ describe("CollectAutofillContentService", () => { const labelTag = collectAutofillContentService["createAutofillFieldLabelTag"](element); expect(collectAutofillContentService["createLabelElementsTag"]).toHaveBeenCalledWith( - new Set([elementLabel]) + new Set([elementLabel]), ); expect(labelTag).toEqual("Username"); }); @@ -1275,10 +1275,10 @@ describe("CollectAutofillContentService", () => { const labelTag = collectAutofillContentService["createLabelElementsTag"](new Set(labels)); expect( - collectAutofillContentService["trimAndRemoveNonPrintableText"] + collectAutofillContentService["trimAndRemoveNonPrintableText"], ).toHaveBeenNthCalledWith(1, firstLabelText); expect( - collectAutofillContentService["trimAndRemoveNonPrintableText"] + collectAutofillContentService["trimAndRemoveNonPrintableText"], ).toHaveBeenNthCalledWith(2, secondLabelText); expect(labelTag).toEqual(`${firstLabelText}${secondLabelText}`); }); @@ -1406,7 +1406,7 @@ describe("CollectAutofillContentService", () => { `; const targetTableCellInput = document.querySelector( - 'input[name="password"]' + 'input[name="password"]', ) as HTMLInputElement; const targetTableCellLabel = @@ -1433,7 +1433,7 @@ describe("CollectAutofillContentService", () => { `; const targetTableCellInput = document.querySelector( - 'input[name="auth-code"]' + 'input[name="auth-code"]', ) as HTMLInputElement; const targetTableCellLabel = @@ -1455,7 +1455,7 @@ describe("CollectAutofillContentService", () => { `; const targetTableCellInput = document.querySelector( - 'input[name="password"]' + 'input[name="password"]', ) as HTMLInputElement; const targetTableCellLabel = @@ -1482,7 +1482,7 @@ describe("CollectAutofillContentService", () => { `; const targetTableCellInput = document.querySelector( - 'input[name="password"]' + 'input[name="password"]', ) as HTMLInputElement; const targetTableCellLabel = @@ -1508,7 +1508,7 @@ describe("CollectAutofillContentService", () => { `; const targetTableCellInput = document.querySelector( - 'input[name="auth-code"]' + 'input[name="auth-code"]', ) as HTMLInputElement; const targetTableCellLabel = @@ -1573,7 +1573,7 @@ describe("CollectAutofillContentService", () => { const element = document.querySelector("#username-id"); const textNode = element.previousSibling; const parsedTextContent = collectAutofillContentService["trimAndRemoveNonPrintableText"]( - textNode.nodeValue + textNode.nodeValue, ); jest.spyOn(collectAutofillContentService as any, "trimAndRemoveNonPrintableText"); @@ -1581,7 +1581,7 @@ describe("CollectAutofillContentService", () => { expect(textNode.nodeType).toEqual(Node.TEXT_NODE); expect(collectAutofillContentService["trimAndRemoveNonPrintableText"]).toHaveBeenCalledWith( - textNode.nodeValue + textNode.nodeValue, ); expect(textContent).toEqual(parsedTextContent); }); @@ -1600,7 +1600,7 @@ describe("CollectAutofillContentService", () => { expect(element.nodeType).toEqual(Node.ELEMENT_NODE); expect(collectAutofillContentService["trimAndRemoveNonPrintableText"]).toHaveBeenCalledWith( - element.textContent + element.textContent, ); expect(textContent).toEqual(element.textContent); }); @@ -1735,20 +1735,20 @@ describe("CollectAutofillContentService", () => { const textInputValue = collectAutofillContentService["getPropertyOrAttribute"]( textInput, - "value" + "value", ); const textInputId = collectAutofillContentService["getPropertyOrAttribute"](textInput, "id"); const textInputBaseURI = collectAutofillContentService["getPropertyOrAttribute"]( textInput, - "baseURI" + "baseURI", ); const textInputAutofocus = collectAutofillContentService["getPropertyOrAttribute"]( textInput, - "autofocus" + "autofocus", ); const checkboxInputChecked = collectAutofillContentService["getPropertyOrAttribute"]( checkboxInput, - "checked" + "checked", ); expect(textInput.getAttribute).not.toHaveBeenCalled(); @@ -1767,7 +1767,7 @@ describe("CollectAutofillContentService", () => { const textInputUniqueAttribute = collectAutofillContentService["getPropertyOrAttribute"]( textInput, - "data-unique-attribute" + "data-unique-attribute", ); expect(textInputUniqueAttribute).toEqual("unique-value"); @@ -1780,7 +1780,7 @@ describe("CollectAutofillContentService", () => { const textInputNonExistentAttribute = collectAutofillContentService["getPropertyOrAttribute"]( textInput, - "non-existent-attribute" + "non-existent-attribute", ); expect(textInputNonExistentAttribute).toEqual(null); @@ -1841,14 +1841,14 @@ describe("CollectAutofillContentService", () => { `; const longValueHiddenInput = document.querySelector( - "#long-value-hidden-input" + "#long-value-hidden-input", ) as HTMLInputElement; const longHiddenValue = collectAutofillContentService["getElementValue"](longValueHiddenInput); expect(longHiddenValue).toEqual( - "’Twas brillig, and the slithy toves | Did gyre and gimble in the wabe: | All mimsy were the borogoves, | And the mome raths outgrabe. | “Beware the Jabberwock, my son! | The jaws that bite, the claws that catch! | Beware the Jubjub bird, and shun | The f...SNIPPED" + "’Twas brillig, and the slithy toves | Did gyre and gimble in the wabe: | All mimsy were the borogoves, | And the mome raths outgrabe. | “Beware the Jabberwock, my son! | The jaws that bite, the claws that catch! | Beware the Jubjub bird, and shun | The f...SNIPPED", ); }); }); @@ -1866,7 +1866,7 @@ describe("CollectAutofillContentService", () => { `; const selectWithOptions = document.querySelector("#select-with-options") as HTMLSelectElement; const selectWithoutOptions = document.querySelector( - "#select-without-options" + "#select-without-options", ) as HTMLSelectElement; const selectWithOptionsOptions = @@ -1925,7 +1925,7 @@ describe("CollectAutofillContentService", () => { document.body, [], callbackFilter, - true + true, ); expect(collectAutofillContentService["buildTreeWalkerNodesQueryResults"]).toBeCalledTimes(2); @@ -1946,7 +1946,7 @@ describe("CollectAutofillContentService", () => { document.body, [], callbackFilter, - false + false, ); expect(collectAutofillContentService["mutationObserver"].observe).not.toBeCalled(); @@ -1993,10 +1993,10 @@ describe("CollectAutofillContentService", () => { expect(collectAutofillContentService["noFieldsFound"]).toEqual(false); expect(collectAutofillContentService["isAutofillElementNodeMutated"]).toBeCalledWith( removedNodes, - true + true, ); expect(collectAutofillContentService["isAutofillElementNodeMutated"]).toBeCalledWith( - addedNodes + addedNodes, ); }); @@ -2048,9 +2048,86 @@ describe("CollectAutofillContentService", () => { expect(collectAutofillContentService["handleWindowLocationMutation"]).toBeCalled(); expect(collectAutofillContentService["isAutofillElementNodeMutated"]).not.toBeCalled(); expect( - collectAutofillContentService["handleAutofillElementAttributeMutation"] + collectAutofillContentService["handleAutofillElementAttributeMutation"], ).not.toBeCalled(); }); + + it("will setup the overlay listeners on mutated elements", async () => { + jest.useFakeTimers(); + const form = document.createElement("form"); + document.body.appendChild(form); + const addedNodes = document.querySelectorAll("form"); + const removedNodes = document.querySelectorAll("li"); + const mutationRecord: MutationRecord = { + type: "childList", + addedNodes: addedNodes, + attributeName: null, + attributeNamespace: null, + nextSibling: null, + oldValue: null, + previousSibling: null, + removedNodes: removedNodes, + target: document.body, + }; + collectAutofillContentService["domRecentlyMutated"] = false; + collectAutofillContentService["noFieldsFound"] = true; + collectAutofillContentService["currentLocationHref"] = window.location.href; + jest.spyOn(collectAutofillContentService as any, "setupOverlayListenersOnMutatedElements"); + + collectAutofillContentService["handleMutationObserverMutation"]([mutationRecord]); + jest.runAllTimers(); + + expect(collectAutofillContentService["setupOverlayListenersOnMutatedElements"]).toBeCalled(); + }); + }); + + describe("setupOverlayListenersOnMutatedElements", () => { + it("skips building the autofill field item if the node is not a form field element", () => { + const divElement = document.createElement("div"); + const nodes = [divElement]; + jest.spyOn(collectAutofillContentService as any, "buildAutofillFieldItem"); + + collectAutofillContentService["setupOverlayListenersOnMutatedElements"](nodes); + + expect(collectAutofillContentService["buildAutofillFieldItem"]).not.toBeCalled(); + }); + + it("skips building the autofill field item if the node is already a field element", () => { + const inputElement = document.createElement("input") as ElementWithOpId; + inputElement.setAttribute("type", "password"); + const nodes = [inputElement]; + collectAutofillContentService["autofillFieldElements"].set(inputElement, { + opid: "1234", + } as AutofillField); + jest.spyOn(collectAutofillContentService as any, "buildAutofillFieldItem"); + + collectAutofillContentService["setupOverlayListenersOnMutatedElements"](nodes); + + expect(collectAutofillContentService["buildAutofillFieldItem"]).not.toBeCalled(); + }); + + it("builds the autofill field item to ensure the overlay listeners are set", () => { + document.body.innerHTML = ` +
+ + +
+ `; + + const inputElement = document.getElementById( + "username-id", + ) as ElementWithOpId; + inputElement.setAttribute("type", "password"); + const nodes = [inputElement]; + jest.spyOn(collectAutofillContentService as any, "buildAutofillFieldItem"); + + collectAutofillContentService["setupOverlayListenersOnMutatedElements"](nodes); + + expect(collectAutofillContentService["buildAutofillFieldItem"]).toBeCalledWith( + inputElement, + -1, + ); + }); }); describe("deleteCachedAutofillElement", () => { @@ -2170,7 +2247,7 @@ describe("CollectAutofillContentService", () => { expect(collectAutofillContentService["updateAutofillFormElementData"]).toBeCalledWith( mutationRecord.attributeName, mutationRecord.target, - autofillForm + autofillForm, ); }); @@ -2217,7 +2294,7 @@ describe("CollectAutofillContentService", () => { expect(collectAutofillContentService["updateAutofillFieldElementData"]).toBeCalledWith( mutationRecord.attributeName, mutationRecord.target, - autofillField + autofillField, ); }); }); @@ -2240,12 +2317,12 @@ describe("CollectAutofillContentService", () => { collectAutofillContentService["updateAutofillFormElementData"]( attribute, formElement, - autofillForm + autofillForm, ); expect(collectAutofillContentService["autofillFormElements"].set).toBeCalledWith( formElement, - autofillForm + autofillForm, ); }); }); @@ -2256,7 +2333,7 @@ describe("CollectAutofillContentService", () => { collectAutofillContentService["updateAutofillFormElementData"]( "aria-label", formElement, - autofillForm + autofillForm, ); expect(collectAutofillContentService["autofillFormElements"].set).not.toBeCalled(); @@ -2305,12 +2382,12 @@ describe("CollectAutofillContentService", () => { await collectAutofillContentService["updateAutofillFieldElementData"]( attribute, fieldElement, - autofillField + autofillField, ); expect(collectAutofillContentService["autofillFieldElements"].set).toBeCalledWith( fieldElement, - autofillField + autofillField, ); }); }); @@ -2318,7 +2395,7 @@ describe("CollectAutofillContentService", () => { it("will check the dom element's visibility if the `style` or `class` attribute has updated ", async () => { jest.spyOn( collectAutofillContentService["domElementVisibilityService"], - "isFormFieldViewable" + "isFormFieldViewable", ); const attributes = ["class", "style"]; @@ -2326,11 +2403,11 @@ describe("CollectAutofillContentService", () => { await collectAutofillContentService["updateAutofillFieldElementData"]( attribute, fieldElement, - autofillField + autofillField, ); expect( - collectAutofillContentService["domElementVisibilityService"].isFormFieldViewable + collectAutofillContentService["domElementVisibilityService"].isFormFieldViewable, ).toBeCalledWith(fieldElement); } }); @@ -2341,7 +2418,7 @@ describe("CollectAutofillContentService", () => { await collectAutofillContentService["updateAutofillFieldElementData"]( "random-attribute", fieldElement, - autofillField + autofillField, ); expect(collectAutofillContentService["autofillFieldElements"].set).not.toBeCalled(); diff --git a/apps/browser/src/autofill/services/collect-autofill-content.service.ts b/apps/browser/src/autofill/services/collect-autofill-content.service.ts index 20f1c2b5921..d675a37921d 100644 --- a/apps/browser/src/autofill/services/collect-autofill-content.service.ts +++ b/apps/browser/src/autofill/services/collect-autofill-content.service.ts @@ -31,7 +31,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte constructor( domElementVisibilityService: DomElementVisibilityService, - autofillOverlayContentService?: AutofillOverlayContentService + autofillOverlayContentService?: AutofillOverlayContentService, ) { this.domElementVisibilityService = domElementVisibilityService; this.autofillOverlayContentService = autofillOverlayContentService; @@ -56,7 +56,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte if (!this.domRecentlyMutated && this.autofillFieldElements.size) { return this.getFormattedPageDetails( this.getFormattedAutofillFormsData(), - this.getFormattedAutofillFieldsData() + this.getFormattedAutofillFieldsData(), ); } @@ -64,7 +64,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte const autofillFormsData: Record = this.buildAutofillFormsData(formElements); const autofillFieldsData: AutofillField[] = await this.buildAutofillFieldsData( - formFieldElements as FormFieldElement[] + formFieldElements as FormFieldElement[], ); this.sortAutofillFieldElementsMap(); @@ -89,7 +89,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte ? cachedFormFieldElements : this.getAutofillFieldElements(); const fieldElementsWithOpid = formFieldElements.filter( - (fieldElement) => (fieldElement as ElementWithOpId).opid === opid + (fieldElement) => (fieldElement as ElementWithOpId).opid === opid, ) as ElementWithOpId[]; if (!fieldElementsWithOpid.length) { @@ -117,7 +117,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte queryAllTreeWalkerNodes( rootNode: Node, filterCallback: CallableFunction, - isObservingShadowRoot = true + isObservingShadowRoot = true, ): Node[] { const treeWalkerQueryResults: Node[] = []; @@ -125,7 +125,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte rootNode, treeWalkerQueryResults, filterCallback, - isObservingShadowRoot + isObservingShadowRoot, ); return treeWalkerQueryResults; @@ -141,7 +141,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte } this.autofillFieldElements = new Map( - [...this.autofillFieldElements].sort((a, b) => a[1].elementNumber - b[1].elementNumber) + [...this.autofillFieldElements].sort((a, b) => a[1].elementNumber - b[1].elementNumber), ); } @@ -154,7 +154,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte */ private getFormattedPageDetails( autofillFormsData: Record, - autofillFieldsData: AutofillField[] + autofillFieldsData: AutofillField[], ): AutofillPageDetails { return { title: document.title, @@ -231,7 +231,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte * @private */ private async buildAutofillFieldsData( - formFieldElements: FormFieldElement[] + formFieldElements: FormFieldElement[], ): Promise { const autofillFieldElements = this.getAutofillFieldElements(100, formFieldElements); const autofillFieldDataPromises = autofillFieldElements.map(this.buildAutofillFieldItem); @@ -250,12 +250,12 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte */ private getAutofillFieldElements( fieldsLimit?: number, - previouslyFoundFormFieldElements?: FormFieldElement[] + previouslyFoundFormFieldElements?: FormFieldElement[], ): FormFieldElement[] { const formFieldElements = previouslyFoundFormFieldElements || (this.queryAllTreeWalkerNodes(document.documentElement, (node: Node) => - this.isNodeFormFieldElement(node) + this.isNodeFormFieldElement(node), ) as FormFieldElement[]); if (!fieldsLimit || formFieldElements.length <= fieldsLimit) { @@ -298,12 +298,12 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte */ private buildAutofillFieldItem = async ( element: ElementWithOpId, - index: number + index: number, ): Promise => { element.opid = `__${index}`; const existingAutofillField = this.autofillFieldElements.get(element); - if (existingAutofillField) { + if (index >= 0 && existingAutofillField) { existingAutofillField.opid = element.opid; existingAutofillField.elementNumber = index; this.autofillFieldElements.set(element, existingAutofillField); @@ -325,10 +325,10 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte }; if (element instanceof HTMLSpanElement) { - this.autofillFieldElements.set(element, autofillFieldBase); + this.cacheAutofillFieldElement(index, element, autofillFieldBase); this.autofillOverlayContentService?.setupAutofillOverlayListenerOnField( element, - autofillFieldBase + autofillFieldBase, ); return autofillFieldBase; } @@ -366,11 +366,31 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte "data-stripe": this.getPropertyOrAttribute(element, "data-stripe"), }; - this.autofillFieldElements.set(element, autofillField); + this.cacheAutofillFieldElement(index, element, autofillField); this.autofillOverlayContentService?.setupAutofillOverlayListenerOnField(element, autofillField); return autofillField; }; + /** + * Caches the autofill field element and its data. + * Will not cache the element if the index is less than 0. + * + * @param index - The index of the autofill field element + * @param element - The autofill field element to cache + * @param autofillFieldData - The autofill field data to cache + */ + private cacheAutofillFieldElement( + index: number, + element: ElementWithOpId, + autofillFieldData: AutofillField, + ) { + if (index < 0) { + return; + } + + this.autofillFieldElements.set(element, autofillFieldData); + } + /** * Identifies the autocomplete attribute associated with an element and returns * the value of the attribute if it is not set to "off". @@ -397,7 +417,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte private getAttributeBoolean( element: ElementWithOpId, attributeName: string, - checkString = false + checkString = false, ): boolean { if (checkString) { return this.getPropertyOrAttribute(element, attributeName) === "true"; @@ -415,7 +435,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte */ private getAttributeLowerCase( element: ElementWithOpId, - attributeName: string + attributeName: string, ): string { return this.getPropertyOrAttribute(element, attributeName)?.toLowerCase(); } @@ -479,7 +499,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte * @private */ private queryElementLabels( - element: FillableFormFieldElement + element: FillableFormFieldElement, ): NodeListOf | null { let labelQuerySelectors = element.id ? `label[for="${element.id}"]` : ""; if (element.name) { @@ -494,7 +514,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte } return (element.getRootNode() as Document | ShadowRoot).querySelectorAll( - labelQuerySelectors.replace(/\n/g, "") + labelQuerySelectors.replace(/\n/g, ""), ); } @@ -645,7 +665,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte } return this.trimAndRemoveNonPrintableText( - element.textContent || (element as HTMLElement).innerText + element.textContent || (element as HTMLElement).innerText, ); } @@ -869,7 +889,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte rootNode: Node, treeWalkerQueryResults: Node[], filterCallback: CallableFunction, - isObservingShadowRoot: boolean + isObservingShadowRoot: boolean, ) { const treeWalker = document?.createTreeWalker(rootNode, NodeFilter.SHOW_ELEMENT); let currentNode = treeWalker?.currentNode; @@ -893,7 +913,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte nodeShadowRoot, treeWalkerQueryResults, filterCallback, - isObservingShadowRoot + isObservingShadowRoot, ); } @@ -987,7 +1007,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte } let isElementMutated = false; - const mutatedElements = []; + const mutatedElements: Node[] = []; for (let index = 0; index < nodes.length; index++) { const node = nodes[index]; if (!(node instanceof HTMLElement)) { @@ -1002,7 +1022,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte const childNodes = this.queryAllTreeWalkerNodes( node, - (node: Node) => node instanceof HTMLFormElement || this.isNodeFormFieldElement(node) + (node: Node) => node instanceof HTMLFormElement || this.isNodeFormFieldElement(node), ) as HTMLElement[]; if (childNodes.length) { isElementMutated = true; @@ -1010,17 +1030,31 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte } } + if (isRemovingNodes) { + for (let elementIndex = 0; elementIndex < mutatedElements.length; elementIndex++) { + const node = mutatedElements[elementIndex]; + this.deleteCachedAutofillElement( + node as ElementWithOpId | ElementWithOpId, + ); + } + } else if (this.autofillOverlayContentService) { + setTimeout(() => this.setupOverlayListenersOnMutatedElements(mutatedElements), 1000); + } + + return isElementMutated; + } + + /** + * Sets up the overlay listeners on the passed mutated elements. This ensures + * that the overlay can appear on elements that are injected into the DOM after + * the initial page load. + * + * @param mutatedElements - HTML elements that have been mutated + */ + private setupOverlayListenersOnMutatedElements(mutatedElements: Node[]) { for (let elementIndex = 0; elementIndex < mutatedElements.length; elementIndex++) { const node = mutatedElements[elementIndex]; - if (isRemovingNodes) { - this.deleteCachedAutofillElement( - node as ElementWithOpId | ElementWithOpId - ); - continue; - } - if ( - this.autofillOverlayContentService && this.isNodeFormFieldElement(node) && !this.autofillFieldElements.get(node as ElementWithOpId) ) { @@ -1029,8 +1063,6 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte this.buildAutofillFieldItem(node as ElementWithOpId, -1); } } - - return isElementMutated; } /** @@ -1040,7 +1072,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte * @private */ private deleteCachedAutofillElement( - element: ElementWithOpId | ElementWithOpId + element: ElementWithOpId | ElementWithOpId, ) { if (element instanceof HTMLFormElement && this.autofillFormElements.has(element)) { this.autofillFormElements.delete(element); @@ -1064,7 +1096,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte this.updateAutofillElementsAfterMutationTimeout = setTimeout( this.getPageDetails.bind(this), - this.updateAfterMutationTimeoutDelay + this.updateAfterMutationTimeoutDelay, ); } @@ -1081,21 +1113,21 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte const attributeName = mutation.attributeName?.toLowerCase(); const autofillForm = this.autofillFormElements.get( - targetElement as ElementWithOpId + targetElement as ElementWithOpId, ); if (autofillForm) { this.updateAutofillFormElementData( attributeName, targetElement as ElementWithOpId, - autofillForm + autofillForm, ); return; } const autofillField = this.autofillFieldElements.get( - targetElement as ElementWithOpId + targetElement as ElementWithOpId, ); if (!autofillField) { return; @@ -1104,7 +1136,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte this.updateAutofillFieldElementData( attributeName, targetElement as ElementWithOpId, - autofillField + autofillField, ); } @@ -1118,7 +1150,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte private updateAutofillFormElementData( attributeName: string, element: ElementWithOpId, - dataTarget: AutofillForm + dataTarget: AutofillForm, ) { const updateAttribute = (dataTargetKey: string) => { this.updateAutofillDataAttribute({ element, attributeName, dataTarget, dataTargetKey }); @@ -1149,7 +1181,7 @@ class CollectAutofillContentService implements CollectAutofillContentServiceInte private async updateAutofillFieldElementData( attributeName: string, element: ElementWithOpId, - dataTarget: AutofillField + dataTarget: AutofillField, ) { const updateAttribute = (dataTargetKey: string) => { this.updateAutofillDataAttribute({ element, attributeName, dataTarget, dataTargetKey }); diff --git a/apps/browser/src/autofill/services/dom-element-visibility.service.spec.ts b/apps/browser/src/autofill/services/dom-element-visibility.service.spec.ts index e17783b7a65..1fb1f969b53 100644 --- a/apps/browser/src/autofill/services/dom-element-visibility.service.spec.ts +++ b/apps/browser/src/autofill/services/dom-element-visibility.service.spec.ts @@ -47,19 +47,18 @@ describe("DomElementVisibilityService", () => { jest.spyOn(domElementVisibilityService, "isElementHiddenByCss"); jest.spyOn(domElementVisibilityService as any, "formFieldIsNotHiddenBehindAnotherElement"); - const isFormFieldViewable = await domElementVisibilityService.isFormFieldViewable( - usernameElement - ); + const isFormFieldViewable = + await domElementVisibilityService.isFormFieldViewable(usernameElement); expect(isFormFieldViewable).toEqual(false); expect(usernameElement.getBoundingClientRect).toHaveBeenCalled(); expect(domElementVisibilityService["isElementOutsideViewportBounds"]).toHaveBeenCalledWith( usernameElement, - usernameElement.getBoundingClientRect() + usernameElement.getBoundingClientRect(), ); expect(domElementVisibilityService["isElementHiddenByCss"]).not.toHaveBeenCalled(); expect( - domElementVisibilityService["formFieldIsNotHiddenBehindAnotherElement"] + domElementVisibilityService["formFieldIsNotHiddenBehindAnotherElement"], ).not.toHaveBeenCalled(); }); @@ -72,21 +71,20 @@ describe("DomElementVisibilityService", () => { jest.spyOn(domElementVisibilityService, "isElementHiddenByCss").mockReturnValueOnce(true); jest.spyOn(domElementVisibilityService as any, "formFieldIsNotHiddenBehindAnotherElement"); - const isFormFieldViewable = await domElementVisibilityService.isFormFieldViewable( - usernameElement - ); + const isFormFieldViewable = + await domElementVisibilityService.isFormFieldViewable(usernameElement); expect(isFormFieldViewable).toEqual(false); expect(usernameElement.getBoundingClientRect).toHaveBeenCalled(); expect(domElementVisibilityService["isElementOutsideViewportBounds"]).toHaveBeenCalledWith( usernameElement, - usernameElement.getBoundingClientRect() + usernameElement.getBoundingClientRect(), ); expect(domElementVisibilityService["isElementHiddenByCss"]).toHaveBeenCalledWith( - usernameElement + usernameElement, ); expect( - domElementVisibilityService["formFieldIsNotHiddenBehindAnotherElement"] + domElementVisibilityService["formFieldIsNotHiddenBehindAnotherElement"], ).not.toHaveBeenCalled(); }); @@ -101,21 +99,20 @@ describe("DomElementVisibilityService", () => { .spyOn(domElementVisibilityService as any, "formFieldIsNotHiddenBehindAnotherElement") .mockReturnValueOnce(false); - const isFormFieldViewable = await domElementVisibilityService.isFormFieldViewable( - usernameElement - ); + const isFormFieldViewable = + await domElementVisibilityService.isFormFieldViewable(usernameElement); expect(isFormFieldViewable).toEqual(false); expect(usernameElement.getBoundingClientRect).toHaveBeenCalled(); expect(domElementVisibilityService["isElementOutsideViewportBounds"]).toHaveBeenCalledWith( usernameElement, - usernameElement.getBoundingClientRect() + usernameElement.getBoundingClientRect(), ); expect(domElementVisibilityService["isElementHiddenByCss"]).toHaveBeenCalledWith( - usernameElement + usernameElement, ); expect( - domElementVisibilityService["formFieldIsNotHiddenBehindAnotherElement"] + domElementVisibilityService["formFieldIsNotHiddenBehindAnotherElement"], ).toHaveBeenCalledWith(usernameElement, usernameElement.getBoundingClientRect()); }); @@ -130,21 +127,20 @@ describe("DomElementVisibilityService", () => { .spyOn(domElementVisibilityService as any, "formFieldIsNotHiddenBehindAnotherElement") .mockReturnValueOnce(true); - const isFormFieldViewable = await domElementVisibilityService.isFormFieldViewable( - usernameElement - ); + const isFormFieldViewable = + await domElementVisibilityService.isFormFieldViewable(usernameElement); expect(isFormFieldViewable).toEqual(true); expect(usernameElement.getBoundingClientRect).toHaveBeenCalled(); expect(domElementVisibilityService["isElementOutsideViewportBounds"]).toHaveBeenCalledWith( usernameElement, - usernameElement.getBoundingClientRect() + usernameElement.getBoundingClientRect(), ); expect(domElementVisibilityService["isElementHiddenByCss"]).toHaveBeenCalledWith( - usernameElement + usernameElement, ); expect( - domElementVisibilityService["formFieldIsNotHiddenBehindAnotherElement"] + domElementVisibilityService["formFieldIsNotHiddenBehindAnotherElement"], ).toHaveBeenCalledWith(usernameElement, usernameElement.getBoundingClientRect()); }); }); @@ -186,12 +182,12 @@ describe("DomElementVisibilityService", () => { expect(isUsernameElementHidden).toEqual(true); expect(usernameElement.style.getPropertyValue).toHaveBeenCalled(); expect(usernameElement.ownerDocument.defaultView.getComputedStyle).toHaveBeenCalledWith( - usernameElement + usernameElement, ); expect(isPasswordElementHidden).toEqual(true); expect(passwordElement.style.getPropertyValue).toHaveBeenCalled(); expect(passwordElement.ownerDocument.defaultView.getComputedStyle).toHaveBeenCalledWith( - passwordElement + passwordElement, ); }); @@ -391,7 +387,7 @@ describe("DomElementVisibilityService", () => { expect(formFieldIsNotHiddenBehindAnotherElement).toEqual(true); expect(document.elementFromPoint).toHaveBeenCalledWith( mockBoundingRect.left + mockBoundingRect.width / 2, - mockBoundingRect.top + mockBoundingRect.height / 2 + mockBoundingRect.top + mockBoundingRect.height / 2, ); expect(usernameElement.getBoundingClientRect).not.toHaveBeenCalled(); }); diff --git a/apps/browser/src/autofill/services/dom-element-visibility.service.ts b/apps/browser/src/autofill/services/dom-element-visibility.service.ts index 2797ee0eb3d..acc5b120596 100644 --- a/apps/browser/src/autofill/services/dom-element-visibility.service.ts +++ b/apps/browser/src/autofill/services/dom-element-visibility.service.ts @@ -67,7 +67,7 @@ class DomElementVisibilityService implements domElementVisibilityServiceInterfac private getElementStyle(element: HTMLElement, styleProperty: string): string { if (!this.cachedComputedStyle) { this.cachedComputedStyle = (element.ownerDocument.defaultView || window).getComputedStyle( - element + element, ); } @@ -132,7 +132,7 @@ class DomElementVisibilityService implements domElementVisibilityServiceInterfac */ private isElementOutsideViewportBounds( targetElement: HTMLElement, - targetElementBoundingClientRect: DOMRectReadOnly | null = null + targetElementBoundingClientRect: DOMRectReadOnly | null = null, ): boolean { const documentElement = targetElement.ownerDocument.documentElement; const documentElementWidth = documentElement.scrollWidth; @@ -171,7 +171,7 @@ class DomElementVisibilityService implements domElementVisibilityServiceInterfac */ private formFieldIsNotHiddenBehindAnotherElement( targetElement: FormFieldElement, - targetElementBoundingClientRect: DOMRectReadOnly | null = null + targetElementBoundingClientRect: DOMRectReadOnly | null = null, ): boolean { const elementBoundingClientRect = targetElementBoundingClientRect || targetElement.getBoundingClientRect(); @@ -180,7 +180,7 @@ class DomElementVisibilityService implements domElementVisibilityServiceInterfac elementRootNode instanceof ShadowRoot ? elementRootNode : targetElement.ownerDocument; const elementAtCenterPoint = rootElement.elementFromPoint( elementBoundingClientRect.left + elementBoundingClientRect.width / 2, - elementBoundingClientRect.top + elementBoundingClientRect.height / 2 + elementBoundingClientRect.top + elementBoundingClientRect.height / 2, ); if (elementAtCenterPoint === targetElement) { diff --git a/apps/browser/src/autofill/services/insert-autofill-content.service.spec.ts b/apps/browser/src/autofill/services/insert-autofill-content.service.spec.ts index b6739db36a2..a3173204c97 100644 --- a/apps/browser/src/autofill/services/insert-autofill-content.service.spec.ts +++ b/apps/browser/src/autofill/services/insert-autofill-content.service.spec.ts @@ -41,8 +41,8 @@ const initEventCount = Object.freeze( ...eventCounts, [eventName]: 0, }), - {} - ) + {}, + ), ); let confirmSpy: jest.SpyInstance; @@ -68,7 +68,7 @@ describe("InsertAutofillContentService", () => { const autofillOverlayContentService = new AutofillOverlayContentService(); const collectAutofillContentService = new CollectAutofillContentService( domElementVisibilityService, - autofillOverlayContentService + autofillOverlayContentService, ); let insertAutofillContentService: InsertAutofillContentService; let fillScript: AutofillScript; @@ -79,7 +79,7 @@ describe("InsertAutofillContentService", () => { windowSpy = jest.spyOn(window, "window", "get"); insertAutofillContentService = new InsertAutofillContentService( domElementVisibilityService, - collectAutofillContentService + collectAutofillContentService, ); fillScript = { script: [ @@ -117,10 +117,10 @@ describe("InsertAutofillContentService", () => { expect(insertAutofillContentService["fillingWithinSandboxedIframe"]).not.toHaveBeenCalled(); expect( - insertAutofillContentService["userCancelledInsecureUrlAutofill"] + insertAutofillContentService["userCancelledInsecureUrlAutofill"], ).not.toHaveBeenCalled(); expect( - insertAutofillContentService["userCancelledUntrustedIframeAutofill"] + insertAutofillContentService["userCancelledUntrustedIframeAutofill"], ).not.toHaveBeenCalled(); expect(insertAutofillContentService["runFillScriptAction"]).not.toHaveBeenCalled(); }); @@ -137,10 +137,10 @@ describe("InsertAutofillContentService", () => { expect(insertAutofillContentService["fillingWithinSandboxedIframe"]).toHaveBeenCalled(); expect( - insertAutofillContentService["userCancelledInsecureUrlAutofill"] + insertAutofillContentService["userCancelledInsecureUrlAutofill"], ).not.toHaveBeenCalled(); expect( - insertAutofillContentService["userCancelledUntrustedIframeAutofill"] + insertAutofillContentService["userCancelledUntrustedIframeAutofill"], ).not.toHaveBeenCalled(); expect(insertAutofillContentService["runFillScriptAction"]).not.toHaveBeenCalled(); }); @@ -160,7 +160,7 @@ describe("InsertAutofillContentService", () => { expect(insertAutofillContentService["fillingWithinSandboxedIframe"]).toHaveBeenCalled(); expect(insertAutofillContentService["userCancelledInsecureUrlAutofill"]).toHaveBeenCalled(); expect( - insertAutofillContentService["userCancelledUntrustedIframeAutofill"] + insertAutofillContentService["userCancelledUntrustedIframeAutofill"], ).not.toHaveBeenCalled(); expect(insertAutofillContentService["runFillScriptAction"]).not.toHaveBeenCalled(); }); @@ -182,7 +182,7 @@ describe("InsertAutofillContentService", () => { expect(insertAutofillContentService["fillingWithinSandboxedIframe"]).toHaveBeenCalled(); expect(insertAutofillContentService["userCancelledInsecureUrlAutofill"]).toHaveBeenCalled(); expect( - insertAutofillContentService["userCancelledUntrustedIframeAutofill"] + insertAutofillContentService["userCancelledUntrustedIframeAutofill"], ).toHaveBeenCalled(); expect(insertAutofillContentService["runFillScriptAction"]).not.toHaveBeenCalled(); }); @@ -204,26 +204,26 @@ describe("InsertAutofillContentService", () => { expect(insertAutofillContentService["fillingWithinSandboxedIframe"]).toHaveBeenCalled(); expect(insertAutofillContentService["userCancelledInsecureUrlAutofill"]).toHaveBeenCalled(); expect( - insertAutofillContentService["userCancelledUntrustedIframeAutofill"] + insertAutofillContentService["userCancelledUntrustedIframeAutofill"], ).toHaveBeenCalled(); expect(insertAutofillContentService["runFillScriptAction"]).toHaveBeenCalledTimes(3); expect(insertAutofillContentService["runFillScriptAction"]).toHaveBeenNthCalledWith( 1, fillScript.script[0], 0, - fillScript.script + fillScript.script, ); expect(insertAutofillContentService["runFillScriptAction"]).toHaveBeenNthCalledWith( 2, fillScript.script[1], 1, - fillScript.script + fillScript.script, ); expect(insertAutofillContentService["runFillScriptAction"]).toHaveBeenNthCalledWith( 3, fillScript.script[2], 2, - fillScript.script + fillScript.script, ); }); }); @@ -432,7 +432,7 @@ describe("InsertAutofillContentService", () => { jest.advanceTimersByTime(20); expect( - insertAutofillContentService["autofillInsertActions"][action] + insertAutofillContentService["autofillInsertActions"][action], ).toHaveBeenCalledWith({ opid, value, @@ -451,18 +451,18 @@ describe("InsertAutofillContentService", () => { textInput.value = value; jest.spyOn( insertAutofillContentService["collectAutofillContentService"], - "getAutofillFieldElementByOpid" + "getAutofillFieldElementByOpid", ); jest.spyOn(insertAutofillContentService as any, "insertValueIntoField"); insertAutofillContentService["handleFillFieldByOpidAction"](opid, value); expect( - insertAutofillContentService["collectAutofillContentService"].getAutofillFieldElementByOpid + insertAutofillContentService["collectAutofillContentService"].getAutofillFieldElementByOpid, ).toHaveBeenCalledWith(opid); expect(insertAutofillContentService["insertValueIntoField"]).toHaveBeenCalledWith( textInput, - value + value, ); }); }); @@ -483,17 +483,17 @@ describe("InsertAutofillContentService", () => { textInput.addEventListener("click", clickEventHandler); jest.spyOn( insertAutofillContentService["collectAutofillContentService"], - "getAutofillFieldElementByOpid" + "getAutofillFieldElementByOpid", ); jest.spyOn(insertAutofillContentService as any, "triggerClickOnElement"); insertAutofillContentService["handleClickOnFieldByOpidAction"]("__1"); expect( - insertAutofillContentService["collectAutofillContentService"].getAutofillFieldElementByOpid + insertAutofillContentService["collectAutofillContentService"].getAutofillFieldElementByOpid, ).toBeCalledWith("__1"); expect((insertAutofillContentService as any)["triggerClickOnElement"]).toHaveBeenCalledWith( - textInput + textInput, ); expect(clickEventCount).toBe(expectedClickEventCount); @@ -544,20 +544,20 @@ describe("InsertAutofillContentService", () => { }); jest.spyOn( insertAutofillContentService["collectAutofillContentService"], - "getAutofillFieldElementByOpid" + "getAutofillFieldElementByOpid", ); jest.spyOn( insertAutofillContentService as any, - "simulateUserMouseClickAndFocusEventInteractions" + "simulateUserMouseClickAndFocusEventInteractions", ); insertAutofillContentService["handleFocusOnFieldByOpidAction"]("__0"); expect( - insertAutofillContentService["collectAutofillContentService"].getAutofillFieldElementByOpid + insertAutofillContentService["collectAutofillContentService"].getAutofillFieldElementByOpid, ).toBeCalledWith("__0"); expect( - insertAutofillContentService["simulateUserMouseClickAndFocusEventInteractions"] + insertAutofillContentService["simulateUserMouseClickAndFocusEventInteractions"], ).toHaveBeenCalledWith(targetInput, true); expect(elementEventCount).toEqual(expectedElementEventCount); }); @@ -572,7 +572,7 @@ describe("InsertAutofillContentService", () => { insertAutofillContentService["insertValueIntoField"](element, value); expect( - insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"] + insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"], ).not.toHaveBeenCalled(); }); @@ -584,7 +584,7 @@ describe("InsertAutofillContentService", () => { insertAutofillContentService["insertValueIntoField"](element, value); expect( - insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"] + insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"], ).not.toHaveBeenCalled(); }); @@ -598,7 +598,7 @@ describe("InsertAutofillContentService", () => { expect(element.innerText).toBe(value); expect( - insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"] + insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"], ).toHaveBeenCalledWith(element, expect.any(Function)); }); @@ -616,10 +616,10 @@ describe("InsertAutofillContentService", () => { expect(checkboxElement.checked).toBe(true); expect(radioElement.checked).toBe(true); expect( - insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"] + insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"], ).toHaveBeenCalledWith(checkboxElement, expect.any(Function)); expect( - insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"] + insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"], ).toHaveBeenCalledWith(radioElement, expect.any(Function)); checkboxElement.checked = false; @@ -641,14 +641,14 @@ describe("InsertAutofillContentService", () => { expect(textInputElement.value).toBe(value1); expect( - insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"] + insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"], ).toHaveBeenCalledWith(textInputElement, expect.any(Function)); insertAutofillContentService["insertValueIntoField"](textareaElement, value2); expect(textareaElement.value).toBe(value2); expect( - insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"] + insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"], ).toHaveBeenCalledWith(textareaElement, expect.any(Function)); }); }); @@ -661,23 +661,23 @@ describe("InsertAutofillContentService", () => { jest.spyOn(insertAutofillContentService as any, "triggerPostInsertEventsOnElement"); jest.spyOn(insertAutofillContentService as any, "triggerFillAnimationOnElement"); const valueChangeCallback = jest.fn( - () => ((element as FillableFormFieldElement).value = value) + () => ((element as FillableFormFieldElement).value = value), ); insertAutofillContentService["handleInsertValueAndTriggerSimulatedEvents"]( element, - valueChangeCallback + valueChangeCallback, ); expect(insertAutofillContentService["triggerPreInsertEventsOnElement"]).toHaveBeenCalledWith( - element + element, ); expect(valueChangeCallback).toHaveBeenCalled(); expect(insertAutofillContentService["triggerPostInsertEventsOnElement"]).toHaveBeenCalledWith( - element + element, ); expect(insertAutofillContentService["triggerFillAnimationOnElement"]).toHaveBeenCalledWith( - element + element, ); expect((element as FillableFormFieldElement).value).toBe(value); }); @@ -690,17 +690,17 @@ describe("InsertAutofillContentService", () => { const element = document.getElementById("username") as FillableFormFieldElement; jest.spyOn( insertAutofillContentService as any, - "simulateUserMouseClickAndFocusEventInteractions" + "simulateUserMouseClickAndFocusEventInteractions", ); jest.spyOn(insertAutofillContentService as any, "simulateUserKeyboardEventInteractions"); insertAutofillContentService["triggerPreInsertEventsOnElement"](element); expect( - insertAutofillContentService["simulateUserMouseClickAndFocusEventInteractions"] + insertAutofillContentService["simulateUserMouseClickAndFocusEventInteractions"], ).toHaveBeenCalledWith(element); expect( - insertAutofillContentService["simulateUserKeyboardEventInteractions"] + insertAutofillContentService["simulateUserKeyboardEventInteractions"], ).toHaveBeenCalledWith(element); expect(element.value).toBe(initialElementValue); }); @@ -718,10 +718,10 @@ describe("InsertAutofillContentService", () => { insertAutofillContentService["triggerPostInsertEventsOnElement"](element); expect( - insertAutofillContentService["simulateUserKeyboardEventInteractions"] + insertAutofillContentService["simulateUserKeyboardEventInteractions"], ).toHaveBeenCalledWith(element); expect(insertAutofillContentService["simulateInputElementChangedEvent"]).toHaveBeenCalledWith( - element + element, ); expect(element.blur).toHaveBeenCalled(); expect(element.value).toBe(elementValue); @@ -738,7 +738,7 @@ describe("InsertAutofillContentService", () => { it("the element is a non-hidden hidden input type", async () => { document.body.innerHTML = mockLoginForm + ''; const testElement = document.querySelector( - 'input[type="hidden"]' + 'input[type="hidden"]', ) as FillableFormFieldElement; jest.spyOn(testElement.classList, "add"); jest.spyOn(testElement.classList, "remove"); @@ -778,7 +778,7 @@ describe("InsertAutofillContentService", () => { it("the element has a `visibility: hidden;` CSS rule applied to it", () => { const testElement = document.querySelector( - 'input[type="password"]' + 'input[type="password"]', ) as FillableFormFieldElement; testElement.style.visibility = "hidden"; jest.spyOn(testElement.classList, "add"); @@ -793,7 +793,7 @@ describe("InsertAutofillContentService", () => { it("the element has a `display: none;` CSS rule applied to it", () => { const testElement = document.querySelector( - 'input[type="password"]' + 'input[type="password"]', ) as FillableFormFieldElement; testElement.style.display = "none"; jest.spyOn(testElement.classList, "add"); @@ -810,7 +810,7 @@ describe("InsertAutofillContentService", () => { document.body.innerHTML = mockLoginForm + '
'; const testElement = document.querySelector( - 'input[type="email"]' + 'input[type="email"]', ) as FillableFormFieldElement; jest.spyOn(testElement.classList, "add"); jest.spyOn(testElement.classList, "remove"); @@ -826,11 +826,11 @@ describe("InsertAutofillContentService", () => { describe("will trigger the animation when...", () => { it("the element is a non-hidden password field", () => { const testElement = document.querySelector( - 'input[type="password"]' + 'input[type="password"]', ) as FillableFormFieldElement; jest.spyOn( insertAutofillContentService["domElementVisibilityService"], - "isElementHiddenByCss" + "isElementHiddenByCss", ); jest.spyOn(testElement.classList, "add"); jest.spyOn(testElement.classList, "remove"); @@ -839,20 +839,20 @@ describe("InsertAutofillContentService", () => { jest.advanceTimersByTime(200); expect( - insertAutofillContentService["domElementVisibilityService"].isElementHiddenByCss + insertAutofillContentService["domElementVisibilityService"].isElementHiddenByCss, ).toHaveBeenCalledWith(testElement); expect(testElement.classList.add).toHaveBeenCalledWith( - "com-bitwarden-browser-animated-fill" + "com-bitwarden-browser-animated-fill", ); expect(testElement.classList.remove).toHaveBeenCalledWith( - "com-bitwarden-browser-animated-fill" + "com-bitwarden-browser-animated-fill", ); }); it("the element is a non-hidden email input", () => { document.body.innerHTML = mockLoginForm + ''; const testElement = document.querySelector( - 'input[type="email"]' + 'input[type="email"]', ) as FillableFormFieldElement; jest.spyOn(testElement.classList, "add"); jest.spyOn(testElement.classList, "remove"); @@ -861,17 +861,17 @@ describe("InsertAutofillContentService", () => { jest.advanceTimersByTime(200); expect(testElement.classList.add).toHaveBeenCalledWith( - "com-bitwarden-browser-animated-fill" + "com-bitwarden-browser-animated-fill", ); expect(testElement.classList.remove).toHaveBeenCalledWith( - "com-bitwarden-browser-animated-fill" + "com-bitwarden-browser-animated-fill", ); }); it("the element is a non-hidden text input", () => { document.body.innerHTML = mockLoginForm + ''; const testElement = document.querySelector( - 'input[type="text"]' + 'input[type="text"]', ) as FillableFormFieldElement; jest.spyOn(testElement.classList, "add"); jest.spyOn(testElement.classList, "remove"); @@ -880,17 +880,17 @@ describe("InsertAutofillContentService", () => { jest.advanceTimersByTime(200); expect(testElement.classList.add).toHaveBeenCalledWith( - "com-bitwarden-browser-animated-fill" + "com-bitwarden-browser-animated-fill", ); expect(testElement.classList.remove).toHaveBeenCalledWith( - "com-bitwarden-browser-animated-fill" + "com-bitwarden-browser-animated-fill", ); }); it("the element is a non-hidden number input", () => { document.body.innerHTML = mockLoginForm + ''; const testElement = document.querySelector( - 'input[type="number"]' + 'input[type="number"]', ) as FillableFormFieldElement; jest.spyOn(testElement.classList, "add"); jest.spyOn(testElement.classList, "remove"); @@ -899,10 +899,10 @@ describe("InsertAutofillContentService", () => { jest.advanceTimersByTime(200); expect(testElement.classList.add).toHaveBeenCalledWith( - "com-bitwarden-browser-animated-fill" + "com-bitwarden-browser-animated-fill", ); expect(testElement.classList.remove).toHaveBeenCalledWith( - "com-bitwarden-browser-animated-fill" + "com-bitwarden-browser-animated-fill", ); }); @@ -916,10 +916,10 @@ describe("InsertAutofillContentService", () => { jest.advanceTimersByTime(200); expect(testElement.classList.add).toHaveBeenCalledWith( - "com-bitwarden-browser-animated-fill" + "com-bitwarden-browser-animated-fill", ); expect(testElement.classList.remove).toHaveBeenCalledWith( - "com-bitwarden-browser-animated-fill" + "com-bitwarden-browser-animated-fill", ); }); @@ -933,10 +933,10 @@ describe("InsertAutofillContentService", () => { jest.advanceTimersByTime(200); expect(testElement.classList.add).toHaveBeenCalledWith( - "com-bitwarden-browser-animated-fill" + "com-bitwarden-browser-animated-fill", ); expect(testElement.classList.remove).toHaveBeenCalledWith( - "com-bitwarden-browser-animated-fill" + "com-bitwarden-browser-animated-fill", ); }); @@ -950,10 +950,10 @@ describe("InsertAutofillContentService", () => { jest.advanceTimersByTime(200); expect(testElement.classList.add).toHaveBeenCalledWith( - "com-bitwarden-browser-animated-fill" + "com-bitwarden-browser-animated-fill", ); expect(testElement.classList.remove).toHaveBeenCalledWith( - "com-bitwarden-browser-animated-fill" + "com-bitwarden-browser-animated-fill", ); }); }); @@ -1009,11 +1009,11 @@ describe("InsertAutofillContentService", () => { insertAutofillContentService["simulateUserMouseClickAndFocusEventInteractions"](inputElement); expect(insertAutofillContentService["triggerClickOnElement"]).toHaveBeenCalledWith( - inputElement + inputElement, ); expect(insertAutofillContentService["triggerFocusOnElement"]).toHaveBeenCalledWith( inputElement, - false + false, ); }); }); @@ -1027,7 +1027,7 @@ describe("InsertAutofillContentService", () => { [EVENTS.KEYDOWN, EVENTS.KEYPRESS, EVENTS.KEYUP].forEach((eventName) => { expect(inputElement.dispatchEvent).toHaveBeenCalledWith( - new KeyboardEvent(eventName, { bubbles: true }) + new KeyboardEvent(eventName, { bubbles: true }), ); }); }); @@ -1042,7 +1042,7 @@ describe("InsertAutofillContentService", () => { [EVENTS.INPUT, EVENTS.CHANGE].forEach((eventName) => { expect(inputElement.dispatchEvent).toHaveBeenCalledWith( - new Event(eventName, { bubbles: true }) + new Event(eventName, { bubbles: true }), ); }); }); diff --git a/apps/browser/src/autofill/services/insert-autofill-content.service.ts b/apps/browser/src/autofill/services/insert-autofill-content.service.ts index 11a2d7fc71e..3d95de0767c 100644 --- a/apps/browser/src/autofill/services/insert-autofill-content.service.ts +++ b/apps/browser/src/autofill/services/insert-autofill-content.service.ts @@ -21,7 +21,7 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf */ constructor( domElementVisibilityService: DomElementVisibilityService, - collectAutofillContentService: CollectAutofillContentService + collectAutofillContentService: CollectAutofillContentService, ) { this.domElementVisibilityService = domElementVisibilityService; this.collectAutofillContentService = collectAutofillContentService; @@ -97,8 +97,8 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf this.collectAutofillContentService.queryAllTreeWalkerNodes( document.documentElement, (node: Node) => node instanceof HTMLInputElement && node.type === "password", - false - )?.length + false, + )?.length, ); } @@ -139,7 +139,7 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf */ private runFillScriptAction = ( [action, opid, value]: FillScript, - actionIndex: number + actionIndex: number, ): Promise => { if (!opid || !this.autofillInsertActions[action]) { return; @@ -150,7 +150,7 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf setTimeout(() => { this.autofillInsertActions[action]({ opid, value }); resolve(); - }, delayActionsInMilliseconds * actionIndex) + }, delayActionsInMilliseconds * actionIndex), ); }; @@ -233,7 +233,7 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf */ private handleInsertValueAndTriggerSimulatedEvents( element: FormFieldElement, - valueChangeCallback: CallableFunction + valueChangeCallback: CallableFunction, ): void { this.triggerPreInsertEventsOnElement(element); valueChangeCallback(); @@ -341,7 +341,7 @@ class InsertAutofillContentService implements InsertAutofillContentServiceInterf */ private simulateUserMouseClickAndFocusEventInteractions( element: FormFieldElement, - shouldResetValue = false + shouldResetValue = false, ): void { this.triggerClickOnElement(element); this.triggerFocusOnElement(element, shouldResetValue); diff --git a/apps/browser/src/autofill/utils/utils.spec.ts b/apps/browser/src/autofill/utils/utils.spec.ts index 43c3ef03ae5..1da83fef242 100644 --- a/apps/browser/src/autofill/utils/utils.spec.ts +++ b/apps/browser/src/autofill/utils/utils.spec.ts @@ -52,7 +52,7 @@ describe("setElementStyles", () => { const domParser = new DOMParser(); const testDivDOM = domParser.parseFromString( "
This is an unexciting div.
", - "text/html" + "text/html", ); const testDiv = testDivDOM.querySelector("div"); @@ -67,7 +67,7 @@ describe("setElementStyles", () => { const domParser = new DOMParser(); const testDivDOM = domParser.parseFromString( "
This is an unexciting div.
", - "text/html" + "text/html", ); const testDiv = testDivDOM.querySelector("div"); @@ -82,7 +82,7 @@ describe("setElementStyles", () => { const domParser = new DOMParser(); const testDivDOM = domParser.parseFromString( "
This is an unexciting div.
", - "text/html" + "text/html", ); const testDiv = testDivDOM.querySelector("div"); @@ -101,7 +101,7 @@ describe("setElementStyles", () => { const domParser = new DOMParser(); const testDivDOM = domParser.parseFromString( "
This is an unexciting div.
", - "text/html" + "text/html", ); const testDiv = testDivDOM.querySelector("div"); diff --git a/apps/browser/src/autofill/utils/utils.ts b/apps/browser/src/autofill/utils/utils.ts index 8f953fb01b9..73e133da32c 100644 --- a/apps/browser/src/autofill/utils/utils.ts +++ b/apps/browser/src/autofill/utils/utils.ts @@ -65,7 +65,7 @@ function buildSvgDomElement(svgString: string, ariaHidden = true): HTMLElement { */ async function sendExtensionMessage( command: string, - options: Record = {} + options: Record = {}, ): Promise { return new Promise((resolve) => { chrome.runtime.sendMessage(Object.assign({ command }, options), (response) => { @@ -88,7 +88,7 @@ async function sendExtensionMessage( function setElementStyles( element: HTMLElement, styles: Partial, - priority?: boolean + priority?: boolean, ) { if (!element || !styles || !Object.keys(styles).length) { return; @@ -98,7 +98,7 @@ function setElementStyles( element.style.setProperty( styleProperty.replace(/([a-z])([A-Z])/g, "$1-$2"), // Convert camelCase to kebab-case styles[styleProperty], - priority ? "important" : undefined + priority ? "important" : undefined, ); } } diff --git a/apps/browser/src/background/commands.background.ts b/apps/browser/src/background/commands.background.ts index 210119aa5f2..a37717baa03 100644 --- a/apps/browser/src/background/commands.background.ts +++ b/apps/browser/src/background/commands.background.ts @@ -5,10 +5,10 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; import { openUnlockPopout } from "../auth/popup/utils/auth-popout-window"; +import LockedVaultPendingNotificationsItem from "../autofill/notification/models/locked-vault-pending-notifications-item"; import { BrowserApi } from "../platform/browser/browser-api"; import MainBackground from "./main.background"; -import LockedVaultPendingNotificationsItem from "./models/lockedVaultPendingNotificationsItem"; export default class CommandsBackground { private isSafari: boolean; @@ -19,7 +19,7 @@ export default class CommandsBackground { private passwordGenerationService: PasswordGenerationServiceAbstraction, private platformUtilsService: PlatformUtilsService, private vaultTimeoutService: VaultTimeoutService, - private authService: AuthService + private authService: AuthService, ) { this.isSafari = this.platformUtilsService.isSafari(); this.isVivaldi = this.platformUtilsService.isVivaldi(); @@ -85,7 +85,7 @@ export default class CommandsBackground { await BrowserApi.tabSendMessageData( tab, "addToLockedVaultPendingNotifications", - retryMessage + retryMessage, ); await openUnlockPopout(tab); diff --git a/apps/browser/src/background/idle.background.ts b/apps/browser/src/background/idle.background.ts index 7200301c795..ccc76883b11 100644 --- a/apps/browser/src/background/idle.background.ts +++ b/apps/browser/src/background/idle.background.ts @@ -14,7 +14,7 @@ export default class IdleBackground { constructor( private vaultTimeoutService: VaultTimeoutService, private stateService: BrowserStateService, - private notificationsService: NotificationsService + private notificationsService: NotificationsService, ) { this.idle = chrome.idle || (browser != null ? browser.idle : null); } diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index bb61bb64658..ec08fef4e22 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -24,6 +24,8 @@ import { TokenService as TokenServiceAbstraction } from "@bitwarden/common/auth/ import { TwoFactorService as TwoFactorServiceAbstraction } from "@bitwarden/common/auth/abstractions/two-factor.service"; import { UserVerificationApiServiceAbstraction } from "@bitwarden/common/auth/abstractions/user-verification/user-verification-api.service.abstraction"; import { UserVerificationService as UserVerificationServiceAbstraction } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction"; +import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; +import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason"; import { AccountServiceImplementation } from "@bitwarden/common/auth/services/account.service"; import { AuthRequestCryptoServiceImplementation } from "@bitwarden/common/auth/services/auth-request-crypto.service.implementation"; import { AuthService } from "@bitwarden/common/auth/services/auth.service"; @@ -87,6 +89,7 @@ import { import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service"; import { SendApiService as SendApiServiceAbstraction } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { InternalSendService as InternalSendServiceAbstraction } from "@bitwarden/common/tools/send/services/send.service.abstraction"; +import { UserId } from "@bitwarden/common/types/guid"; import { CipherService as CipherServiceAbstraction } from "@bitwarden/common/vault/abstractions/cipher.service"; import { CollectionService as CollectionServiceAbstraction } from "@bitwarden/common/vault/abstractions/collection.service"; import { Fido2AuthenticatorService as Fido2AuthenticatorServiceAbstraction } from "@bitwarden/common/vault/abstractions/fido2/fido2-authenticator.service.abstraction"; @@ -125,6 +128,7 @@ import ContextMenusBackground from "../autofill/background/context-menus.backgro import NotificationBackground from "../autofill/background/notification.background"; import OverlayBackground from "../autofill/background/overlay.background"; import TabsBackground from "../autofill/background/tabs.background"; +import WebRequestBackground from "../autofill/background/web-request.background"; import { CipherContextMenuHandler } from "../autofill/browser/cipher-context-menu-handler"; import { ContextMenuClickedHandler } from "../autofill/browser/context-menu-clicked-handler"; import { MainContextMenuHandler } from "../autofill/browser/main-context-menu-handler"; @@ -159,7 +163,6 @@ import CommandsBackground from "./commands.background"; import IdleBackground from "./idle.background"; import { NativeMessagingBackground } from "./nativeMessaging.background"; import RuntimeBackground from "./runtime.background"; -import WebRequestBackground from "./webRequest.background"; export default class MainBackground { messagingService: MessagingServiceAbstraction; @@ -281,17 +284,17 @@ export default class MainBackground { BrowserApi.manifestVersion === 3 ? new LocalBackedSessionStorageService( new EncryptServiceImplementation(this.cryptoFunctionService, this.logService, false), - new KeyGenerationService(this.cryptoFunctionService) + new KeyGenerationService(this.cryptoFunctionService), ) : new BackgroundMemoryStorageService(); this.globalStateProvider = new DefaultGlobalStateProvider( this.memoryStorageService as BackgroundMemoryStorageService, - this.storageService as BrowserLocalStorageService + this.storageService as BrowserLocalStorageService, ); this.accountService = new AccountServiceImplementation( this.messagingService, this.logService, - this.globalStateProvider + this.globalStateProvider, ); this.stateService = new BrowserStateService( this.storageService, @@ -299,7 +302,7 @@ export default class MainBackground { this.memoryStorageService, this.logService, new StateFactory(GlobalState, Account), - this.accountService + this.accountService, ); this.platformUtilsService = new BrowserPlatformUtilsService( this.messagingService, @@ -321,14 +324,14 @@ export default class MainBackground { return promise.then((result) => result.response === "unlocked"); } }, - window + window, ); this.i18nService = new BrowserI18nService(BrowserApi.getUILanguage(), this.stateService); this.encryptService = flagEnabled("multithreadDecryption") ? new MultithreadEncryptServiceImplementation( this.cryptoFunctionService, this.logService, - true + true, ) : new EncryptServiceImplementation(this.cryptoFunctionService, this.logService, true); this.cryptoService = new BrowserCryptoService( @@ -336,7 +339,7 @@ export default class MainBackground { this.encryptService, this.platformUtilsService, this.logService, - this.stateService + this.stateService, ); this.tokenService = new TokenService(this.stateService); this.appIdService = new AppIdService(this.storageService); @@ -346,20 +349,20 @@ export default class MainBackground { this.platformUtilsService, this.environmentService, this.appIdService, - (expired: boolean) => this.logout(expired) + (expired: boolean) => this.logout(expired), ); this.settingsService = new BrowserSettingsService(this.stateService); this.fileUploadService = new FileUploadService(this.logService); this.cipherFileUploadService = new CipherFileUploadService( this.apiService, - this.fileUploadService + this.fileUploadService, ); this.searchService = new SearchService(this.logService, this.i18nService); this.collectionService = new CollectionService( this.cryptoService, this.i18nService, - this.stateService + this.stateService, ); this.syncNotifierService = new SyncNotifierService(); this.organizationService = new BrowserOrganizationService(this.stateService); @@ -367,7 +370,7 @@ export default class MainBackground { this.policyApiService = new PolicyApiService( this.policyService, this.apiService, - this.stateService + this.stateService, ); this.keyConnectorService = new KeyConnectorService( this.stateService, @@ -377,7 +380,7 @@ export default class MainBackground { this.logService, this.organizationService, this.cryptoFunctionService, - logoutCallback + logoutCallback, ); this.passwordStrengthService = new PasswordStrengthService(); @@ -385,7 +388,7 @@ export default class MainBackground { this.passwordGenerationService = new PasswordGenerationService( this.cryptoService, this.policyService, - this.stateService + this.stateService, ); this.twoFactorService = new TwoFactorService(this.i18nService, this.platformUtilsService); @@ -409,7 +412,7 @@ export default class MainBackground { this.appIdService, this.devicesApiService, this.i18nService, - this.platformUtilsService + this.platformUtilsService, ); this.devicesService = new DevicesServiceImplementation(this.devicesApiService); @@ -433,7 +436,7 @@ export default class MainBackground { this.passwordStrengthService, this.policyService, this.deviceTrustCryptoService, - this.authRequestCryptoService + this.authRequestCryptoService, ); this.userVerificationApiService = new UserVerificationApiService(this.apiService); @@ -442,7 +445,7 @@ export default class MainBackground { this.stateService, this.cryptoService, this.i18nService, - this.userVerificationApiService + this.userVerificationApiService, ); this.configApiService = new ConfigApiService(this.apiService, this.authService); @@ -453,7 +456,7 @@ export default class MainBackground { this.authService, this.environmentService, this.logService, - true + true, ); this.cipherService = new CipherService( @@ -465,13 +468,13 @@ export default class MainBackground { this.stateService, this.encryptService, this.cipherFileUploadService, - this.configService + this.configService, ); this.folderService = new BrowserFolderService( this.cryptoService, this.i18nService, this.cipherService, - this.stateService + this.stateService, ); this.folderApiService = new FolderApiService(this.folderService, this.apiService); @@ -480,7 +483,7 @@ export default class MainBackground { this.tokenService, this.policyService, this.stateService, - this.userVerificationService + this.userVerificationService, ); this.vaultFilterService = new VaultFilterService( @@ -489,7 +492,7 @@ export default class MainBackground { this.folderService, this.cipherService, this.collectionService, - this.policyService + this.policyService, ); this.vaultTimeoutService = new VaultTimeoutService( @@ -504,19 +507,19 @@ export default class MainBackground { this.authService, this.vaultTimeoutSettingsService, lockedCallback, - logoutCallback + logoutCallback, ); this.containerService = new ContainerService(this.cryptoService, this.encryptService); this.sendService = new BrowserSendService( this.cryptoService, this.i18nService, this.cryptoFunctionService, - this.stateService + this.stateService, ); this.sendApiService = new SendApiService( this.apiService, this.fileUploadService, - this.sendService + this.sendService, ); this.providerService = new ProviderService(this.stateService); this.syncService = new SyncService( @@ -536,18 +539,19 @@ export default class MainBackground { this.folderApiService, this.organizationService, this.sendApiService, - logoutCallback + this.configService, + logoutCallback, ); this.eventUploadService = new EventUploadService( this.apiService, this.stateService, - this.logService + this.logService, ); this.eventCollectionService = new EventCollectionService( this.cipherService, this.stateService, this.organizationService, - this.eventUploadService + this.eventUploadService, ); this.totpService = new TotpService(this.cryptoFunctionService, this.logService); @@ -558,7 +562,7 @@ export default class MainBackground { this.eventCollectionService, this.logService, this.settingsService, - this.userVerificationService + this.userVerificationService, ); this.auditService = new AuditService(this.cryptoFunctionService, this.apiService); @@ -570,7 +574,7 @@ export default class MainBackground { this.importApiService, this.i18nService, this.collectionService, - this.cryptoService + this.cryptoService, ); this.exportService = new VaultExportService( @@ -579,7 +583,7 @@ export default class MainBackground { this.apiService, this.cryptoService, this.cryptoFunctionService, - this.stateService + this.stateService, ); this.notificationsService = new NotificationsService( this.logService, @@ -590,7 +594,7 @@ export default class MainBackground { logoutCallback, this.stateService, this.authService, - this.messagingService + this.messagingService, ); this.fido2UserInterfaceService = new BrowserFido2UserInterfaceService(this.authService); @@ -598,14 +602,14 @@ export default class MainBackground { this.cipherService, this.fido2UserInterfaceService, this.syncService, - this.logService + this.logService, ); this.fido2ClientService = new Fido2ClientService( this.fido2AuthenticatorService, this.configService, this.authService, this.stateService, - this.logService + this.logService, ); const systemUtilsServiceReloadCallback = () => { @@ -621,7 +625,8 @@ export default class MainBackground { this.messagingService, this.platformUtilsService, systemUtilsServiceReloadCallback, - this.stateService + this.stateService, + this.vaultTimeoutSettingsService, ); // Other fields @@ -639,7 +644,7 @@ export default class MainBackground { this.environmentService, this.messagingService, this.logService, - this.configService + this.configService, ); this.nativeMessagingBackground = new NativeMessagingBackground( this.cryptoService, @@ -651,14 +656,14 @@ export default class MainBackground { this.platformUtilsService, this.stateService, this.logService, - this.authService + this.authService, ); this.commandsBackground = new CommandsBackground( this, this.passwordGenerationService, this.platformUtilsService, this.vaultTimeoutService, - this.authService + this.authService, ); this.notificationBackground = new NotificationBackground( this.autofillService, @@ -667,7 +672,7 @@ export default class MainBackground { this.policyService, this.folderService, this.stateService, - this.environmentService + this.environmentService, ); this.overlayBackground = new OverlayBackground( this.cipherService, @@ -676,12 +681,12 @@ export default class MainBackground { this.environmentService, this.settingsService, this.stateService, - this.i18nService + this.i18nService, ); this.tabsBackground = new TabsBackground( this, this.notificationBackground, - this.overlayBackground + this.overlayBackground, ); if (!this.popupOnlyContext) { const contextMenuClickedHandler = new ContextMenuClickedHandler( @@ -709,7 +714,7 @@ export default class MainBackground { this.stateService, this.totpService, this.eventCollectionService, - this.userVerificationService + this.userVerificationService, ); this.contextMenusBackground = new ContextMenusBackground(contextMenuClickedHandler); @@ -718,18 +723,18 @@ export default class MainBackground { this.idleBackground = new IdleBackground( this.vaultTimeoutService, this.stateService, - this.notificationsService + this.notificationsService, ); this.webRequestBackground = new WebRequestBackground( this.platformUtilsService, this.cipherService, - this.authService + this.authService, ); this.usernameGenerationService = new UsernameGenerationService( this.cryptoService, this.stateService, - this.apiService + this.apiService, ); this.avatarUpdateService = new AvatarUpdateService(this.apiService, this.stateService); @@ -738,13 +743,13 @@ export default class MainBackground { this.mainContextMenuHandler = new MainContextMenuHandler( this.stateService, this.i18nService, - this.logService + this.logService, ); this.cipherContextMenuHandler = new CipherContextMenuHandler( this.mainContextMenuHandler, this.authService, - this.cipherService + this.cipherService, ); } } @@ -829,6 +834,43 @@ export default class MainBackground { } } + /** + * Switch accounts to indicated userId -- null is no active user + */ + async switchAccount(userId: UserId) { + try { + await this.stateService.setActiveUser(userId); + + if (userId == null) { + await this.stateService.setRememberedEmail(null); + await this.refreshBadge(); + await this.refreshMenu(); + return; + } + + const status = await this.authService.getAuthStatus(userId); + const forcePasswordReset = + (await this.stateService.getForceSetPasswordReason({ userId: userId })) != + ForceSetPasswordReason.None; + + await this.systemService.clearPendingClipboard(); + await this.notificationsService.updateConnection(false); + + if (status === AuthenticationStatus.Locked) { + this.messagingService.send("locked", { userId: userId }); + } else if (forcePasswordReset) { + this.messagingService.send("update-temp-password", { userId: userId }); + } else { + this.messagingService.send("unlocked", { userId: userId }); + await this.refreshBadge(); + await this.refreshMenu(); + await this.syncService.fullSync(false); + } + } finally { + this.messagingService.send("switchAccountFinish", { userId: userId }); + } + } + async logout(expired: boolean, userId?: string) { await this.eventUploadService.uploadEvents(userId); @@ -849,9 +891,16 @@ export default class MainBackground { //Needs to be checked before state is cleaned const needStorageReseed = await this.needsStorageReseed(); - await this.stateService.clean({ userId: userId }); + const currentUserId = await this.stateService.getUserId(); + const newActiveUser = await this.stateService.clean({ userId: userId }); - if (userId == null || userId === (await this.stateService.getUserId())) { + if (newActiveUser != null) { + // we have a new active user, do not continue tearing down application + await this.switchAccount(newActiveUser as UserId); + this.messagingService.send("switchAccountFinish"); + } + + if (userId == null || userId === currentUserId) { this.searchService.clearIndex(); this.messagingService.send("doneLoggingOut", { expired: expired, userId: userId }); } @@ -892,7 +941,7 @@ export default class MainBackground { tab: tab, sender: sender, }, - options + options, ); } diff --git a/apps/browser/src/background/models/add-unlock-vault-queue-message.ts b/apps/browser/src/background/models/add-unlock-vault-queue-message.ts deleted file mode 100644 index 9ddde271008..00000000000 --- a/apps/browser/src/background/models/add-unlock-vault-queue-message.ts +++ /dev/null @@ -1,6 +0,0 @@ -import NotificationQueueMessage from "./notificationQueueMessage"; -import { NotificationQueueMessageType } from "./notificationQueueMessageType"; - -export default class AddUnlockVaultQueueMessage extends NotificationQueueMessage { - type: NotificationQueueMessageType.UnlockVault; -} diff --git a/apps/browser/src/background/nativeMessaging.background.ts b/apps/browser/src/background/nativeMessaging.background.ts index f4eed16823a..308f40aeb4c 100644 --- a/apps/browser/src/background/nativeMessaging.background.ts +++ b/apps/browser/src/background/nativeMessaging.background.ts @@ -81,7 +81,7 @@ export class NativeMessagingBackground { private platformUtilsService: PlatformUtilsService, private stateService: StateService, private logService: LogService, - private authService: AuthService + private authService: AuthService, ) { this.stateService.setBiometricFingerprintValidated(false); @@ -136,7 +136,7 @@ export class NativeMessagingBackground { const decrypted = await this.cryptoFunctionService.rsaDecrypt( encrypted, this.privateKey, - EncryptionAlgorithm + EncryptionAlgorithm, ); if (this.validatingFingerprint) { @@ -278,7 +278,7 @@ export class NativeMessagingBackground { let message = rawMessage as ReceiveMessage; if (!this.platformUtilsService.isSafari()) { message = JSON.parse( - await this.cryptoService.decryptToUtf8(rawMessage as EncString, this.sharedSecret) + await this.cryptoService.decryptToUtf8(rawMessage as EncString, this.sharedSecret), ); } @@ -328,7 +328,7 @@ export class NativeMessagingBackground { try { if (message.userKeyB64) { const userKey = new SymmetricCryptoKey( - Utils.fromB64ToArray(message.userKeyB64) + Utils.fromB64ToArray(message.userKeyB64), ) as UserKey; await this.cryptoService.setUserKey(userKey); } else if (message.keyB64) { @@ -340,11 +340,11 @@ export class NativeMessagingBackground { throw new Error("No encrypted user key found"); } const masterKey = new SymmetricCryptoKey( - Utils.fromB64ToArray(message.keyB64) + Utils.fromB64ToArray(message.keyB64), ) as MasterKey; const userKey = await this.cryptoService.decryptUserKeyWithMasterKey( masterKey, - new EncString(encUserKey) + new EncString(encUserKey), ); await this.cryptoService.setMasterKey(masterKey); await this.cryptoService.setUserKey(userKey); @@ -424,7 +424,7 @@ export class NativeMessagingBackground { private async showFingerprintDialog() { const fingerprint = await this.cryptoService.getFingerprint( await this.stateService.getUserId(), - this.publicKey + this.publicKey, ); this.messagingService.send("showNativeMessagingFinterprintDialog", { diff --git a/apps/browser/src/background/runtime.background.ts b/apps/browser/src/background/runtime.background.ts index a5c101fa969..434fd078347 100644 --- a/apps/browser/src/background/runtime.background.ts +++ b/apps/browser/src/background/runtime.background.ts @@ -13,6 +13,7 @@ import { openSsoAuthResultPopout, openTwoFactorAuthPopout, } from "../auth/popup/utils/auth-popout-window"; +import LockedVaultPendingNotificationsItem from "../autofill/notification/models/locked-vault-pending-notifications-item"; import { AutofillService } from "../autofill/services/abstractions/autofill.service"; import { BrowserApi } from "../platform/browser/browser-api"; import { BrowserStateService } from "../platform/services/abstractions/browser-state.service"; @@ -21,7 +22,6 @@ import BrowserPlatformUtilsService from "../platform/services/browser-platform-u import { AbortManager } from "../vault/background/abort-manager"; import MainBackground from "./main.background"; -import LockedVaultPendingNotificationsItem from "./models/lockedVaultPendingNotificationsItem"; export default class RuntimeBackground { private autofillTimeout: any; @@ -41,7 +41,7 @@ export default class RuntimeBackground { private environmentService: BrowserEnvironmentService, private messagingService: MessagingService, private logService: LogService, - private configService: ConfigServiceAbstraction + private configService: ConfigServiceAbstraction, ) { // onInstalled listener must be wired up before anything else, so we do it in the ctor chrome.runtime.onInstalled.addListener((details: any) => { @@ -58,7 +58,7 @@ export default class RuntimeBackground { const backgroundMessageListener = ( msg: any, sender: chrome.runtime.MessageSender, - sendResponse: any + sendResponse: any, ) => { const messagesWithResponse = [ "checkFido2FeatureEnabled", @@ -69,7 +69,7 @@ export default class RuntimeBackground { if (messagesWithResponse.includes(msg.command)) { this.processMessage(msg, sender).then( (value) => sendResponse({ result: value }), - (error) => sendResponse({ error: { ...error, message: error.message } }) + (error) => sendResponse({ error: { ...error, message: error.message } }), ); return true; } @@ -106,7 +106,7 @@ export default class RuntimeBackground { await BrowserApi.tabSendMessageData( item.commandToRetry.sender.tab, "unlockCompleted", - item + item, ); } break; @@ -134,7 +134,7 @@ export default class RuntimeBackground { await this.autofillService.injectAutofillScripts( sender, await this.configService.getFeatureFlag(FeatureFlag.AutofillV2), - await this.configService.getFeatureFlag(FeatureFlag.AutofillOverlay) + await this.configService.getFeatureFlag(FeatureFlag.AutofillOverlay), ); break; case "bgCollectPageDetails": @@ -163,7 +163,7 @@ export default class RuntimeBackground { details: msg.details, }, ], - msg.sender === "autofill_cmd" + msg.sender === "autofill_cmd", ); if (totpCode != null) { this.platformUtilsService.copyToClipboard(totpCode, { window: window }); @@ -180,7 +180,7 @@ export default class RuntimeBackground { }, ], false, - CipherType.Card + CipherType.Card, ); break; } @@ -194,7 +194,7 @@ export default class RuntimeBackground { }, ], false, - CipherType.Identity + CipherType.Identity, ); break; } @@ -270,13 +270,13 @@ export default class RuntimeBackground { return await this.main.fido2ClientService.createCredential( msg.data, sender.tab, - abortController + abortController, ); } finally { await BrowserApi.focusTab(sender.tab.id); await BrowserApi.focusWindow(sender.tab.windowId); } - } + }, ); case "fido2GetCredentialRequest": return await this.abortManager.runWithAbortController( @@ -286,14 +286,17 @@ export default class RuntimeBackground { return await this.main.fido2ClientService.assertCredential( msg.data, sender.tab, - abortController + abortController, ); } finally { await BrowserApi.focusTab(sender.tab.id); await BrowserApi.focusWindow(sender.tab.windowId); } - } + }, ); + case "switchAccount": { + await this.main.switchAccount(msg.userId); + } } } 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 index 7c83958927f..4127ff5acf4 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 @@ -23,7 +23,7 @@ export type CipherFileUploadServiceInitOptions = CipherFileUploadServiceFactoyOp export function cipherFileUploadServiceFactory( cache: { cipherFileUploadService?: CipherFileUploadServiceAbstraction } & CachedServices, - opts: CipherFileUploadServiceInitOptions + opts: CipherFileUploadServiceInitOptions, ): Promise { return factory( cache, @@ -32,7 +32,7 @@ export function cipherFileUploadServiceFactory( async () => new CipherFileUploadService( await apiServiceFactory(cache, opts), - await fileUploadServiceFactory(cache, opts) - ) + await fileUploadServiceFactory(cache, opts), + ), ); } 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 index 7c83958927f..4127ff5acf4 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 @@ -23,7 +23,7 @@ export type CipherFileUploadServiceInitOptions = CipherFileUploadServiceFactoyOp export function cipherFileUploadServiceFactory( cache: { cipherFileUploadService?: CipherFileUploadServiceAbstraction } & CachedServices, - opts: CipherFileUploadServiceInitOptions + opts: CipherFileUploadServiceInitOptions, ): Promise { return factory( cache, @@ -32,7 +32,7 @@ export function cipherFileUploadServiceFactory( async () => new CipherFileUploadService( await apiServiceFactory(cache, opts), - await fileUploadServiceFactory(cache, opts) - ) + await fileUploadServiceFactory(cache, opts), + ), ); } diff --git a/apps/browser/src/background/service-factories/devices-api-service.factory.ts b/apps/browser/src/background/service-factories/devices-api-service.factory.ts index 8999b7c2c72..117b82777ae 100644 --- a/apps/browser/src/background/service-factories/devices-api-service.factory.ts +++ b/apps/browser/src/background/service-factories/devices-api-service.factory.ts @@ -17,12 +17,12 @@ export type DevicesApiServiceInitOptions = DevicesApiServiceFactoryOptions & Api export function devicesApiServiceFactory( cache: { devicesApiService?: DevicesApiServiceAbstraction } & CachedServices, - opts: DevicesApiServiceInitOptions + opts: DevicesApiServiceInitOptions, ): Promise { return factory( cache, "devicesApiService", opts, - async () => new DevicesApiServiceImplementation(await apiServiceFactory(cache, opts)) + async () => new DevicesApiServiceImplementation(await apiServiceFactory(cache, opts)), ); } 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 index 5ed6c24ca4b..7ce77da045b 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 @@ -34,7 +34,7 @@ export type EventCollectionServiceInitOptions = EventCollectionServiceOptions & export function eventCollectionServiceFactory( cache: { eventCollectionService?: AbstractEventCollectionService } & CachedServices, - opts: EventCollectionServiceInitOptions + opts: EventCollectionServiceInitOptions, ): Promise { return factory( cache, @@ -45,7 +45,7 @@ export function eventCollectionServiceFactory( await cipherServiceFactory(cache, opts), await stateServiceFactory(cache, opts), await organizationServiceFactory(cache, opts), - await eventUploadServiceFactory(cache, opts) - ) + await eventUploadServiceFactory(cache, opts), + ), ); } 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 index f9e72395a74..fcaec459c0d 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 @@ -28,7 +28,7 @@ export type EventUploadServiceInitOptions = EventUploadServiceOptions & export function eventUploadServiceFactory( cache: { eventUploadService?: AbstractEventUploadService } & CachedServices, - opts: EventUploadServiceInitOptions + opts: EventUploadServiceInitOptions, ): Promise { return factory( cache, @@ -38,7 +38,7 @@ export function eventUploadServiceFactory( new EventUploadService( await apiServiceFactory(cache, opts), await stateServiceFactory(cache, opts), - await logServiceFactory(cache, opts) - ) + await logServiceFactory(cache, opts), + ), ); } 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 index d97e8ce98a6..ec7ca50ec46 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 @@ -30,7 +30,7 @@ export type PasswordGenerationServiceInitOptions = PasswordGenerationServiceFact export function passwordGenerationServiceFactory( cache: { passwordGenerationService?: PasswordGenerationServiceAbstraction } & CachedServices, - opts: PasswordGenerationServiceInitOptions + opts: PasswordGenerationServiceInitOptions, ): Promise { return factory( cache, @@ -40,7 +40,7 @@ export function passwordGenerationServiceFactory( new PasswordGenerationService( await cryptoServiceFactory(cache, opts), await policyServiceFactory(cache, opts), - await stateServiceFactory(cache, opts) - ) + await stateServiceFactory(cache, opts), + ), ); } diff --git a/apps/browser/src/background/service-factories/search-service.factory.ts b/apps/browser/src/background/service-factories/search-service.factory.ts index 6ff9691c524..38c7620b5aa 100644 --- a/apps/browser/src/background/service-factories/search-service.factory.ts +++ b/apps/browser/src/background/service-factories/search-service.factory.ts @@ -23,13 +23,16 @@ export type SearchServiceInitOptions = SearchServiceFactoryOptions & export function searchServiceFactory( cache: { searchService?: AbstractSearchService } & CachedServices, - opts: SearchServiceInitOptions + opts: SearchServiceInitOptions, ): Promise { return factory( cache, "searchService", opts, async () => - new SearchService(await logServiceFactory(cache, opts), await i18nServiceFactory(cache, opts)) + new SearchService( + await logServiceFactory(cache, opts), + await i18nServiceFactory(cache, opts), + ), ); } diff --git a/apps/browser/src/background/service-factories/send-service.factory.ts b/apps/browser/src/background/service-factories/send-service.factory.ts index bc0f83787fd..bb5ef1fa37f 100644 --- a/apps/browser/src/background/service-factories/send-service.factory.ts +++ b/apps/browser/src/background/service-factories/send-service.factory.ts @@ -29,7 +29,7 @@ export type SendServiceInitOptions = SendServiceFactoryOptions & export function sendServiceFactory( cache: { sendService?: InternalSendService } & CachedServices, - opts: SendServiceInitOptions + opts: SendServiceInitOptions, ): Promise { return factory( cache, @@ -40,7 +40,7 @@ export function sendServiceFactory( await cryptoServiceFactory(cache, opts), await i18nServiceFactory(cache, opts), await cryptoFunctionServiceFactory(cache, opts), - await stateServiceFactory(cache, opts) - ) + await stateServiceFactory(cache, opts), + ), ); } diff --git a/apps/browser/src/background/service-factories/settings-service.factory.ts b/apps/browser/src/background/service-factories/settings-service.factory.ts index 17e22a6678d..28e97de51fa 100644 --- a/apps/browser/src/background/service-factories/settings-service.factory.ts +++ b/apps/browser/src/background/service-factories/settings-service.factory.ts @@ -17,12 +17,12 @@ export type SettingsServiceInitOptions = SettingsServiceFactoryOptions & StateSe export function settingsServiceFactory( cache: { settingsService?: AbstractSettingsService } & CachedServices, - opts: SettingsServiceInitOptions + opts: SettingsServiceInitOptions, ): Promise { return factory( cache, "settingsService", opts, - async () => new BrowserSettingsService(await stateServiceFactory(cache, opts)) + async () => new BrowserSettingsService(await stateServiceFactory(cache, opts)), ); } 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 index b019db3297d..7a34b6b4b14 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 @@ -66,7 +66,7 @@ export type VaultTimeoutServiceInitOptions = VaultTimeoutServiceFactoryOptions & export function vaultTimeoutServiceFactory( cache: { vaultTimeoutService?: AbstractVaultTimeoutService } & CachedServices, - opts: VaultTimeoutServiceInitOptions + opts: VaultTimeoutServiceInitOptions, ): Promise { return factory( cache, @@ -85,7 +85,7 @@ export function vaultTimeoutServiceFactory( await authServiceFactory(cache, opts), await vaultTimeoutSettingsServiceFactory(cache, opts), opts.vaultTimeoutServiceOptions.lockedCallback, - opts.vaultTimeoutServiceOptions.loggedOutCallback - ) + opts.vaultTimeoutServiceOptions.loggedOutCallback, + ), ); } 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 index eda86c0a156..b2dfd96f5b0 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 @@ -38,7 +38,7 @@ export type VaultTimeoutSettingsServiceInitOptions = VaultTimeoutSettingsService export function vaultTimeoutSettingsServiceFactory( cache: { vaultTimeoutSettingsService?: AbstractVaultTimeoutSettingsService } & CachedServices, - opts: VaultTimeoutSettingsServiceInitOptions + opts: VaultTimeoutSettingsServiceInitOptions, ): Promise { return factory( cache, @@ -50,7 +50,7 @@ export function vaultTimeoutSettingsServiceFactory( await tokenServiceFactory(cache, opts), await policyServiceFactory(cache, opts), await stateServiceFactory(cache, opts), - await userVerificationServiceFactory(cache, opts) - ) + await userVerificationServiceFactory(cache, opts), + ), ); } diff --git a/apps/browser/src/browser/safariApp.ts b/apps/browser/src/browser/safariApp.ts index 683c9ef08a0..f96a560e3f1 100644 --- a/apps/browser/src/browser/safariApp.ts +++ b/apps/browser/src/browser/safariApp.ts @@ -19,7 +19,7 @@ export class SafariApp { }, (response: any) => { resolve(response); - } + }, ); }); } diff --git a/apps/browser/src/manifest.json b/apps/browser/src/manifest.json index d5bef7f950e..2bd032495c4 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.10.2", + "version": "2023.12.0", "description": "__MSG_extDesc__", "default_locale": "en", "author": "Bitwarden Inc.", @@ -59,7 +59,7 @@ "webRequest", "webRequestBlocking" ], - "optional_permissions": ["nativeMessaging", "privacy"], + "optional_permissions": ["nativeMessaging"], "content_security_policy": "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'", "sandbox": { "pages": ["overlay/button.html", "overlay/list.html"], diff --git a/apps/browser/src/manifest.v3.json b/apps/browser/src/manifest.v3.json index 27b7a418260..dba40744e75 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.10.2", + "version": "2023.12.0", "description": "__MSG_extDesc__", "default_locale": "en", "author": "Bitwarden Inc.", @@ -69,7 +69,7 @@ "alarms", "scripting" ], - "optional_permissions": ["nativeMessaging", "privacy"], + "optional_permissions": ["nativeMessaging"], "host_permissions": ["http://*/*", "https://*/*"], "content_security_policy": { "extension_pages": "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'", diff --git a/apps/browser/src/platform/background.ts b/apps/browser/src/platform/background.ts index f7913dade9f..148ec8280b6 100644 --- a/apps/browser/src/platform/background.ts +++ b/apps/browser/src/platform/background.ts @@ -28,7 +28,7 @@ if (BrowserApi.manifestVersion === 3) { "runtime.background", (message: { command: string }, sender, sendResponse) => { runtimeMessageListener(message, sender); - } + }, ); } else { const bitwardenMain = ((window as any).bitwardenMain = new MainBackground()); diff --git a/apps/browser/src/platform/background/service-factories/api-service.factory.ts b/apps/browser/src/platform/background/service-factories/api-service.factory.ts index bcde07fbb20..649fe1f7fe6 100644 --- a/apps/browser/src/platform/background/service-factories/api-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/api-service.factory.ts @@ -36,7 +36,7 @@ export type ApiServiceInitOptions = ApiServiceFactoryOptions & export function apiServiceFactory( cache: { apiService?: AbstractApiService } & CachedServices, - opts: ApiServiceInitOptions + opts: ApiServiceInitOptions, ): Promise { return factory( cache, @@ -49,7 +49,7 @@ export function apiServiceFactory( await environmentServiceFactory(cache, opts), await appIdServiceFactory(cache, opts), opts.apiServiceOptions.logoutCallback, - opts.apiServiceOptions.customUserAgent - ) + opts.apiServiceOptions.customUserAgent, + ), ); } diff --git a/apps/browser/src/platform/background/service-factories/app-id-service.factory.ts b/apps/browser/src/platform/background/service-factories/app-id-service.factory.ts index 30397d737ef..af5012798b8 100644 --- a/apps/browser/src/platform/background/service-factories/app-id-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/app-id-service.factory.ts @@ -12,12 +12,12 @@ export type AppIdServiceInitOptions = AppIdServiceFactoryOptions & DiskStorageOp export function appIdServiceFactory( cache: { appIdService?: AbstractAppIdService } & CachedServices, - opts: AppIdServiceInitOptions + opts: AppIdServiceInitOptions, ): Promise { return factory( cache, "appIdService", opts, - async () => new AppIdService(await diskStorageServiceFactory(cache, opts)) + async () => new AppIdService(await diskStorageServiceFactory(cache, opts)), ); } diff --git a/apps/browser/src/platform/background/service-factories/config-api.service.factory.ts b/apps/browser/src/platform/background/service-factories/config-api.service.factory.ts index e9e1b86488a..c0dbf1f475d 100644 --- a/apps/browser/src/platform/background/service-factories/config-api.service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/config-api.service.factory.ts @@ -17,7 +17,7 @@ export type ConfigApiServiceInitOptions = ConfigApiServiceFactoyOptions & export function configApiServiceFactory( cache: { configApiService?: ConfigApiServiceAbstraction } & CachedServices, - opts: ConfigApiServiceInitOptions + opts: ConfigApiServiceInitOptions, ): Promise { return factory( cache, @@ -26,7 +26,7 @@ export function configApiServiceFactory( async () => new ConfigApiService( await apiServiceFactory(cache, opts), - await authServiceFactory(cache, opts) - ) + await authServiceFactory(cache, opts), + ), ); } diff --git a/apps/browser/src/platform/background/service-factories/config-service.factory.ts b/apps/browser/src/platform/background/service-factories/config-service.factory.ts index a5dc6016c65..9c8b485c2a7 100644 --- a/apps/browser/src/platform/background/service-factories/config-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/config-service.factory.ts @@ -30,7 +30,7 @@ export type ConfigServiceInitOptions = ConfigServiceFactoryOptions & export function configServiceFactory( cache: { configService?: ConfigServiceAbstraction } & CachedServices, - opts: ConfigServiceInitOptions + opts: ConfigServiceInitOptions, ): Promise { return factory( cache, @@ -43,7 +43,7 @@ export function configServiceFactory( await authServiceFactory(cache, opts), await environmentServiceFactory(cache, opts), await logServiceFactory(cache, opts), - opts.configServiceOptions?.subscribe ?? true - ) + opts.configServiceOptions?.subscribe ?? true, + ), ); } diff --git a/apps/browser/src/platform/background/service-factories/crypto-function-service.factory.ts b/apps/browser/src/platform/background/service-factories/crypto-function-service.factory.ts index bcfffb6bd08..b9a9cc66483 100644 --- a/apps/browser/src/platform/background/service-factories/crypto-function-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/crypto-function-service.factory.ts @@ -13,12 +13,12 @@ export type CryptoFunctionServiceInitOptions = CryptoFunctionServiceFactoryOptio export function cryptoFunctionServiceFactory( cache: { cryptoFunctionService?: CryptoFunctionService } & CachedServices, - opts: CryptoFunctionServiceFactoryOptions + opts: CryptoFunctionServiceFactoryOptions, ): Promise { return factory( cache, "cryptoFunctionService", opts, - () => new WebCryptoFunctionService(opts.cryptoFunctionServiceOptions.win) + () => new WebCryptoFunctionService(opts.cryptoFunctionServiceOptions.win), ); } diff --git a/apps/browser/src/platform/background/service-factories/crypto-service.factory.ts b/apps/browser/src/platform/background/service-factories/crypto-service.factory.ts index 7f66a4f6fe7..3922f3d435e 100644 --- a/apps/browser/src/platform/background/service-factories/crypto-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/crypto-service.factory.ts @@ -32,7 +32,7 @@ export type CryptoServiceInitOptions = CryptoServiceFactoryOptions & export function cryptoServiceFactory( cache: { cryptoService?: AbstractCryptoService } & CachedServices, - opts: CryptoServiceInitOptions + opts: CryptoServiceInitOptions, ): Promise { return factory( cache, @@ -44,7 +44,7 @@ export function cryptoServiceFactory( await encryptServiceFactory(cache, opts), await platformUtilsServiceFactory(cache, opts), await logServiceFactory(cache, opts), - await stateServiceFactory(cache, opts) - ) + await stateServiceFactory(cache, opts), + ), ); } diff --git a/apps/browser/src/platform/background/service-factories/encrypt-service.factory.ts b/apps/browser/src/platform/background/service-factories/encrypt-service.factory.ts index 75e8c1974e2..055e5235914 100644 --- a/apps/browser/src/platform/background/service-factories/encrypt-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/encrypt-service.factory.ts @@ -23,7 +23,7 @@ export type EncryptServiceInitOptions = EncryptServiceFactoryOptions & export function encryptServiceFactory( cache: { encryptService?: EncryptServiceImplementation } & CachedServices, - opts: EncryptServiceInitOptions + opts: EncryptServiceInitOptions, ): Promise { return factory( cache, @@ -33,7 +33,7 @@ export function encryptServiceFactory( new EncryptServiceImplementation( await cryptoFunctionServiceFactory(cache, opts), await logServiceFactory(cache, opts), - opts.encryptServiceOptions.logMacFailures - ) + opts.encryptServiceOptions.logMacFailures, + ), ); } diff --git a/apps/browser/src/platform/background/service-factories/environment-service.factory.ts b/apps/browser/src/platform/background/service-factories/environment-service.factory.ts index 5150c7bd4a0..4ea7dac225c 100644 --- a/apps/browser/src/platform/background/service-factories/environment-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/environment-service.factory.ts @@ -15,7 +15,7 @@ export type EnvironmentServiceInitOptions = EnvironmentServiceFactoryOptions & export function environmentServiceFactory( cache: { environmentService?: BrowserEnvironmentService } & CachedServices, - opts: EnvironmentServiceInitOptions + opts: EnvironmentServiceInitOptions, ): Promise { return factory( cache, @@ -24,7 +24,7 @@ export function environmentServiceFactory( async () => new BrowserEnvironmentService( await stateServiceFactory(cache, opts), - await logServiceFactory(cache, opts) - ) + await logServiceFactory(cache, opts), + ), ); } diff --git a/apps/browser/src/platform/background/service-factories/factory-options.ts b/apps/browser/src/platform/background/service-factories/factory-options.ts index 7dde09204ef..4219a67181e 100644 --- a/apps/browser/src/platform/background/service-factories/factory-options.ts +++ b/apps/browser/src/platform/background/service-factories/factory-options.ts @@ -9,12 +9,12 @@ export type FactoryOptions = { export async function factory< TCache extends CachedServices, TName extends keyof TCache, - TOpts extends FactoryOptions + TOpts extends FactoryOptions, >( cachedServices: TCache, name: TName, opts: TOpts, - factory: () => TCache[TName] | Promise + factory: () => TCache[TName] | Promise, ): Promise { let instance = cachedServices[name]; if (opts.alwaysInitializeNewService || !instance) { diff --git a/apps/browser/src/platform/background/service-factories/file-upload-service.factory.ts b/apps/browser/src/platform/background/service-factories/file-upload-service.factory.ts index d890a3b37a7..77b5703619b 100644 --- a/apps/browser/src/platform/background/service-factories/file-upload-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/file-upload-service.factory.ts @@ -15,12 +15,12 @@ export type FileUploadServiceInitOptions = FileUploadServiceFactoryOptions & Log export function fileUploadServiceFactory( cache: { fileUploadService?: FileUploadServiceAbstraction } & CachedServices, - opts: FileUploadServiceInitOptions + opts: FileUploadServiceInitOptions, ): Promise { return factory( cache, "fileUploadService", opts, - async () => new FileUploadService(await logServiceFactory(cache, opts)) + async () => new FileUploadService(await logServiceFactory(cache, opts)), ); } diff --git a/apps/browser/src/platform/background/service-factories/global-state-provider.factory.ts b/apps/browser/src/platform/background/service-factories/global-state-provider.factory.ts index d20b7a72ade..3615b2b060d 100644 --- a/apps/browser/src/platform/background/service-factories/global-state-provider.factory.ts +++ b/apps/browser/src/platform/background/service-factories/global-state-provider.factory.ts @@ -18,7 +18,7 @@ export type GlobalStateProviderInitOptions = GlobalStateProviderFactoryOptions & export async function globalStateProviderFactory( cache: { globalStateProvider?: GlobalStateProvider } & CachedServices, - opts: GlobalStateProviderInitOptions + opts: GlobalStateProviderInitOptions, ): Promise { return factory( cache, @@ -27,7 +27,7 @@ export async function globalStateProviderFactory( async () => new DefaultGlobalStateProvider( await observableMemoryStorageServiceFactory(cache, opts), - await observableDiskStorageServiceFactory(cache, opts) - ) + await observableDiskStorageServiceFactory(cache, opts), + ), ); } diff --git a/apps/browser/src/platform/background/service-factories/i18n-service.factory.ts b/apps/browser/src/platform/background/service-factories/i18n-service.factory.ts index 3dd7e1814ff..86ec82784b1 100644 --- a/apps/browser/src/platform/background/service-factories/i18n-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/i18n-service.factory.ts @@ -15,13 +15,13 @@ export type I18nServiceInitOptions = I18nServiceFactoryOptions; export async function i18nServiceFactory( cache: { i18nService?: AbstractI18nService } & CachedServices, - opts: I18nServiceInitOptions + opts: I18nServiceInitOptions, ): Promise { const service = await factory( cache, "i18nService", opts, - () => new I18nService(opts.i18nServiceOptions.systemLanguage) + () => new I18nService(opts.i18nServiceOptions.systemLanguage), ); if (!(service as BaseI18nService as any).inited) { await (service as BaseI18nService).init(); diff --git a/apps/browser/src/platform/background/service-factories/key-generation-service.factory.ts b/apps/browser/src/platform/background/service-factories/key-generation-service.factory.ts index 7dbcf3fa79e..d4f6d52738f 100644 --- a/apps/browser/src/platform/background/service-factories/key-generation-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/key-generation-service.factory.ts @@ -13,12 +13,12 @@ export type KeyGenerationServiceInitOptions = KeyGenerationServiceFactoryOptions export function keyGenerationServiceFactory( cache: { keyGenerationService?: KeyGenerationService } & CachedServices, - opts: KeyGenerationServiceInitOptions + opts: KeyGenerationServiceInitOptions, ): Promise { return factory( cache, "keyGenerationService", opts, - async () => new KeyGenerationService(await cryptoFunctionServiceFactory(cache, opts)) + async () => new KeyGenerationService(await cryptoFunctionServiceFactory(cache, opts)), ); } diff --git a/apps/browser/src/platform/background/service-factories/log-service.factory.ts b/apps/browser/src/platform/background/service-factories/log-service.factory.ts index 4dd5f7dd782..7e171ee3104 100644 --- a/apps/browser/src/platform/background/service-factories/log-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/log-service.factory.ts @@ -15,12 +15,12 @@ export type LogServiceInitOptions = LogServiceFactoryOptions; export function logServiceFactory( cache: { logService?: LogService } & CachedServices, - opts: LogServiceInitOptions + opts: LogServiceInitOptions, ): Promise { return factory( cache, "logService", opts, - () => new ConsoleLogService(opts.logServiceOptions.isDev, opts.logServiceOptions.filter) + () => new ConsoleLogService(opts.logServiceOptions.isDev, opts.logServiceOptions.filter), ); } diff --git a/apps/browser/src/platform/background/service-factories/messaging-service.factory.ts b/apps/browser/src/platform/background/service-factories/messaging-service.factory.ts index 0d0c797056e..46852712aa8 100644 --- a/apps/browser/src/platform/background/service-factories/messaging-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/messaging-service.factory.ts @@ -13,7 +13,7 @@ export type MessagingServiceInitOptions = MessagingServiceFactoryOptions; export function messagingServiceFactory( cache: { messagingService?: AbstractMessagingService } & CachedServices, - opts: MessagingServiceInitOptions + opts: MessagingServiceInitOptions, ): Promise { return factory(cache, "messagingService", opts, () => new BrowserMessagingService()); } diff --git a/apps/browser/src/platform/background/service-factories/platform-utils-service.factory.ts b/apps/browser/src/platform/background/service-factories/platform-utils-service.factory.ts index 5748c523f70..d3ac465e4c9 100644 --- a/apps/browser/src/platform/background/service-factories/platform-utils-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/platform-utils-service.factory.ts @@ -18,7 +18,7 @@ export type PlatformUtilsServiceInitOptions = PlatformUtilsServiceFactoryOptions export function platformUtilsServiceFactory( cache: { platformUtilsService?: PlatformUtilsService } & CachedServices, - opts: PlatformUtilsServiceInitOptions + opts: PlatformUtilsServiceInitOptions, ): Promise { return factory( cache, @@ -29,7 +29,7 @@ export function platformUtilsServiceFactory( await messagingServiceFactory(cache, opts), opts.platformUtilsServiceOptions.clipboardWriteCallback, opts.platformUtilsServiceOptions.biometricCallback, - opts.platformUtilsServiceOptions.win - ) + opts.platformUtilsServiceOptions.win, + ), ); } diff --git a/apps/browser/src/platform/background/service-factories/state-service.factory.ts b/apps/browser/src/platform/background/service-factories/state-service.factory.ts index 31a0316c09a..3fc5aedefb7 100644 --- a/apps/browser/src/platform/background/service-factories/state-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/state-service.factory.ts @@ -35,7 +35,7 @@ export type StateServiceInitOptions = StateServiceFactoryOptions & export async function stateServiceFactory( cache: { stateService?: BrowserStateService } & CachedServices, - opts: StateServiceInitOptions + opts: StateServiceInitOptions, ): Promise { const service = await factory( cache, @@ -49,8 +49,8 @@ export async function stateServiceFactory( await logServiceFactory(cache, opts), opts.stateServiceOptions.stateFactory, await accountServiceFactory(cache, opts), - opts.stateServiceOptions.useAccountCache - ) + opts.stateServiceOptions.useAccountCache, + ), ); service.init(); return service; diff --git a/apps/browser/src/platform/background/service-factories/storage-service.factory.ts b/apps/browser/src/platform/background/service-factories/storage-service.factory.ts index b83ec742782..226025c1f61 100644 --- a/apps/browser/src/platform/background/service-factories/storage-service.factory.ts +++ b/apps/browser/src/platform/background/service-factories/storage-service.factory.ts @@ -27,7 +27,7 @@ export type MemoryStorageServiceInitOptions = StorageServiceFactoryOptions & export function diskStorageServiceFactory( cache: { diskStorageService?: AbstractStorageService } & CachedServices, - opts: DiskStorageServiceInitOptions + opts: DiskStorageServiceInitOptions, ): Promise { return factory(cache, "diskStorageService", opts, () => new BrowserLocalStorageService()); } @@ -35,27 +35,27 @@ export function observableDiskStorageServiceFactory( cache: { diskStorageService?: AbstractStorageService & ObservableStorageService; } & CachedServices, - opts: DiskStorageServiceInitOptions + opts: DiskStorageServiceInitOptions, ): Promise { return factory(cache, "diskStorageService", opts, () => new BrowserLocalStorageService()); } export function secureStorageServiceFactory( cache: { secureStorageService?: AbstractStorageService } & CachedServices, - opts: SecureStorageServiceInitOptions + opts: SecureStorageServiceInitOptions, ): Promise { return factory(cache, "secureStorageService", opts, () => new BrowserLocalStorageService()); } export function memoryStorageServiceFactory( cache: { memoryStorageService?: AbstractMemoryStorageService } & CachedServices, - opts: MemoryStorageServiceInitOptions + opts: MemoryStorageServiceInitOptions, ): Promise { return factory(cache, "memoryStorageService", opts, async () => { if (BrowserApi.manifestVersion === 3) { return new LocalBackedSessionStorageService( await encryptServiceFactory(cache, opts), - await keyGenerationServiceFactory(cache, opts) + await keyGenerationServiceFactory(cache, opts), ); } return new MemoryStorageService(); @@ -66,7 +66,7 @@ export function observableMemoryStorageServiceFactory( cache: { memoryStorageService?: AbstractMemoryStorageService & ObservableStorageService; } & CachedServices, - opts: MemoryStorageServiceInitOptions + opts: MemoryStorageServiceInitOptions, ): Promise { return factory(cache, "memoryStorageService", opts, async () => { return new BackgroundMemoryStorageService(); diff --git a/apps/browser/src/platform/browser/browser-api.spec.ts b/apps/browser/src/platform/browser/browser-api.spec.ts index 057ae0a1010..887c1284a01 100644 --- a/apps/browser/src/platform/browser/browser-api.spec.ts +++ b/apps/browser/src/platform/browser/browser-api.spec.ts @@ -24,7 +24,7 @@ describe("BrowserApi", () => { expect(chrome.windows.get).toHaveBeenCalledWith( windowId, { populate: true }, - expect.anything() + expect.anything(), ); }); }); @@ -46,7 +46,7 @@ describe("BrowserApi", () => { expect(chrome.windows.get).toHaveBeenCalledWith( windowId, { populate: true }, - expect.anything() + expect.anything(), ); }); }); @@ -73,7 +73,7 @@ describe("BrowserApi", () => { expect(chrome.windows.update).toHaveBeenCalledWith( windowId, windowOptions, - expect.anything() + expect.anything(), ); }); }); @@ -87,7 +87,7 @@ describe("BrowserApi", () => { expect(chrome.windows.update).toHaveBeenCalledWith( windowId, { focused: true }, - expect.anything() + expect.anything(), ); }); }); @@ -98,7 +98,7 @@ describe("BrowserApi", () => { const injectDetails = mock(); jest.spyOn(BrowserApi, "manifestVersion", "get").mockReturnValue(2); (chrome.tabs.executeScript as jest.Mock).mockImplementation( - (tabId, injectDetails, callback) => callback(executeScriptResult) + (tabId, injectDetails, callback) => callback(executeScriptResult), ); const result = await BrowserApi.executeScriptInTab(tabId, injectDetails); @@ -106,7 +106,7 @@ describe("BrowserApi", () => { expect(chrome.tabs.executeScript).toHaveBeenCalledWith( tabId, injectDetails, - expect.any(Function) + expect.any(Function), ); expect(result).toEqual(executeScriptResult); }); diff --git a/apps/browser/src/platform/browser/browser-api.ts b/apps/browser/src/platform/browser/browser-api.ts index 19815b1cf53..aaab7e113ab 100644 --- a/apps/browser/src/platform/browser/browser-api.ts +++ b/apps/browser/src/platform/browser/browser-api.ts @@ -52,7 +52,7 @@ export class BrowserApi { return new Promise((resolve) => chrome.windows.create(options, (window) => { resolve(window); - }) + }), ); } @@ -73,12 +73,12 @@ export class BrowserApi { */ static async updateWindowProperties( windowId: number, - options: chrome.windows.UpdateInfo + options: chrome.windows.UpdateInfo, ): Promise { return new Promise((resolve) => chrome.windows.update(windowId, options, () => { resolve(); - }) + }), ); } @@ -110,7 +110,7 @@ export class BrowserApi { return new Promise((resolve) => chrome.tabs.get(tabId, (tab) => { resolve(tab); - }) + }), ); } @@ -147,7 +147,7 @@ export class BrowserApi { static tabSendMessageData( tab: chrome.tabs.Tab, command: string, - data: any = null + data: any = null, ): Promise { const obj: any = { command: command, @@ -163,7 +163,7 @@ export class BrowserApi { static async tabSendMessage( tab: chrome.tabs.Tab, obj: T, - options: chrome.tabs.MessageSendOptions = null + options: chrome.tabs.MessageSendOptions = null, ): Promise { if (!tab || !tab.id) { return; @@ -183,7 +183,7 @@ export class BrowserApi { tabId: number, message: TabMessage, options?: chrome.tabs.MessageSendOptions, - responseCallback?: (response: T) => void + responseCallback?: (response: T) => void, ) { chrome.tabs.sendMessage(tabId, message, options, responseCallback); } @@ -217,7 +217,7 @@ export class BrowserApi { static createNewTab(url: string, active = true): Promise { return new Promise((resolve) => - chrome.tabs.create({ url: url, active: active }, (tab) => resolve(tab)) + chrome.tabs.create({ url: url, active: active }, (tab) => resolve(tab)), ); } @@ -225,7 +225,7 @@ export class BrowserApi { // them when the popup gets unloaded, otherwise we cause a memory leak private static trackedChromeEventListeners: [ event: chrome.events.Event<(...args: unknown[]) => unknown>, - callback: (...args: unknown[]) => unknown + callback: (...args: unknown[]) => unknown, ][] = []; static messageListener( @@ -233,8 +233,8 @@ export class BrowserApi { callback: ( message: any, sender: chrome.runtime.MessageSender, - sendResponse: any - ) => boolean | void + sendResponse: any, + ) => boolean | void, ) { BrowserApi.addListener(chrome.runtime.onMessage, callback); } @@ -252,7 +252,7 @@ export class BrowserApi { } static storageChangeListener( - callback: Parameters[0] + callback: Parameters[0], ) { BrowserApi.addListener(chrome.storage.onChanged, callback); } @@ -268,7 +268,7 @@ export class BrowserApi { */ static addListener unknown>( event: chrome.events.Event, - callback: T + callback: T, ) { event.addListener(callback); @@ -285,7 +285,7 @@ export class BrowserApi { */ static removeListener unknown>( event: chrome.events.Event, - callback: T + callback: T, ) { event.removeListener(callback); @@ -315,6 +315,11 @@ export class BrowserApi { return chrome.runtime.sendMessage(message); } + static sendMessageWithResponse(subscriber: string, arg: any = {}) { + const message = Object.assign({}, { command: subscriber }, arg); + return new Promise((resolve) => chrome.runtime.sendMessage(message, resolve)); + } + static async focusTab(tabId: number) { chrome.tabs.update(tabId, { active: true, highlighted: true }); } @@ -381,7 +386,7 @@ export class BrowserApi { */ static async permissionsGranted(permissions: string[]): Promise { return new Promise((resolve) => - chrome.permissions.contains({ permissions }, (result) => resolve(result)) + chrome.permissions.contains({ permissions }, (result) => resolve(result)), ); } @@ -399,7 +404,7 @@ export class BrowserApi { } static getSidebarAction( - win: Window & typeof globalThis + win: Window & typeof globalThis, ): OperaSidebarAction | FirefoxSidebarAction | null { const deviceType = BrowserPlatformUtilsService.getDevice(win); if (deviceType !== DeviceType.FirefoxExtension && deviceType !== DeviceType.OperaExtension) { @@ -434,33 +439,4 @@ export class BrowserApi { }); }); } - - /** - * Identifies if the browser autofill settings are overridden by the extension. - */ - static async browserAutofillSettingsOverridden(): Promise { - const autofillAddressOverridden: boolean = await new Promise((resolve) => - chrome.privacy.services.autofillAddressEnabled.get({}, (details) => - resolve(details.levelOfControl === "controlled_by_this_extension" && !details.value) - ) - ); - - const autofillCreditCardOverridden: boolean = await new Promise((resolve) => - chrome.privacy.services.autofillCreditCardEnabled.get({}, (details) => - resolve(details.levelOfControl === "controlled_by_this_extension" && !details.value) - ) - ); - - return autofillAddressOverridden && autofillCreditCardOverridden; - } - - /** - * Updates the browser autofill settings to the given value. - * - * @param value - Determines whether to enable or disable the autofill settings. - */ - static async updateDefaultBrowserAutofillSettings(value: boolean) { - chrome.privacy.services.autofillAddressEnabled.set({ value }); - chrome.privacy.services.autofillCreditCardEnabled.set({ value }); - } } diff --git a/apps/browser/src/platform/browser/from-chrome-event.ts b/apps/browser/src/platform/browser/from-chrome-event.ts index 5217d8e7021..e45dcdcd082 100644 --- a/apps/browser/src/platform/browser/from-chrome-event.ts +++ b/apps/browser/src/platform/browser/from-chrome-event.ts @@ -21,7 +21,7 @@ import { BrowserApi } from "./browser-api"; * ``` */ export function fromChromeEvent( - event: chrome.events.Event<(...args: T) => void> + event: chrome.events.Event<(...args: T) => void>, ): Observable { return new Observable((subscriber) => { const handler = (...args: T) => { diff --git a/apps/browser/src/platform/browser/zoned-message-listener.service.ts b/apps/browser/src/platform/browser/zoned-message-listener.service.ts index 4f8d740d231..ce9f7e2021e 100644 --- a/apps/browser/src/platform/browser/zoned-message-listener.service.ts +++ b/apps/browser/src/platform/browser/zoned-message-listener.service.ts @@ -19,8 +19,8 @@ export class ZonedMessageListenerService { callback: ( message: any, sender: chrome.runtime.MessageSender, - sendResponse: any - ) => boolean | void + sendResponse: any, + ) => boolean | void, ) { BrowserApi.messageListener(name, (message, sender, sendResponse) => { return this.ngZone.run(() => callback(message, sender, sendResponse)); diff --git a/apps/browser/src/platform/decorators/dev-flag.decorator.ts b/apps/browser/src/platform/decorators/dev-flag.decorator.ts index 4a67d6239e6..a31cdbc9924 100644 --- a/apps/browser/src/platform/decorators/dev-flag.decorator.ts +++ b/apps/browser/src/platform/decorators/dev-flag.decorator.ts @@ -6,7 +6,7 @@ export function devFlag(flag: keyof DevFlags) { descriptor.value = function (...args: any[]) { if (!devFlagEnabled(flag)) { throw new Error( - `This method should not be called, it is protected by a disabled dev flag.` + `This method should not be called, it is protected by a disabled dev flag.`, ); } return originalMethod.apply(this, args); diff --git a/apps/browser/src/platform/decorators/session-sync-observable/browser-session.decorator.spec.ts b/apps/browser/src/platform/decorators/session-sync-observable/browser-session.decorator.spec.ts index 5ddc3f8e07e..4b0226d54e9 100644 --- a/apps/browser/src/platform/decorators/session-sync-observable/browser-session.decorator.spec.ts +++ b/apps/browser/src/platform/decorators/session-sync-observable/browser-session.decorator.spec.ts @@ -20,7 +20,7 @@ describe("browserSession decorator", () => { expect(() => { new TestClass(); }).toThrowError( - "Cannot decorate TestClass with browserSession, Browser's AbstractMemoryStorageService must be accessible through the observed classes parameters" + "Cannot decorate TestClass with browserSession, Browser's AbstractMemoryStorageService must be accessible through the observed classes parameters", ); }); diff --git a/apps/browser/src/platform/decorators/session-sync-observable/browser-session.decorator.ts b/apps/browser/src/platform/decorators/session-sync-observable/browser-session.decorator.ts index b325f6b9a56..47fb5d7e085 100644 --- a/apps/browser/src/platform/decorators/session-sync-observable/browser-session.decorator.ts +++ b/apps/browser/src/platform/decorators/session-sync-observable/browser-session.decorator.ts @@ -23,7 +23,7 @@ export function browserSession>(constructor: TCto // Require state service to be injected const storageService: AbstractMemoryStorageService = this.findStorageService( - [this as any].concat(args) + [this as any].concat(args), ); if (this.__syncedItemMetadata == null || !(this.__syncedItemMetadata instanceof Array)) { @@ -31,7 +31,7 @@ export function browserSession>(constructor: TCto } this.__sessionSyncers = this.__syncedItemMetadata.map((metadata) => - this.buildSyncer(metadata, storageService) + this.buildSyncer(metadata, storageService), ); } @@ -39,7 +39,7 @@ export function browserSession>(constructor: TCto const syncer = new SessionSyncer( (this as any)[metadata.propertyKey], storageSerice, - metadata + metadata, ); syncer.init(); return syncer; @@ -54,14 +54,15 @@ export function browserSession>(constructor: TCto const stateService = args.find( (arg) => - arg?.memoryStorageService != null && this.isMemoryStorageService(arg.memoryStorageService) + arg?.memoryStorageService != null && + this.isMemoryStorageService(arg.memoryStorageService), ); if (stateService) { return stateService.memoryStorageService; } throw new Error( - `Cannot decorate ${constructor.name} with browserSession, Browser's AbstractMemoryStorageService must be accessible through the observed classes parameters` + `Cannot decorate ${constructor.name} with browserSession, Browser's AbstractMemoryStorageService must be accessible through the observed classes parameters`, ); } diff --git a/apps/browser/src/platform/decorators/session-sync-observable/session-syncer.spec.ts b/apps/browser/src/platform/decorators/session-sync-observable/session-syncer.spec.ts index 96c5a4eea55..f163cf495a9 100644 --- a/apps/browser/src/platform/decorators/session-sync-observable/session-syncer.spec.ts +++ b/apps/browser/src/platform/decorators/session-sync-observable/session-syncer.spec.ts @@ -55,7 +55,7 @@ describe("session syncer", () => { sessionKey, initializeAs: "object", initializer: () => null, - }) + }), ).toBeDefined(); expect( new SessionSyncer(behaviorSubject, storageService, { @@ -63,7 +63,7 @@ describe("session syncer", () => { sessionKey, initializer: (s: any) => s, initializeAs: "object", - }) + }), ).toBeDefined(); }); it("should throw if neither ctor or initializer is provided", () => { diff --git a/apps/browser/src/platform/decorators/session-sync-observable/session-syncer.ts b/apps/browser/src/platform/decorators/session-sync-observable/session-syncer.ts index 120c4b8b58c..7f57e6431e2 100644 --- a/apps/browser/src/platform/decorators/session-sync-observable/session-syncer.ts +++ b/apps/browser/src/platform/decorators/session-sync-observable/session-syncer.ts @@ -17,7 +17,7 @@ export class SessionSyncer { constructor( private subject: Subject, private memoryStorageService: AbstractMemoryStorageService, - private metaData: SyncedItemMetadata + private metaData: SyncedItemMetadata, ) { if (!(subject instanceof Subject)) { throw new Error("subject must inherit from Subject"); @@ -66,7 +66,7 @@ export class SessionSyncer { return; } await this.updateSession(next); - }) + }), ) .subscribe(); } diff --git a/apps/browser/src/platform/globals.d.ts b/apps/browser/src/platform/globals.d.ts index 9c7be016b0b..9e53d898027 100644 --- a/apps/browser/src/platform/globals.d.ts +++ b/apps/browser/src/platform/globals.d.ts @@ -10,7 +10,7 @@ type OperaAddons = { installExtension: ( id: string, success_callback: () => void, - error_callback: (errorMessage: string) => void + error_callback: (errorMessage: string) => void, ) => void; }; @@ -49,7 +49,7 @@ type OperaSidebarAction = { path?: string | Record; tabId?: number; }, - callback?: () => void + callback?: () => void, ) => void; /** * @link https://dev.opera.com/extensions/sidebar-action-api/#method-setpanel @@ -84,7 +84,7 @@ type OperaSidebarAction = { */ getBadgeBackgroundColor: ( details: { tabId?: number }, - callback: (result: ColorArray) => void + callback: (result: ColorArray) => void, ) => void; /** * *Not supported on mac* diff --git a/apps/browser/src/platform/listeners/combine.ts b/apps/browser/src/platform/listeners/combine.ts index 91d2af7ba55..4737da2cbf7 100644 --- a/apps/browser/src/platform/listeners/combine.ts +++ b/apps/browser/src/platform/listeners/combine.ts @@ -4,7 +4,7 @@ type Listener = (...args: [...T, CachedServices]) => Promis export const combine = ( listeners: Listener[], - startingServices: CachedServices = {} + startingServices: CachedServices = {}, ) => { return async (...args: T) => { const cachedServices = { ...startingServices }; diff --git a/apps/browser/src/platform/listeners/on-command-listener.ts b/apps/browser/src/platform/listeners/on-command-listener.ts index 04f8b72dbfb..893136205a0 100644 --- a/apps/browser/src/platform/listeners/on-command-listener.ts +++ b/apps/browser/src/platform/listeners/on-command-listener.ts @@ -98,7 +98,7 @@ const doGeneratePasswordToClipboard = async (tab: chrome.tabs.Tab): Promise + serviceCache: Record, ) { await new UpdateBadge(self).run({ windowId, existingServices: serviceCache }); } static async tabsOnActivatedListener( activeInfo: chrome.tabs.TabActiveInfo, - serviceCache: Record + serviceCache: Record, ) { await new UpdateBadge(self).run({ tabId: activeInfo.tabId, @@ -63,7 +63,7 @@ export class UpdateBadge { static async tabsOnReplacedListener( addedTabId: number, removedTabId: number, - serviceCache: Record + serviceCache: Record, ) { await new UpdateBadge(self).run({ tabId: addedTabId, existingServices: serviceCache }); } @@ -72,7 +72,7 @@ export class UpdateBadge { tabId: number, changeInfo: chrome.tabs.TabChangeInfo, tab: chrome.tabs.Tab, - serviceCache: Record + serviceCache: Record, ) { await new UpdateBadge(self).run({ tabId, @@ -83,7 +83,7 @@ export class UpdateBadge { static async messageListener( message: { command: string; tabId: number }, - serviceCache: Record + serviceCache: Record, ) { if (!UpdateBadge.listenedToCommands.includes(message.command)) { return; @@ -229,7 +229,7 @@ export class UpdateBadge { if (this.isOperaSidebar(this.sidebarAction)) { await new Promise((resolve) => - (this.sidebarAction as OperaSidebarAction).setIcon(options, () => resolve()) + (this.sidebarAction as OperaSidebarAction).setIcon(options, () => resolve()), ); } else { await this.sidebarAction.setIcon(options); @@ -290,7 +290,7 @@ export class UpdateBadge { if (!self.bitwardenContainerService) { new ContainerService( serviceCache.cryptoService as CryptoService, - serviceCache.encryptService as EncryptService + serviceCache.encryptService as EncryptService, ).attachToGlobal(self); } @@ -300,7 +300,7 @@ export class UpdateBadge { } private isOperaSidebar( - action: OperaSidebarAction | FirefoxSidebarAction + action: OperaSidebarAction | FirefoxSidebarAction, ): action is OperaSidebarAction { return action != null && (action as OperaSidebarAction).setBadgeText != null; } diff --git a/apps/browser/src/platform/popup/browser-popup-utils.spec.ts b/apps/browser/src/platform/popup/browser-popup-utils.spec.ts index 7a9136ff9eb..d640a3bc23d 100644 --- a/apps/browser/src/platform/popup/browser-popup-utils.spec.ts +++ b/apps/browser/src/platform/popup/browser-popup-utils.spec.ts @@ -191,25 +191,18 @@ describe("BrowserPopupUtils", () => { }); }); - it("replaces any existing `uilocation=` query params within the passed extension url path to state the the uilocaiton is a popup", async () => { - const url = "popup/index.html#/tabs/vault?uilocation=sidebar"; + it("skips parsing the passed extension url path if the option to do that is set", () => { + const url = "popup/index.html?uilocation=popout#/tabs/vault"; jest.spyOn(BrowserPopupUtils as any, "isSingleActionPopoutOpen").mockResolvedValueOnce(false); + jest.spyOn(BrowserPopupUtils as any, "buildPopoutUrl"); - await BrowserPopupUtils.openPopout(url); + BrowserPopupUtils.openPopout(url); - expect(BrowserApi.createWindow).toHaveBeenCalledWith({ - type: "popup", - focused: true, - width: 380, - height: 630, - left: 85, - top: 190, - url: `chrome-extension://id/popup/index.html#/tabs/vault?uilocation=popout`, - }); + expect(BrowserPopupUtils["buildPopoutUrl"]).not.toHaveBeenCalled(); }); - it("appends the uilocation to the search params if an existing param is passed with the extension url path", async () => { - const url = "popup/index.html#/tabs/vault?existingParam=123"; + it("replaces any existing `uilocation=` query params within the passed extension url path to state the the uilocaiton is a popup", async () => { + const url = "popup/index.html?uilocation=sidebar#/tabs/vault"; jest.spyOn(BrowserPopupUtils as any, "isSingleActionPopoutOpen").mockResolvedValueOnce(false); await BrowserPopupUtils.openPopout(url); @@ -221,7 +214,7 @@ describe("BrowserPopupUtils", () => { height: 630, left: 85, top: 190, - url: `chrome-extension://id/${url}&uilocation=popout`, + url: `chrome-extension://id/popup/index.html?uilocation=popout#/tabs/vault`, }); }); @@ -383,7 +376,7 @@ describe("BrowserPopupUtils", () => { it("returns false if the popoutKey is not provided", async () => { await expect(BrowserPopupUtils["isSingleActionPopoutOpen"](undefined, {})).resolves.toBe( - false + false, ); }); @@ -391,7 +384,7 @@ describe("BrowserPopupUtils", () => { jest.spyOn(BrowserApi, "tabsQuery").mockResolvedValueOnce([]); await expect( - BrowserPopupUtils["isSingleActionPopoutOpen"]("123", windowOptions) + BrowserPopupUtils["isSingleActionPopoutOpen"]("123", windowOptions), ).resolves.toBe(false); }); @@ -412,7 +405,7 @@ describe("BrowserPopupUtils", () => { ]); await expect( - BrowserPopupUtils["isSingleActionPopoutOpen"]("789", windowOptions) + BrowserPopupUtils["isSingleActionPopoutOpen"]("789", windowOptions), ).resolves.toBe(false); }); @@ -433,7 +426,7 @@ describe("BrowserPopupUtils", () => { ]); await expect( - BrowserPopupUtils["isSingleActionPopoutOpen"]("123", windowOptions) + BrowserPopupUtils["isSingleActionPopoutOpen"]("123", windowOptions), ).resolves.toBe(true); expect(BrowserApi.updateWindowProperties).toHaveBeenCalledWith(2, { focused: true, diff --git a/apps/browser/src/platform/popup/browser-popup-utils.ts b/apps/browser/src/platform/popup/browser-popup-utils.ts index 3e687fa0815..8cc060969d4 100644 --- a/apps/browser/src/platform/popup/browser-popup-utils.ts +++ b/apps/browser/src/platform/popup/browser-popup-utils.ts @@ -67,7 +67,7 @@ class BrowserPopupUtils { options: ScrollOptions = { delay: 0, containerSelector: "main", - } + }, ) { const { delay, containerSelector } = options; return new Promise((resolve) => @@ -78,7 +78,7 @@ class BrowserPopupUtils { } resolve(); - }, delay) + }, delay), ); } @@ -109,7 +109,7 @@ class BrowserPopupUtils { singleActionKey?: string; forceCloseExistingWindows?: boolean; windowOptions?: Partial; - } = {} + } = {}, ) { const { senderWindowId, singleActionKey, forceCloseExistingWindows, windowOptions } = options; const defaultPopoutWindowOptions: chrome.windows.CreateData = { @@ -127,16 +127,14 @@ class BrowserPopupUtils { top: senderWindow.top + offsetTop, ...defaultPopoutWindowOptions, ...windowOptions, - url: chrome.runtime.getURL( - BrowserPopupUtils.buildPopoutUrlPath(extensionUrlPath, singleActionKey) - ), + url: BrowserPopupUtils.buildPopoutUrl(extensionUrlPath, singleActionKey), }; if ( (await BrowserPopupUtils.isSingleActionPopoutOpen( singleActionKey, popoutWindowOptions, - forceCloseExistingWindows + forceCloseExistingWindows, )) && !forceCloseExistingWindows ) { @@ -199,7 +197,7 @@ class BrowserPopupUtils { private static async isSingleActionPopoutOpen( popoutKey: string | undefined, windowInfo: chrome.windows.CreateData, - forceCloseExistingWindows = false + forceCloseExistingWindows = false, ) { if (!popoutKey) { return false; @@ -207,7 +205,7 @@ class BrowserPopupUtils { const extensionUrl = chrome.runtime.getURL("popup/index.html"); const popoutTabs = (await BrowserApi.tabsQuery({ url: `${extensionUrl}*` })).filter((tab) => - tab.url.includes(`singleActionPopout=${popoutKey}`) + tab.url.includes(`singleActionPopout=${popoutKey}`), ); if (popoutTabs.length === 0) { return false; @@ -240,7 +238,7 @@ class BrowserPopupUtils { private static urlContainsSearchParams( win: Window, searchParam: string, - searchValue: string + searchValue: string, ): boolean { return win.location.href.indexOf(`${searchParam}=${searchValue}`) > -1; } @@ -252,23 +250,15 @@ class BrowserPopupUtils { * @param extensionUrlPath - A relative path to the extension page. Example: "popup/index.html#/tabs/vault" * @param singleActionKey - The single action popout key used to identify the popout. */ - private static buildPopoutUrlPath(extensionUrlPath: string, singleActionKey: string) { - let formattedExtensionUrlPath = extensionUrlPath; - if (formattedExtensionUrlPath.includes("uilocation=")) { - formattedExtensionUrlPath = formattedExtensionUrlPath.replace( - /uilocation=[^&]*/g, - "uilocation=popout" - ); - } else { - formattedExtensionUrlPath += - (formattedExtensionUrlPath.includes("?") ? "&" : "?") + "uilocation=popout"; - } + private static buildPopoutUrl(extensionUrlPath: string, singleActionKey: string) { + const parsedUrl = new URL(chrome.runtime.getURL(extensionUrlPath)); + parsedUrl.searchParams.set("uilocation", "popout"); if (singleActionKey) { - formattedExtensionUrlPath += `&singleActionPopout=${singleActionKey}`; + parsedUrl.searchParams.set("singleActionPopout", singleActionKey); } - return formattedExtensionUrlPath; + return parsedUrl.toString(); } } diff --git a/apps/browser/src/platform/popup/header.component.ts b/apps/browser/src/platform/popup/header.component.ts index c32ee603458..a124c78f7b8 100644 --- a/apps/browser/src/platform/popup/header.component.ts +++ b/apps/browser/src/platform/popup/header.component.ts @@ -21,7 +21,7 @@ export class HeaderComponent { } return Object.values(accounts).some((a) => a.status !== AuthenticationStatus.LoggedOut); - }) + }), ); } } diff --git a/apps/browser/src/platform/services/abstractions/abstract-chrome-storage-api.service.ts b/apps/browser/src/platform/services/abstractions/abstract-chrome-storage-api.service.ts index 60ca9415e0e..22ce8d45649 100644 --- a/apps/browser/src/platform/services/abstractions/abstract-chrome-storage-api.service.ts +++ b/apps/browser/src/platform/services/abstractions/abstract-chrome-storage-api.service.ts @@ -32,7 +32,7 @@ export default abstract class AbstractChromeStorageService updateType: updateType, }; }); - }) + }), ); } diff --git a/apps/browser/src/platform/services/abstractions/browser-state.service.ts b/apps/browser/src/platform/services/abstractions/browser-state.service.ts index 30b1bb98635..88c2312762b 100644 --- a/apps/browser/src/platform/services/abstractions/browser-state.service.ts +++ b/apps/browser/src/platform/services/abstractions/browser-state.service.ts @@ -8,25 +8,25 @@ import { BrowserSendComponentState } from "../../../models/browserSendComponentS export abstract class BrowserStateService extends BaseStateServiceAbstraction { getBrowserGroupingComponentState: ( - options?: StorageOptions + options?: StorageOptions, ) => Promise; setBrowserGroupingComponentState: ( value: BrowserGroupingsComponentState, - options?: StorageOptions + options?: StorageOptions, ) => Promise; getBrowserVaultItemsComponentState: (options?: StorageOptions) => Promise; setBrowserVaultItemsComponentState: ( value: BrowserComponentState, - options?: StorageOptions + options?: StorageOptions, ) => Promise; getBrowserSendComponentState: (options?: StorageOptions) => Promise; setBrowserSendComponentState: ( value: BrowserSendComponentState, - options?: StorageOptions + options?: StorageOptions, ) => Promise; getBrowserSendTypeComponentState: (options?: StorageOptions) => Promise; setBrowserSendTypeComponentState: ( value: BrowserComponentState, - options?: StorageOptions + options?: StorageOptions, ) => Promise; } diff --git a/apps/browser/src/platform/services/browser-config.service.ts b/apps/browser/src/platform/services/browser-config.service.ts index 39d1fc565eb..557db4f33ce 100644 --- a/apps/browser/src/platform/services/browser-config.service.ts +++ b/apps/browser/src/platform/services/browser-config.service.ts @@ -21,7 +21,7 @@ export class BrowserConfigService extends ConfigService { authService: AuthService, environmentService: EnvironmentService, logService: LogService, - subscribe = false + subscribe = false, ) { super(stateService, configApiService, authService, environmentService, logService, subscribe); } diff --git a/apps/browser/src/platform/services/browser-crypto.service.ts b/apps/browser/src/platform/services/browser-crypto.service.ts index 0166fd439b0..54396206607 100644 --- a/apps/browser/src/platform/services/browser-crypto.service.ts +++ b/apps/browser/src/platform/services/browser-crypto.service.ts @@ -18,15 +18,18 @@ export class BrowserCryptoService extends CryptoService { * Browser doesn't store biometric keys, so we retrieve them from the desktop and return * if we successfully saved it into memory as the User Key */ - protected override async getKeyFromStorage(keySuffix: KeySuffixOptions): Promise { + protected override async getKeyFromStorage( + keySuffix: KeySuffixOptions, + userId?: string, + ): Promise { if (keySuffix === KeySuffixOptions.Biometric) { await this.platformUtilService.authenticateBiometric(); - const userKey = await this.stateService.getUserKey(); + const userKey = await this.stateService.getUserKey({ userId: userId }); if (userKey) { return new SymmetricCryptoKey(Utils.fromB64ToArray(userKey.keyB64)) as UserKey; } } - return await super.getKeyFromStorage(keySuffix); + return await super.getKeyFromStorage(keySuffix, userId); } } diff --git a/apps/browser/src/platform/services/browser-environment.service.ts b/apps/browser/src/platform/services/browser-environment.service.ts index 08a4d811d9d..db716baf4a3 100644 --- a/apps/browser/src/platform/services/browser-environment.service.ts +++ b/apps/browser/src/platform/services/browser-environment.service.ts @@ -6,7 +6,10 @@ import { GroupPolicyEnvironment } from "../../admin-console/types/group-policy-e import { devFlagEnabled, devFlagValue } from "../flags"; export class BrowserEnvironmentService extends EnvironmentService { - constructor(stateService: StateService, private logService: LogService) { + constructor( + stateService: StateService, + private logService: LogService, + ) { super(stateService); } diff --git a/apps/browser/src/platform/services/browser-file-download.service.ts b/apps/browser/src/platform/services/browser-file-download.service.ts index 1ade74367f5..ec1de5f3668 100644 --- a/apps/browser/src/platform/services/browser-file-download.service.ts +++ b/apps/browser/src/platform/services/browser-file-download.service.ts @@ -26,7 +26,7 @@ export class BrowserFileDownloadService implements FileDownloadService { blobOptions: request.blobOptions, fileName: request.fileName, }), - true + true, ); } else { const a = window.document.createElement("a"); diff --git a/apps/browser/src/platform/services/browser-i18n.service.ts b/apps/browser/src/platform/services/browser-i18n.service.ts index 03406c5b706..66821bc1582 100644 --- a/apps/browser/src/platform/services/browser-i18n.service.ts +++ b/apps/browser/src/platform/services/browser-i18n.service.ts @@ -11,7 +11,10 @@ export class BrowserI18nService extends I18nService { @sessionSync({ initializer: (s: string) => s }) protected _locale: ReplaySubject; - constructor(systemLanguage: string, private stateService: StateService) { + constructor( + systemLanguage: string, + private stateService: StateService, + ) { super(systemLanguage); } } diff --git a/apps/browser/src/platform/services/browser-platform-utils.service.ts b/apps/browser/src/platform/services/browser-platform-utils.service.ts index 018b1c623dc..a610afd733d 100644 --- a/apps/browser/src/platform/services/browser-platform-utils.service.ts +++ b/apps/browser/src/platform/services/browser-platform-utils.service.ts @@ -12,7 +12,7 @@ export default class BrowserPlatformUtilsService implements PlatformUtilsService private messagingService: MessagingService, private clipboardWriteCallback: (clipboardValue: string, clearMs: number) => void, private biometricCallback: () => Promise, - private win: Window & typeof globalThis + private win: Window & typeof globalThis, ) {} static getDevice(win: Window & typeof globalThis): DeviceType { @@ -197,7 +197,7 @@ export default class BrowserPlatformUtilsService implements PlatformUtilsService type: "error" | "success" | "warning" | "info", title: string, text: string | string[], - options?: any + options?: any, ): void { this.messagingService.send("showToast", { text: text, @@ -332,7 +332,7 @@ export default class BrowserPlatformUtilsService implements PlatformUtilsService autofillCommand = "Cmd+Shift+L"; } else if (this.isFirefox()) { autofillCommand = (await browser.commands.getAll()).find( - (c) => c.name === "autofill_login" + (c) => c.name === "autofill_login", ).shortcut; // Firefox is returning Ctrl instead of Cmd for the modifier key on macOS if // the command is the default one set on installation. @@ -345,8 +345,8 @@ export default class BrowserPlatformUtilsService implements PlatformUtilsService } else { await new Promise((resolve) => chrome.commands.getAll((c) => - resolve((autofillCommand = c.find((c) => c.name === "autofill_login").shortcut)) - ) + resolve((autofillCommand = c.find((c) => c.name === "autofill_login").shortcut)), + ), ); } return autofillCommand; diff --git a/apps/browser/src/platform/services/browser-state.service.spec.ts b/apps/browser/src/platform/services/browser-state.service.spec.ts index c63aae74036..08393ca0de3 100644 --- a/apps/browser/src/platform/services/browser-state.service.spec.ts +++ b/apps/browser/src/platform/services/browser-state.service.spec.ts @@ -66,7 +66,7 @@ describe("Browser State Service", () => { logService, stateFactory, accountService, - useAccountCache + useAccountCache, ); }); diff --git a/apps/browser/src/platform/services/browser-state.service.ts b/apps/browser/src/platform/services/browser-state.service.ts index ae5abb8a897..d5cba8fa9d3 100644 --- a/apps/browser/src/platform/services/browser-state.service.ts +++ b/apps/browser/src/platform/services/browser-state.service.ts @@ -44,7 +44,7 @@ export class BrowserStateService logService: LogService, stateFactory: StateFactory, accountService: AccountService, - useAccountCache = true + useAccountCache = true, ) { super( storageService, @@ -53,7 +53,7 @@ export class BrowserStateService logService, stateFactory, accountService, - useAccountCache + useAccountCache, ); // TODO: This is a hack to fix having a disk cache on both the popup and @@ -69,9 +69,31 @@ export class BrowserStateService } } }); + + BrowserApi.addListener( + chrome.runtime.onMessage, + (message: { command: string }, _, respond) => { + if (message.command === "initializeDiskCache") { + respond(JSON.stringify(this.accountDiskCache.value)); + } + }, + ); } } + override async initAccountState(): Promise { + if (this.isRecoveredSession && this.useAccountCache) { + // request cache initialization + + const response = await BrowserApi.sendMessageWithResponse("initializeDiskCache"); + this.accountDiskCache.next(JSON.parse(response)); + + return; + } + + await super.initAccountState(); + } + async addAccount(account: Account) { // Apply browser overrides to default account values account = new Account(account); @@ -88,7 +110,7 @@ export class BrowserStateService } async getBrowserGroupingComponentState( - options?: StorageOptions + options?: StorageOptions, ): Promise { return ( await this.getAccount(this.reconcileOptions(options, await this.defaultInMemoryOptions())) @@ -97,20 +119,20 @@ export class BrowserStateService async setBrowserGroupingComponentState( value: BrowserGroupingsComponentState, - options?: StorageOptions + options?: StorageOptions, ): Promise { const account = await this.getAccount( - this.reconcileOptions(options, await this.defaultInMemoryOptions()) + this.reconcileOptions(options, await this.defaultInMemoryOptions()), ); account.groupings = value; await this.saveAccount( account, - this.reconcileOptions(options, await this.defaultInMemoryOptions()) + this.reconcileOptions(options, await this.defaultInMemoryOptions()), ); } async getBrowserVaultItemsComponentState( - options?: StorageOptions + options?: StorageOptions, ): Promise { return ( await this.getAccount(this.reconcileOptions(options, await this.defaultInMemoryOptions())) @@ -119,15 +141,15 @@ export class BrowserStateService async setBrowserVaultItemsComponentState( value: BrowserComponentState, - options?: StorageOptions + options?: StorageOptions, ): Promise { const account = await this.getAccount( - this.reconcileOptions(options, await this.defaultInMemoryOptions()) + this.reconcileOptions(options, await this.defaultInMemoryOptions()), ); account.ciphers = value; await this.saveAccount( account, - this.reconcileOptions(options, await this.defaultInMemoryOptions()) + this.reconcileOptions(options, await this.defaultInMemoryOptions()), ); } @@ -139,15 +161,15 @@ export class BrowserStateService async setBrowserSendComponentState( value: BrowserSendComponentState, - options?: StorageOptions + options?: StorageOptions, ): Promise { const account = await this.getAccount( - this.reconcileOptions(options, await this.defaultInMemoryOptions()) + this.reconcileOptions(options, await this.defaultInMemoryOptions()), ); account.send = value; await this.saveAccount( account, - this.reconcileOptions(options, await this.defaultInMemoryOptions()) + this.reconcileOptions(options, await this.defaultInMemoryOptions()), ); } @@ -159,15 +181,15 @@ export class BrowserStateService async setBrowserSendTypeComponentState( value: BrowserComponentState, - options?: StorageOptions + options?: StorageOptions, ): Promise { const account = await this.getAccount( - this.reconcileOptions(options, await this.defaultInMemoryOptions()) + this.reconcileOptions(options, await this.defaultInMemoryOptions()), ); account.sendType = value; await this.saveAccount( account, - this.reconcileOptions(options, await this.defaultInMemoryOptions()) + this.reconcileOptions(options, await this.defaultInMemoryOptions()), ); } @@ -175,7 +197,7 @@ export class BrowserStateService // to delete the cache in the constructor above. protected override async saveAccountToDisk( account: Account, - options: StorageOptions + options: StorageOptions, ): Promise { const storageLocation = options.useSecureStorage ? this.secureStorageService diff --git a/apps/browser/src/platform/services/key-generation.service.ts b/apps/browser/src/platform/services/key-generation.service.ts index b2c76e1aee2..6b6f552c715 100644 --- a/apps/browser/src/platform/services/key-generation.service.ts +++ b/apps/browser/src/platform/services/key-generation.service.ts @@ -13,7 +13,7 @@ export class KeyGenerationService implements AbstractKeyGenerationService { "bitwarden-ephemeral", "ephemeral", 64, - "sha256" + "sha256", ); return new SymmetricCryptoKey(key); } diff --git a/apps/browser/src/platform/services/local-backed-session-storage.service.ts b/apps/browser/src/platform/services/local-backed-session-storage.service.ts index 8f6d519bcf1..d17a338f7fb 100644 --- a/apps/browser/src/platform/services/local-backed-session-storage.service.ts +++ b/apps/browser/src/platform/services/local-backed-session-storage.service.ts @@ -31,7 +31,7 @@ export class LocalBackedSessionStorageService extends AbstractMemoryStorageServi constructor( private encryptService: EncryptService, - private keyGenerationService: AbstractKeyGenerationService + private keyGenerationService: AbstractKeyGenerationService, ) { super(); this.updates$ = this.updatesSubject.asObservable(); diff --git a/apps/browser/src/platform/storage/background-memory-storage.service.ts b/apps/browser/src/platform/storage/background-memory-storage.service.ts index 14dadf225ee..9fb8cb71627 100644 --- a/apps/browser/src/platform/storage/background-memory-storage.service.ts +++ b/apps/browser/src/platform/storage/background-memory-storage.service.ts @@ -53,7 +53,7 @@ export class BackgroundMemoryStorageService extends MemoryStorageService { break; } case "save": - await this.save(message.key, JSON.parse(message.data as string) as unknown); + await this.save(message.key, JSON.parse((message.data as string) ?? null) as unknown); break; case "remove": await this.remove(message.key); diff --git a/apps/browser/src/platform/storage/foreground-memory-storage.service.ts b/apps/browser/src/platform/storage/foreground-memory-storage.service.ts index ea36c322082..1e5220002a8 100644 --- a/apps/browser/src/platform/storage/foreground-memory-storage.service.ts +++ b/apps/browser/src/platform/storage/foreground-memory-storage.service.ts @@ -29,14 +29,14 @@ export class ForegroundMemoryStorageService extends AbstractMemoryStorageService this._port = chrome.runtime.connect({ name: portName(chrome.storage.session) }); this._backgroundResponses$ = fromChromeEvent(this._port.onMessage).pipe( map(([message]) => message), - filter((message) => message.originator === "background") + filter((message) => message.originator === "background"), ); this._backgroundResponses$ .pipe( filter( - (message) => message.action === "subject_update" || message.action === "initialization" - ) + (message) => message.action === "subject_update" || message.action === "initialization", + ), ) .subscribe((message) => { switch (message.action) { @@ -71,15 +71,15 @@ export class ForegroundMemoryStorageService extends AbstractMemoryStorageService private async delegateToBackground( action: MemoryStoragePortMessage["action"], key: string, - data?: T + data?: T, ): Promise { const id = Utils.newGuid(); // listen for response before request const response = firstValueFrom( this._backgroundResponses$.pipe( filter((message) => message.id === id), - map((message) => JSON.parse(message.data as string) as T) - ) + map((message) => JSON.parse((message.data as string) ?? null) as T), + ), ); this.sendMessage({ diff --git a/apps/browser/src/platform/storage/memory-storage-service-interactions.spec.ts b/apps/browser/src/platform/storage/memory-storage-service-interactions.spec.ts index a09d733c6d3..0f604035247 100644 --- a/apps/browser/src/platform/storage/memory-storage-service-interactions.spec.ts +++ b/apps/browser/src/platform/storage/memory-storage-service-interactions.spec.ts @@ -1,3 +1,8 @@ +/** + * need to update test environment so structuredClone works appropriately + * @jest-environment ../../libs/shared/test.environment.ts + */ + import { trackEmissions } from "@bitwarden/common/../spec/utils"; import { BackgroundMemoryStorageService } from "./background-memory-storage.service"; @@ -29,7 +34,7 @@ describe("foreground background memory storage interaction", () => { const result = await foreground[action](key); expect(result).toEqual(value); - } + }, ); test("background should call save from foreground", async () => { diff --git a/apps/browser/src/popup/app-routing.animations.ts b/apps/browser/src/popup/app-routing.animations.ts index 42baf65c270..13403545fde 100644 --- a/apps/browser/src/popup/app-routing.animations.ts +++ b/apps/browser/src/popup/app-routing.animations.ts @@ -5,7 +5,7 @@ const queryShown = query( [style({ position: "fixed", width: "100%", height: "100%" })], { optional: true, - } + }, ); // ref: https://github.com/angular/angular/issues/15477 @@ -20,7 +20,7 @@ export function queryTranslate( axis: string, from: number, to: number, - zIndex = 1000 + zIndex = 1000, ) { return query( ":" + direction, @@ -32,7 +32,7 @@ export function queryTranslate( }), animate(speed + " ease-in-out", style({ transform: "translate" + axis + "(" + to + "%)" })), ], - { optional: true } + { optional: true }, ); } @@ -144,7 +144,7 @@ export const routerTransition = trigger("routerTransition", [ transition("view-cipher => edit-cipher, view-cipher => cipher-password-history", inSlideUp), transition( "edit-cipher => view-cipher, cipher-password-history => view-cipher, edit-cipher => tabs", - outSlideDown + outSlideDown, ), transition("view-cipher => clone-cipher", inSlideUp), @@ -161,11 +161,11 @@ export const routerTransition = trigger("routerTransition", [ transition( "add-cipher => generator, edit-cipher => generator, clone-cipher => generator", - inSlideUp + inSlideUp, ), transition( "generator => add-cipher, generator => edit-cipher, generator => clone-cipher", - outSlideDown + outSlideDown, ), transition("edit-cipher => attachments, edit-cipher => collections", inSlideLeft), @@ -214,4 +214,9 @@ export const routerTransition = trigger("routerTransition", [ transition("tabs => autofill", inSlideLeft), transition("autofill => tabs", outSlideRight), + + transition("* => account-switcher", inSlideUp), + transition("account-switcher => *", outSlideDown), + + transition("lock => *", outSlideDown), ]); diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts index 33ac4558eca..f012dbe9c99 100644 --- a/apps/browser/src/popup/app-routing.module.ts +++ b/apps/browser/src/popup/app-routing.module.ts @@ -27,6 +27,7 @@ import { SsoComponent } from "../auth/popup/sso.component"; import { TwoFactorOptionsComponent } from "../auth/popup/two-factor-options.component"; import { TwoFactorComponent } from "../auth/popup/two-factor.component"; import { UpdateTempPasswordComponent } from "../auth/popup/update-temp-password.component"; +import { AutofillComponent } from "../autofill/popup/settings/autofill.component"; import { GeneratorComponent } from "../tools/popup/generator/generator.component"; import { PasswordGeneratorHistoryComponent } from "../tools/popup/generator/password-generator-history.component"; import { SendAddEditComponent } from "../tools/popup/send/send-add-edit.component"; @@ -46,8 +47,7 @@ import { VaultItemsComponent } from "../vault/popup/components/vault/vault-items import { ViewComponent } from "../vault/popup/components/vault/view.component"; import { FolderAddEditComponent } from "../vault/popup/settings/folder-add-edit.component"; -import { DebounceNavigationService } from "./services/debounceNavigationService"; -import { AutofillComponent } from "./settings/autofill.component"; +import { debounceNavigationGuard } from "./services/debounce-navigation.service"; import { ExcludedDomainsComponent } from "./settings/excluded-domains.component"; import { FoldersComponent } from "./settings/folders.component"; import { HelpAndFeedbackComponent } from "./settings/help-and-feedback.component"; @@ -183,14 +183,14 @@ const routes: Routes = [ { path: "add-cipher", component: AddEditComponent, - canActivate: [AuthGuard, DebounceNavigationService], + canActivate: [AuthGuard, debounceNavigationGuard()], data: { state: "add-cipher" }, runGuardsAndResolvers: "always", }, { path: "edit-cipher", component: AddEditComponent, - canActivate: [AuthGuard, DebounceNavigationService], + canActivate: [AuthGuard, debounceNavigationGuard()], data: { state: "edit-cipher" }, runGuardsAndResolvers: "always", }, @@ -366,7 +366,7 @@ const routes: Routes = [ { path: "account-switcher", component: AccountSwitcherComponent, - data: { state: "account-switcher" }, + data: { state: "account-switcher", doNotSaveUrl: true }, }, ]; diff --git a/apps/browser/src/popup/app.component.ts b/apps/browser/src/popup/app.component.ts index 9d91bef0ba3..22595f5a64e 100644 --- a/apps/browser/src/popup/app.component.ts +++ b/apps/browser/src/popup/app.component.ts @@ -52,7 +52,7 @@ export class AppComponent implements OnInit, OnDestroy { private sanitizer: DomSanitizer, private platformUtilsService: PlatformUtilsService, private dialogService: DialogService, - private browserMessagingApi: ZonedMessageListenerService + private browserMessagingApi: ZonedMessageListenerService, ) {} async ngOnInit() { @@ -70,7 +70,7 @@ export class AppComponent implements OnInit, OnDestroy { concatMap(async () => { await this.recordActivity(); }), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe(); @@ -93,14 +93,15 @@ export class AppComponent implements OnInit, OnDestroy { }); } - if (this.activeUserId === null) { - this.router.navigate(["home"]); - } + this.router.navigate(["home"]); }); this.changeDetectorRef.detectChanges(); } else if (msg.command === "authBlocked") { this.router.navigate(["home"]); - } else if (msg.command === "locked" && msg.userId == null) { + } else if ( + msg.command === "locked" && + (msg.userId === null || msg.userId == this.activeUserId) + ) { this.router.navigate(["lock"]); } else if (msg.command === "showDialog") { this.showDialog(msg); @@ -117,12 +118,17 @@ export class AppComponent implements OnInit, OnDestroy { // Wait to make sure background has reloaded first. window.setTimeout( () => BrowserApi.reloadExtension(forceWindowReload ? window : null), - 2000 + 2000, ); } else if (msg.command === "reloadPopup") { this.router.navigate(["/"]); } else if (msg.command === "convertAccountToKeyConnector") { this.router.navigate(["/remove-password"]); + } else if (msg.command === "switchAccountFinish") { + // TODO: unset loading? + // this.loading = false; + } else if (msg.command == "update-temp-password") { + this.router.navigate(["/update-temp-password"]); } else { msg.webExtSender = sender; this.broadcasterService.send(msg); @@ -206,7 +212,7 @@ export class AppComponent implements OnInit, OnDestroy { } else { msg.text.forEach( (t: string) => - (message += "

" + this.sanitizer.sanitize(SecurityContext.HTML, t) + "

") + (message += "

" + this.sanitizer.sanitize(SecurityContext.HTML, t) + "

"), ); options.enableHtml = true; } diff --git a/apps/browser/src/popup/app.module.ts b/apps/browser/src/popup/app.module.ts index 3aff12b4e38..ae8fd394df9 100644 --- a/apps/browser/src/popup/app.module.ts +++ b/apps/browser/src/popup/app.module.ts @@ -18,6 +18,7 @@ import { ColorPasswordPipe } from "@bitwarden/angular/pipes/color-password.pipe" import { AvatarModule } from "@bitwarden/components"; import { AccountSwitcherComponent } from "../auth/popup/account-switching/account-switcher.component"; +import { AccountComponent } from "../auth/popup/account-switching/account.component"; import { CurrentAccountComponent } from "../auth/popup/account-switching/current-account.component"; import { SetPinComponent } from "../auth/popup/components/set-pin.component"; import { EnvironmentComponent } from "../auth/popup/environment.component"; @@ -34,6 +35,7 @@ import { SsoComponent } from "../auth/popup/sso.component"; import { TwoFactorOptionsComponent } from "../auth/popup/two-factor-options.component"; import { TwoFactorComponent } from "../auth/popup/two-factor.component"; import { UpdateTempPasswordComponent } from "../auth/popup/update-temp-password.component"; +import { AutofillComponent } from "../autofill/popup/settings/autofill.component"; import { HeaderComponent } from "../platform/popup/header.component"; import { FilePopoutCalloutComponent } from "../tools/popup/components/file-popout-callout.component"; import { GeneratorComponent } from "../tools/popup/generator/generator.component"; @@ -68,7 +70,6 @@ import { PopOutComponent } from "./components/pop-out.component"; import { PrivateModeWarningComponent } from "./components/private-mode-warning.component"; import { UserVerificationComponent } from "./components/user-verification.component"; import { ServicesModule } from "./services/services.module"; -import { AutofillComponent } from "./settings/autofill.component"; import { ExcludedDomainsComponent } from "./settings/excluded-domains.component"; import { FoldersComponent } from "./settings/folders.component"; import { HelpAndFeedbackComponent } from "./settings/help-and-feedback.component"; @@ -105,6 +106,7 @@ import "../platform/popup/locales"; DialogModule, FilePopoutCalloutComponent, AvatarModule, + AccountComponent, ], declarations: [ ActionButtonsComponent, diff --git a/apps/browser/src/popup/index.html b/apps/browser/src/popup/index.html index 17f50e0a0eb..e76a8c749fd 100644 --- a/apps/browser/src/popup/index.html +++ b/apps/browser/src/popup/index.html @@ -1,4 +1,4 @@ - + diff --git a/apps/browser/src/popup/scss/base.scss b/apps/browser/src/popup/scss/base.scss index 16cac3352a8..4ca486369b1 100644 --- a/apps/browser/src/popup/scss/base.scss +++ b/apps/browser/src/popup/scss/base.scss @@ -176,11 +176,10 @@ cdk-virtual-scroll-viewport::-webkit-scrollbar-thumb, } header:not(bit-callout header) { - max-height: 44px; + height: 44px; display: flex; &:not(.no-theme) { - min-height: 44px; border-bottom: 1px solid #000000; @include themify($themes) { @@ -231,7 +230,7 @@ header:not(bit-callout header) { } app-pop-out > button, - div > button, + div > button:not(app-current-account button):not(.home-acc-switcher-btn), div > a { border: none; padding: 0 10px; @@ -243,8 +242,8 @@ header:not(bit-callout header) { height: 100%; white-space: pre; - &:hover, - &:focus { + &:not(.home-acc-switcher-btn):hover, + &:not(.home-acc-switcher-btn):focus { @include themify($themes) { background-color: themed("headerBackgroundHoverColor"); color: themed("headerColor"); diff --git a/apps/browser/src/popup/scss/environment.scss b/apps/browser/src/popup/scss/environment.scss index f6adba86c2e..0fb8e0ddaba 100644 --- a/apps/browser/src/popup/scss/environment.scss +++ b/apps/browser/src/popup/scss/environment.scss @@ -65,7 +65,9 @@ html.browser_safari { } padding: 5px; width: 100%; - box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.12), + box-shadow: + 0 2px 2px 0 rgba(0, 0, 0, 0.14), + 0 3px 1px -2px rgba(0, 0, 0, 0.12), 0 1px 5px 0 rgba(0, 0, 0, 0.2); border-radius: $border-radius; } diff --git a/apps/browser/src/popup/services/debounceNavigationService.ts b/apps/browser/src/popup/services/debounce-navigation.service.ts similarity index 59% rename from apps/browser/src/popup/services/debounceNavigationService.ts rename to apps/browser/src/popup/services/debounce-navigation.service.ts index bf1e2e83ca5..b40738f0a80 100644 --- a/apps/browser/src/popup/services/debounceNavigationService.ts +++ b/apps/browser/src/popup/services/debounce-navigation.service.ts @@ -1,10 +1,24 @@ -import { Injectable, OnDestroy } from "@angular/core"; -import { CanActivate, NavigationEnd, NavigationStart, Router } from "@angular/router"; +import { inject, Injectable, OnDestroy } from "@angular/core"; +import { CanActivateFn, NavigationEnd, NavigationStart, Router } from "@angular/router"; import { Subscription } from "rxjs"; import { filter, pairwise } from "rxjs/operators"; +/** + * CanActivate guard that cancels duplicate navigation events, which can otherwise reinitialize some components + * unexpectedly. + * Specifically, this is used to avoid data loss when navigating from the password generator component back to the + * add/edit cipher component in browser. + * For more information, see https://github.com/bitwarden/clients/pull/1935 + */ +export function debounceNavigationGuard(): CanActivateFn { + return async () => { + const debounceNavigationService = inject(DebounceNavigationService); + return debounceNavigationService.canActivate(); + }; +} + @Injectable() -export class DebounceNavigationService implements CanActivate, OnDestroy { +export class DebounceNavigationService implements OnDestroy { navigationStartSub: Subscription; navigationSuccessSub: Subscription; @@ -16,11 +30,11 @@ export class DebounceNavigationService implements CanActivate, OnDestroy { this.navigationStartSub = this.router.events .pipe( filter((event) => event instanceof NavigationStart), - pairwise() + pairwise(), ) .subscribe( (events: [NavigationStart, NavigationStart]) => - ([this.lastNavigation, this.thisNavigation] = events) + ([this.lastNavigation, this.thisNavigation] = events), ); this.navigationSuccessSub = this.router.events diff --git a/apps/browser/src/popup/services/init.service.ts b/apps/browser/src/popup/services/init.service.ts index 78fbdfaa9f1..005664bdd20 100644 --- a/apps/browser/src/popup/services/init.service.ts +++ b/apps/browser/src/popup/services/init.service.ts @@ -17,7 +17,7 @@ export class InitService { private stateService: StateServiceAbstraction, private logService: LogServiceAbstraction, private themingService: AbstractThemingService, - private configService: ConfigService + private configService: ConfigService, ) {} init() { diff --git a/apps/browser/src/popup/services/popup-close-warning.service.ts b/apps/browser/src/popup/services/popup-close-warning.service.ts index 536def47d5d..01e91ecad70 100644 --- a/apps/browser/src/popup/services/popup-close-warning.service.ts +++ b/apps/browser/src/popup/services/popup-close-warning.service.ts @@ -26,7 +26,7 @@ export class PopupCloseWarningService { // Older methods with better support e.returnValue = confirmationMessage; return confirmationMessage; - } + }, ); } diff --git a/apps/browser/src/popup/services/popup-search.service.ts b/apps/browser/src/popup/services/popup-search.service.ts index 43fbed055e8..7eea1265a23 100644 --- a/apps/browser/src/popup/services/popup-search.service.ts +++ b/apps/browser/src/popup/services/popup-search.service.ts @@ -6,7 +6,7 @@ export class PopupSearchService extends SearchService { constructor( private mainSearchService: SearchService, consoleLogService: ConsoleLogService, - i18nService: I18nService + i18nService: I18nService, ) { super(consoleLogService, i18nService); } diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts index 2cd0166f946..dc223488280 100644 --- a/apps/browser/src/popup/services/services.module.ts +++ b/apps/browser/src/popup/services/services.module.ts @@ -116,7 +116,7 @@ import { FilePopoutUtilsService } from "../../tools/popup/services/file-popout-u import { BrowserFolderService } from "../../vault/services/browser-folder.service"; import { VaultFilterService } from "../../vault/services/vault-filter.service"; -import { DebounceNavigationService } from "./debounceNavigationService"; +import { DebounceNavigationService } from "./debounce-navigation.service"; import { InitService } from "./init.service"; import { PopupCloseWarningService } from "./popup-close-warning.service"; import { PopupSearchService } from "./popup-search.service"; @@ -183,7 +183,7 @@ function getBgService(service: keyof MainBackground) { return new PopupSearchService( getBgService("searchService")(), logService, - i18nService + i18nService, ); }, deps: [LogServiceAbstraction, I18nServiceAbstraction], @@ -210,7 +210,7 @@ function getBgService(service: keyof MainBackground) { cryptoService: CryptoService, i18nService: I18nServiceAbstraction, cipherService: CipherService, - stateService: StateServiceAbstraction + stateService: StateServiceAbstraction, ) => { return new BrowserFolderService(cryptoService, i18nService, cipherService, stateService); }, @@ -293,7 +293,7 @@ function getBgService(service: keyof MainBackground) { provide: PolicyService, useFactory: ( stateService: StateServiceAbstraction, - organizationService: OrganizationService + organizationService: OrganizationService, ) => { return new BrowserPolicyService(stateService, organizationService); }, @@ -304,7 +304,7 @@ function getBgService(service: keyof MainBackground) { useFactory: ( policyService: InternalPolicyService, apiService: ApiService, - stateService: StateService + stateService: StateService, ) => { return new PolicyApiService(policyService, apiService, stateService); }, @@ -332,13 +332,13 @@ function getBgService(service: keyof MainBackground) { cryptoService: CryptoService, i18nService: I18nServiceAbstraction, cryptoFunctionService: CryptoFunctionService, - stateServiceAbstraction: StateServiceAbstraction + stateServiceAbstraction: StateServiceAbstraction, ) => { return new BrowserSendService( cryptoService, i18nService, cryptoFunctionService, - stateServiceAbstraction + stateServiceAbstraction, ); }, deps: [CryptoService, I18nServiceAbstraction, CryptoFunctionService, StateServiceAbstraction], @@ -352,7 +352,7 @@ function getBgService(service: keyof MainBackground) { useFactory: ( apiService: ApiService, fileUploadService: FileUploadService, - sendService: InternalSendServiceAbstraction + sendService: InternalSendServiceAbstraction, ) => { return new SendApiService(apiService, fileUploadService, sendService); }, @@ -430,7 +430,7 @@ function getBgService(service: keyof MainBackground) { stateService: StateServiceAbstraction, organizationService: OrganizationService, folderService: FolderService, - policyService: PolicyService + policyService: PolicyService, ) => { return new VaultFilterService( stateService, @@ -438,7 +438,7 @@ function getBgService(service: keyof MainBackground) { folderService, getBgService("cipherService")(), getBgService("collectionService")(), - policyService + policyService, ); }, deps: [StateServiceAbstraction, OrganizationService, FolderService, PolicyService], @@ -472,7 +472,7 @@ function getBgService(service: keyof MainBackground) { secureStorageService: AbstractStorageService, memoryStorageService: AbstractMemoryStorageService, logService: LogServiceAbstraction, - accountService: AccountServiceAbstraction + accountService: AccountServiceAbstraction, ) => { return new BrowserStateService( storageService, @@ -480,7 +480,7 @@ function getBgService(service: keyof MainBackground) { memoryStorageService, logService, new StateFactory(GlobalState, Account), - accountService + accountService, ); }, deps: [ @@ -514,14 +514,14 @@ function getBgService(service: keyof MainBackground) { provide: AbstractThemingService, useFactory: ( stateService: StateServiceAbstraction, - platformUtilsService: PlatformUtilsService + platformUtilsService: PlatformUtilsService, ) => { return new ThemingService( stateService, // Safari doesn't properly handle the (prefers-color-scheme) media query in the popup window, it always returns light. // In Safari we have to use the background page instead, which comes with limitations like not dynamically changing the extension theme when the system theme is changed. platformUtilsService.isSafari() ? getBgService("backgroundWindow")() : window, - document + document, ); }, deps: [StateServiceAbstraction, PlatformUtilsService], diff --git a/apps/browser/src/popup/settings/about.component.html b/apps/browser/src/popup/settings/about.component.html index b68f592492f..b4086178340 100644 --- a/apps/browser/src/popup/settings/about.component.html +++ b/apps/browser/src/popup/settings/about.component.html @@ -10,7 +10,7 @@

{{ "serverVersion" | i18n }}: {{ this.serverConfig?.version }} - ({{ "lastSeenOn" | i18n : (serverConfig.utcDate | date : "mediumDate") }}) + ({{ "lastSeenOn" | i18n: (serverConfig.utcDate | date: "mediumDate") }})

@@ -20,11 +20,11 @@ {{ "serverVersion" | i18n }} ({{ "thirdParty" | i18n }}): {{ this.serverConfig?.version }} - ({{ "lastSeenOn" | i18n : (serverConfig.utcDate | date : "mediumDate") }}) + ({{ "lastSeenOn" | i18n: (serverConfig.utcDate | date: "mediumDate") }})

- {{ "thirdPartyServerMessage" | i18n : serverConfig.server?.name }} + {{ "thirdPartyServerMessage" | i18n: serverConfig.server?.name }}
@@ -32,7 +32,7 @@ {{ "serverVersion" | i18n }} ({{ "selfHostedServer" | i18n }}): {{ this.serverConfig?.version }} - ({{ "lastSeenOn" | i18n : (serverConfig.utcDate | date : "mediumDate") }}) + ({{ "lastSeenOn" | i18n: (serverConfig.utcDate | date: "mediumDate") }})

diff --git a/apps/browser/src/popup/settings/about.component.ts b/apps/browser/src/popup/settings/about.component.ts index c0c9012f341..d6f6f000b61 100644 --- a/apps/browser/src/popup/settings/about.component.ts +++ b/apps/browser/src/popup/settings/about.component.ts @@ -24,6 +24,6 @@ export class AboutComponent { constructor( private configService: ConfigServiceAbstraction, - private environmentService: EnvironmentService + private environmentService: EnvironmentService, ) {} } diff --git a/apps/browser/src/popup/settings/excluded-domains.component.html b/apps/browser/src/popup/settings/excluded-domains.component.html index 51d6a20d5be..652eb4aef08 100644 --- a/apps/browser/src/popup/settings/excluded-domains.component.html +++ b/apps/browser/src/popup/settings/excluded-domains.component.html @@ -38,7 +38,7 @@
- + await this.loadCurrentUris(), - 500 + 500, ); break; default: @@ -96,7 +96,7 @@ export class ExcludedDomainsComponent implements OnInit, OnDestroy { this.platformUtilsService.showToast( "error", null, - this.i18nService.t("excludedDomainsInvalidDomain", domain.uri) + this.i18nService.t("excludedDomainsInvalidDomain", domain.uri), ); return; } @@ -116,7 +116,7 @@ export class ExcludedDomainsComponent implements OnInit, OnDestroy { getNewlyAddedDomains(domain: ExcludedDomain[]): ExcludedDomain[] { const result = this.excludedDomains.filter( (newDomain) => - !this.existingExcludedDomains.some((oldDomain) => newDomain.uri === oldDomain.uri) + !this.existingExcludedDomains.some((oldDomain) => newDomain.uri === oldDomain.uri), ); return result; } diff --git a/apps/browser/src/popup/settings/folders.component.ts b/apps/browser/src/popup/settings/folders.component.ts index cae5d6f5106..6e97fb332a2 100644 --- a/apps/browser/src/popup/settings/folders.component.ts +++ b/apps/browser/src/popup/settings/folders.component.ts @@ -12,7 +12,10 @@ import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; export class FoldersComponent { folders$: Observable; - constructor(private folderService: FolderService, private router: Router) { + constructor( + private folderService: FolderService, + private router: Router, + ) { this.folders$ = this.folderService.folderViews$.pipe( map((folders) => { if (folders.length > 0) { @@ -20,7 +23,7 @@ export class FoldersComponent { } return folders; - }) + }), ); } diff --git a/apps/browser/src/popup/settings/options.component.html b/apps/browser/src/popup/settings/options.component.html index fb8906463be..93c018233af 100644 --- a/apps/browser/src/popup/settings/options.component.html +++ b/apps/browser/src/popup/settings/options.component.html @@ -205,7 +205,9 @@ />
- +
diff --git a/apps/browser/src/popup/settings/options.component.ts b/apps/browser/src/popup/settings/options.component.ts index 4f943a857be..cac85405298 100644 --- a/apps/browser/src/popup/settings/options.component.ts +++ b/apps/browser/src/popup/settings/options.component.ts @@ -46,7 +46,7 @@ export class OptionsComponent implements OnInit { private totpService: TotpService, i18nService: I18nService, private themingService: AbstractThemingService, - private settingsService: SettingsService + private settingsService: SettingsService, ) { this.themeOptions = [ { name: i18nService.t("default"), value: ThemeType.System }, @@ -118,7 +118,7 @@ export class OptionsComponent implements OnInit { async updateChangedPasswordNotification() { await this.stateService.setDisableChangedPasswordNotification( - !this.enableChangedPasswordNotification + !this.enableChangedPasswordNotification, ); } diff --git a/apps/browser/src/popup/settings/premium.component.ts b/apps/browser/src/popup/settings/premium.component.ts index e57d53f3c40..cda93d5b68f 100644 --- a/apps/browser/src/popup/settings/premium.component.ts +++ b/apps/browser/src/popup/settings/premium.component.ts @@ -26,7 +26,7 @@ export class PremiumComponent extends BasePremiumComponent { private location: Location, private currencyPipe: CurrencyPipe, dialogService: DialogService, - environmentService: EnvironmentService + environmentService: EnvironmentService, ) { super( i18nService, @@ -35,7 +35,7 @@ export class PremiumComponent extends BasePremiumComponent { logService, stateService, dialogService, - environmentService + environmentService, ); // Support old price string. Can be removed in future once all translations are properly updated. diff --git a/apps/browser/src/popup/settings/settings.component.html b/apps/browser/src/popup/settings/settings.component.html index 0b752ac6ce6..f099528918b 100644 --- a/apps/browser/src/popup/settings/settings.component.html +++ b/apps/browser/src/popup/settings/settings.component.html @@ -1,4 +1,4 @@ -
+
@@ -6,7 +6,7 @@ {{ "settings" | i18n }}
-
+

{{ "manage" | i18n }}

@@ -52,14 +52,14 @@ {{ "vaultTimeoutPolicyWithActionInEffect" - | i18n : policy.timeout.hours : policy.timeout.minutes : (policy.action | i18n) + | i18n: policy.timeout.hours : policy.timeout.minutes : (policy.action | i18n) }} - {{ "vaultTimeoutPolicyInEffect" | i18n : policy.timeout.hours : policy.timeout.minutes }} + {{ "vaultTimeoutPolicyInEffect" | i18n: policy.timeout.hours : policy.timeout.minutes }} - {{ "vaultTimeoutActionPolicyInEffect" | i18n : (policy.action | i18n) }} + {{ "vaultTimeoutActionPolicyInEffect" | i18n: (policy.action | i18n) }} { await this.saveVaultTimeout(previousValue, newValue); }), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe(); @@ -165,14 +165,14 @@ export class SettingsComponent implements OnInit { concatMap(async ([previousValue, newValue]) => { await this.saveVaultTimeoutAction(previousValue, newValue); }), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe(); const initialValues = { vaultTimeout: timeout, vaultTimeoutAction: await firstValueFrom( - this.vaultTimeoutSettingsService.vaultTimeoutAction$() + this.vaultTimeoutSettingsService.vaultTimeoutAction$(), ), pin: pinStatus !== "DISABLED", biometric: await this.vaultTimeoutSettingsService.isBiometricLockSet(), @@ -189,7 +189,7 @@ export class SettingsComponent implements OnInit { await this.updatePin(value); this.refreshTimeoutSettings$.next(); }), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe(); @@ -205,7 +205,7 @@ export class SettingsComponent implements OnInit { } this.refreshTimeoutSettings$.next(); }), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe(); @@ -215,9 +215,9 @@ export class SettingsComponent implements OnInit { combineLatest([ this.vaultTimeoutSettingsService.availableVaultTimeoutActions$(), this.vaultTimeoutSettingsService.vaultTimeoutAction$(), - ]) + ]), ), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe(([availableActions, action]) => { this.availableVaultTimeoutActions = availableActions; @@ -235,9 +235,9 @@ export class SettingsComponent implements OnInit { combineLatest([ this.vaultTimeoutSettingsService.availableVaultTimeoutActions$(), maximumVaultTimeoutPolicy, - ]) + ]), ), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe(([availableActions, policy]) => { if (policy?.data?.action || availableActions.length <= 1) { @@ -268,14 +268,14 @@ export class SettingsComponent implements OnInit { this.platformUtilsService.showToast( "error", null, - this.i18nService.t("vaultTimeoutTooLarge") + this.i18nService.t("vaultTimeoutTooLarge"), ); return; } await this.vaultTimeoutSettingsService.setVaultTimeoutOptions( newValue, - await firstValueFrom(this.vaultTimeoutSettingsService.vaultTimeoutAction$()) + await firstValueFrom(this.vaultTimeoutSettingsService.vaultTimeoutAction$()), ); if (newValue == null) { this.messagingService.send("bgReseedStorage"); @@ -302,14 +302,14 @@ export class SettingsComponent implements OnInit { this.platformUtilsService.showToast( "error", null, - this.i18nService.t("vaultTimeoutTooLarge") + this.i18nService.t("vaultTimeoutTooLarge"), ); return; } await this.vaultTimeoutSettingsService.setVaultTimeoutOptions( this.form.value.vaultTimeout, - newValue + newValue, ); this.refreshTimeoutSettings$.next(); } @@ -386,7 +386,7 @@ export class SettingsComponent implements OnInit { this.platformUtilsService.showToast( "error", this.i18nService.t("errorEnableBiometricTitle"), - this.i18nService.t("errorEnableBiometricDesc") + this.i18nService.t("errorEnableBiometricDesc"), ); } }) @@ -416,7 +416,7 @@ export class SettingsComponent implements OnInit { async updateAutoBiometricsPrompt() { await this.stateService.setDisableAutoBiometricsPrompt( - !this.form.value.enableAutoBiometricsPrompt + !this.form.value.enableAutoBiometricsPrompt, ); } @@ -491,7 +491,7 @@ export class SettingsComponent implements OnInit { async fingerprint() { const fingerprint = await this.cryptoService.getFingerprint( - await this.stateService.getUserId() + await this.stateService.getUserId(), ); const dialogRef = FingerprintDialogComponent.open(this.dialogService, { diff --git a/apps/browser/src/popup/settings/sync.component.ts b/apps/browser/src/popup/settings/sync.component.ts index ffc20363f71..3fe4de9eb51 100644 --- a/apps/browser/src/popup/settings/sync.component.ts +++ b/apps/browser/src/popup/settings/sync.component.ts @@ -15,7 +15,7 @@ export class SyncComponent implements OnInit { constructor( private syncService: SyncService, private platformUtilsService: PlatformUtilsService, - private i18nService: I18nService + private i18nService: I18nService, ) {} async ngOnInit() { diff --git a/apps/browser/src/tools/background/service_factories/import-api-service.factory.ts b/apps/browser/src/tools/background/service_factories/import-api-service.factory.ts index 00954a0dc60..37d0b9000c2 100644 --- a/apps/browser/src/tools/background/service_factories/import-api-service.factory.ts +++ b/apps/browser/src/tools/background/service_factories/import-api-service.factory.ts @@ -15,12 +15,12 @@ type ServiceCache = { importApiService?: ImportApiServiceAbstraction } & CachedS export function importApiServiceFactory( cache: ServiceCache, - opts: ImportApiServiceInitOptions + opts: ImportApiServiceInitOptions, ): Promise { return factory( cache, "importApiService", opts, - async () => new ImportApiService(await apiServiceFactory(cache, opts)) + async () => new ImportApiService(await apiServiceFactory(cache, opts)), ); } diff --git a/apps/browser/src/tools/background/service_factories/import-service.factory.ts b/apps/browser/src/tools/background/service_factories/import-service.factory.ts index 7f5328f4d07..e800dbabaa1 100644 --- a/apps/browser/src/tools/background/service_factories/import-service.factory.ts +++ b/apps/browser/src/tools/background/service_factories/import-service.factory.ts @@ -42,7 +42,7 @@ export function importServiceFactory( cache: { importService?: ImportServiceAbstraction; } & CachedServices, - opts: ImportServiceInitOptions + opts: ImportServiceInitOptions, ): Promise { return factory( cache, @@ -55,7 +55,7 @@ export function importServiceFactory( await importApiServiceFactory(cache, opts), await i18nServiceFactory(cache, opts), await collectionServiceFactory(cache, opts), - await cryptoServiceFactory(cache, opts) - ) + await cryptoServiceFactory(cache, opts), + ), ); } diff --git a/apps/browser/src/tools/background/service_factories/password-generation-service.factory.ts b/apps/browser/src/tools/background/service_factories/password-generation-service.factory.ts index b5a56dc1184..4b4d80e76d4 100644 --- a/apps/browser/src/tools/background/service_factories/password-generation-service.factory.ts +++ b/apps/browser/src/tools/background/service_factories/password-generation-service.factory.ts @@ -30,7 +30,7 @@ export type PasswordGenerationServiceInitOptions = PasswordGenerationServiceFact export function passwordGenerationServiceFactory( cache: { passwordGenerationService?: PasswordGenerationServiceAbstraction } & CachedServices, - opts: PasswordGenerationServiceInitOptions + opts: PasswordGenerationServiceInitOptions, ): Promise { return factory( cache, @@ -40,7 +40,7 @@ export function passwordGenerationServiceFactory( new PasswordGenerationService( await cryptoServiceFactory(cache, opts), await policyServiceFactory(cache, opts), - await stateServiceFactory(cache, opts) - ) + await stateServiceFactory(cache, opts), + ), ); } diff --git a/apps/browser/src/tools/background/service_factories/password-strength-service.factory.ts b/apps/browser/src/tools/background/service_factories/password-strength-service.factory.ts index 3ebd4636fe3..c1e5b71ee32 100644 --- a/apps/browser/src/tools/background/service_factories/password-strength-service.factory.ts +++ b/apps/browser/src/tools/background/service_factories/password-strength-service.factory.ts @@ -17,7 +17,7 @@ export function passwordStrengthServiceFactory( cache: { passwordStrengthService?: PasswordStrengthServiceAbstraction; } & CachedServices, - opts: PasswordStrengthServiceInitOptions + opts: PasswordStrengthServiceInitOptions, ): Promise { return factory(cache, "passwordStrengthService", opts, async () => new PasswordStrengthService()); } diff --git a/apps/browser/src/tools/popup/generator/generator.component.html b/apps/browser/src/tools/popup/generator/generator.component.html index a236c765577..5f722b661ce 100644 --- a/apps/browser/src/tools/popup/generator/generator.component.html +++ b/apps/browser/src/tools/popup/generator/generator.component.html @@ -1,4 +1,4 @@ -
+
-
+
{{ "passwordGeneratorPolicyInEffect" | i18n }} diff --git a/apps/browser/src/tools/popup/generator/generator.component.ts b/apps/browser/src/tools/popup/generator/generator.component.ts index 03d7442e6eb..e4263d3caa2 100644 --- a/apps/browser/src/tools/popup/generator/generator.component.ts +++ b/apps/browser/src/tools/popup/generator/generator.component.ts @@ -28,7 +28,7 @@ export class GeneratorComponent extends BaseGeneratorComponent { stateService: StateService, route: ActivatedRoute, logService: LogService, - private location: Location + private location: Location, ) { super( passwordGenerationService, @@ -38,7 +38,7 @@ export class GeneratorComponent extends BaseGeneratorComponent { i18nService, logService, route, - window + window, ); } diff --git a/apps/browser/src/tools/popup/generator/password-generator-history.component.html b/apps/browser/src/tools/popup/generator/password-generator-history.component.html index 22e07810d07..8f4a246fc5e 100644 --- a/apps/browser/src/tools/popup/generator/password-generator-history.component.html +++ b/apps/browser/src/tools/popup/generator/password-generator-history.component.html @@ -25,7 +25,7 @@ [appCopyText]="h.password" [innerHTML]="h.password | colorPassword" >
- {{ h.date | date : "medium" }} + {{ h.date | date: "medium" }}
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 fbe1ba10d33..8448077083e 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 @@ -15,7 +15,7 @@ export class PasswordGeneratorHistoryComponent extends BasePasswordGeneratorHist passwordGenerationService: PasswordGenerationServiceAbstraction, platformUtilsService: PlatformUtilsService, i18nService: I18nService, - private location: Location + private location: Location, ) { super(passwordGenerationService, platformUtilsService, i18nService, window); } diff --git a/apps/browser/src/tools/popup/send/components/send-list.component.html b/apps/browser/src/tools/popup/send/components/send-list.component.html index 3dc5af0106d..05c8e3e3754 100644 --- a/apps/browser/src/tools/popup/send/components/send-list.component.html +++ b/apps/browser/src/tools/popup/send/components/send-list.component.html @@ -57,7 +57,7 @@ {{ "pendingDeletion" | i18n }} - {{ s.deletionDate | date : "medium" }} + {{ s.deletionDate | date: "medium" }}
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 5ad664d871e..ef2b57992ac 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 @@ -48,7 +48,7 @@ export class SendAddEditComponent extends BaseAddEditComponent { sendApiService: SendApiService, dialogService: DialogService, formBuilder: FormBuilder, - private filePopoutUtilsService: FilePopoutUtilsService + private filePopoutUtilsService: FilePopoutUtilsService, ) { super( i18nService, @@ -62,7 +62,7 @@ export class SendAddEditComponent extends BaseAddEditComponent { stateService, sendApiService, dialogService, - formBuilder + formBuilder, ); } diff --git a/apps/browser/src/tools/popup/send/send-groupings.component.html b/apps/browser/src/tools/popup/send/send-groupings.component.html index e677895b409..edeabd6546a 100644 --- a/apps/browser/src/tools/popup/send/send-groupings.component.html +++ b/apps/browser/src/tools/popup/send/send-groupings.component.html @@ -1,9 +1,9 @@ -
+

{{ "send" | i18n }}

-
+
-
+
{{ "sendDisabledWarning" | i18n }} 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 0fde93df8fe..40bb38d574f 100644 --- a/apps/browser/src/tools/popup/send/send-groupings.component.ts +++ b/apps/browser/src/tools/popup/send/send-groupings.component.ts @@ -50,7 +50,7 @@ export class SendGroupingsComponent extends BaseSendComponent { private broadcasterService: BroadcasterService, logService: LogService, sendApiService: SendApiService, - dialogService: DialogService + dialogService: DialogService, ) { super( sendService, @@ -62,7 +62,7 @@ export class SendGroupingsComponent extends BaseSendComponent { policyService, logService, sendApiService, - dialogService + dialogService, ); super.onSuccessfulLoad = async () => { this.calculateTypeCounts(); 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 6e5e76a0e5d..f72be474f13 100644 --- a/apps/browser/src/tools/popup/send/send-type.component.ts +++ b/apps/browser/src/tools/popup/send/send-type.component.ts @@ -50,7 +50,7 @@ export class SendTypeComponent extends BaseSendComponent { private router: Router, logService: LogService, sendApiService: SendApiService, - dialogService: DialogService + dialogService: DialogService, ) { super( sendService, @@ -62,7 +62,7 @@ export class SendTypeComponent extends BaseSendComponent { policyService, logService, sendApiService, - dialogService + dialogService, ); super.onSuccessfulLoad = async () => { this.selectType(this.type); diff --git a/apps/browser/src/tools/popup/settings/export.component.ts b/apps/browser/src/tools/popup/settings/export.component.ts index d34b86a9e46..7c0a294ec5e 100644 --- a/apps/browser/src/tools/popup/settings/export.component.ts +++ b/apps/browser/src/tools/popup/settings/export.component.ts @@ -31,7 +31,7 @@ export class ExportComponent extends BaseExportComponent { userVerificationService: UserVerificationService, formBuilder: UntypedFormBuilder, fileDownloadService: FileDownloadService, - dialogService: DialogService + dialogService: DialogService, ) { super( cryptoService, @@ -45,7 +45,7 @@ export class ExportComponent extends BaseExportComponent { userVerificationService, formBuilder, fileDownloadService, - dialogService + dialogService, ); } 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 46062ebc9cc..3c539586333 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 @@ -58,7 +58,7 @@ export type CipherServiceInitOptions = CipherServiceFactoryOptions & export function cipherServiceFactory( cache: { cipherService?: AbstractCipherService } & CachedServices, - opts: CipherServiceInitOptions + opts: CipherServiceInitOptions, ): Promise { return factory( cache, @@ -74,7 +74,7 @@ export function cipherServiceFactory( await stateServiceFactory(cache, opts), await encryptServiceFactory(cache, opts), await cipherFileUploadServiceFactory(cache, opts), - await configServiceFactory(cache, opts) - ) + await configServiceFactory(cache, opts), + ), ); } diff --git a/apps/browser/src/vault/background/service_factories/collection-service.factory.ts b/apps/browser/src/vault/background/service_factories/collection-service.factory.ts index 323eebe27d1..fd576ca12c3 100644 --- a/apps/browser/src/vault/background/service_factories/collection-service.factory.ts +++ b/apps/browser/src/vault/background/service_factories/collection-service.factory.ts @@ -28,7 +28,7 @@ export type CollectionServiceInitOptions = CollectionServiceFactoryOptions & export function collectionServiceFactory( cache: { collectionService?: AbstractCollectionService } & CachedServices, - opts: CollectionServiceInitOptions + opts: CollectionServiceInitOptions, ): Promise { return factory( cache, @@ -38,7 +38,7 @@ export function collectionServiceFactory( new CollectionService( await cryptoServiceFactory(cache, opts), await i18nServiceFactory(cache, opts), - await stateServiceFactory(cache, opts) - ) + await stateServiceFactory(cache, opts), + ), ); } 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 b33c79a012b..aeafbe5ef24 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 @@ -31,7 +31,7 @@ export type FolderServiceInitOptions = FolderServiceFactoryOptions & export function folderServiceFactory( cache: { folderService?: AbstractFolderService } & CachedServices, - opts: FolderServiceInitOptions + opts: FolderServiceInitOptions, ): Promise { return factory( cache, @@ -42,7 +42,7 @@ export function folderServiceFactory( await cryptoServiceFactory(cache, opts), await i18nServiceFactory(cache, opts), await cipherServiceFactory(cache, opts), - await stateServiceFactory(cache, opts) - ) + await stateServiceFactory(cache, opts), + ), ); } 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 9e976b3bf75..715d0f2c860 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 @@ -13,9 +13,9 @@ export type SyncNotifierServiceInitOptions = SyncNotifierServiceFactoryOptions; export function syncNotifierServiceFactory( cache: { syncNotifierService?: AbstractSyncNotifierService } & CachedServices, - opts: SyncNotifierServiceInitOptions + opts: SyncNotifierServiceInitOptions, ): Promise { return factory(cache, "syncNotifierService", opts, () => - Promise.resolve(new SyncNotifierService()) + Promise.resolve(new SyncNotifierService()), ); } diff --git a/apps/browser/src/vault/background/service_factories/totp-service.factory.ts b/apps/browser/src/vault/background/service_factories/totp-service.factory.ts index 21e042370b7..c8f5a270b48 100644 --- a/apps/browser/src/vault/background/service_factories/totp-service.factory.ts +++ b/apps/browser/src/vault/background/service_factories/totp-service.factory.ts @@ -23,7 +23,7 @@ export type TotpServiceInitOptions = TotpServiceOptions & export function totpServiceFactory( cache: { totpService?: AbstractTotpService } & CachedServices, - opts: TotpServiceInitOptions + opts: TotpServiceInitOptions, ): Promise { return factory( cache, @@ -32,7 +32,7 @@ export function totpServiceFactory( async () => new TotpService( await cryptoFunctionServiceFactory(cache, opts), - await logServiceFactory(cache, opts) - ) + await logServiceFactory(cache, opts), + ), ); } diff --git a/apps/browser/src/vault/fido2/browser-fido2-user-interface.service.ts b/apps/browser/src/vault/fido2/browser-fido2-user-interface.service.ts index e03c430009d..c22c043fb92 100644 --- a/apps/browser/src/vault/fido2/browser-fido2-user-interface.service.ts +++ b/apps/browser/src/vault/fido2/browser-fido2-user-interface.service.ts @@ -46,7 +46,7 @@ export function fido2PopoutSessionData$() { sessionId: queryParams.sessionId as string, fallbackSupported: queryParams.fallbackSupported === "true", userVerification: queryParams.userVerification === "true", - })) + })), ); } @@ -121,13 +121,13 @@ export class BrowserFido2UserInterfaceService implements Fido2UserInterfaceServi async newSession( fallbackSupported: boolean, tab: chrome.tabs.Tab, - abortController?: AbortController + abortController?: AbortController, ): Promise { return await BrowserFido2UserInterfaceSession.create( this.authService, fallbackSupported, tab, - abortController + abortController, ); } } @@ -137,13 +137,13 @@ export class BrowserFido2UserInterfaceSession implements Fido2UserInterfaceSessi authService: AuthService, fallbackSupported: boolean, tab: chrome.tabs.Tab, - abortController?: AbortController + abortController?: AbortController, ): Promise { return new BrowserFido2UserInterfaceSession( authService, fallbackSupported, tab, - abortController + abortController, ); } @@ -170,7 +170,7 @@ export class BrowserFido2UserInterfaceSession implements Fido2UserInterfaceSessi private closed = false; private messages$ = (BrowserApi.messageListener$() as Observable).pipe( - filter((msg) => msg.sessionId === this.sessionId) + filter((msg) => msg.sessionId === this.sessionId), ); private connected$ = new BehaviorSubject(false); private windowClosed$: Observable; @@ -181,13 +181,13 @@ export class BrowserFido2UserInterfaceSession implements Fido2UserInterfaceSessi private readonly fallbackSupported: boolean, private readonly tab: chrome.tabs.Tab, readonly abortController = new AbortController(), - readonly sessionId = Utils.newGuid() + readonly sessionId = Utils.newGuid(), ) { this.messages$ .pipe( filter((msg) => msg.type === "ConnectResponse"), take(1), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe(() => { this.connected$.next(true); @@ -209,7 +209,7 @@ export class BrowserFido2UserInterfaceSession implements Fido2UserInterfaceSessi .pipe( filter((msg) => msg.type === "AbortResponse"), take(1), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe((msg) => { if (msg.type === "AbortResponse") { @@ -223,7 +223,7 @@ export class BrowserFido2UserInterfaceSession implements Fido2UserInterfaceSessi // and test that it doesn't break. Tracking Ticket: https://bitwarden.atlassian.net/browse/PM-4735 // eslint-disable-next-line no-restricted-syntax (handler: any) => chrome.windows.onRemoved.addListener(handler), - (handler: any) => chrome.windows.onRemoved.removeListener(handler) + (handler: any) => chrome.windows.onRemoved.removeListener(handler), ); BrowserFido2UserInterfaceSession.sendMessage({ @@ -318,14 +318,14 @@ export class BrowserFido2UserInterfaceSession implements Fido2UserInterfaceSessi } private async receive( - type: T + type: T, ): Promise { try { const response = await firstValueFrom( this.messages$.pipe( filter((msg) => msg.sessionId === this.sessionId && msg.type === type), - takeUntil(this.destroy$) - ) + takeUntil(this.destroy$), + ), ); return response as BrowserFido2Message & { type: T }; } catch (error) { @@ -345,9 +345,9 @@ export class BrowserFido2UserInterfaceSession implements Fido2UserInterfaceSessi merge( this.connected$.pipe(filter((connected) => connected === true)), fromEvent(this.abortController.signal, "abort").pipe( - switchMap(() => throwError(() => new SessionClosedError())) - ) - ) + switchMap(() => throwError(() => new SessionClosedError())), + ), + ), ); const popoutId = await openFido2Popout(this.tab, { @@ -360,7 +360,7 @@ export class BrowserFido2UserInterfaceSession implements Fido2UserInterfaceSessi filter((windowId) => { return popoutId === windowId; }), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe(() => { this.close(); diff --git a/apps/browser/src/vault/fido2/content/content-script.ts b/apps/browser/src/vault/fido2/content/content-script.ts index 96af5a6e647..3fe3e814481 100644 --- a/apps/browser/src/vault/fido2/content/content-script.ts +++ b/apps/browser/src/vault/fido2/content/content-script.ts @@ -10,7 +10,7 @@ function isFido2FeatureEnabled(): Promise { return new Promise((resolve) => { chrome.runtime.sendMessage( { command: "checkFido2FeatureEnabled" }, - (response: { result?: boolean }) => resolve(response.result) + (response: { result?: boolean }) => resolve(response.result), ); }); } @@ -21,7 +21,7 @@ async function getFromLocalStorage(keys: string | string[]): Promise) { + const excludedDomains = activeUserSettings?.neverDomains; return excludedDomains && window.location.hostname in excludedDomains; } @@ -53,6 +57,10 @@ function isSameOriginWithAncestors() { } } +async function isLocationBitwardenVault(activeUserSettings: Record) { + return window.location.origin === activeUserSettings.serverConfig.environment.vault; +} + function initializeFido2ContentScript() { const s = document.createElement("script"); s.src = chrome.runtime.getURL("content/fido2/page-script.js"); @@ -92,7 +100,7 @@ function initializeFido2ContentScript() { type: MessageType.CredentialCreationResponse, result: response.result, }); - } + }, ); }); } @@ -120,10 +128,10 @@ function initializeFido2ContentScript() { type: MessageType.CredentialGetResponse, result: response.result, }); - } + }, ); }).finally(() => - abortController.signal.removeEventListener("abort", abortHandler) + abortController.signal.removeEventListener("abort", abortHandler), ) as Promise; } @@ -132,9 +140,21 @@ function initializeFido2ContentScript() { } async function run() { - if ((await hasActiveUser()) && (await isFido2FeatureEnabled()) && !(await isDomainExcluded())) { - initializeFido2ContentScript(); + if (!(await hasActiveUser())) { + return; } + + const activeUserSettings = await getActiveUserSettings(); + if ( + activeUserSettings == null || + !(await isFido2FeatureEnabled()) || + (await isDomainExcluded(activeUserSettings)) || + (await isLocationBitwardenVault(activeUserSettings)) + ) { + return; + } + + initializeFido2ContentScript(); } run(); diff --git a/apps/browser/src/vault/fido2/content/messaging/messenger.spec.ts b/apps/browser/src/vault/fido2/content/messaging/messenger.spec.ts index 505682d997d..02e0f944974 100644 --- a/apps/browser/src/vault/fido2/content/messaging/messenger.spec.ts +++ b/apps/browser/src/vault/fido2/content/messaging/messenger.spec.ts @@ -99,7 +99,7 @@ class TestChannelPair { class TestMessageHandler { readonly handler: ( message: TestMessage, - abortController?: AbortController + abortController?: AbortController, ) => Promise; private recievedMessages: { @@ -144,7 +144,7 @@ class MockMessagePort { postMessage(message: T, port?: MessagePort) { this.remotePort.onmessage( - new MessageEvent("message", { data: message, ports: port ? [port] : [] }) + new MessageEvent("message", { data: message, ports: port ? [port] : [] }), ); } diff --git a/apps/browser/src/vault/fido2/content/messaging/messenger.ts b/apps/browser/src/vault/fido2/content/messaging/messenger.ts index aeb835e2d5f..b69f6ac076f 100644 --- a/apps/browser/src/vault/fido2/content/messaging/messenger.ts +++ b/apps/browser/src/vault/fido2/content/messaging/messenger.ts @@ -13,7 +13,7 @@ export type Metadata = { SENDER: typeof SENDER }; export type MessageWithMetadata = Message & Metadata; type Handler = ( message: MessageWithMetadata, - abortController?: AbortController + abortController?: AbortController, ) => Promise; /** diff --git a/apps/browser/src/vault/fido2/content/page-script.ts b/apps/browser/src/vault/fido2/content/page-script.ts index 2071dbb1495..9a3a74bed1b 100644 --- a/apps/browser/src/vault/fido2/content/page-script.ts +++ b/apps/browser/src/vault/fido2/content/page-script.ts @@ -47,7 +47,7 @@ if (browserNativeWebauthnSupport) { const browserCredentials = { create: navigator.credentials.create.bind( - navigator.credentials + navigator.credentials, ) as typeof navigator.credentials.create, get: navigator.credentials.get.bind(navigator.credentials) as typeof navigator.credentials.get, }; @@ -55,16 +55,16 @@ const browserCredentials = { const messenger = ((window as any).messenger = Messenger.forDOMCommunication(window)); navigator.credentials.create = async ( options?: CredentialCreationOptions, - abortController?: AbortController + abortController?: AbortController, ): Promise => { if (!isWebauthnCall(options)) { return await browserCredentials.create(options); } const fallbackSupported = - (options?.publicKey?.authenticatorSelection.authenticatorAttachment === "platform" && + (options?.publicKey?.authenticatorSelection?.authenticatorAttachment === "platform" && browserNativeWebauthnPlatformAuthenticatorSupport) || - (options?.publicKey?.authenticatorSelection.authenticatorAttachment !== "platform" && + (options?.publicKey?.authenticatorSelection?.authenticatorAttachment !== "platform" && browserNativeWebauthnSupport); try { const response = await messenger.request( @@ -72,7 +72,7 @@ navigator.credentials.create = async ( type: MessageType.CredentialCreationRequest, data: WebauthnUtils.mapCredentialCreationOptions(options, fallbackSupported), }, - abortController + abortController, ); if (response.type !== MessageType.CredentialCreationResponse) { @@ -92,7 +92,7 @@ navigator.credentials.create = async ( navigator.credentials.get = async ( options?: CredentialRequestOptions, - abortController?: AbortController + abortController?: AbortController, ): Promise => { if (!isWebauthnCall(options)) { return await browserCredentials.get(options); @@ -110,7 +110,7 @@ navigator.credentials.get = async ( type: MessageType.CredentialGetRequest, data: WebauthnUtils.mapCredentialRequestOptions(options, fallbackSupported), }, - abortController + abortController, ); if (response.type !== MessageType.CredentialGetResponse) { @@ -161,9 +161,9 @@ async function waitForFocus(fallbackWait = 500, timeout = 5 * 60 * 1000) { timeoutId = window.setTimeout( () => reject( - new DOMException("The operation either timed out or was not allowed.", "AbortError") + new DOMException("The operation either timed out or was not allowed.", "AbortError"), ), - timeout + timeout, ); }); diff --git a/apps/browser/src/vault/fido2/webauthn-utils.ts b/apps/browser/src/vault/fido2/webauthn-utils.ts index 3227e5ef116..ec23303a6eb 100644 --- a/apps/browser/src/vault/fido2/webauthn-utils.ts +++ b/apps/browser/src/vault/fido2/webauthn-utils.ts @@ -12,7 +12,7 @@ import { export class WebauthnUtils { static mapCredentialCreationOptions( options: CredentialCreationOptions, - fallbackSupported: boolean + fallbackSupported: boolean, ): InsecureCreateCredentialParams { const keyOptions = options.publicKey; @@ -92,7 +92,7 @@ export class WebauthnUtils { static mapCredentialRequestOptions( options: CredentialRequestOptions, - fallbackSupported: boolean + fallbackSupported: boolean, ): InsecureAssertCredentialParams { const keyOptions = options.publicKey; 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 e9ed209bb27..5dbf4f35b8e 100644 --- a/apps/browser/src/vault/popup/components/action-buttons.component.ts +++ b/apps/browser/src/vault/popup/components/action-buttons.component.ts @@ -30,7 +30,7 @@ export class ActionButtonsComponent { private eventCollectionService: EventCollectionService, private totpService: TotpService, private stateService: StateService, - private passwordRepromptService: PasswordRepromptService + private passwordRepromptService: PasswordRepromptService, ) {} async ngOnInit() { @@ -64,7 +64,7 @@ export class ActionButtonsComponent { this.platformUtilsService.showToast( "info", null, - this.i18nService.t("valueCopied", this.i18nService.t(typeI18nKey)) + this.i18nService.t("valueCopied", this.i18nService.t(typeI18nKey)), ); if (typeI18nKey === "password") { diff --git a/apps/browser/src/vault/popup/components/fido2/fido2.component.ts b/apps/browser/src/vault/popup/components/fido2/fido2.component.ts index e0a81d760e3..9311b6f18ad 100644 --- a/apps/browser/src/vault/popup/components/fido2/fido2.component.ts +++ b/apps/browser/src/vault/popup/components/fido2/fido2.component.ts @@ -79,7 +79,7 @@ export class Fido2Component implements OnInit, OnDestroy { private searchService: SearchService, private logService: LogService, private dialogService: DialogService, - private browserMessagingApi: ZonedMessageListenerService + private browserMessagingApi: ZonedMessageListenerService, ) {} ngOnInit() { @@ -91,7 +91,7 @@ export class Fido2Component implements OnInit, OnDestroy { sessionId: queryParamMap.get("sessionId"), senderTabId: queryParamMap.get("senderTabId"), senderUrl: queryParamMap.get("senderUrl"), - })) + })), ); combineLatest([ @@ -125,7 +125,7 @@ export class Fido2Component implements OnInit, OnDestroy { return message; }), filter((message) => !!message), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe((message) => { this.message$.next(message); @@ -139,10 +139,10 @@ export class Fido2Component implements OnInit, OnDestroy { const equivalentDomains = this.settingsService.getEquivalentDomains(this.url); this.ciphers = (await this.cipherService.getAllDecrypted()).filter( - (cipher) => cipher.type === CipherType.Login && !cipher.isDeleted + (cipher) => cipher.type === CipherType.Login && !cipher.isDeleted, ); this.displayedCiphers = this.ciphers.filter((cipher) => - cipher.login.matchesUri(this.url, equivalentDomains) + cipher.login.matchesUri(this.url, equivalentDomains), ); if (this.displayedCiphers.length > 0) { @@ -156,9 +156,9 @@ export class Fido2Component implements OnInit, OnDestroy { message.cipherIds.map(async (cipherId) => { const cipher = await this.cipherService.get(cipherId); return cipher.decrypt( - await this.cipherService.getKeyForCipherKeyDecryption(cipher) + await this.cipherService.getKeyForCipherKeyDecryption(cipher), ); - }) + }), ); this.displayedCiphers = [...this.ciphers]; if (this.displayedCiphers.length > 0) { @@ -172,9 +172,9 @@ export class Fido2Component implements OnInit, OnDestroy { message.existingCipherIds.map(async (cipherId) => { const cipher = await this.cipherService.get(cipherId); return cipher.decrypt( - await this.cipherService.getKeyForCipherKeyDecryption(cipher) + await this.cipherService.getKeyForCipherKeyDecryption(cipher), ); - }) + }), ); this.displayedCiphers = [...this.ciphers]; @@ -196,7 +196,7 @@ export class Fido2Component implements OnInit, OnDestroy { fallbackSupported: "fallbackSupported" in message && message.fallbackSupported, }; }), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ); queryParams$.pipe(takeUntil(this.destroy$)).subscribe((queryParams) => { @@ -312,12 +312,12 @@ export class Fido2Component implements OnInit, OnDestroy { this.displayedCiphers = await this.searchService.searchCiphers( this.searchText, null, - this.ciphers + this.ciphers, ); } else { const equivalentDomains = this.settingsService.getEquivalentDomains(this.url); this.displayedCiphers = this.ciphers.filter((cipher) => - cipher.login.matchesUri(this.url, equivalentDomains) + cipher.login.matchesUri(this.url, equivalentDomains), ); } this.searchPending = false; @@ -369,7 +369,7 @@ export class Fido2Component implements OnInit, OnDestroy { private async handleUserVerification( userVerificationRequested: boolean, - cipher: CipherView + cipher: CipherView, ): Promise { const masterPasswordRepromptRequired = cipher && cipher.reprompt !== 0; diff --git a/apps/browser/src/vault/popup/components/vault/add-edit.component.html b/apps/browser/src/vault/popup/components/vault/add-edit.component.html index b2a42776e18..de8315d3022 100644 --- a/apps/browser/src/vault/popup/components/vault/add-edit.component.html +++ b/apps/browser/src/vault/popup/components/vault/add-edit.component.html @@ -136,7 +136,7 @@
{{ "typePasskey" | i18n }} {{ "dateCreated" | i18n }} - {{ cipher.login.fido2Credentials[0].creationDate | date : "short" }} + {{ cipher.login.fido2Credentials[0].creationDate | date: "short" }}
@@ -241,7 +241,7 @@ type="text" name="Card.ExpYear" [(ngModel)]="cipher.card.expYear" - placeholder="{{ 'ex' | i18n }} {{ currentDate | date : 'yyyy' }}" + placeholder="{{ 'ex' | i18n }} {{ currentDate | date: 'yyyy' }}" [readonly]="!cipher.edit && editMode" />
@@ -483,7 +483,7 @@ class="box-content-row box-content-row-multi" appBoxRow *ngFor="let u of cipher.login.uris; let i = index; trackBy: trackByFunction" - attr.aria-label="{{ 'uriPosition' | i18n : i + 1 }}" + attr.aria-label="{{ 'uriPosition' | i18n: i + 1 }}" >
- + { // We are bypassing user verification pending implementation of PIN and biometric support. return true; @@ -322,7 +322,7 @@ export class AddEditComponent extends BaseAddEditComponent { this.platformUtilsService.showToast( "info", null, - this.i18nService.t("passwordRepromptDisabledAutofillOnPageLoad") + this.i18nService.t("passwordRepromptDisabledAutofillOnPageLoad"), ); return; } @@ -330,14 +330,14 @@ export class AddEditComponent extends BaseAddEditComponent { this.platformUtilsService.showToast( "info", null, - this.i18nService.t("autofillOnPageLoadSetToDefault") + this.i18nService.t("autofillOnPageLoadSetToDefault"), ); } private inAddEditPopoutWindow() { return BrowserPopupUtils.inSingleActionPopout( window, - this.singleActionKey || VaultPopoutType.addEditVaultItem + this.singleActionKey || VaultPopoutType.addEditVaultItem, ); } } 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 5047c9bfd1e..8faeb86de62 100644 --- a/apps/browser/src/vault/popup/components/vault/attachments.component.ts +++ b/apps/browser/src/vault/popup/components/vault/attachments.component.ts @@ -33,7 +33,7 @@ export class AttachmentsComponent extends BaseAttachmentsComponent { stateService: StateService, logService: LogService, fileDownloadService: FileDownloadService, - dialogService: DialogService + dialogService: DialogService, ) { super( cipherService, @@ -45,7 +45,7 @@ export class AttachmentsComponent extends BaseAttachmentsComponent { logService, stateService, fileDownloadService, - dialogService + dialogService, ); } 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 d4615e165b2..acbdab36852 100644 --- a/apps/browser/src/vault/popup/components/vault/collections.component.ts +++ b/apps/browser/src/vault/popup/components/vault/collections.component.ts @@ -23,7 +23,7 @@ export class CollectionsComponent extends BaseCollectionsComponent { cipherService: CipherService, private route: ActivatedRoute, private location: Location, - logService: LogService + logService: LogService, ) { super(collectionService, platformUtilsService, i18nService, cipherService, logService); } diff --git a/apps/browser/src/vault/popup/components/vault/current-tab.component.html b/apps/browser/src/vault/popup/components/vault/current-tab.component.html index 4ff7adf4678..c971f6c9371 100644 --- a/apps/browser/src/vault/popup/components/vault/current-tab.component.html +++ b/apps/browser/src/vault/popup/components/vault/current-tab.component.html @@ -1,4 +1,4 @@ -
+

{{ "currentTab" | i18n }}

@@ -11,7 +11,7 @@
-
+
-
+
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 86c6551fb4f..872f6c8d97a 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 @@ -67,7 +67,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy { private stateService: StateService, private passwordRepromptService: PasswordRepromptService, private organizationService: OrganizationService, - private vaultFilterService: VaultFilterService + private vaultFilterService: VaultFilterService, ) {} async ngOnInit() { @@ -124,7 +124,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy { this.platformUtilsService.showToast( "info", null, - this.i18nService.t("autofillPageLoadPolicyActivated") + this.i18nService.t("autofillPageLoadPolicyActivated"), ); } } @@ -252,7 +252,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy { const ciphers = await this.cipherService.getAllDecryptedForUrl( this.url, - otherTypes.length > 0 ? otherTypes : null + otherTypes.length > 0 ? otherTypes : null, ); this.loginCiphers = []; @@ -278,7 +278,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy { }); this.loginCiphers = this.loginCiphers.sort((a, b) => - this.cipherService.sortCiphersByLastUsedThenName(a, b) + this.cipherService.sortCiphersByLastUsedThenName(a, b), ); this.isLoading = this.loaded = true; } diff --git a/apps/browser/src/vault/popup/components/vault/password-history.component.html b/apps/browser/src/vault/popup/components/vault/password-history.component.html index 7d468c87f25..6286aa1022d 100644 --- a/apps/browser/src/vault/popup/components/vault/password-history.component.html +++ b/apps/browser/src/vault/popup/components/vault/password-history.component.html @@ -17,7 +17,7 @@ class="text monospaced no-ellipsis" [innerHTML]="h.password | colorPassword" > - {{ h.lastUsedDate | date : "medium" }} + {{ h.lastUsedDate | date: "medium" }}
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 1dd7697a7d5..05986aad51f 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 @@ -19,7 +19,7 @@ export class PasswordHistoryComponent extends BasePasswordHistoryComponent { platformUtilsService: PlatformUtilsService, i18nService: I18nService, private location: Location, - private route: ActivatedRoute + private route: ActivatedRoute, ) { super(cipherService, platformUtilsService, i18nService, window); } 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 80188646baf..7f99ea72db2 100644 --- a/apps/browser/src/vault/popup/components/vault/share.component.ts +++ b/apps/browser/src/vault/popup/components/vault/share.component.ts @@ -24,7 +24,7 @@ export class ShareComponent extends BaseShareComponent { cipherService: CipherService, private route: ActivatedRoute, private router: Router, - organizationService: OrganizationService + organizationService: OrganizationService, ) { super( collectionService, @@ -32,7 +32,7 @@ export class ShareComponent extends BaseShareComponent { i18nService, cipherService, logService, - organizationService + organizationService, ); } 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 c2bfb262fd4..61f21a8750a 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 @@ -85,7 +85,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy { private searchService: SearchService, private location: Location, private browserStateService: BrowserStateService, - private vaultFilterService: VaultFilterService + private vaultFilterService: VaultFilterService, ) { this.noFolderListSize = 100; } @@ -177,7 +177,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy { async loadCollections() { const allCollections = await this.vaultFilterService.buildCollections( - this.selectedOrganization + this.selectedOrganization, ); this.collections = allCollections.fullList; this.nestedCollections = allCollections.nestedList; @@ -185,7 +185,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy { async loadFolders() { const allFolders = await firstValueFrom( - this.vaultFilterService.buildNestedFolders(this.selectedOrganization) + this.vaultFilterService.buildNestedFolders(this.selectedOrganization), ); this.folders = allFolders.fullList; this.nestedFolders = allFolders.nestedList; @@ -202,10 +202,10 @@ export class VaultFilterComponent implements OnInit, OnDestroy { this.ciphers = await this.searchService.searchCiphers( this.searchText, filterDeleted, - this.allCiphers + this.allCiphers, ); this.ciphers = this.ciphers.filter( - (c) => !this.vaultFilterService.filterCipherForSelectedVault(c) + (c) => !this.vaultFilterService.filterCipherForSelectedVault(c), ); return; } @@ -218,11 +218,11 @@ export class VaultFilterComponent implements OnInit, OnDestroy { this.ciphers = await this.searchService.searchCiphers( this.searchText, filterDeleted, - this.allCiphers + this.allCiphers, ); } this.ciphers = this.ciphers.filter( - (c) => !this.vaultFilterService.filterCipherForSelectedVault(c) + (c) => !this.vaultFilterService.filterCipherForSelectedVault(c), ); this.searchPending = false; }, timeout); @@ -301,7 +301,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy { const typeCounts = new Map(); this.deletedCount = this.allCiphers.filter( - (c) => c.isDeleted && !this.vaultFilterService.filterCipherForSelectedVault(c) + (c) => c.isDeleted && !this.vaultFilterService.filterCipherForSelectedVault(c), ).length; this.ciphers?.forEach((c) => { 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 70d9d079c6e..1e29a17981e 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 @@ -64,7 +64,7 @@ export class VaultItemsComponent extends BaseVaultItemsComponent implements OnIn private collectionService: CollectionService, private platformUtilsService: PlatformUtilsService, cipherService: CipherService, - private vaultFilterService: VaultFilterService + private vaultFilterService: VaultFilterService, ) { super(searchService, cipherService); this.applySavedState = @@ -143,7 +143,7 @@ export class VaultItemsComponent extends BaseVaultItemsComponent implements OnIn : null; } await this.load( - (c) => c.collectionIds != null && c.collectionIds.indexOf(this.collectionId) > -1 + (c) => c.collectionIds != null && c.collectionIds.indexOf(this.collectionId) > -1, ); } else { this.showVaultFilter = true; 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 30b5533fcc4..de6a33724d1 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 @@ -32,7 +32,7 @@ import { VaultFilterService } from "../../../services/vault-filter.service"; "void", style({ opacity: 0, - }) + }), ), transition( "void => open", @@ -40,8 +40,8 @@ import { VaultFilterService } from "../../../services/vault-filter.service"; "100ms linear", style({ opacity: 1, - }) - ) + }), + ), ), transition("* => void", animate("100ms linear", style({ opacity: 0 }))), ]), @@ -87,7 +87,7 @@ export class VaultSelectComponent implements OnInit, OnDestroy { private overlay: Overlay, private viewContainerRef: ViewContainerRef, private platformUtilsService: PlatformUtilsService, - private organizationService: OrganizationService + private organizationService: OrganizationService, ) {} @HostListener("document:keydown.escape", ["$event"]) @@ -118,14 +118,14 @@ export class VaultSelectComponent implements OnInit, OnDestroy { this._selectedVault.next(this.i18nService.t(this.vaultFilterService.myVault)); } else if (this.vaultFilterService.vaultFilter.selectedOrganizationId != null) { const selectedOrganization = organizations.find( - (o) => o.id === this.vaultFilterService.vaultFilter.selectedOrganizationId + (o) => o.id === this.vaultFilterService.vaultFilter.selectedOrganizationId, ); this._selectedVault.next(selectedOrganization.name); } else { this._selectedVault.next(this.i18nService.t(this.vaultFilterService.allVaults)); } } - }) + }), ) .pipe(takeUntil(this._destroy)) .subscribe(); @@ -167,7 +167,7 @@ export class VaultSelectComponent implements OnInit, OnDestroy { merge( this.overlayRef.outsidePointerEvents(), this.overlayRef.backdropClick(), - this.overlayRef.detachments() + this.overlayRef.detachments(), // eslint-disable-next-line rxjs-angular/prefer-takeuntil ).subscribe(() => { this.close(); @@ -187,7 +187,7 @@ export class VaultSelectComponent implements OnInit, OnDestroy { this.platformUtilsService.showToast( "error", null, - this.i18nService.t("disabledOrganizationFilterError") + this.i18nService.t("disabledOrganizationFilterError"), ); } else { this._selectedVault.next(organization.name); diff --git a/apps/browser/src/vault/popup/components/vault/view.component.html b/apps/browser/src/vault/popup/components/vault/view.component.html index a4b2ae200c8..dcdb1cab12b 100644 --- a/apps/browser/src/vault/popup/components/vault/view.component.html +++ b/apps/browser/src/vault/popup/components/vault/view.component.html @@ -149,7 +149,7 @@
{{ "typePasskey" | i18n }} {{ "dateCreated" | i18n }} - {{ cipher.login.fido2Credentials[0].creationDate | date : "short" }} + {{ cipher.login.fido2Credentials[0].creationDate | date: "short" }}
@@ -233,10 +233,10 @@ >{{ "number" | i18n }} {{ - cipher.card.maskedNumber | creditCardNumber : cipher.card.brand + cipher.card.maskedNumber | creditCardNumber: cipher.card.brand }} {{ - cipher.card.number | creditCardNumber : cipher.card.brand + cipher.card.number | creditCardNumber: cipher.card.brand }}
@@ -655,15 +655,15 @@
{{ "dateUpdated" | i18n }}: - {{ cipher.revisionDate | date : "medium" }} + {{ cipher.revisionDate | date: "medium" }}
{{ "dateCreated" | i18n }}: - {{ cipher.creationDate | date : "medium" }} + {{ cipher.creationDate | date: "medium" }}
{{ "datePasswordUpdated" | i18n }}: - {{ cipher.passwordRevisionDisplayDate | date : "medium" }} + {{ cipher.passwordRevisionDisplayDate | date: "medium" }}
{{ "passwordHistory" | i18n }}: 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 2fef48b9bbd..c0e1032f4bd 100644 --- a/apps/browser/src/vault/popup/components/vault/view.component.ts +++ b/apps/browser/src/vault/popup/components/vault/view.component.ts @@ -95,7 +95,7 @@ export class ViewComponent extends BaseViewComponent { passwordRepromptService: PasswordRepromptService, logService: LogService, fileDownloadService: FileDownloadService, - dialogService: DialogService + dialogService: DialogService, ) { super( cipherService, @@ -116,7 +116,7 @@ export class ViewComponent extends BaseViewComponent { logService, stateService, fileDownloadService, - dialogService + dialogService, ); } @@ -249,7 +249,7 @@ export class ViewComponent extends BaseViewComponent { this.platformUtilsService.showToast( "success", null, - this.i18nService.t("autoFillSuccessAndSavedUri") + this.i18nService.t("autoFillSuccessAndSavedUri"), ); return; } @@ -265,7 +265,7 @@ export class ViewComponent extends BaseViewComponent { this.platformUtilsService.showToast( "success", null, - this.i18nService.t("autoFillSuccessAndSavedUri") + this.i18nService.t("autoFillSuccessAndSavedUri"), ); this.messagingService.send("editedCipher"); } catch { diff --git a/apps/browser/src/vault/popup/settings/folder-add-edit.component.ts b/apps/browser/src/vault/popup/settings/folder-add-edit.component.ts index 8266cc883a7..03a4716bcc9 100644 --- a/apps/browser/src/vault/popup/settings/folder-add-edit.component.ts +++ b/apps/browser/src/vault/popup/settings/folder-add-edit.component.ts @@ -26,7 +26,7 @@ export class FolderAddEditComponent extends BaseFolderAddEditComponent { private route: ActivatedRoute, logService: LogService, dialogService: DialogService, - formBuilder: FormBuilder + formBuilder: FormBuilder, ) { super( folderService, @@ -35,7 +35,7 @@ export class FolderAddEditComponent extends BaseFolderAddEditComponent { platformUtilsService, logService, dialogService, - formBuilder + formBuilder, ); } diff --git a/apps/browser/src/vault/popup/utils/vault-popout-window.spec.ts b/apps/browser/src/vault/popup/utils/vault-popout-window.spec.ts index d4a8b87c529..84b6101c1c5 100644 --- a/apps/browser/src/vault/popup/utils/vault-popout-window.spec.ts +++ b/apps/browser/src/vault/popup/utils/vault-popout-window.spec.ts @@ -5,12 +5,14 @@ import { CipherType } from "@bitwarden/common/vault/enums"; import BrowserPopupUtils from "../../../platform/popup/browser-popup-utils"; import { + openViewVaultItemPopout, closeAddEditVaultItemPopout, closeFido2Popout, openAddEditVaultItemPopout, openFido2Popout, openVaultItemPasswordRepromptPopout, VaultPopoutType, + closeViewVaultItemPopout, } from "./vault-popout-window"; describe("VaultPopoutWindow", () => { @@ -25,6 +27,34 @@ describe("VaultPopoutWindow", () => { jest.clearAllMocks(); }); + describe("openViewVaultItemPopout", () => { + it("opens a popout window that contains a sender tab id query param reference", async () => { + const senderTab = { id: 1, windowId: 2 } as chrome.tabs.Tab; + + await openViewVaultItemPopout(senderTab, { + cipherId: "cipherId", + action: "action", + }); + + expect(openPopoutSpy).toHaveBeenCalledWith( + "popup/index.html#/view-cipher?cipherId=cipherId&senderTabId=1&action=action", + { + singleActionKey: `${VaultPopoutType.viewVaultItem}_cipherId`, + senderWindowId: 2, + forceCloseExistingWindows: undefined, + }, + ); + }); + }); + + describe("closeViewVaultItemPopout", () => { + it("closes the view vault item popout window", async () => { + await closeViewVaultItemPopout("cipherId"); + + expect(closeSingleActionPopoutSpy).toHaveBeenCalledWith(`cipherId`, 0); + }); + }); + describe("openVaultItemPasswordRepromptPopout", () => { it("opens a popout window that facilitates re-prompting for the password of a vault item", async () => { const senderTab = { windowId: 1 } as chrome.tabs.Tab; @@ -35,12 +65,12 @@ describe("VaultPopoutWindow", () => { }); expect(openPopoutSpy).toHaveBeenCalledWith( - "popup/index.html#/view-cipher?uilocation=popout&cipherId=cipherId&action=action", + "popup/index.html#/view-cipher?cipherId=cipherId&action=action", { singleActionKey: `${VaultPopoutType.viewVaultItem}_cipherId`, senderWindowId: 1, forceCloseExistingWindows: true, - } + }, ); }); }); @@ -48,15 +78,15 @@ describe("VaultPopoutWindow", () => { describe("openAddEditVaultItemPopout", () => { it("opens a popout window that facilitates adding a vault item", async () => { await openAddEditVaultItemPopout( - mock({ windowId: 1, url: "https://jest-testing-website.com" }) + mock({ windowId: 1, url: "https://jest-testing-website.com" }), ); expect(openPopoutSpy).toHaveBeenCalledWith( - "popup/index.html#/edit-cipher?uilocation=popout&uri=https://jest-testing-website.com", + "popup/index.html#/edit-cipher?uri=https://jest-testing-website.com", { singleActionKey: VaultPopoutType.addEditVaultItem, senderWindowId: 1, - } + }, ); }); @@ -65,15 +95,15 @@ describe("VaultPopoutWindow", () => { mock({ windowId: 1, url: "https://jest-testing-website.com" }), { cipherType: CipherType.Identity, - } + }, ); expect(openPopoutSpy).toHaveBeenCalledWith( - `popup/index.html#/edit-cipher?uilocation=popout&type=${CipherType.Identity}&uri=https://jest-testing-website.com`, + `popup/index.html#/edit-cipher?type=${CipherType.Identity}&uri=https://jest-testing-website.com`, { singleActionKey: `${VaultPopoutType.addEditVaultItem}_${CipherType.Identity}`, senderWindowId: 1, - } + }, ); }); @@ -82,15 +112,15 @@ describe("VaultPopoutWindow", () => { mock({ windowId: 1, url: "https://jest-testing-website.com" }), { cipherId: "cipherId", - } + }, ); expect(openPopoutSpy).toHaveBeenCalledWith( - "popup/index.html#/edit-cipher?uilocation=popout&cipherId=cipherId&uri=https://jest-testing-website.com", + "popup/index.html#/edit-cipher?cipherId=cipherId&uri=https://jest-testing-website.com", { singleActionKey: `${VaultPopoutType.addEditVaultItem}_cipherId`, senderWindowId: 1, - } + }, ); }); }); @@ -107,7 +137,7 @@ describe("VaultPopoutWindow", () => { expect(closeSingleActionPopoutSpy).toHaveBeenCalledWith( VaultPopoutType.addEditVaultItem, - 1000 + 1000, ); }); }); @@ -132,7 +162,7 @@ describe("VaultPopoutWindow", () => { senderWindowId: 1, forceCloseExistingWindows: true, windowOptions: { height: 450 }, - } + }, ); expect(returnedWindowId).toEqual(10); }); @@ -145,7 +175,7 @@ describe("VaultPopoutWindow", () => { await closeFido2Popout(sessionId); expect(closeSingleActionPopoutSpy).toHaveBeenCalledWith( - `${VaultPopoutType.fido2Popout}_${sessionId}` + `${VaultPopoutType.fido2Popout}_${sessionId}`, ); }); }); diff --git a/apps/browser/src/vault/popup/utils/vault-popout-window.ts b/apps/browser/src/vault/popup/utils/vault-popout-window.ts index 9812bc550e4..00cb4a71b8a 100644 --- a/apps/browser/src/vault/popup/utils/vault-popout-window.ts +++ b/apps/browser/src/vault/popup/utils/vault-popout-window.ts @@ -9,24 +9,37 @@ const VaultPopoutType = { fido2Popout: "vault_Fido2Popout", } as const; +/** + * Opens a popout window that facilitates viewing a vault item. + * + * @param senderTab - The tab that sent the request. + * @param cipherOptions - The cipher id and action to perform. + */ async function openViewVaultItemPopout( senderTab: chrome.tabs.Tab, cipherOptions: { cipherId: string; action: string; forceCloseExistingWindows?: boolean; - } + }, ) { const { cipherId, action, forceCloseExistingWindows } = cipherOptions; - let promptWindowPath = "popup/index.html#/view-cipher?uilocation=popout"; + let promptWindowPath = "popup/index.html#/view-cipher"; + let queryParamToken = "?"; + const formatQueryString = (key: string, value: string) => { + const queryString = `${queryParamToken}${key}=${value}`; + queryParamToken = "&"; + return queryString; + }; + if (cipherId) { - promptWindowPath += `&cipherId=${cipherId}`; + promptWindowPath += formatQueryString("cipherId", cipherId); } if (senderTab.id) { - promptWindowPath += `&senderTabId=${senderTab.id}`; + promptWindowPath += formatQueryString("senderTabId", String(senderTab.id)); } if (action) { - promptWindowPath += `&action=${action}`; + promptWindowPath += formatQueryString("action", action); } await BrowserPopupUtils.openPopout(promptWindowPath, { @@ -36,6 +49,12 @@ async function openViewVaultItemPopout( }); } +/** + * Closes the view vault item popout window. + * + * @param singleActionKey - The single action popout key used to identify the popout. + * @param delayClose - The amount of time to wait before closing the popout. Defaults to 0. + */ async function closeViewVaultItemPopout(singleActionKey: string, delayClose = 0) { await BrowserPopupUtils.closeSingleActionPopout(singleActionKey, delayClose); } @@ -52,7 +71,7 @@ async function openVaultItemPasswordRepromptPopout( cipherOptions: { cipherId: string; action: string; - } + }, ) { await openViewVaultItemPopout(senderTab, { forceCloseExistingWindows: true, @@ -69,23 +88,29 @@ async function openVaultItemPasswordRepromptPopout( */ async function openAddEditVaultItemPopout( senderTab: chrome.tabs.Tab, - cipherOptions: { cipherId?: string; cipherType?: CipherType } = {} + cipherOptions: { cipherId?: string; cipherType?: CipherType } = {}, ) { const { cipherId, cipherType } = cipherOptions; const { url, windowId } = senderTab; - let singleActionKey = VaultPopoutType.addEditVaultItem; - let addEditCipherUrl = "popup/index.html#/edit-cipher?uilocation=popout"; + let addEditCipherUrl = "popup/index.html#/edit-cipher"; + let queryParamToken = "?"; + const formatQueryString = (key: string, value: string) => { + const queryString = `${queryParamToken}${key}=${value}`; + queryParamToken = "&"; + return queryString; + }; + if (cipherId && !cipherType) { singleActionKey += `_${cipherId}`; - addEditCipherUrl += `&cipherId=${cipherId}`; + addEditCipherUrl += formatQueryString("cipherId", cipherId); } if (cipherType && !cipherId) { singleActionKey += `_${cipherType}`; - addEditCipherUrl += `&type=${cipherType}`; + addEditCipherUrl += formatQueryString("type", String(cipherType)); } if (senderTab.url) { - addEditCipherUrl += `&uri=${url}`; + addEditCipherUrl += formatQueryString("uri", url); } await BrowserPopupUtils.openPopout(addEditCipherUrl, { @@ -115,7 +140,7 @@ async function openFido2Popout( options: { sessionId: string; fallbackSupported: boolean; - } + }, ): Promise { const { sessionId, fallbackSupported } = options; const promptWindowPath = diff --git a/apps/browser/src/vault/services/vault-filter.service.ts b/apps/browser/src/vault/services/vault-filter.service.ts index 1caf54fe55b..787732353d4 100644 --- a/apps/browser/src/vault/services/vault-filter.service.ts +++ b/apps/browser/src/vault/services/vault-filter.service.ts @@ -20,7 +20,7 @@ export class VaultFilterService extends BaseVaultFilterService { folderService: FolderService, cipherService: CipherService, collectionService: CollectionService, - policyService: PolicyService + policyService: PolicyService, ) { super( stateService, @@ -28,7 +28,7 @@ export class VaultFilterService extends BaseVaultFilterService { folderService, cipherService, collectionService, - policyService + policyService, ); this.vaultFilter.myVaultOnly = false; this.vaultFilter.selectedOrganizationId = null; diff --git a/apps/browser/webpack.config.js b/apps/browser/webpack.config.js index 0b40a0fadef..23a24b91e64 100644 --- a/apps/browser/webpack.config.js +++ b/apps/browser/webpack.config.js @@ -268,7 +268,7 @@ if (manifestVersion == 2) { template: "./src/platform/background.html", filename: "background.html", chunks: ["vendor", "background"], - }) + }), ); // Manifest V2 background pages can be run through the regular build pipeline. diff --git a/apps/cli/package.json b/apps/cli/package.json index 2736e1b02ce..8401480eecd 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.10.0", + "version": "2023.12.0", "keywords": [ "bitwarden", "password", @@ -57,7 +57,7 @@ "form-data": "4.0.0", "https-proxy-agent": "5.0.1", "inquirer": "8.2.6", - "jsdom": "22.1.0", + "jsdom": "23.0.1", "jszip": "3.10.1", "koa": "2.14.2", "koa-bodyparser": "4.4.1", @@ -71,7 +71,7 @@ "papaparse": "5.4.1", "proper-lockfile": "4.1.2", "rxjs": "7.8.1", - "tldts": "6.0.22", + "tldts": "6.1.0", "zxcvbn": "4.4.2" } } diff --git a/apps/cli/src/admin-console/commands/confirm.command.ts b/apps/cli/src/admin-console/commands/confirm.command.ts index 3ae9b515160..c6d9e4bd574 100644 --- a/apps/cli/src/admin-console/commands/confirm.command.ts +++ b/apps/cli/src/admin-console/commands/confirm.command.ts @@ -10,7 +10,7 @@ export class ConfirmCommand { constructor( private apiService: ApiService, private cryptoService: CryptoService, - private organizationUserService: OrganizationUserService + private organizationUserService: OrganizationUserService, ) {} async run(object: string, id: string, cmdOptions: Record): Promise { @@ -44,7 +44,7 @@ export class ConfirmCommand { } const orgUser = await this.organizationUserService.getOrganizationUser( options.organizationId, - id + id, ); if (orgUser == null) { throw new Error("Member id does not exist for this organization."); @@ -57,7 +57,7 @@ export class ConfirmCommand { await this.organizationUserService.postOrganizationUserConfirm( options.organizationId, id, - req + req, ); return Response.success(); } catch (e) { diff --git a/apps/cli/src/admin-console/commands/share.command.ts b/apps/cli/src/admin-console/commands/share.command.ts index 88fe256af18..d78f4cfa29c 100644 --- a/apps/cli/src/admin-console/commands/share.command.ts +++ b/apps/cli/src/admin-console/commands/share.command.ts @@ -46,13 +46,13 @@ export class ShareCommand { return Response.badRequest("This item already belongs to an organization."); } const cipherView = await cipher.decrypt( - await this.cipherService.getKeyForCipherKeyDecryption(cipher) + await this.cipherService.getKeyForCipherKeyDecryption(cipher), ); try { await this.cipherService.shareWithServer(cipherView, organizationId, req); const updatedCipher = await this.cipherService.get(cipher.id); const decCipher = await updatedCipher.decrypt( - await this.cipherService.getKeyForCipherKeyDecryption(updatedCipher) + await this.cipherService.getKeyForCipherKeyDecryption(updatedCipher), ); const res = new CipherResponse(decCipher); return Response.success(res); diff --git a/apps/cli/src/auth/commands/login.command.ts b/apps/cli/src/auth/commands/login.command.ts index 4ce81dbd4cd..480127f1ffa 100644 --- a/apps/cli/src/auth/commands/login.command.ts +++ b/apps/cli/src/auth/commands/login.command.ts @@ -65,7 +65,7 @@ export class LoginCommand { protected keyConnectorService: KeyConnectorService, protected policyApiService: PolicyApiServiceAbstraction, protected orgService: OrganizationService, - protected logoutCallback: () => Promise + protected logoutCallback: () => Promise, ) {} async run(email: string, password: string, options: program.OptionValues) { @@ -179,7 +179,7 @@ export class LoginCommand { } try { response = await this.authService.logIn( - new UserApiLoginCredentials(clientId, clientSecret) + new UserApiLoginCredentials(clientId, clientSecret), ); } catch (e) { // handle API key login failures @@ -201,17 +201,17 @@ export class LoginCommand { ssoCodeVerifier, this.ssoRedirectUri, orgIdentifier, - twoFactor - ) + twoFactor, + ), ); } else { response = await this.authService.logIn( - new PasswordLoginCredentials(email, password, null, twoFactor) + new PasswordLoginCredentials(email, password, null, twoFactor), ); } if (response.requiresEncryptionKeyMigration) { return Response.error( - "Encryption key migration required. Please login through the web vault to update your encryption key." + "Encryption key migration required. Please login through the web vault to update your encryption key.", ); } if (response.captchaSiteKey) { @@ -294,7 +294,7 @@ export class LoginCommand { response = await this.authService.logInTwoFactor( new TokenTwoFactorRequest(selectedProvider.type, twoFactorToken), - null + null, ); } @@ -317,7 +317,7 @@ export class LoginCommand { if (response.resetMasterPassword) { return Response.error( "In order to log in with SSO from the CLI, you must first log in" + - " through the web vault to set your master password." + " through the web vault to set your master password.", ); } @@ -358,7 +358,7 @@ export class LoginCommand { ) { const res = new MessageResponse( "You are logged in!", - "\n" + "To unlock your vault, use the `unlock` command. ex:\n" + "$ bw unlock" + "\n" + "To unlock your vault, use the `unlock` command. ex:\n" + "$ bw unlock", ); return Response.success(res); } @@ -375,7 +375,7 @@ export class LoginCommand { '"\n\n' + "You can also pass the session key to any command with the `--session` option. ex:\n" + "$ bw list items --session " + - process.env.BW_SESSION + process.env.BW_SESSION, ); res.raw = process.env.BW_SESSION; return Response.success(res); @@ -389,7 +389,7 @@ export class LoginCommand { const res = new MessageResponse( "Your master password has been updated!", - "\n" + "You have been logged out and must log in again to access the vault." + "\n" + "You have been logged out and must log in again to access the vault.", ); return Response.success(res); @@ -405,14 +405,14 @@ export class LoginCommand { return Response.error( new MessageResponse( "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 via the web vault. You have been logged out.", - null - ) + null, + ), ); } try { const { newPasswordHash, newUserKey, hint } = await this.collectNewMasterPasswordDetails( - "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." + "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.", ); const request = new PasswordRequest(); @@ -443,14 +443,14 @@ export class LoginCommand { return Response.error( new MessageResponse( "An organization administrator recently changed your master password. In order to access the vault, you must update your master password now via the web vault. You have been logged out.", - null - ) + null, + ), ); } try { const { newPasswordHash, newUserKey, hint } = await this.collectNewMasterPasswordDetails( - "An organization administrator recently changed your master password. In order to access the vault, you must update your master password now." + "An organization administrator recently changed your master password. In order to access the vault, you must update your master password now.", ); const request = new UpdateTempPasswordRequest(); @@ -479,7 +479,7 @@ export class LoginCommand { */ private async collectNewMasterPasswordDetails( prompt: string, - error?: string + error?: string, ): Promise<{ newPasswordHash: string; newUserKey: [SymmetricCryptoKey, EncString]; @@ -507,18 +507,18 @@ export class LoginCommand { if (masterPassword.length < Utils.minimumPasswordLength) { return this.collectNewMasterPasswordDetails( prompt, - `Master password must be at least ${Utils.minimumPasswordLength} characters long.\n` + `Master password must be at least ${Utils.minimumPasswordLength} characters long.\n`, ); } // Strength & Policy Validation const strengthResult = this.passwordStrengthService.getPasswordStrength( masterPassword, - this.email + this.email, ); const enforcedPolicyOptions = await firstValueFrom( - this.policyService.masterPasswordPolicyOptions$() + this.policyService.masterPasswordPolicyOptions$(), ); // Verify master password meets policy requirements @@ -527,12 +527,12 @@ export class LoginCommand { !this.policyService.evaluateMasterPassword( strengthResult.score, masterPassword, - enforcedPolicyOptions + enforcedPolicyOptions, ) ) { return this.collectNewMasterPasswordDetails( prompt, - "Your new master password does not meet the policy requirements.\n" + "Your new master password does not meet the policy requirements.\n", ); } @@ -549,7 +549,7 @@ export class LoginCommand { if (masterPassword !== masterPasswordRetype) { return this.collectNewMasterPasswordDetails( prompt, - "Master password confirmation does not match.\n" + "Master password confirmation does not match.\n", ); } @@ -568,7 +568,7 @@ export class LoginCommand { masterPassword, this.email.trim().toLowerCase(), kdf, - kdfConfig + kdfConfig, ); const newPasswordHash = await this.cryptoService.hashMasterKey(masterPassword, newMasterKey); @@ -586,12 +586,12 @@ export class LoginCommand { private async handleCaptchaRequired( twoFactorRequest: TokenTwoFactorRequest, - credentials: PasswordLoginCredentials = null + credentials: PasswordLoginCredentials = null, ): Promise { const badCaptcha = Response.badRequest( "Your authentication request has been flagged and will require user interaction to proceed.\n" + "Please use your API key to validate this request and ensure BW_CLIENTSECRET is correct, if set.\n" + - "(https://bitwarden.com/help/cli-auth-challenges)" + "(https://bitwarden.com/help/cli-auth-challenges)", ); try { @@ -608,7 +608,7 @@ export class LoginCommand { } else { authResultResponse = await this.authService.logInTwoFactor( twoFactorRequest, - captchaClientSecret + captchaClientSecret, ); } @@ -685,7 +685,7 @@ export class LoginCommand { private async openSsoPrompt( codeChallenge: string, - state: string + state: string, ): Promise<{ ssoCode: string; orgIdentifier: string }> { return new Promise((resolve, reject) => { const callbackServer = http.createServer((req, res) => { @@ -701,13 +701,13 @@ export class LoginCommand { "Success | Bitwarden CLI" + "

Successfully authenticated with the Bitwarden CLI

" + "

You may now close this tab and return to the terminal.

" + - "" + "", ); callbackServer.close(() => resolve({ ssoCode: code, orgIdentifier: orgIdentifier, - }) + }), ); } else { res.writeHead(400); @@ -715,7 +715,7 @@ export class LoginCommand { "Failed | Bitwarden CLI" + "

Something went wrong logging into the Bitwarden CLI

" + "

You may now close this tab and return to the terminal.

" + - "" + "", ); callbackServer.close(() => reject()); } @@ -735,7 +735,7 @@ export class LoginCommand { "&state=" + state + "&codeChallenge=" + - codeChallenge + codeChallenge, ); }); foundPort = true; diff --git a/apps/cli/src/auth/commands/logout.command.ts b/apps/cli/src/auth/commands/logout.command.ts index a2dce59da3f..f3f5b21a09a 100644 --- a/apps/cli/src/auth/commands/logout.command.ts +++ b/apps/cli/src/auth/commands/logout.command.ts @@ -8,7 +8,7 @@ export class LogoutCommand { constructor( private authService: AuthService, private i18nService: I18nService, - private logoutCallback: () => Promise + private logoutCallback: () => Promise, ) {} async run() { diff --git a/apps/cli/src/auth/commands/unlock.command.ts b/apps/cli/src/auth/commands/unlock.command.ts index edd1dea043f..98bc926079c 100644 --- a/apps/cli/src/auth/commands/unlock.command.ts +++ b/apps/cli/src/auth/commands/unlock.command.ts @@ -27,7 +27,7 @@ export class UnlockCommand { private environmentService: EnvironmentService, private syncService: SyncService, private organizationApiService: OrganizationApiServiceAbstraction, - private logout: () => Promise + private logout: () => Promise, ) {} async run(password: string, cmdOptions: Record) { @@ -55,7 +55,7 @@ export class UnlockCommand { const serverKeyHash = await this.cryptoService.hashMasterKey( password, masterKey, - HashPurpose.ServerAuthorization + HashPurpose.ServerAuthorization, ); const request = new SecretVerificationRequest(); request.masterPasswordHash = serverKeyHash; @@ -65,7 +65,7 @@ export class UnlockCommand { const localKeyHash = await this.cryptoService.hashMasterKey( password, masterKey, - HashPurpose.LocalAuthorization + HashPurpose.LocalAuthorization, ); await this.cryptoService.setMasterKeyHash(localKeyHash); } catch { @@ -85,7 +85,7 @@ export class UnlockCommand { this.environmentService, this.syncService, this.organizationApiService, - this.logout + this.logout, ); const convertResponse = await convertToKeyConnectorCommand.run(); if (!convertResponse.success) { @@ -117,7 +117,7 @@ export class UnlockCommand { '"\n\n' + "You can also pass the session key to any command with the `--session` option. ex:\n" + "$ bw list items --session " + - process.env.BW_SESSION + process.env.BW_SESSION, ); res.raw = process.env.BW_SESSION; return Response.success(res); diff --git a/apps/cli/src/bw.ts b/apps/cli/src/bw.ts index ceed0f28659..8b3ea41e21a 100644 --- a/apps/cli/src/bw.ts +++ b/apps/cli/src/bw.ts @@ -188,26 +188,26 @@ export class Main { this.platformUtilsService = new CliPlatformUtilsService(ClientType.Cli, packageJson); this.logService = new ConsoleLogService( this.platformUtilsService.isDev(), - (level) => process.env.BITWARDENCLI_DEBUG !== "true" && level <= LogLevelType.Info + (level) => process.env.BITWARDENCLI_DEBUG !== "true" && level <= LogLevelType.Info, ); this.cryptoFunctionService = new NodeCryptoFunctionService(); this.encryptService = new EncryptServiceImplementation( this.cryptoFunctionService, this.logService, - true + true, ); this.storageService = new LowdbStorageService(this.logService, null, p, false, true); this.secureStorageService = new NodeEnvSecureStorageService( this.storageService, this.logService, - () => this.cryptoService + () => this.cryptoService, ); this.memoryStorageService = new MemoryStorageService(); this.globalStateProvider = new DefaultGlobalStateProvider( this.memoryStorageService, - this.storageService + this.storageService, ); this.messagingService = new NoopMessagingService(); @@ -215,7 +215,7 @@ export class Main { this.accountService = new AccountServiceImplementation( this.messagingService, this.logService, - this.globalStateProvider + this.globalStateProvider, ); this.stateService = new StateService( @@ -224,7 +224,7 @@ export class Main { this.memoryStorageService, this.logService, new StateFactory(GlobalState, Account), - this.accountService + this.accountService, ); this.cryptoService = new CryptoService( @@ -232,7 +232,7 @@ export class Main { this.encryptService, this.platformUtilsService, this.logService, - this.stateService + this.stateService, ); this.appIdService = new AppIdService(this.storageService); @@ -251,7 +251,7 @@ export class Main { this.environmentService, this.appIdService, async (expired: boolean) => await this.logout(), - customUserAgent + customUserAgent, ); this.syncNotifierService = new SyncNotifierService(); @@ -268,18 +268,18 @@ export class Main { this.cryptoService, this.i18nService, this.cryptoFunctionService, - this.stateService + this.stateService, ); this.cipherFileUploadService = new CipherFileUploadService( this.apiService, - this.fileUploadService + this.fileUploadService, ); this.sendApiService = this.sendApiService = new SendApiService( this.apiService, this.fileUploadService, - this.sendService + this.sendService, ); this.searchService = new SearchService(this.logService, this.i18nService); @@ -289,7 +289,7 @@ export class Main { this.collectionService = new CollectionService( this.cryptoService, this.i18nService, - this.stateService + this.stateService, ); this.providerService = new ProviderService(this.stateService); @@ -303,7 +303,7 @@ export class Main { this.policyApiService = new PolicyApiService( this.policyService, this.apiService, - this.stateService + this.stateService, ); this.keyConnectorService = new KeyConnectorService( @@ -314,7 +314,7 @@ export class Main { this.logService, this.organizationService, this.cryptoFunctionService, - async (expired: boolean) => await this.logout() + async (expired: boolean) => await this.logout(), ); this.twoFactorService = new TwoFactorService(this.i18nService, this.platformUtilsService); @@ -324,7 +324,7 @@ export class Main { this.passwordGenerationService = new PasswordGenerationService( this.cryptoService, this.policyService, - this.stateService + this.stateService, ); this.devicesApiService = new DevicesApiServiceImplementation(this.apiService); @@ -336,7 +336,7 @@ export class Main { this.appIdService, this.devicesApiService, this.i18nService, - this.platformUtilsService + this.platformUtilsService, ); this.authRequestCryptoService = new AuthRequestCryptoServiceImplementation(this.cryptoService); @@ -358,7 +358,7 @@ export class Main { this.passwordStrengthService, this.policyService, this.deviceTrustCryptoService, - this.authRequestCryptoService + this.authRequestCryptoService, ); this.configApiService = new ConfigApiService(this.apiService, this.authService); @@ -369,7 +369,7 @@ export class Main { this.authService, this.environmentService, this.logService, - true + true, ); this.cipherService = new CipherService( @@ -381,14 +381,14 @@ export class Main { this.stateService, this.encryptService, this.cipherFileUploadService, - this.configService + this.configService, ); this.folderService = new FolderService( this.cryptoService, this.i18nService, this.cipherService, - this.stateService + this.stateService, ); this.folderApiService = new FolderApiService(this.folderService, this.apiService); @@ -400,7 +400,7 @@ export class Main { this.stateService, this.cryptoService, this.i18nService, - this.userVerificationApiService + this.userVerificationApiService, ); this.vaultTimeoutSettingsService = new VaultTimeoutSettingsService( @@ -408,7 +408,7 @@ export class Main { this.tokenService, this.policyService, this.stateService, - this.userVerificationService + this.userVerificationService, ); this.vaultTimeoutService = new VaultTimeoutService( @@ -423,7 +423,7 @@ export class Main { this.authService, this.vaultTimeoutSettingsService, lockedCallback, - null + null, ); this.syncService = new SyncService( @@ -443,7 +443,8 @@ export class Main { this.folderApiService, this.organizationService, this.sendApiService, - async (expired: boolean) => await this.logout() + this.configService, + async (expired: boolean) => await this.logout(), ); this.totpService = new TotpService(this.cryptoFunctionService, this.logService); @@ -456,7 +457,7 @@ export class Main { this.importApiService, this.i18nService, this.collectionService, - this.cryptoService + this.cryptoService, ); this.exportService = new VaultExportService( this.folderService, @@ -464,7 +465,7 @@ export class Main { this.apiService, this.cryptoService, this.cryptoFunctionService, - this.stateService + this.stateService, ); this.auditService = new AuditService(this.cryptoFunctionService, this.apiService); @@ -477,14 +478,14 @@ export class Main { this.eventUploadService = new EventUploadService( this.apiService, this.stateService, - this.logService + this.logService, ); this.eventCollectionService = new EventCollectionService( this.cipherService, this.stateService, this.organizationService, - this.eventUploadService + this.eventUploadService, ); } diff --git a/apps/cli/src/commands/completion.command.ts b/apps/cli/src/commands/completion.command.ts index fe5575681b2..b0d34819218 100644 --- a/apps/cli/src/commands/completion.command.ts +++ b/apps/cli/src/commands/completion.command.ts @@ -69,7 +69,7 @@ export class CompletionCommand { .concat( `'(-h --help)'{-h,--help}'[output usage information]'`, hasCommands ? '"1: :->cmnds"' : null, - '"*::arg:->args"' + '"*::arg:->args"', ) .filter(Boolean); @@ -100,7 +100,7 @@ export class CompletionCommand { ${commands .map(({ _name }) => [`${_name})`, `_${name}_${_name}`, ";;"].join("\n ")) .join("\n ")} - esac` + esac`, ); } @@ -110,7 +110,7 @@ export class CompletionCommand { if (hasCommands) { commandBlocParts.push( - commands.map((c) => this.renderCommandBlock(`${name}_${c._name}`, c)).join("\n\n") + commands.map((c) => this.renderCommandBlock(`${name}_${c._name}`, c)).join("\n\n"), ); } diff --git a/apps/cli/src/commands/config.command.ts b/apps/cli/src/commands/config.command.ts index bf3507ee3d0..1665bae1484 100644 --- a/apps/cli/src/commands/config.command.ts +++ b/apps/cli/src/commands/config.command.ts @@ -32,7 +32,7 @@ export class ConfigCommand { const stringRes = new StringResponse( this.environmentService.hasBaseUrl() ? this.environmentService.getUrls().base - : "https://bitwarden.com" + : "https://bitwarden.com", ); return Response.success(stringRes); } 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 d3c7b5c3fc7..de9565dfb6c 100644 --- a/apps/cli/src/commands/convert-to-key-connector.command.ts +++ b/apps/cli/src/commands/convert-to-key-connector.command.ts @@ -14,7 +14,7 @@ export class ConvertToKeyConnectorCommand { private environmentService: EnvironmentService, private syncService: SyncService, private organizationApiService: OrganizationApiServiceAbstraction, - private logout: () => Promise + private logout: () => Promise, ) {} async run(): Promise { @@ -26,8 +26,8 @@ export class ConvertToKeyConnectorCommand { new MessageResponse( "An organization you are a member of is using Key Connector. " + "In order to access the vault, you must opt-in to Key Connector now via the web vault. You have been logged out.", - null - ) + null, + ), ); } diff --git a/apps/cli/src/commands/download.command.ts b/apps/cli/src/commands/download.command.ts index 5c3decc27d4..e417b7c3b88 100644 --- a/apps/cli/src/commands/download.command.ts +++ b/apps/cli/src/commands/download.command.ts @@ -15,12 +15,12 @@ export abstract class DownloadCommand { url: string, key: SymmetricCryptoKey, fileName: string, - output?: string + output?: string, ) { const response = await fet.default(new fet.Request(url, { headers: { cache: "no-cache" } })); if (response.status !== 200) { return Response.error( - "A " + response.status + " error occurred while downloading the attachment." + "A " + response.status + " error occurred while downloading the attachment.", ); } diff --git a/apps/cli/src/commands/edit.command.ts b/apps/cli/src/commands/edit.command.ts index bee1c6849fe..3d4f9529adb 100644 --- a/apps/cli/src/commands/edit.command.ts +++ b/apps/cli/src/commands/edit.command.ts @@ -23,14 +23,14 @@ export class EditCommand { private folderService: FolderService, private cryptoService: CryptoService, private apiService: ApiService, - private folderApiService: FolderApiServiceAbstraction + private folderApiService: FolderApiServiceAbstraction, ) {} async run( object: string, id: string, requestJson: any, - cmdOptions: Record + cmdOptions: Record, ): Promise { if (process.env.BW_SERVE !== "true" && (requestJson == null || requestJson === "")) { requestJson = await CliUtils.readStdin(); @@ -78,7 +78,7 @@ export class EditCommand { } let cipherView = await cipher.decrypt( - await this.cipherService.getKeyForCipherKeyDecryption(cipher) + await this.cipherService.getKeyForCipherKeyDecryption(cipher), ); if (cipherView.isDeleted) { return Response.badRequest("You may not edit a deleted item. Use the restore command first."); @@ -89,7 +89,7 @@ export class EditCommand { await this.cipherService.updateWithServer(encCipher); const updatedCipher = await this.cipherService.get(cipher.id); const decCipher = await updatedCipher.decrypt( - await this.cipherService.getKeyForCipherKeyDecryption(updatedCipher) + await this.cipherService.getKeyForCipherKeyDecryption(updatedCipher), ); const res = new CipherResponse(decCipher); return Response.success(res); @@ -105,7 +105,7 @@ export class EditCommand { } if (cipher.organizationId == null) { return Response.badRequest( - "Item does not belong to an organization. Consider moving it first." + "Item does not belong to an organization. Consider moving it first.", ); } @@ -114,7 +114,7 @@ export class EditCommand { await this.cipherService.saveCollectionsWithServer(cipher); const updatedCipher = await this.cipherService.get(cipher.id); const decCipher = await updatedCipher.decrypt( - await this.cipherService.getKeyForCipherKeyDecryption(updatedCipher) + await this.cipherService.getKeyForCipherKeyDecryption(updatedCipher), ); const res = new CipherResponse(decCipher); return Response.success(res); @@ -146,7 +146,7 @@ export class EditCommand { private async editOrganizationCollection( id: string, req: OrganizationCollectionRequest, - options: Options + options: Options, ) { if (options.organizationId == null || options.organizationId === "") { return Response.badRequest("`organizationid` option is required."); @@ -170,7 +170,7 @@ export class EditCommand { req.groups == null ? null : req.groups.map( - (g) => new SelectionReadOnlyRequest(g.id, g.readOnly, g.hidePasswords, g.manage) + (g) => new SelectionReadOnlyRequest(g.id, g.readOnly, g.hidePasswords, g.manage), ); const request = new CollectionRequest(); request.name = (await this.cryptoService.encrypt(req.name, orgKey)).encryptedString; diff --git a/apps/cli/src/commands/get.command.ts b/apps/cli/src/commands/get.command.ts index f1f6da7b6f2..43d1ab4d935 100644 --- a/apps/cli/src/commands/get.command.ts +++ b/apps/cli/src/commands/get.command.ts @@ -56,7 +56,7 @@ export class GetCommand extends DownloadCommand { private searchService: SearchService, private apiService: ApiService, private organizationService: OrganizationService, - private eventCollectionService: EventCollectionService + private eventCollectionService: EventCollectionService, ) { super(cryptoService); } @@ -107,7 +107,7 @@ export class GetCommand extends DownloadCommand { const cipher = await this.cipherService.get(id); if (cipher != null) { decCipher = await cipher.decrypt( - await this.cipherService.getKeyForCipherKeyDecryption(cipher) + await this.cipherService.getKeyForCipherKeyDecryption(cipher), ); } } else if (id.trim() !== "") { @@ -145,7 +145,7 @@ export class GetCommand extends DownloadCommand { EventType.Cipher_ClientViewed, id, true, - decCipher.organizationId + decCipher.organizationId, ); const res = new CipherResponse(decCipher); @@ -155,7 +155,7 @@ export class GetCommand extends DownloadCommand { private async getUsername(id: string) { const cipherResponse = await this.getCipher( id, - (c) => c.type === CipherType.Login && !Utils.isNullOrWhitespace(c.login.username) + (c) => c.type === CipherType.Login && !Utils.isNullOrWhitespace(c.login.username), ); if (!cipherResponse.success) { return cipherResponse; @@ -177,7 +177,7 @@ export class GetCommand extends DownloadCommand { private async getPassword(id: string) { const cipherResponse = await this.getCipher( id, - (c) => c.type === CipherType.Login && !Utils.isNullOrWhitespace(c.login.password) + (c) => c.type === CipherType.Login && !Utils.isNullOrWhitespace(c.login.password), ); if (!cipherResponse.success) { return cipherResponse; @@ -203,7 +203,7 @@ export class GetCommand extends DownloadCommand { c.type === CipherType.Login && c.login.uris != null && c.login.uris.length > 0 && - c.login.uris[0].uri !== "" + c.login.uris[0].uri !== "", ); if (!cipherResponse.success) { return cipherResponse; @@ -229,7 +229,7 @@ export class GetCommand extends DownloadCommand { private async getTotp(id: string) { const cipherResponse = await this.getCipher( id, - (c) => c.type === CipherType.Login && !Utils.isNullOrWhitespace(c.login.totp) + (c) => c.type === CipherType.Login && !Utils.isNullOrWhitespace(c.login.totp), ); if (!cipherResponse.success) { return cipherResponse; @@ -287,7 +287,7 @@ export class GetCommand extends DownloadCommand { } const exposedNumber = await this.auditService.passwordLeaked( - (passwordResponse.data as StringResponse).data + (passwordResponse.data as StringResponse).data, ); const res = new StringResponse(exposedNumber.toString()); return Response.success(res); @@ -317,7 +317,7 @@ export class GetCommand extends DownloadCommand { let attachments = cipher.attachments.filter( (a) => a.id.toLowerCase() === id || - (a.fileName != null && a.fileName.toLowerCase().indexOf(id) > -1) + (a.fileName != null && a.fileName.toLowerCase().indexOf(id) > -1), ); if (attachments.length === 0) { return Response.error("Attachment `" + id + "` was not found."); @@ -343,7 +343,7 @@ export class GetCommand extends DownloadCommand { try { const attachmentDownloadResponse = await this.apiService.getAttachmentData( cipher.id, - attachments[0].id + attachments[0].id, ); url = attachmentDownloadResponse.url; } catch (e) { @@ -433,13 +433,13 @@ export class GetCommand extends DownloadCommand { const decCollection = new CollectionView(response); decCollection.name = await this.cryptoService.decryptToUtf8( new EncString(response.name), - orgKey + orgKey, ); const groups = response.groups == null ? null : response.groups.map( - (g) => new SelectionReadOnly(g.id, g.readOnly, g.hidePasswords, g.manage) + (g) => new SelectionReadOnly(g.id, g.readOnly, g.hidePasswords, g.manage), ); const res = new OrganizationCollectionResponse(decCollection, groups); return Response.success(res); diff --git a/apps/cli/src/commands/list.command.ts b/apps/cli/src/commands/list.command.ts index bd307308905..fbb0dd08e0f 100644 --- a/apps/cli/src/commands/list.command.ts +++ b/apps/cli/src/commands/list.command.ts @@ -35,7 +35,7 @@ export class ListCommand { private searchService: SearchService, private organizationUserService: OrganizationUserService, private apiService: ApiService, - private eventCollectionService: EventCollectionService + private eventCollectionService: EventCollectionService, ) {} async run(object: string, cmdOptions: Record): Promise { @@ -133,7 +133,7 @@ export class ListCommand { EventType.Cipher_ClientViewed, c.id, index === ciphers.length - 1, - c.organizationId + c.organizationId, ); }); @@ -229,7 +229,7 @@ export class ListCommand { u.type = r.type; u.twoFactorEnabled = r.twoFactorEnabled; return u; - }) + }), ); return Response.success(res); } catch (e) { diff --git a/apps/cli/src/commands/serve.command.ts b/apps/cli/src/commands/serve.command.ts index 5937c51ae6e..0f81fde1284 100644 --- a/apps/cli/src/commands/serve.command.ts +++ b/apps/cli/src/commands/serve.command.ts @@ -67,7 +67,7 @@ export class ServeCommand { this.main.searchService, this.main.apiService, this.main.organizationService, - this.main.eventCollectionService + this.main.eventCollectionService, ); this.listCommand = new ListCommand( this.main.cipherService, @@ -77,7 +77,7 @@ export class ServeCommand { this.main.searchService, this.main.organizationUserService, this.main.apiService, - this.main.eventCollectionService + this.main.eventCollectionService, ); this.createCommand = new CreateCommand( this.main.cipherService, @@ -85,37 +85,37 @@ export class ServeCommand { this.main.stateService, this.main.cryptoService, this.main.apiService, - this.main.folderApiService + this.main.folderApiService, ); this.editCommand = new EditCommand( this.main.cipherService, this.main.folderService, this.main.cryptoService, this.main.apiService, - this.main.folderApiService + this.main.folderApiService, ); this.generateCommand = new GenerateCommand( this.main.passwordGenerationService, - this.main.stateService + this.main.stateService, ); this.syncCommand = new SyncCommand(this.main.syncService); this.statusCommand = new StatusCommand( this.main.environmentService, this.main.syncService, this.main.stateService, - this.main.authService + this.main.authService, ); this.deleteCommand = new DeleteCommand( this.main.cipherService, this.main.folderService, this.main.stateService, this.main.apiService, - this.main.folderApiService + this.main.folderApiService, ); this.confirmCommand = new ConfirmCommand( this.main.apiService, this.main.cryptoService, - this.main.organizationUserService + this.main.organizationUserService, ); this.restoreCommand = new RestoreCommand(this.main.cipherService); this.shareCommand = new ShareCommand(this.main.cipherService); @@ -130,36 +130,36 @@ export class ServeCommand { this.main.environmentService, this.main.syncService, this.main.organizationApiService, - async () => await this.main.logout() + async () => await this.main.logout(), ); this.sendCreateCommand = new SendCreateCommand( this.main.sendService, this.main.stateService, this.main.environmentService, - this.main.sendApiService + this.main.sendApiService, ); this.sendDeleteCommand = new SendDeleteCommand(this.main.sendService, this.main.sendApiService); this.sendGetCommand = new SendGetCommand( this.main.sendService, this.main.environmentService, this.main.searchService, - this.main.cryptoService + this.main.cryptoService, ); this.sendEditCommand = new SendEditCommand( this.main.sendService, this.main.stateService, this.sendGetCommand, - this.main.sendApiService + this.main.sendApiService, ); this.sendListCommand = new SendListCommand( this.main.sendService, this.main.environmentService, - this.main.searchService + this.main.searchService, ); this.sendRemovePasswordCommand = new SendRemovePasswordCommand( this.main.sendService, - this.main.sendApiService + this.main.sendApiService, ); } @@ -170,7 +170,7 @@ export class ServeCommand { this.main.logService.info( `Starting server on ${hostname}:${port} with ${ protectOrigin ? "origin protection" : "no origin protection" - }` + }`, ); const server = new koa(); @@ -187,7 +187,7 @@ export class ServeCommand { Utils.isNullOrEmpty(ctx.headers.origin) ? "(Origin header value missing)" : ctx.headers.origin - }"` + }"`, ); return; } @@ -252,7 +252,7 @@ export class ServeCommand { const response = await this.unlockCommand.run( ctx.request.body.password == null ? null : (ctx.request.body.password as string), - ctx.request.query + ctx.request.query, ); this.processResponse(ctx.response, response); await next(); @@ -266,7 +266,7 @@ export class ServeCommand { const response = await this.confirmCommand.run( ctx.params.object, ctx.params.id, - ctx.request.query + ctx.request.query, ); this.processResponse(ctx.response, response); await next(); @@ -290,7 +290,7 @@ export class ServeCommand { const response = await this.shareCommand.run( ctx.params.id, ctx.params.organizationId, - ctx.request.body // TODO: Check the format of this body for an array of collection ids + ctx.request.body, // TODO: Check the format of this body for an array of collection ids ); this.processResponse(ctx.response, response); await next(); @@ -308,7 +308,7 @@ export class ServeCommand { { fileBuffer: ctx.request.file.buffer, fileName: ctx.request.file.originalname, - } + }, ); this.processResponse(ctx.response, response); await next(); @@ -336,7 +336,7 @@ export class ServeCommand { response = await this.createCommand.run( ctx.params.object, ctx.request.body, - ctx.request.query + ctx.request.query, ); } this.processResponse(ctx.response, response); @@ -357,7 +357,7 @@ export class ServeCommand { ctx.params.object, ctx.params.id, ctx.request.body, - ctx.request.query + ctx.request.query, ); } this.processResponse(ctx.response, response); @@ -391,7 +391,7 @@ export class ServeCommand { response = await this.deleteCommand.run( ctx.params.object, ctx.params.id, - ctx.request.query + ctx.request.query, ); } this.processResponse(ctx.response, response); diff --git a/apps/cli/src/commands/status.command.ts b/apps/cli/src/commands/status.command.ts index b04a9dcb760..d7bc17b643a 100644 --- a/apps/cli/src/commands/status.command.ts +++ b/apps/cli/src/commands/status.command.ts @@ -12,7 +12,7 @@ export class StatusCommand { private envService: EnvironmentService, private syncService: SyncService, private stateService: StateService, - private authService: AuthService + private authService: AuthService, ) {} async run(): Promise { @@ -30,7 +30,7 @@ export class StatusCommand { userEmail: email, userId: userId, status: status, - }) + }), ); } catch (e) { return Response.error(e); diff --git a/apps/cli/src/models/response.ts b/apps/cli/src/models/response.ts index ad70c4c8df1..cbeb9f17273 100644 --- a/apps/cli/src/models/response.ts +++ b/apps/cli/src/models/response.ts @@ -11,8 +11,8 @@ export class Response { error.message != null ? error.message : error.toString() === "[object Object]" - ? JSON.stringify(error) - : error.toString(); + ? JSON.stringify(error) + : error.toString(); } res.data = data; return res; diff --git a/apps/cli/src/platform/services/cli-platform-utils.service.ts b/apps/cli/src/platform/services/cli-platform-utils.service.ts index 883270cd09f..0950a7dfec0 100644 --- a/apps/cli/src/platform/services/cli-platform-utils.service.ts +++ b/apps/cli/src/platform/services/cli-platform-utils.service.ts @@ -11,7 +11,10 @@ export class CliPlatformUtilsService implements PlatformUtilsService { private deviceCache: DeviceType = null; - constructor(clientType: ClientType, private packageJson: any) { + constructor( + clientType: ClientType, + private packageJson: any, + ) { this.clientType = clientType; } @@ -107,7 +110,7 @@ export class CliPlatformUtilsService implements PlatformUtilsService { type: "error" | "success" | "warning" | "info", title: string, text: string | string[], - options?: any + options?: any, ): void { throw new Error("Not implemented."); } diff --git a/apps/cli/src/platform/services/i18n.service.ts b/apps/cli/src/platform/services/i18n.service.ts index 276fa7ef9a9..0a52aba41e9 100644 --- a/apps/cli/src/platform/services/i18n.service.ts +++ b/apps/cli/src/platform/services/i18n.service.ts @@ -8,7 +8,7 @@ export class I18nService extends BaseI18nService { super(systemLanguage, localesDirectory, (formattedLocale: string) => { const filePath = path.join( __dirname, - this.localesDirectory + "/" + formattedLocale + "/messages.json" + this.localesDirectory + "/" + formattedLocale + "/messages.json", ); const localesJson = fs.readFileSync(filePath, "utf8"); const locales = JSON.parse(localesJson.replace(/^\uFEFF/, "")); // strip the BOM diff --git a/apps/cli/src/platform/services/lowdb-storage.service.ts b/apps/cli/src/platform/services/lowdb-storage.service.ts index 6beea9945dd..a296c88c880 100644 --- a/apps/cli/src/platform/services/lowdb-storage.service.ts +++ b/apps/cli/src/platform/services/lowdb-storage.service.ts @@ -36,7 +36,7 @@ export class LowdbStorageService implements AbstractStorageService { defaults?: any, private dir?: string, private allowCache = false, - private requireLock = false + private requireLock = false, ) { this.defaults = defaults; this.updates$ = this.updatesSubject.asObservable(); @@ -59,7 +59,7 @@ export class LowdbStorageService implements AbstractStorageService { this.dataFilePath = path.join(this.dir, "data.json"); if (!fs.existsSync(this.dataFilePath)) { this.logService.warning( - `Could not find data file, "${this.dataFilePath}"; creating it instead.` + `Could not find data file, "${this.dataFilePath}"; creating it instead.`, ); fs.writeFileSync(this.dataFilePath, "", { mode: 0o600 }); fs.chmodSync(this.dataFilePath, 0o600); @@ -78,14 +78,14 @@ export class LowdbStorageService implements AbstractStorageService { } catch (e) { if (e instanceof SyntaxError) { this.logService.warning( - `Error creating lowdb storage adapter, "${e.message}"; emptying data file.` + `Error creating lowdb storage adapter, "${e.message}"; emptying data file.`, ); if (fs.existsSync(this.dataFilePath)) { const backupPath = this.dataFilePath + ".bak"; this.logService.warning(`Writing backup of data file to ${backupPath}`); await fs.copyFile(this.dataFilePath, backupPath, () => { this.logService.warning( - `Error while creating data file backup, "${e.message}". No backup may have been created.` + `Error while creating data file backup, "${e.message}". No backup may have been created.`, ); }); } diff --git a/apps/cli/src/platform/services/node-api.service.ts b/apps/cli/src/platform/services/node-api.service.ts index 669a562d597..d95e9d7d85e 100644 --- a/apps/cli/src/platform/services/node-api.service.ts +++ b/apps/cli/src/platform/services/node-api.service.ts @@ -21,7 +21,7 @@ export class NodeApiService extends ApiService { environmentService: EnvironmentService, appIdService: AppIdService, logoutCallback: (expired: boolean) => Promise, - customUserAgent: string = null + customUserAgent: string = null, ) { super( tokenService, @@ -29,7 +29,7 @@ export class NodeApiService extends ApiService { environmentService, appIdService, logoutCallback, - customUserAgent + customUserAgent, ); } diff --git a/apps/cli/src/platform/services/node-env-secure-storage.service.ts b/apps/cli/src/platform/services/node-env-secure-storage.service.ts index 14ea6a6bb12..2364553d2a3 100644 --- a/apps/cli/src/platform/services/node-env-secure-storage.service.ts +++ b/apps/cli/src/platform/services/node-env-secure-storage.service.ts @@ -11,7 +11,7 @@ export class NodeEnvSecureStorageService implements AbstractStorageService { constructor( private storageService: AbstractStorageService, private logService: LogService, - private cryptoService: () => CryptoService + private cryptoService: () => CryptoService, ) {} get valuesRequireDeserialization(): boolean { @@ -20,7 +20,7 @@ export class NodeEnvSecureStorageService implements AbstractStorageService { get updates$() { return throwError( - () => new Error("Secure storage implementations cannot have their updates subscribed to.") + () => new Error("Secure storage implementations cannot have their updates subscribed to."), ); } @@ -61,7 +61,7 @@ export class NodeEnvSecureStorageService implements AbstractStorageService { } const encValue = await this.cryptoService().encryptToBytes( Utils.fromB64ToArray(plainValue), - sessionKey + sessionKey, ); if (encValue == null) { throw new Error("Value didn't encrypt."); diff --git a/apps/cli/src/program.ts b/apps/cli/src/program.ts index 8bca024b410..64fe2092586 100644 --- a/apps/cli/src/program.ts +++ b/apps/cli/src/program.ts @@ -86,7 +86,7 @@ export class Program { writeLn(' echo \'{"name":"My Folder"}\' | bw encode'); writeLn(" bw create folder eyJuYW1lIjoiTXkgRm9sZGVyIn0K"); writeLn( - " bw edit folder c7c7b60b-9c61-40f2-8ccd-36c49595ed72 eyJuYW1lIjoiTXkgRm9sZGVyMiJ9Cg==" + " bw edit folder c7c7b60b-9c61-40f2-8ccd-36c49595ed72 eyJuYW1lIjoiTXkgRm9sZGVyMiJ9Cg==", ); writeLn(" bw delete item 99ee88d2-6046-4ea7-92c2-acac464b1412"); writeLn(" bw generate -lusn --length 18"); @@ -95,7 +95,7 @@ export class Program { writeLn(' bw send "text to send"'); writeLn(' echo "text to send" | bw send'); writeLn( - " bw receive https://vault.bitwarden.com/#/send/rg3iuoS_Akm2gqy6ADRHmg/Ht7dYjsqjmgqUM3rjzZDSQ" + " bw receive https://vault.bitwarden.com/#/send/rg3iuoS_Akm2gqy6ADRHmg/Ht7dYjsqjmgqUM3rjzZDSQ", ); writeLn("", true); }); @@ -110,7 +110,7 @@ export class Program { .option("--passwordenv ", "Environment variable storing your password") .option( "--passwordfile ", - "Path to a file containing your password as its first line" + "Path to a file containing your password as its first line", ) .option("--check", "Check login status.", async () => { const authed = await this.main.stateService.getIsAuthenticated(); @@ -154,7 +154,7 @@ export class Program { this.main.keyConnectorService, this.main.policyApiService, this.main.organizationService, - async () => await this.main.logout() + async () => await this.main.logout(), ); const response = await command.run(email, password, options); this.processResponse(response, true); @@ -175,7 +175,7 @@ export class Program { const command = new LogoutCommand( this.main.authService, this.main.i18nService, - async () => await this.main.logout() + async () => await this.main.logout(), ); const response = await command.run(); this.processResponse(response); @@ -197,15 +197,15 @@ export class Program { const logoutCommand = new LogoutCommand( this.main.authService, this.main.i18nService, - async () => await this.main.logout() + async () => await this.main.logout(), ); await logoutCommand.run(); this.processResponse( Response.error( "You cannot lock your vault because you are using Key Connector. " + - "To protect your vault, you have been logged out." + "To protect your vault, you have been logged out.", ), - true + true, ); return; } @@ -246,7 +246,7 @@ export class Program { .option("--passwordenv ", "Environment variable storing your password") .option( "--passwordfile ", - "Path to a file containing your password as its first line" + "Path to a file containing your password as its first line", ) .action(async (password, cmd) => { if (!cmd.check) { @@ -261,7 +261,7 @@ export class Program { this.main.environmentService, this.main.syncService, this.main.organizationApiService, - async () => await this.main.logout() + async () => await this.main.logout(), ); const response = await command.run(password, cmd); this.processResponse(response); @@ -326,7 +326,7 @@ export class Program { .action(async (options) => { const command = new GenerateCommand( this.main.passwordGenerationService, - this.main.stateService + this.main.stateService, ); const response = await command.run(options); this.processResponse(response); @@ -356,17 +356,17 @@ export class Program { .description("Configure CLI settings.") .option( "--web-vault ", - "Provides a custom web vault URL that differs from the base URL." + "Provides a custom web vault URL that differs from the base URL.", ) .option("--api ", "Provides a custom API URL that differs from the base URL.") .option("--identity ", "Provides a custom identity URL that differs from the base URL.") .option( "--icons ", - "Provides a custom icons service URL that differs from the base URL." + "Provides a custom icons service URL that differs from the base URL.", ) .option( "--notifications ", - "Provides a custom notifications URL that differs from the base URL." + "Provides a custom notifications URL that differs from the base URL.", ) .option("--events ", "Provides a custom events URL that differs from the base URL.") .option("--key-connector ", "Provides the URL for your Key Connector server.") @@ -381,7 +381,7 @@ export class Program { writeLn(" bw config server https://bw.company.com"); writeLn(" bw config server bitwarden.com"); writeLn( - " bw config server --api http://localhost:4000 --identity http://localhost:33656" + " bw config server --api http://localhost:4000 --identity http://localhost:33656", ); writeLn("", true); }) @@ -462,7 +462,7 @@ export class Program { this.main.environmentService, this.main.syncService, this.main.stateService, - this.main.authService + this.main.authService, ); const response = await command.run(); this.processResponse(response); @@ -475,7 +475,7 @@ export class Program { .option("--port ", "The port to run your API webserver on.") .option( "--disable-origin-protection", - "If set, allows requests with origin header. Warning, this option exists for backwards compatibility reasons and exposes your environment to known CSRF attacks." + "If set, allows requests with origin header. Warning, this option exists for backwards compatibility reasons and exposes your environment to known CSRF attacks.", ) .on("--help", () => { writeLn("\n Notes:"); @@ -606,7 +606,7 @@ export class Program { if (await this.main.keyConnectorService.getUsesKeyConnector()) { const response = Response.error( "Your vault is locked. You must unlock your vault using your session key.\n" + - "If you do not have your session key, you can get a new one by logging out and logging in again." + "If you do not have your session key, you can get a new one by logging out and logging in again.", ); this.processResponse(response, true); } else { @@ -620,7 +620,7 @@ export class Program { this.main.environmentService, this.main.syncService, this.main.organizationApiService, - this.main.logout + this.main.logout, ); const response = await command.run(null, null); if (!response.success) { diff --git a/apps/cli/src/tools/export.command.ts b/apps/cli/src/tools/export.command.ts index 7b4b0405087..4d4e81530db 100644 --- a/apps/cli/src/tools/export.command.ts +++ b/apps/cli/src/tools/export.command.ts @@ -19,7 +19,7 @@ export class ExportCommand { constructor( private exportService: VaultExportServiceAbstraction, private policyService: PolicyService, - private eventCollectionService: EventCollectionService + private eventCollectionService: EventCollectionService, ) {} async run(options: program.OptionValues): Promise { @@ -28,7 +28,7 @@ export class ExportCommand { (await this.policyService.policyAppliesToUser(PolicyType.DisablePersonalVaultExport)) ) { return Response.badRequest( - "One or more organization policies prevents you from exporting your personal vault." + "One or more organization policies prevents you from exporting your personal vault.", ); } @@ -36,8 +36,8 @@ export class ExportCommand { if (!this.isSupportedExportFormat(format)) { return Response.badRequest( `'${format}' is not a supported export format. Supported formats: ${EXPORT_FORMATS.join( - ", " - )}.` + ", ", + )}.`, ); } @@ -76,7 +76,7 @@ export class ExportCommand { private async saveFile( exportContent: string, options: program.OptionValues, - format: ExportFormat + format: ExportFormat, ): Promise { try { const fileName = this.getFileName(format, options.organizationid != null ? "org" : null); diff --git a/apps/cli/src/tools/generate.command.ts b/apps/cli/src/tools/generate.command.ts index 30436e7db71..484dd4f4579 100644 --- a/apps/cli/src/tools/generate.command.ts +++ b/apps/cli/src/tools/generate.command.ts @@ -9,7 +9,7 @@ import { CliUtils } from "../utils"; export class GenerateCommand { constructor( private passwordGenerationService: PasswordGenerationServiceAbstraction, - private stateService: StateService + private stateService: StateService, ) {} async run(cmdOptions: Record): Promise { diff --git a/apps/cli/src/tools/import.command.ts b/apps/cli/src/tools/import.command.ts index 1be562239f5..bd5a72803be 100644 --- a/apps/cli/src/tools/import.command.ts +++ b/apps/cli/src/tools/import.command.ts @@ -13,13 +13,13 @@ export class ImportCommand { constructor( private importService: ImportServiceAbstraction, private organizationService: OrganizationService, - private syncService: SyncService + private syncService: SyncService, ) {} async run( format: ImportType, filepath: string, - options: program.OptionValues + options: program.OptionValues, ): Promise { const organizationId = options.organizationid; if (organizationId != null) { @@ -27,13 +27,13 @@ export class ImportCommand { if (organization == null) { return Response.badRequest( - `You do not belong to an organization with the ID of ${organizationId}. Check the organization ID and sync your vault.` + `You do not belong to an organization with the ID of ${organizationId}. Check the organization ID and sync your vault.`, ); } if (!organization.canAccessImportExport) { return Response.badRequest( - "You are not authorized to import into the provided organization." + "You are not authorized to import into the provided organization.", ); } } @@ -58,7 +58,7 @@ export class ImportCommand { const importer = await this.importService.getImporter( format, promptForPassword_callback, - organizationId + organizationId, ); if (importer === null) { return Response.badRequest("Proper importer type required."); diff --git a/apps/cli/src/tools/send/commands/create.command.ts b/apps/cli/src/tools/send/commands/create.command.ts index fd3b9428b2e..ef70498b78e 100644 --- a/apps/cli/src/tools/send/commands/create.command.ts +++ b/apps/cli/src/tools/send/commands/create.command.ts @@ -18,7 +18,7 @@ export class SendCreateCommand { private sendService: SendService, private stateService: StateService, private environmentService: EnvironmentService, - private sendApiService: SendApiService + private sendApiService: SendApiService, ) {} async run(requestJson: any, cmdOptions: Record) { @@ -78,7 +78,7 @@ export class SendCreateCommand { case SendType.File: if (process.env.BW_SERVE === "true") { return Response.error( - "Creating a file-based Send is unsupported through the `serve` command at this time." + "Creating a file-based Send is unsupported through the `serve` command at this time.", ); } @@ -88,7 +88,7 @@ export class SendCreateCommand { if (filePath == null) { return Response.badRequest( - "Must specify a file to Send either with the --file option or in the request JSON." + "Must specify a file to Send either with the --file option or in the request JSON.", ); } @@ -97,7 +97,7 @@ export class SendCreateCommand { case SendType.Text: if (text == null) { return Response.badRequest( - "Must specify text content to Send either with the --text option or in the request JSON." + "Must specify text content to Send either with the --text option or in the request JSON.", ); } req.text = new SendTextResponse(); @@ -106,7 +106,7 @@ export class SendCreateCommand { break; default: return Response.badRequest( - "Unknown Send type " + SendType[req.type] + ". Valid types are: file, text" + "Unknown Send type " + SendType[req.type] + ". Valid types are: file, text", ); } diff --git a/apps/cli/src/tools/send/commands/delete.command.ts b/apps/cli/src/tools/send/commands/delete.command.ts index 90cf5978859..dc2efeca5d3 100644 --- a/apps/cli/src/tools/send/commands/delete.command.ts +++ b/apps/cli/src/tools/send/commands/delete.command.ts @@ -4,7 +4,10 @@ import { SendService } from "@bitwarden/common/tools/send/services/send.service. import { Response } from "../../../models/response"; export class SendDeleteCommand { - constructor(private sendService: SendService, private sendApiService: SendApiService) {} + constructor( + private sendService: SendService, + private sendApiService: SendApiService, + ) {} async run(id: string) { const send = await this.sendService.getFromState(id); diff --git a/apps/cli/src/tools/send/commands/edit.command.ts b/apps/cli/src/tools/send/commands/edit.command.ts index d17694f46df..f6901097105 100644 --- a/apps/cli/src/tools/send/commands/edit.command.ts +++ b/apps/cli/src/tools/send/commands/edit.command.ts @@ -14,7 +14,7 @@ export class SendEditCommand { private sendService: SendService, private stateService: StateService, private getCommand: SendGetCommand, - private sendApiService: SendApiService + private sendApiService: SendApiService, ) {} async run(requestJson: string, cmdOptions: Record): Promise { diff --git a/apps/cli/src/tools/send/commands/get.command.ts b/apps/cli/src/tools/send/commands/get.command.ts index 4746e3dfe2d..f6e61bab7b5 100644 --- a/apps/cli/src/tools/send/commands/get.command.ts +++ b/apps/cli/src/tools/send/commands/get.command.ts @@ -16,7 +16,7 @@ export class SendGetCommand extends DownloadCommand { private sendService: SendService, private environmentService: EnvironmentService, private searchService: SearchService, - cryptoService: CryptoService + cryptoService: CryptoService, ) { super(cryptoService); } diff --git a/apps/cli/src/tools/send/commands/list.command.ts b/apps/cli/src/tools/send/commands/list.command.ts index 008c584388a..e169a26ea1c 100644 --- a/apps/cli/src/tools/send/commands/list.command.ts +++ b/apps/cli/src/tools/send/commands/list.command.ts @@ -10,7 +10,7 @@ export class SendListCommand { constructor( private sendService: SendService, private environmentService: EnvironmentService, - private searchService: SearchService + private searchService: SearchService, ) {} async run(cmdOptions: Record): Promise { diff --git a/apps/cli/src/tools/send/commands/receive.command.ts b/apps/cli/src/tools/send/commands/receive.command.ts index f5f35783275..9e7d9c7e3cb 100644 --- a/apps/cli/src/tools/send/commands/receive.command.ts +++ b/apps/cli/src/tools/send/commands/receive.command.ts @@ -31,7 +31,7 @@ export class SendReceiveCommand extends DownloadCommand { private cryptoFunctionService: CryptoFunctionService, private platformUtilsService: PlatformUtilsService, private environmentService: EnvironmentService, - private sendApiService: SendApiService + private sendApiService: SendApiService, ) { super(cryptoService); } @@ -89,13 +89,13 @@ export class SendReceiveCommand extends DownloadCommand { const downloadData = await this.sendApiService.getSendFileDownloadData( response, this.sendAccessRequest, - apiUrl + apiUrl, ); return await this.saveAttachmentToFile( downloadData.url, this.decKey, response?.file?.fileName, - options.output + options.output, ); } default: @@ -126,7 +126,7 @@ export class SendReceiveCommand extends DownloadCommand { password, keyArray, "sha256", - 100000 + 100000, ); return Utils.fromBufferToB64(passwordHash); } @@ -134,13 +134,13 @@ export class SendReceiveCommand extends DownloadCommand { private async sendRequest( url: string, id: string, - key: Uint8Array + key: Uint8Array, ): Promise { try { const sendResponse = await this.sendApiService.postSendAccess( id, this.sendAccessRequest, - url + url, ); const sendAccess = new SendAccess(sendResponse); diff --git a/apps/cli/src/tools/send/commands/remove-password.command.ts b/apps/cli/src/tools/send/commands/remove-password.command.ts index fe1452b0368..cdfc29be26f 100644 --- a/apps/cli/src/tools/send/commands/remove-password.command.ts +++ b/apps/cli/src/tools/send/commands/remove-password.command.ts @@ -5,7 +5,10 @@ import { Response } from "../../../models/response"; import { SendResponse } from "../models/send.response"; export class SendRemovePasswordCommand { - constructor(private sendService: SendService, private sendApiService: SendApiService) {} + constructor( + private sendService: SendService, + private sendApiService: SendApiService, + ) {} async run(id: string) { try { diff --git a/apps/cli/src/tools/send/send.program.ts b/apps/cli/src/tools/send/send.program.ts index be99fc2ed1f..01c1c00a691 100644 --- a/apps/cli/src/tools/send/send.program.ts +++ b/apps/cli/src/tools/send/send.program.ts @@ -46,24 +46,24 @@ export class SendProgram extends Program { "Work with Bitwarden sends. A Send can be quickly created using this command or subcommands can be used to fine-tune the Send", { data: "The data to Send. Specify as a filepath with the --file option", - } + }, ) .option("-f, --file", "Specifies that is a filepath") .option( "-d, --deleteInDays ", "The number of days in the future to set deletion date, defaults to 7", - "7" + "7", ) .option("-a, --maxAccessCount ", "The amount of max possible accesses.") .option("--hidden", "Hide in web by default. Valid only if --file is not set.") .option( "-n, --name ", - "The name of the Send. Defaults to a guid for text Sends and the filename for files." + "The name of the Send. Defaults to a guid for text Sends and the filename for files.", ) .option("--notes ", "Notes to add to the Send.") .option( "--fullObject", - "Specifies that the full Send object should be returned rather than just the access url." + "Specifies that the full Send object should be returned rather than just the access url.", ) .addCommand(this.listCommand()) .addCommand(this.templateCommand()) @@ -95,14 +95,14 @@ export class SendProgram extends Program { .option("--passwordenv ", "Environment variable storing the Send's password") .option( "--passwordfile ", - "Path to a file containing the Sends password as its first line" + "Path to a file containing the Sends password as its first line", ) .option("--obj", "Return the Send's json object rather than the Send's content") .option("--output ", "Specify a file path to save a File-type Send to") .on("--help", () => { writeLn(""); writeLn( - "If a password is required, the provided password is used or the user is prompted." + "If a password is required, the provided password is used or the user is prompted.", ); writeLn("", true); }) @@ -113,7 +113,7 @@ export class SendProgram extends Program { this.main.cryptoFunctionService, this.main.platformUtilsService, this.main.environmentService, - this.main.sendApiService + this.main.sendApiService, ); const response = await cmd.run(url, options); this.processResponse(response); @@ -132,7 +132,7 @@ export class SendProgram extends Program { const cmd = new SendListCommand( this.main.sendService, this.main.environmentService, - this.main.searchService + this.main.searchService, ); const response = await cmd.run(options); this.processResponse(response); @@ -157,7 +157,7 @@ export class SendProgram extends Program { this.main.searchService, this.main.apiService, this.main.organizationService, - this.main.eventCollectionService + this.main.eventCollectionService, ); const response = await cmd.run("template", object, null); this.processResponse(response); @@ -195,7 +195,7 @@ export class SendProgram extends Program { this.main.sendService, this.main.environmentService, this.main.searchService, - this.main.cryptoService + this.main.cryptoService, ); const response = await cmd.run(id, options); this.processResponse(response); @@ -213,7 +213,7 @@ export class SendProgram extends Program { .option("--hidden", "text hidden flag. Valid only with the --text option.") .option( "--password ", - "optional password to access this Send. Can also be specified in JSON" + "optional password to access this Send. Can also be specified in JSON", ) .on("--help", () => { writeLn(""); @@ -225,7 +225,7 @@ export class SendProgram extends Program { async ( encodedJson: string, options: program.OptionValues, - args: { parent: program.Command } + args: { parent: program.Command }, ) => { // Work-around to support `--fullObject` option for `send create --fullObject` // Calling `option('--fullObject', ...)` above won't work due to Commander doesn't like same option @@ -238,7 +238,7 @@ export class SendProgram extends Program { const response = await this.runCreate(encodedJson, mergedOptions); this.processResponse(response); - } + }, ); } @@ -262,13 +262,13 @@ export class SendProgram extends Program { this.main.sendService, this.main.environmentService, this.main.searchService, - this.main.cryptoService + this.main.cryptoService, ); const cmd = new SendEditCommand( this.main.sendService, this.main.stateService, getCmd, - this.main.sendApiService + this.main.sendApiService, ); const response = await cmd.run(encodedJson, options); this.processResponse(response); @@ -338,7 +338,7 @@ export class SendProgram extends Program { this.main.sendService, this.main.stateService, this.main.environmentService, - this.main.sendApiService + this.main.sendApiService, ); return await cmd.run(encodedJson, options); } diff --git a/apps/cli/src/utils.ts b/apps/cli/src/utils.ts index 77efbb80d4d..29021629b80 100644 --- a/apps/cli/src/utils.ts +++ b/apps/cli/src/utils.ts @@ -69,7 +69,7 @@ export class CliUtils { }, (reason) => { reject(reason); - } + }, ); }); }); @@ -216,7 +216,7 @@ export class CliUtils { static async getPassword( password: string, options: { passwordFile?: string; passwordEnv?: string }, - logService?: LogService + logService?: LogService, ): Promise { if (Utils.isNullOrEmpty(password)) { if (options?.passwordFile) { @@ -243,7 +243,7 @@ export class CliUtils { password = answer.password; } else { return Response.badRequest( - "Master password is required. Try again in interactive mode or provide a password file or environment variable." + "Master password is required. Try again in interactive mode or provide a password file or environment variable.", ); } } diff --git a/apps/cli/src/vault.program.ts b/apps/cli/src/vault.program.ts index 33d74694919..d27aba88292 100644 --- a/apps/cli/src/vault.program.ts +++ b/apps/cli/src/vault.program.ts @@ -47,8 +47,8 @@ export class VaultProgram extends Program { requestedObject + '". Allowed objects are ' + validObjects.join(", ") + - "." - ) + ".", + ), ); } return success; @@ -75,7 +75,7 @@ export class VaultProgram extends Program { .option("--collectionid ", "Filter items by collection id.") .option( "--organizationid ", - "Filter items or collections by organization id." + "Filter items or collections by organization id.", ) .option("--trash", "Filter items that are deleted and in the trash.") .on("--help", () => { @@ -90,13 +90,13 @@ export class VaultProgram extends Program { writeLn(" bw list items"); writeLn(" bw list items --folderid 60556c31-e649-4b5d-8daf-fc1c391a1bf2"); writeLn( - " bw list items --search google --folderid 60556c31-e649-4b5d-8daf-fc1c391a1bf2" + " bw list items --search google --folderid 60556c31-e649-4b5d-8daf-fc1c391a1bf2", ); writeLn(" bw list items --url https://google.com"); writeLn(" bw list items --folderid null"); writeLn(" bw list items --organizationid notnull"); writeLn( - " bw list items --folderid 60556c31-e649-4b5d-8daf-fc1c391a1bf2 --organizationid notnull" + " bw list items --folderid 60556c31-e649-4b5d-8daf-fc1c391a1bf2 --organizationid notnull", ); writeLn(" bw list items --trash"); writeLn(" bw list folders --search email"); @@ -117,7 +117,7 @@ export class VaultProgram extends Program { this.main.searchService, this.main.organizationUserService, this.main.apiService, - this.main.eventCollectionService + this.main.eventCollectionService, ); const response = await command.run(object, cmd); @@ -165,10 +165,10 @@ export class VaultProgram extends Program { writeLn(" bw get exposed yahoo.com"); writeLn( " bw get attachment b857igwl1dzrs2 --itemid 99ee88d2-6046-4ea7-92c2-acac464b1412 " + - "--output ./photo.jpg" + "--output ./photo.jpg", ); writeLn( - " bw get attachment photo.jpg --itemid 99ee88d2-6046-4ea7-92c2-acac464b1412 --raw" + " bw get attachment photo.jpg --itemid 99ee88d2-6046-4ea7-92c2-acac464b1412 --raw", ); writeLn(" bw get folder email"); writeLn(" bw get template folder"); @@ -191,7 +191,7 @@ export class VaultProgram extends Program { this.main.searchService, this.main.apiService, this.main.organizationService, - this.main.eventCollectionService + this.main.eventCollectionService, ); const response = await command.run(object, id, cmd); this.processResponse(response); @@ -216,7 +216,7 @@ export class VaultProgram extends Program { writeLn(" echo 'eyJuYW1lIjoiTXkgRm9sZGVyIn0K' | bw create folder"); writeLn( " bw create attachment --file ./myfile.csv " + - "--itemid 16b15b89-65b3-4639-ad2a-95052a6d8f66" + "--itemid 16b15b89-65b3-4639-ad2a-95052a6d8f66", ); writeLn("", true); }) @@ -232,7 +232,7 @@ export class VaultProgram extends Program { this.main.stateService, this.main.cryptoService, this.main.apiService, - this.main.folderApiService + this.main.folderApiService, ); const response = await command.run(object, encodedJson, cmd); this.processResponse(response); @@ -253,15 +253,15 @@ export class VaultProgram extends Program { writeLn("\n Examples:"); writeLn(""); writeLn( - " bw edit folder 5cdfbd80-d99f-409b-915b-f4c5d0241b02 eyJuYW1lIjoiTXkgRm9sZGVyMiJ9Cg==" + " bw edit folder 5cdfbd80-d99f-409b-915b-f4c5d0241b02 eyJuYW1lIjoiTXkgRm9sZGVyMiJ9Cg==", ); writeLn( " echo 'eyJuYW1lIjoiTXkgRm9sZGVyMiJ9Cg==' | " + - "bw edit folder 5cdfbd80-d99f-409b-915b-f4c5d0241b02" + "bw edit folder 5cdfbd80-d99f-409b-915b-f4c5d0241b02", ); writeLn( " bw edit item-collections 78307355-fd25-416b-88b8-b33fd0e88c82 " + - "WyI5NzQwNTNkMC0zYjMzLTRiOTgtODg2ZS1mZWNmNWM4ZGJhOTYiXQ==" + "WyI5NzQwNTNkMC0zYjMzLTRiOTgtODg2ZS1mZWNmNWM4ZGJhOTYiXQ==", ); writeLn("", true); }) @@ -276,7 +276,7 @@ export class VaultProgram extends Program { this.main.folderService, this.main.cryptoService, this.main.apiService, - this.main.folderApiService + this.main.folderApiService, ); const response = await command.run(object, id, encodedJson, cmd); this.processResponse(response); @@ -295,7 +295,7 @@ export class VaultProgram extends Program { .option("--organizationid ", "Organization id for an organization object.") .option( "-p, --permanent", - "Permanently deletes the item instead of soft-deleting it (item only)." + "Permanently deletes the item instead of soft-deleting it (item only).", ) .on("--help", () => { writeLn("\n Examples:"); @@ -304,7 +304,7 @@ export class VaultProgram extends Program { writeLn(" bw delete item 89c21cd2-fab0-4f69-8c6e-ab8a0168f69a --permanent"); writeLn(" bw delete folder 5cdfbd80-d99f-409b-915b-f4c5d0241b02"); writeLn( - " bw delete attachment b857igwl1dzrs2 --itemid 310d5ffd-e9a2-4451-af87-ea054dce0f78" + " bw delete attachment b857igwl1dzrs2 --itemid 310d5ffd-e9a2-4451-af87-ea054dce0f78", ); writeLn("", true); }) @@ -319,7 +319,7 @@ export class VaultProgram extends Program { this.main.folderService, this.main.stateService, this.main.apiService, - this.main.folderApiService + this.main.folderApiService, ); const response = await command.run(object, id, cmd); this.processResponse(response); @@ -367,13 +367,13 @@ export class VaultProgram extends Program { " bw " + commandName + " 4af958ce-96a7-45d9-beed-1e70fabaa27a " + - "6d82949b-b44d-468a-adae-3f3bacb0ea32 WyI5NzQwNTNkMC0zYjMzLTRiOTgtODg2ZS1mZWNmNWM4ZGJhOTYiXQ==" + "6d82949b-b44d-468a-adae-3f3bacb0ea32 WyI5NzQwNTNkMC0zYjMzLTRiOTgtODg2ZS1mZWNmNWM4ZGJhOTYiXQ==", ); writeLn( " echo '[\"974053d0-3b33-4b98-886e-fecf5c8dba96\"]' | bw encode | " + "bw " + commandName + - " 4af958ce-96a7-45d9-beed-1e70fabaa27a 6d82949b-b44d-468a-adae-3f3bacb0ea32" + " 4af958ce-96a7-45d9-beed-1e70fabaa27a 6d82949b-b44d-468a-adae-3f3bacb0ea32", ); if (deprecated) { writeLn(""); @@ -403,7 +403,7 @@ export class VaultProgram extends Program { writeLn(""); writeLn( " bw confirm org-member 7063feab-4b10-472e-b64c-785e2b870b92 " + - "--organizationid 310d5ffd-e9a2-4451-af87-ea054dce0f78" + "--organizationid 310d5ffd-e9a2-4451-af87-ea054dce0f78", ); writeLn("", true); }) @@ -416,7 +416,7 @@ export class VaultProgram extends Program { const command = new ConfirmCommand( this.main.apiService, this.main.cryptoService, - this.main.organizationUserService + this.main.organizationUserService, ); const response = await command.run(object, id, cmd); this.processResponse(response); @@ -439,7 +439,7 @@ export class VaultProgram extends Program { writeLn(" bw import bitwardencsv ./from/source.csv"); writeLn(" bw import keepass2xml keepass_backup.xml"); writeLn( - " bw import --organizationid cf14adc3-aca5-4573-890a-f6fa231436d9 keepass2xml keepass_backup.xml" + " bw import --organizationid cf14adc3-aca5-4573-890a-f6fa231436d9 keepass2xml keepass_backup.xml", ); }) .action(async (format, filepath, options) => { @@ -447,7 +447,7 @@ export class VaultProgram extends Program { const command = new ImportCommand( this.main.importService, this.main.organizationService, - this.main.syncService + this.main.syncService, ); const response = await command.run(format, filepath, options); this.processResponse(response); @@ -461,18 +461,18 @@ export class VaultProgram extends Program { .option("--format ", "Export file format.") .option( "--password [password]", - "Use password to encrypt instead of your Bitwarden account encryption key. Only applies to the encrypted_json format." + "Use password to encrypt instead of your Bitwarden account encryption key. Only applies to the encrypted_json format.", ) .option("--organizationid ", "Organization id for an organization.") .on("--help", () => { writeLn("\n Notes:"); writeLn(""); writeLn( - " Valid formats are `csv`, `json`, and `encrypted_json`. Default format is `csv`." + " Valid formats are `csv`, `json`, and `encrypted_json`. Default format is `csv`.", ); writeLn(""); writeLn( - " If --raw option is specified and no output filename or directory is given, the" + " If --raw option is specified and no output filename or directory is given, the", ); writeLn(" result is written to stdout."); writeLn(""); @@ -485,7 +485,7 @@ export class VaultProgram extends Program { writeLn(" bw export --output ./exp/bw.csv"); writeLn(" bw export myPassword321 --output bw.json --format json"); writeLn( - " bw export myPassword321 --organizationid 7063feab-4b10-472e-b64c-785e2b870b92" + " bw export myPassword321 --organizationid 7063feab-4b10-472e-b64c-785e2b870b92", ); writeLn("", true); }) @@ -494,7 +494,7 @@ export class VaultProgram extends Program { const command = new ExportCommand( this.main.exportService, this.main.policyService, - this.main.eventCollectionService + this.main.eventCollectionService, ); const response = await command.run(options); this.processResponse(response); diff --git a/apps/cli/src/vault/create.command.ts b/apps/cli/src/vault/create.command.ts index fcef368d53d..a3d16abee4a 100644 --- a/apps/cli/src/vault/create.command.ts +++ b/apps/cli/src/vault/create.command.ts @@ -29,14 +29,14 @@ export class CreateCommand { private stateService: StateService, private cryptoService: CryptoService, private apiService: ApiService, - private folderApiService: FolderApiServiceAbstraction + private folderApiService: FolderApiServiceAbstraction, ) {} async run( object: string, requestJson: string, cmdOptions: Record, - additionalData: any = null + additionalData: any = null, ): Promise { let req: any = null; if (object !== "attachment") { @@ -81,7 +81,7 @@ export class CreateCommand { await this.cipherService.createWithServer(cipher); const newCipher = await this.cipherService.get(cipher.id); const decCipher = await newCipher.decrypt( - await this.cipherService.getKeyForCipherKeyDecryption(newCipher) + await this.cipherService.getKeyForCipherKeyDecryption(newCipher), ); const res = new CipherResponse(decCipher); return Response.success(res); @@ -132,7 +132,7 @@ export class CreateCommand { if (userKey == null) { return Response.error( "You must update your encryption key before you can use this feature. " + - "See https://help.bitwarden.com/article/update-encryption-key/" + "See https://help.bitwarden.com/article/update-encryption-key/", ); } @@ -140,11 +140,11 @@ export class CreateCommand { await this.cipherService.saveAttachmentRawWithServer( cipher, fileName, - new Uint8Array(fileBuf).buffer + new Uint8Array(fileBuf).buffer, ); const updatedCipher = await this.cipherService.get(cipher.id); const decCipher = await updatedCipher.decrypt( - await this.cipherService.getKeyForCipherKeyDecryption(updatedCipher) + await this.cipherService.getKeyForCipherKeyDecryption(updatedCipher), ); return Response.success(new CipherResponse(decCipher)); } catch (e) { @@ -185,7 +185,7 @@ export class CreateCommand { req.groups == null ? null : req.groups.map( - (g) => new SelectionReadOnlyRequest(g.id, g.readOnly, g.hidePasswords, g.manage) + (g) => new SelectionReadOnlyRequest(g.id, g.readOnly, g.hidePasswords, g.manage), ); const request = new CollectionRequest(); request.name = (await this.cryptoService.encrypt(req.name, orgKey)).encryptedString; diff --git a/apps/cli/src/vault/delete.command.ts b/apps/cli/src/vault/delete.command.ts index 12b8ae415f8..c9d0f542ada 100644 --- a/apps/cli/src/vault/delete.command.ts +++ b/apps/cli/src/vault/delete.command.ts @@ -14,7 +14,7 @@ export class DeleteCommand { private folderService: FolderService, private stateService: StateService, private apiService: ApiService, - private folderApiService: FolderApiServiceAbstraction + private folderApiService: FolderApiServiceAbstraction, ) {} async run(object: string, id: string, cmdOptions: Record): Promise { diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock index 75e8e076f21..2766e5542bd 100644 --- a/apps/desktop/desktop_native/Cargo.lock +++ b/apps/desktop/desktop_native/Cargo.lock @@ -3,10 +3,25 @@ version = 3 [[package]] -name = "aes" -version = "0.8.2" +name = "addr2line" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if", "cipher", @@ -15,18 +30,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arboard" @@ -52,10 +67,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "base64" -version = "0.21.2" +name = "backtrace" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bitflags" @@ -65,9 +95,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "block" @@ -191,9 +221,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -210,19 +240,19 @@ dependencies = [ [[package]] name = "ctor" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f34ba9a9bcb8645379e9de8cb3ecfcf4d1c85ba66d90deb3259206fa5aa193b" +checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" dependencies = [ "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "cxx" -version = "1.0.107" +version = "1.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe98ba1789d56fb3db3bee5e032774d4f421b685de7ba703643584ba24effbe" +checksum = "7129e341034ecb940c9072817cd9007974ea696844fc4dd582dc1653a7fbe2e8" dependencies = [ "cc", "cxxbridge-flags", @@ -232,9 +262,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.97" +version = "1.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0c11acd0e63bae27dcd2afced407063312771212b7a823b4fd72d633be30fb" +checksum = "a2a24f3f5f8eed71936f21e570436f024f5c2e25628f7496aa7ccd03b90109d5" dependencies = [ "cc", "codespan-reporting", @@ -242,24 +272,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "cxxbridge-flags" -version = "1.0.107" +version = "1.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20888d9e1d2298e2ff473cee30efe7d5036e437857ab68bbfea84c74dba91da2" +checksum = "06fdd177fc61050d63f67f5bd6351fac6ab5526694ea8e359cd9cd3b75857f44" [[package]] name = "cxxbridge-macro" -version = "1.0.107" +version = "1.0.110" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa16a70dd58129e4dfffdff535fb1bce66673f7bbeec4a5a1765a504e1ccd84" +checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -319,24 +349,24 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -345,32 +375,32 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-core", "futures-macro", @@ -412,12 +442,17 @@ dependencies = [ ] [[package]] -name = "gio" -version = "0.17.9" +name = "gimli" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14522e56c6bcb6f7a3aebc25cbcfb06776af4c0c25232b601b4383252d7cb92" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "gio" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524" dependencies = [ - "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", @@ -433,9 +468,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ccf87c30a12c469b6d958950f6a9c09f2be20b7773f7e70d20b867fdf2628c3" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ "glib-sys", "gobject-sys", @@ -446,11 +481,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.17.10" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fad45ba8d4d2cea612b432717e834f48031cd8853c8aaf43b2c79fec8d144b" +checksum = "1c316afb01ce8067c5eaab1fc4f2cd47dc21ce7b6296358605e2ffab23ccbd19" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "futures-channel", "futures-core", "futures-executor", @@ -469,24 +504,23 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.17.10" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca5c79337338391f1ab8058d6698125034ce8ef31b72a442437fa6c8580de26" +checksum = "f8da903822b136d42360518653fcf154455defc437d3e7a81475bf9a95ff1e47" dependencies = [ - "anyhow", "heck", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "glib-sys" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d80aa6ea7bba0baac79222204aa786a6293078c210abe69ef1336911d4bdc4f0" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc", "system-deps", @@ -494,9 +528,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd34c3317740a6358ec04572c1bcfd3ac0b5b6529275fae255b237b314bb8062" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ "glib-sys", "libc", @@ -505,9 +539,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" [[package]] name = "heck" @@ -523,9 +557,9 @@ checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", "hashbrown", @@ -564,9 +598,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.148" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" @@ -580,23 +614,21 @@ dependencies = [ [[package]] name = "libsecret" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accb700635d0b1b296d83c93fa5d112400168d04481db0ccca946293af9f0206" +checksum = "ac6fae6ebe590e06ef9d01b125e46b7d4c05ccbd5961f12b4aefe2ecd010220f" dependencies = [ - "bitflags 1.3.2", "gio", "glib", "libc", "libsecret-sys", - "once_cell", ] [[package]] name = "libsecret-sys" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b06012ca123d27ccceffa112d0f930c23eb549a2447dc710e99f5dc2d1040b2" +checksum = "9b716fc5e1c82eb0d28665882628382ab0e0a156a6d73580e33f0ac6ac8d2540" dependencies = [ "gio-sys", "glib-sys", @@ -617,9 +649,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -642,9 +674,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -656,10 +688,19 @@ dependencies = [ ] [[package]] -name = "mio" -version = "0.8.8" +name = "miniz_oxide" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "wasi", @@ -668,11 +709,11 @@ dependencies = [ [[package]] name = "napi" -version = "2.13.1" +version = "2.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f0a2e93526dd9c8c522d72a4d0c88678be8966fabe9fb8f2947fde6339b682" +checksum = "fd063c93b900149304e3ba96ce5bf210cd4f81ef5eb80ded0d100df3e85a3ac0" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "ctor", "napi-derive", "napi-sys", @@ -776,10 +817,19 @@ dependencies = [ ] [[package]] -name = "once_cell" -version = "1.16.0" +name = "object" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "parking_lot" @@ -793,9 +843,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", @@ -835,7 +885,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] @@ -864,9 +914,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -912,18 +962,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -933,9 +983,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -944,9 +994,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "retry" @@ -958,10 +1008,16 @@ dependencies = [ ] [[package]] -name = "scopeguard" -version = "1.1.0" +name = "rustc-demangle" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scratch" @@ -971,9 +1027,9 @@ checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -984,9 +1040,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -994,44 +1050,44 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -1064,12 +1120,12 @@ checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "socket2" -version = "0.4.9" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "winapi", + "windows-sys", ] [[package]] @@ -1091,9 +1147,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -1102,9 +1158,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.1" +version = "6.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "94af52f9402f94aac4948a2518b43359be8d9ce6cd9efc1c4de3b2f7b7e897d6" dependencies = [ "cfg-expr", "heck", @@ -1115,9 +1171,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "termcolor" @@ -1130,31 +1186,31 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "tokio" -version = "1.28.2" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", @@ -1175,26 +1231,26 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] name = "toml" -version = "0.7.8" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.20.7", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -1204,6 +1260,17 @@ name = "toml_edit" version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ "indexmap", "serde", @@ -1302,9 +1369,19 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.48.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core", + "windows-targets", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets", ] @@ -1377,9 +1454,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] diff --git a/apps/desktop/desktop_native/Cargo.toml b/apps/desktop/desktop_native/Cargo.toml index 9dd36d32040..7d789461758 100644 --- a/apps/desktop/desktop_native/Cargo.toml +++ b/apps/desktop/desktop_native/Cargo.toml @@ -13,19 +13,19 @@ default = [] manual_test = [] [dependencies] -aes = "=0.8.2" -anyhow = "=1.0.71" +aes = "=0.8.3" +anyhow = "=1.0.75" arboard = { version = "=3.2.1", default-features = false } -base64 = "=0.21.2" +base64 = "=0.21.4" cbc = { version = "=0.1.2", features = ["alloc"] } -napi = { version = "=2.13.1", features = ["async"] } +napi = { version = "=2.13.3", 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.28.2", features = ["full"] } +scopeguard = "=1.2.0" +sha2 = "=0.10.7" +thiserror = "=1.0.48" +tokio = { version = "=1.32.0", features = ["full"] } typenum = "=1.16.0" [build-dependencies] @@ -33,7 +33,7 @@ napi-build = "=2.0.1" [target.'cfg(windows)'.dependencies] widestring = "=1.0.2" -windows = { version = "=0.48.0", features = [ +windows = { version = "=0.51.1", features = [ "Foundation", "Security_Credentials_UI", "Security_Cryptography", @@ -50,9 +50,9 @@ keytar = "=0.1.6" [target.'cfg(target_os = "macos")'.dependencies] core-foundation = "=0.9.3" -security-framework = "=2.9.1" -security-framework-sys = "=2.9.0" +security-framework = "=2.9.2" +security-framework-sys = "=2.9.1" [target.'cfg(target_os = "linux")'.dependencies] -gio = "=0.17.9" -libsecret = "=0.3.0" +gio = "=0.18.1" +libsecret = "=0.4.0" diff --git a/apps/desktop/desktop_native/src/biometric/windows.rs b/apps/desktop/desktop_native/src/biometric/windows.rs index 54abea7281c..cb3b69273dd 100644 --- a/apps/desktop/desktop_native/src/biometric/windows.rs +++ b/apps/desktop/desktop_native/src/biometric/windows.rs @@ -7,8 +7,7 @@ use rand::RngCore; use retry::delay::Fixed; use sha2::{Digest, Sha256}; use windows::{ - core::{factory, HSTRING}, - h, + core::{factory, h, s, HSTRING}, Foundation::IAsyncOperation, Security::{ Credentials::{ @@ -202,7 +201,7 @@ fn focus_security_prompt() -> Result<()> { retry::OperationResult::Retry(()) } - let class_name = windows::s!("Credential Dialog Xaml Host"); + let class_name = s!("Credential Dialog Xaml Host"); retry::retry_with_index(Fixed::from_millis(500), |current_try| { if current_try > 3 { return retry::OperationResult::Err(()); diff --git a/apps/desktop/desktop_native/src/password/windows.rs b/apps/desktop/desktop_native/src/password/windows.rs index 9a92ae7cc85..97d5bbc66c7 100644 --- a/apps/desktop/desktop_native/src/password/windows.rs +++ b/apps/desktop/desktop_native/src/password/windows.rs @@ -3,7 +3,7 @@ use widestring::{U16CString, U16String}; use windows::{ core::{PCWSTR, PWSTR}, Win32::{ - Foundation::{GetLastError, ERROR_NOT_FOUND, FILETIME, WIN32_ERROR}, + Foundation::{ERROR_NOT_FOUND, FILETIME}, Security::Credentials::{ CredDeleteW, CredFree, CredReadW, CredWriteW, CREDENTIALW, CRED_FLAGS, CRED_PERSIST_ENTERPRISE, CRED_TYPE_GENERIC, @@ -32,9 +32,7 @@ pub fn get_password<'a>(service: &str, account: &str) -> Result { unsafe { CredFree(credential as *mut _) }; }); - if !result.as_bool() { - return Err(anyhow!(convert_error(unsafe { GetLastError() }))); - } + result.map_err(|e| anyhow!(convert_error(e)))?; let password = unsafe { U16String::from_ptr( @@ -67,9 +65,7 @@ pub fn get_password_keytar<'a>(service: &str, account: &str) -> Result { unsafe { CredFree(credential as *mut _) }; }); - if !result.as_bool() { - return Err(anyhow!(unsafe { GetLastError() }.0.to_string())); - } + result?; let password = unsafe { std::str::from_utf8_unchecked(std::slice::from_raw_parts( @@ -107,10 +103,7 @@ pub fn set_password(service: &str, account: &str, password: &str) -> Result<()> UserName: PWSTR(user_name.as_mut_ptr()), }; - let result = unsafe { CredWriteW(&credential, 0) }; - if !result.as_bool() { - return Err(anyhow!(unsafe { GetLastError() }.0.to_string())); - } + unsafe { CredWriteW(&credential, 0) }?; Ok(()) } @@ -123,8 +116,7 @@ pub fn delete_password(service: &str, account: &str) -> Result<()> { PCWSTR(target_name.as_ptr()), CRED_TYPE_GENERIC.0, CRED_FLAGS_NONE, - ) - .ok()? + )? }; Ok(()) @@ -135,11 +127,11 @@ fn target_name(service: &str, account: &str) -> String { } // Convert the internal WIN32 errors to descriptive messages -fn convert_error(code: WIN32_ERROR) -> String { - match code { - ERROR_NOT_FOUND => String::from("Password not found."), - _ => code.0.to_string(), +fn convert_error(e: windows::core::Error) -> String { + if e == ERROR_NOT_FOUND.into() { + return "Password not found.".to_string(); } + e.to_string() } #[cfg(test)] diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json index 69d1c0074fa..a12870bd96f 100644 --- a/apps/desktop/electron-builder.json +++ b/apps/desktop/electron-builder.json @@ -19,7 +19,7 @@ "**/node_modules/@bitwarden/desktop-native/index.js", "**/node_modules/@bitwarden/desktop-native/desktop_native.${platform}-${arch}*.node" ], - "electronVersion": "25.9.1", + "electronVersion": "27.1.3", "generateUpdatesFilesForAllChannels": true, "publish": { "provider": "generic", diff --git a/apps/desktop/native-messaging-test-runner/package-lock.json b/apps/desktop/native-messaging-test-runner/package-lock.json index a30da02ad9e..5575d5ca154 100644 --- a/apps/desktop/native-messaging-test-runner/package-lock.json +++ b/apps/desktop/native-messaging-test-runner/package-lock.json @@ -19,7 +19,7 @@ }, "devDependencies": { "@tsconfig/node16": "1.0.4", - "@types/node": "18.17.5", + "@types/node": "18.19.2", "@types/node-ipc": "9.2.0", "typescript": "4.7.4" } @@ -99,9 +99,12 @@ "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==" }, "node_modules/@types/node": { - "version": "18.17.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.5.tgz", - "integrity": "sha512-xNbS75FxH6P4UXTPUJp/zNPq6/xsfdJKussCWNOnz4aULWIRwMgP1LgaB5RiBnMX1DPCYenuqGZfnIAx5mbFLA==" + "version": "18.19.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.2.tgz", + "integrity": "sha512-6wzfBdbWpe8QykUkXBjtmO3zITA0A3FIjoy+in0Y2K4KrCiRhNYJIdwAPDffZ3G6GnaKaSLSEa9ZuORLfEoiwg==", + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/node-ipc": { "version": "9.2.0", @@ -373,6 +376,11 @@ "node": ">=4.2.0" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" + }, "node_modules/uuid": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", diff --git a/apps/desktop/native-messaging-test-runner/package.json b/apps/desktop/native-messaging-test-runner/package.json index cd848a9768a..ebe665aaf4f 100644 --- a/apps/desktop/native-messaging-test-runner/package.json +++ b/apps/desktop/native-messaging-test-runner/package.json @@ -24,7 +24,7 @@ }, "devDependencies": { "@tsconfig/node16": "1.0.4", - "@types/node": "18.17.5", + "@types/node": "18.19.2", "@types/node-ipc": "9.2.0", "typescript": "4.7.4" }, diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts index 4fee93d21db..6a37904fdc3 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts @@ -25,7 +25,7 @@ const { name } = argv; LogUtils.logInfo("Sending Handshake"); const handshakeResponse = await nativeMessageService.sendHandshake( config.testRsaPublicKey, - config.applicationName + config.applicationName, ); if (!handshakeResponse.status) { diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-retrieval.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-retrieval.ts index 783d7c404a0..17f3dd00c89 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-retrieval.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-retrieval.ts @@ -24,7 +24,7 @@ const { uri } = argv; LogUtils.logInfo("Sending Handshake"); const handshakeResponse = await nativeMessageService.sendHandshake( config.testRsaPublicKey, - config.applicationName + config.applicationName, ); if (!handshakeResponse.status) { diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts index 7d685c7f026..559175b168c 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts @@ -49,7 +49,7 @@ const { name, username, password, uri, credentialId } = argv; LogUtils.logInfo("Sending Handshake"); const handshakeResponse = await nativeMessageService.sendHandshake( config.testRsaPublicKey, - config.applicationName + config.applicationName, ); if (!handshakeResponse.status) { diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-generate-password.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-generate-password.ts index c3796b43cf9..d59fb083f3b 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-generate-password.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-generate-password.ts @@ -24,7 +24,7 @@ const { userId } = argv; LogUtils.logInfo("Sending Handshake"); const handshakeResponse = await nativeMessageService.sendHandshake( config.testRsaPublicKey, - config.applicationName + config.applicationName, ); if (!handshakeResponse.status) { diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-handshake.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-handshake.ts index 129e1fca170..68c58763570 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-handshake.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-handshake.ts @@ -11,7 +11,7 @@ import * as config from "../variables"; const response = await nativeMessageService.sendHandshake( config.testRsaPublicKey, - config.applicationName + config.applicationName, ); LogUtils.logSuccess("Received response to handshake request"); if (response.status) { diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-status.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-status.ts index e7789edd1d2..3e431b9910d 100644 --- a/apps/desktop/native-messaging-test-runner/src/commands/bw-status.ts +++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-status.ts @@ -12,7 +12,7 @@ import * as config from "../variables"; LogUtils.logInfo("Sending Handshake"); const handshakeResponse = await nativeMessageService.sendHandshake( config.testRsaPublicKey, - config.applicationName + config.applicationName, ); LogUtils.logSuccess("Received response to handshake request"); diff --git a/apps/desktop/native-messaging-test-runner/src/ipc.service.ts b/apps/desktop/native-messaging-test-runner/src/ipc.service.ts index 3fd4353b220..be79f6939a8 100644 --- a/apps/desktop/native-messaging-test-runner/src/ipc.service.ts +++ b/apps/desktop/native-messaging-test-runner/src/ipc.service.ts @@ -37,7 +37,10 @@ export default class IPCService { // A set of deferred promises that are awaiting socket connection private awaitingConnection = new Set>(); - constructor(private socketName: string, private messageHandler: MessageHandler) {} + constructor( + private socketName: string, + private messageHandler: MessageHandler, + ) {} async connect(): Promise { console.log("[IPCService] connecting..."); @@ -75,7 +78,7 @@ export default class IPCService { // invoked multiple times each time a connection error happens console.log("[IPCService] errored"); console.log( - "\x1b[33m Please make sure the desktop app is running locally and 'Allow DuckDuckGo browser integration' setting is enabled \x1b[0m" + "\x1b[33m Please make sure the desktop app is running locally and 'Allow DuckDuckGo browser integration' setting is enabled \x1b[0m", ); this.awaitingConnection.forEach((deferred) => { console.log(`rejecting: ${deferred}`); @@ -110,7 +113,7 @@ export default class IPCService { async sendMessage( message: MessageCommon, - options: IPCOptions = {} + options: IPCOptions = {}, ): Promise { console.log("[IPCService] sendMessage"); if (this.pendingMessages.has(message.messageId)) { 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 4782389b7f8..8cc94c96191 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 @@ -44,7 +44,7 @@ export default class NativeMessageService { this.encryptService = new EncryptServiceImplementation( this.nodeCryptoFunctionService, new ConsoleLogService(false), - false + false, ); } @@ -61,7 +61,7 @@ export default class NativeMessageService { }, { overrideTimeout: CONFIRMATION_MESSAGE_TIMEOUT, - } + }, ); return rawResponse.payload as HandshakeResponse; } @@ -71,7 +71,7 @@ export default class NativeMessageService { { command: "bw-status", }, - key + key, ); const response = await this.sendEncryptedMessage({ @@ -89,7 +89,7 @@ export default class NativeMessageService { uri: uri, }, }, - key + key, ); const response = await this.sendEncryptedMessage({ encryptedCommand, @@ -100,14 +100,14 @@ export default class NativeMessageService { async credentialCreation( key: string, - credentialData: CredentialCreatePayload + credentialData: CredentialCreatePayload, ): Promise { const encryptedCommand = await this.encryptCommandData( { command: "bw-credential-create", payload: credentialData, }, - key + key, ); const response = await this.sendEncryptedMessage({ encryptedCommand, @@ -118,14 +118,14 @@ export default class NativeMessageService { async credentialUpdate( key: string, - credentialData: CredentialUpdatePayload + credentialData: CredentialUpdatePayload, ): Promise { const encryptedCommand = await this.encryptCommandData( { command: "bw-credential-update", payload: credentialData, }, - key + key, ); const response = await this.sendEncryptedMessage({ encryptedCommand, @@ -142,7 +142,7 @@ export default class NativeMessageService { userId: userId, }, }, - key + key, ); const response = await this.sendEncryptedMessage({ encryptedCommand, @@ -155,7 +155,7 @@ export default class NativeMessageService { private async sendEncryptedMessage( message: Omit, - options: IPCOptions = {} + options: IPCOptions = {}, ): Promise { const result = await this.sendMessage(message, options); return result as EncryptedMessageResponse; @@ -163,7 +163,7 @@ export default class NativeMessageService { private async sendUnencryptedMessage( message: Omit, - options: IPCOptions = {} + options: IPCOptions = {}, ): Promise { const result = await this.sendMessage(message, options); return result as UnencryptedMessageResponse; @@ -173,7 +173,7 @@ export default class NativeMessageService { message: | Omit | Omit, - options: IPCOptions + options: IPCOptions, ): Promise { // Attempt to connect before sending any messages. If the connection has already // been made, this is a NOOP within the IPCService. @@ -205,7 +205,7 @@ export default class NativeMessageService { // Data Encryption private async encryptCommandData( commandData: DecryptedCommandData, - key: string + key: string, ): Promise { const commandDataString = JSON.stringify(commandData); @@ -216,7 +216,7 @@ export default class NativeMessageService { private async decryptResponsePayload( payload: EncString, - key: string + key: string, ): Promise { const sharedKey = await this.getSharedKeyForKey(key); const decrypted = await this.encryptService.decryptToUtf8(payload, sharedKey); @@ -229,7 +229,7 @@ export default class NativeMessageService { const privKey = Utils.fromB64ToArray(config.testRsaPrivateKey); return new SymmetricCryptoKey( - await this.nodeCryptoFunctionService.rsaDecrypt(dataBuffer, privKey, "sha1") + await this.nodeCryptoFunctionService.rsaDecrypt(dataBuffer, privKey, "sha1"), ); } } diff --git a/apps/desktop/package.json b/apps/desktop/package.json index e74570f020b..c42768eef7a 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.10.2", + "version": "2023.12.1", "keywords": [ "bitwarden", "password", diff --git a/apps/desktop/scripts/after-sign.js b/apps/desktop/scripts/after-sign.js index 0b181f90f62..97815bc8b9b 100644 --- a/apps/desktop/scripts/after-sign.js +++ b/apps/desktop/scripts/after-sign.js @@ -24,7 +24,7 @@ async function run(context) { fse.mkdirSync(path.join(appPath, "Contents/PlugIns")); fse.copySync( path.join(plugIn, "safari.appex"), - path.join(appPath, "Contents/PlugIns/safari.appex") + path.join(appPath, "Contents/PlugIns/safari.appex"), ); // Resign to sign safari extension @@ -32,7 +32,7 @@ async function run(context) { const masBuildOptions = deepAssign( {}, context.packager.platformSpecificBuildOptions, - context.packager.config.mas + context.packager.config.mas, ); if (context.targets.some((e) => e.name === "mas-dev")) { deepAssign(masBuildOptions, { diff --git a/apps/desktop/scripts/start.js b/apps/desktop/scripts/start.js index 388bf09405c..c1a2fb3cffc 100644 --- a/apps/desktop/scripts/start.js +++ b/apps/desktop/scripts/start.js @@ -26,7 +26,7 @@ concurrently( { name: "Elec", command: `npx wait-on ./build/main.js && npx electron --inspect=5858 ${args.join( - " " + " ", )} ./build --watch`, prefixColor: "green", }, @@ -35,5 +35,5 @@ concurrently( prefix: "name", outputStream: process.stdout, killOthers: ["success", "failure"], - } + }, ); diff --git a/apps/desktop/sign.js b/apps/desktop/sign.js index fe57a1343a2..74c63932306 100644 --- a/apps/desktop/sign.js +++ b/apps/desktop/sign.js @@ -16,7 +16,7 @@ exports.default = async function (configuration) { `${configuration.path}`, { stdio: "inherit", - } + }, ); } }; diff --git a/apps/desktop/src/app/accounts/settings.component.html b/apps/desktop/src/app/accounts/settings.component.html index c3087809c06..7a61a55ccff 100644 --- a/apps/desktop/src/app/accounts/settings.component.html +++ b/apps/desktop/src/app/accounts/settings.component.html @@ -4,7 +4,7 @@

- {{ "settingsTitle" | i18n : currentUserEmail }} + {{ "settingsTitle" | i18n: currentUserEmail }}

@@ -34,20 +34,17 @@ {{ "vaultTimeoutPolicyWithActionInEffect" - | i18n - : policy.timeout.hours - : policy.timeout.minutes - : (policy.action | i18n) + | i18n: policy.timeout.hours : policy.timeout.minutes : (policy.action | i18n) }} {{ "vaultTimeoutPolicyInEffect" - | i18n : policy.timeout.hours : policy.timeout.minutes + | i18n: policy.timeout.hours : policy.timeout.minutes }} - {{ "vaultTimeoutActionPolicyInEffect" | i18n : (policy.action | i18n) }} + {{ "vaultTimeoutActionPolicyInEffect" | i18n: (policy.action | i18n) }} this.vaultTimeoutSettingsService.availableVaultTimeoutActions$()) + switchMap(() => this.vaultTimeoutSettingsService.availableVaultTimeoutActions$()), ); // Load timeout policy @@ -227,7 +227,7 @@ export class SettingsComponent implements OnInit { } else { this.form.controls.vaultTimeoutAction.enable({ emitEvent: false }); } - }) + }), ); // Load initial values @@ -237,7 +237,7 @@ export class SettingsComponent implements OnInit { const initialValues = { vaultTimeout: await this.vaultTimeoutSettingsService.getVaultTimeout(), vaultTimeoutAction: await firstValueFrom( - this.vaultTimeoutSettingsService.vaultTimeoutAction$() + this.vaultTimeoutSettingsService.vaultTimeoutAction$(), ), pin: this.userHasPinSet, biometric: await this.vaultTimeoutSettingsService.isBiometricLockSet(), @@ -283,7 +283,7 @@ export class SettingsComponent implements OnInit { this.refreshTimeoutSettings$ .pipe( switchMap(() => this.vaultTimeoutSettingsService.vaultTimeoutAction$()), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe((action) => { this.form.controls.vaultTimeoutAction.setValue(action, { emitEvent: false }); @@ -296,7 +296,7 @@ export class SettingsComponent implements OnInit { concatMap(async (value) => { await this.saveVaultTimeout(value); }), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe(); @@ -305,7 +305,7 @@ export class SettingsComponent implements OnInit { concatMap(async (action) => { await this.saveVaultTimeoutAction(action); }), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe(); @@ -315,7 +315,7 @@ export class SettingsComponent implements OnInit { await this.updatePin(value); this.refreshTimeoutSettings$.next(); }), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe(); @@ -325,7 +325,7 @@ export class SettingsComponent implements OnInit { await this.updateBiometric(enabled); this.refreshTimeoutSettings$.next(); }), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe(); @@ -363,7 +363,7 @@ export class SettingsComponent implements OnInit { this.platformUtilsService.showToast( "error", null, - this.i18nService.t("vaultTimeoutTooLarge") + this.i18nService.t("vaultTimeoutTooLarge"), ); return; } @@ -372,7 +372,7 @@ export class SettingsComponent implements OnInit { await this.vaultTimeoutSettingsService.setVaultTimeoutOptions( newValue, - this.form.value.vaultTimeoutAction + this.form.value.vaultTimeoutAction, ); } @@ -396,14 +396,14 @@ export class SettingsComponent implements OnInit { this.platformUtilsService.showToast( "error", null, - this.i18nService.t("vaultTimeoutTooLarge") + this.i18nService.t("vaultTimeoutTooLarge"), ); return; } await this.vaultTimeoutSettingsService.setVaultTimeoutOptions( this.form.value.vaultTimeout, - newValue + newValue, ); } @@ -573,7 +573,7 @@ export class SettingsComponent implements OnInit { async saveOpenAtLogin() { this.stateService.setOpenAtLogin(this.form.value.openAtLogin); this.messagingService.send( - this.form.value.openAtLogin ? "addOpenAtLogin" : "removeOpenAtLogin" + this.form.value.openAtLogin ? "addOpenAtLogin" : "removeOpenAtLogin", ); } @@ -617,7 +617,7 @@ export class SettingsComponent implements OnInit { this.messagingService.send( this.form.value.enableBrowserIntegration ? "enableBrowserIntegration" - : "disableBrowserIntegration" + : "disableBrowserIntegration", ); if (!this.form.value.enableBrowserIntegration) { @@ -628,7 +628,7 @@ export class SettingsComponent implements OnInit { async saveDdgBrowserIntegration() { await this.stateService.setEnableDuckDuckGoBrowserIntegration( - this.form.value.enableDuckDuckGoBrowserIntegration + this.form.value.enableDuckDuckGoBrowserIntegration, ); if (!this.form.value.enableBrowserIntegration) { @@ -638,13 +638,13 @@ export class SettingsComponent implements OnInit { this.messagingService.send( this.form.value.enableDuckDuckGoBrowserIntegration ? "enableDuckDuckGoBrowserIntegration" - : "disableDuckDuckGoBrowserIntegration" + : "disableDuckDuckGoBrowserIntegration", ); } async saveBrowserIntegrationFingerprint() { await this.stateService.setEnableBrowserIntegrationFingerprint( - this.form.value.enableBrowserIntegrationFingerprint + this.form.value.enableBrowserIntegrationFingerprint, ); } diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts index 5216960654a..8e5feac57c3 100644 --- a/apps/desktop/src/app/app.component.ts +++ b/apps/desktop/src/app/app.component.ts @@ -143,7 +143,7 @@ export class AppComponent implements OnInit, OnDestroy { private keyConnectorService: KeyConnectorService, private userVerificationService: UserVerificationService, private configService: ConfigServiceAbstraction, - private dialogService: DialogService + private dialogService: DialogService, ) {} ngOnInit() { @@ -203,7 +203,7 @@ export class AppComponent implements OnInit, OnDestroy { Promise.all( Object.keys(accounts) .filter((u) => u !== currentUser) - .map((u) => this.vaultTimeoutService.lock(u)) + .map((u) => this.vaultTimeoutService.lock(u)), ); break; } @@ -243,7 +243,7 @@ export class AppComponent implements OnInit, OnDestroy { break; case "showFingerprintPhrase": { const fingerprint = await this.cryptoService.getFingerprint( - await this.stateService.getUserId() + await this.stateService.getUserId(), ); const dialogRef = FingerprintDialogComponent.open(this.dialogService, { fingerprint }); await firstValueFrom(dialogRef.closed); @@ -255,7 +255,7 @@ export class AppComponent implements OnInit, OnDestroy { case "openPasswordHistory": await this.openModal( PasswordGeneratorHistoryComponent, - this.passwordHistoryRef + this.passwordHistoryRef, ); break; case "showToast": @@ -292,7 +292,7 @@ export class AppComponent implements OnInit, OnDestroy { }); if (emailVerificationConfirmed) { this.platformUtilsService.launchUri( - "https://bitwarden.com/help/create-bitwarden-account/" + "https://bitwarden.com/help/create-bitwarden-account/", ); } break; @@ -303,13 +303,13 @@ export class AppComponent implements OnInit, OnDestroy { this.platformUtilsService.showToast( "success", null, - this.i18nService.t("syncingComplete") + this.i18nService.t("syncingComplete"), ); } catch { this.platformUtilsService.showToast( "error", null, - this.i18nService.t("syncingFailed") + this.i18nService.t("syncingFailed"), ); } break; @@ -417,7 +417,7 @@ export class AppComponent implements OnInit, OnDestroy { const [modal, childComponent] = await this.modalService.openViewRef( ExportComponent, - this.exportVaultModalRef + this.exportVaultModalRef, ); this.modal = modal; @@ -438,7 +438,7 @@ export class AppComponent implements OnInit, OnDestroy { const [modal, childComponent] = await this.modalService.openViewRef( FolderAddEditComponent, this.folderAddEditModalRef, - (comp) => (comp.folderId = null) + (comp) => (comp.folderId = null), ); this.modal = modal; @@ -460,7 +460,7 @@ export class AppComponent implements OnInit, OnDestroy { [this.modal] = await this.modalService.openViewRef( GeneratorComponent, this.generatorModalRef, - (comp) => (comp.comingFromAddEdit = false) + (comp) => (comp.comingFromAddEdit = false), ); // eslint-disable-next-line rxjs-angular/prefer-takeuntil @@ -496,7 +496,7 @@ export class AppComponent implements OnInit, OnDestroy { if (i != null && stateAccounts[i]?.profile?.userId != null) { const userId = stateAccounts[i].profile.userId; const availableTimeoutActions = await firstValueFrom( - this.vaultTimeoutSettingsService.availableVaultTimeoutActions$(userId) + this.vaultTimeoutSettingsService.availableVaultTimeoutActions$(userId), ); accounts[userId] = { @@ -557,7 +557,7 @@ export class AppComponent implements OnInit, OnDestroy { this.platformUtilsService.showToast( "warning", this.i18nService.t("loggedOut"), - this.i18nService.t("loginExpired") + this.i18nService.t("loginExpired"), ); } }); @@ -625,7 +625,7 @@ export class AppComponent implements OnInit, OnDestroy { } else { msg.text.forEach( (t: string) => - (message += "

" + this.sanitizer.sanitize(SecurityContext.HTML, t) + "

") + (message += "

" + this.sanitizer.sanitize(SecurityContext.HTML, t) + "

"), ); options.enableHtml = true; } diff --git a/apps/desktop/src/app/components/avatar.component.ts b/apps/desktop/src/app/components/avatar.component.ts index 1560c440783..c77bfe0b7ab 100644 --- a/apps/desktop/src/app/components/avatar.component.ts +++ b/apps/desktop/src/app/components/avatar.component.ts @@ -69,7 +69,7 @@ export class AvatarComponent implements OnChanges, OnInit { const html = window.document.createElement("div").appendChild(svg).outerHTML; const svgHtml = window.btoa(unescape(encodeURIComponent(html))); this.src = this.sanitizer.bypassSecurityTrustResourceUrl( - "data:image/svg+xml;base64," + svgHtml + "data:image/svg+xml;base64," + svgHtml, ); } @@ -108,7 +108,7 @@ export class AvatarComponent implements OnChanges, OnInit { textTag.setAttribute( "font-family", '"Open Sans","Helvetica Neue",Helvetica,Arial,' + - 'sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"' + 'sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"', ); textTag.textContent = character; textTag.style.fontWeight = this.svgFontWeight.toString(); diff --git a/apps/desktop/src/app/components/verify-native-messaging-dialog.component.html b/apps/desktop/src/app/components/verify-native-messaging-dialog.component.html index 0334857962b..b47068f846c 100644 --- a/apps/desktop/src/app/components/verify-native-messaging-dialog.component.html +++ b/apps/desktop/src/app/components/verify-native-messaging-dialog.component.html @@ -1,6 +1,6 @@ - {{ "verifyNativeMessagingConnectionTitle" | i18n : data.applicationName }}: + {{ "verifyNativeMessagingConnectionTitle" | i18n: data.applicationName }}: {{ "verifyNativeMessagingConnectionDesc" | i18n }} diff --git a/apps/desktop/src/app/layout/account-switcher.component.ts b/apps/desktop/src/app/layout/account-switcher.component.ts index b603fde14e7..d6597c0422a 100644 --- a/apps/desktop/src/app/layout/account-switcher.component.ts +++ b/apps/desktop/src/app/layout/account-switcher.component.ts @@ -34,7 +34,7 @@ type InactiveAccount = ActiveAccount & { "void", style({ opacity: 0, - }) + }), ), transition( "void => open", @@ -42,8 +42,8 @@ type InactiveAccount = ActiveAccount & { "100ms linear", style({ opacity: 1, - }) - ) + }), + ), ), transition("* => void", animate("100ms linear", style({ opacity: 0 }))), ]), @@ -87,7 +87,7 @@ export class AccountSwitcherComponent implements OnInit, OnDestroy { private messagingService: MessagingService, private router: Router, private tokenService: TokenService, - private environmentService: EnvironmentService + private environmentService: EnvironmentService, ) {} async ngOnInit(): Promise { @@ -108,7 +108,7 @@ export class AccountSwitcherComponent implements OnInit, OnDestroy { this.activeAccount = undefined; } }), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe(); } @@ -136,7 +136,7 @@ export class AccountSwitcherComponent implements OnInit, OnDestroy { this.close(); await this.stateService.setActiveUser(null); await this.stateService.setRememberedEmail(null); - this.router.navigate(["/login"]); + await this.router.navigate(["/login"]); } private async createInactiveAccounts(baseAccounts: { diff --git a/apps/desktop/src/app/layout/search/search.component.ts b/apps/desktop/src/app/layout/search/search.component.ts index 3ede3f75abe..9a7226218a6 100644 --- a/apps/desktop/src/app/layout/search/search.component.ts +++ b/apps/desktop/src/app/layout/search/search.component.ts @@ -16,7 +16,10 @@ export class SearchComponent implements OnInit, OnDestroy { private activeAccountSubscription: Subscription; - constructor(private searchBarService: SearchBarService, private stateService: StateService) { + constructor( + private searchBarService: SearchBarService, + private stateService: StateService, + ) { // eslint-disable-next-line rxjs-angular/prefer-takeuntil this.searchBarService.state$.subscribe((state) => { this.state = state; diff --git a/apps/desktop/src/app/services/init.service.ts b/apps/desktop/src/app/services/init.service.ts index f49f0f5fb1a..998c49071e0 100644 --- a/apps/desktop/src/app/services/init.service.ts +++ b/apps/desktop/src/app/services/init.service.ts @@ -37,7 +37,7 @@ export class InitService { private nativeMessagingService: NativeMessagingService, private themingService: AbstractThemingService, private encryptService: EncryptService, - private configService: ConfigService + private configService: ConfigService, ) {} init() { diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts index 8ff79c7a151..895ff347f24 100644 --- a/apps/desktop/src/app/services/services.module.ts +++ b/apps/desktop/src/app/services/services.module.ts @@ -12,6 +12,7 @@ import { OBSERVABLE_DISK_STORAGE, } from "@bitwarden/angular/services/injection-tokens"; import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services.module"; +import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service"; import { PolicyService as PolicyServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { AccountService as AccountServiceAbstraction } from "@bitwarden/common/auth/abstractions/account.service"; import { AuthService as AuthServiceAbstraction } from "@bitwarden/common/auth/abstractions/auth.service"; @@ -114,6 +115,7 @@ const RELOAD_CALLBACK = new InjectionToken<() => any>("RELOAD_CALLBACK"); PlatformUtilsServiceAbstraction, RELOAD_CALLBACK, StateServiceAbstraction, + VaultTimeoutSettingsService, ], }, { diff --git a/apps/desktop/src/app/tools/export/export.component.ts b/apps/desktop/src/app/tools/export/export.component.ts index 94121afc8d2..4f87a9f1492 100644 --- a/apps/desktop/src/app/tools/export/export.component.ts +++ b/apps/desktop/src/app/tools/export/export.component.ts @@ -33,7 +33,7 @@ export class ExportComponent extends BaseExportComponent implements OnInit { private broadcasterService: BroadcasterService, logService: LogService, fileDownloadService: FileDownloadService, - dialogService: DialogService + dialogService: DialogService, ) { super( cryptoService, @@ -47,7 +47,7 @@ export class ExportComponent extends BaseExportComponent implements OnInit { userVerificationService, formBuilder, fileDownloadService, - dialogService + dialogService, ); } diff --git a/apps/desktop/src/app/tools/generator.component.ts b/apps/desktop/src/app/tools/generator.component.ts index 0aa20c0c946..a36bffa0e5f 100644 --- a/apps/desktop/src/app/tools/generator.component.ts +++ b/apps/desktop/src/app/tools/generator.component.ts @@ -21,7 +21,7 @@ export class GeneratorComponent extends BaseGeneratorComponent { platformUtilsService: PlatformUtilsService, i18nService: I18nService, route: ActivatedRoute, - logService: LogService + logService: LogService, ) { super( passwordGenerationService, @@ -31,7 +31,7 @@ export class GeneratorComponent extends BaseGeneratorComponent { i18nService, logService, route, - window + window, ); } diff --git a/apps/desktop/src/app/tools/password-generator-history.component.html b/apps/desktop/src/app/tools/password-generator-history.component.html index d45cccd635d..3144ef7da86 100644 --- a/apps/desktop/src/app/tools/password-generator-history.component.html +++ b/apps/desktop/src/app/tools/password-generator-history.component.html @@ -14,7 +14,7 @@ [appCopyText]="h.password" [innerHTML]="h.password | colorPassword" >

- {{ h.date | date : "medium" }} + {{ h.date | date: "medium" }}
diff --git a/apps/desktop/src/auth/lock.component.ts b/apps/desktop/src/auth/lock.component.ts index df5f7b42384..91a60557fb9 100644 --- a/apps/desktop/src/auth/lock.component.ts +++ b/apps/desktop/src/auth/lock.component.ts @@ -52,7 +52,7 @@ export class LockComponent extends BaseLockComponent { logService: LogService, dialogService: DialogService, deviceTrustCryptoService: DeviceTrustCryptoServiceAbstraction, - userVerificationService: UserVerificationService + userVerificationService: UserVerificationService, ) { super( router, @@ -72,7 +72,7 @@ export class LockComponent extends BaseLockComponent { passwordStrengthService, dialogService, deviceTrustCryptoService, - userVerificationService + userVerificationService, ); } diff --git a/apps/desktop/src/auth/login/login-approval.component.html b/apps/desktop/src/auth/login/login-approval.component.html index c7018e298c1..8a07c37f80b 100644 --- a/apps/desktop/src/auth/login/login-approval.component.html +++ b/apps/desktop/src/auth/login/login-approval.component.html @@ -6,7 +6,7 @@
-

{{ "logInAttemptBy" | i18n : email }}

+

{{ "logInAttemptBy" | i18n: email }}

diff --git a/apps/desktop/src/auth/login/login-approval.component.ts b/apps/desktop/src/auth/login/login-approval.component.ts index 0e2c03af35d..b16c9e96143 100644 --- a/apps/desktop/src/auth/login/login-approval.component.ts +++ b/apps/desktop/src/auth/login/login-approval.component.ts @@ -41,7 +41,7 @@ export class LoginApprovalComponent implements OnInit, OnDestroy { protected appIdService: AppIdService, protected cryptoService: CryptoService, private modalRef: ModalRef, - config: ModalConfig + config: ModalConfig, ) { this.notificationId = config.data.notificationId; @@ -80,7 +80,7 @@ export class LoginApprovalComponent implements OnInit, OnDestroy { await ipc.auth.loginRequest( this.i18nService.t("logInRequested"), this.i18nService.t("confirmLoginAtemptForMail", this.email), - this.i18nService.t("close") + this.i18nService.t("close"), ); } } @@ -99,13 +99,13 @@ export class LoginApprovalComponent implements OnInit, OnDestroy { this.platformUtilsService.showToast( "info", null, - this.i18nService.t("thisRequestIsNoLongerValid") + this.i18nService.t("thisRequestIsNoLongerValid"), ); } else { const loginResponse = await this.authService.passwordlessLogin( this.authRequestResponse.id, this.authRequestResponse.publicKey, - approveLogin + approveLogin, ); this.showResultToast(loginResponse); } @@ -119,14 +119,14 @@ export class LoginApprovalComponent implements OnInit, OnDestroy { this.i18nService.t( "logInConfirmedForEmailOnDevice", this.email, - loginResponse.requestDeviceType - ) + loginResponse.requestDeviceType, + ), ); } else { this.platformUtilsService.showToast( "info", null, - this.i18nService.t("youDeniedALogInAttemptFromAnotherDevice") + this.i18nService.t("youDeniedALogInAttemptFromAnotherDevice"), ); } } @@ -140,7 +140,7 @@ export class LoginApprovalComponent implements OnInit, OnDestroy { requestDate.getUTCHours(), requestDate.getUTCMinutes(), requestDate.getUTCSeconds(), - requestDate.getUTCMilliseconds() + requestDate.getUTCMilliseconds(), ); const dateNow = new Date(Date.now()); @@ -151,7 +151,7 @@ export class LoginApprovalComponent implements OnInit, OnDestroy { dateNow.getUTCHours(), dateNow.getUTCMinutes(), dateNow.getUTCSeconds(), - dateNow.getUTCMilliseconds() + dateNow.getUTCMilliseconds(), ); const diffInMinutes = dateNowUTC - requestDateUTC; @@ -161,7 +161,7 @@ export class LoginApprovalComponent implements OnInit, OnDestroy { } else if (diffInMinutes < RequestTimeOut) { this.requestTimeText = this.i18nService.t( "requestedXMinutesAgo", - (diffInMinutes / 60000).toFixed() + (diffInMinutes / 60000).toFixed(), ); } else { clearInterval(this.interval); @@ -169,7 +169,7 @@ export class LoginApprovalComponent implements OnInit, OnDestroy { this.platformUtilsService.showToast( "info", null, - this.i18nService.t("loginRequestHasAlreadyExpired") + this.i18nService.t("loginRequestHasAlreadyExpired"), ); } } diff --git a/apps/desktop/src/auth/login/login-via-auth-request.component.ts b/apps/desktop/src/auth/login/login-via-auth-request.component.ts index 0b8f97aaf3a..e61c68c5cba 100644 --- a/apps/desktop/src/auth/login/login-via-auth-request.component.ts +++ b/apps/desktop/src/auth/login/login-via-auth-request.component.ts @@ -56,7 +56,7 @@ export class LoginViaAuthRequestComponent loginService: LoginService, deviceTrustCryptoService: DeviceTrustCryptoServiceAbstraction, authReqCryptoService: AuthRequestCryptoServiceAbstraction, - private location: Location + private location: Location, ) { super( router, @@ -75,7 +75,7 @@ export class LoginViaAuthRequestComponent stateService, loginService, deviceTrustCryptoService, - authReqCryptoService + authReqCryptoService, ); super.onSuccessfulLogin = () => { @@ -86,7 +86,7 @@ export class LoginViaAuthRequestComponent async settings() { const [modal, childComponent] = await this.modalService.openViewRef( EnvironmentComponent, - this.environmentModal + this.environmentModal, ); // eslint-disable-next-line rxjs-angular/prefer-takeuntil diff --git a/apps/desktop/src/auth/login/login.component.ts b/apps/desktop/src/auth/login/login.component.ts index 8c182cdb21f..eef5b871fe5 100644 --- a/apps/desktop/src/auth/login/login.component.ts +++ b/apps/desktop/src/auth/login/login.component.ts @@ -73,7 +73,7 @@ export class LoginComponent extends BaseLoginComponent implements OnDestroy { formValidationErrorService: FormValidationErrorsService, route: ActivatedRoute, loginService: LoginService, - webAuthnLoginService: WebAuthnLoginServiceAbstraction + webAuthnLoginService: WebAuthnLoginServiceAbstraction, ) { super( devicesApiService, @@ -92,7 +92,7 @@ export class LoginComponent extends BaseLoginComponent implements OnDestroy { formValidationErrorService, route, loginService, - webAuthnLoginService + webAuthnLoginService, ); super.onSuccessfulLogin = () => { return syncService.fullSync(true); @@ -135,7 +135,7 @@ export class LoginComponent extends BaseLoginComponent implements OnDestroy { async settings() { const [modal, childComponent] = await this.modalService.openViewRef( EnvironmentComponent, - this.environmentModal + this.environmentModal, ); modal.onShown.pipe(takeUntil(this.componentDestroyed$)).subscribe(() => { @@ -164,7 +164,7 @@ export class LoginComponent extends BaseLoginComponent implements OnDestroy { this.platformUtilsService.showToast( "error", this.i18nService.t("errorOccured"), - this.i18nService.t("invalidEmail") + this.i18nService.t("invalidEmail"), ); return; } diff --git a/apps/desktop/src/auth/register.component.ts b/apps/desktop/src/auth/register.component.ts index f02ce3dadaa..0941740d546 100644 --- a/apps/desktop/src/auth/register.component.ts +++ b/apps/desktop/src/auth/register.component.ts @@ -40,7 +40,7 @@ export class RegisterComponent extends BaseRegisterComponent implements OnInit, private ngZone: NgZone, logService: LogService, auditService: AuditService, - dialogService: DialogService + dialogService: DialogService, ) { super( formValidationErrorService, @@ -56,7 +56,7 @@ export class RegisterComponent extends BaseRegisterComponent implements OnInit, environmentService, logService, auditService, - dialogService + dialogService, ); } diff --git a/apps/desktop/src/auth/remove-password.component.html b/apps/desktop/src/auth/remove-password.component.html index 7ee5fa03138..87f86e7721e 100644 --- a/apps/desktop/src/auth/remove-password.component.html +++ b/apps/desktop/src/auth/remove-password.component.html @@ -1,7 +1,7 @@

{{ "removeMasterPassword" | i18n }}

-

{{ "convertOrganizationEncryptionDesc" | i18n : organization.name }}

+

{{ "convertOrganizationEncryptionDesc" | i18n: organization.name }}

- +
- {{ h.lastUsedDate | date : "medium" }} + {{ h.lastUsedDate | date: "medium" }}
- {{ "loggedInAsEmailOn" | i18n : email : webVaultHostname }} + {{ "loggedInAsEmailOn" | i18n: email : webVaultHostname }}
diff --git a/apps/web/src/app/auth/lock.component.ts b/apps/web/src/app/auth/lock.component.ts index d19bd1d01f8..6b2aba4f2ec 100644 --- a/apps/web/src/app/auth/lock.component.ts +++ b/apps/web/src/app/auth/lock.component.ts @@ -42,7 +42,7 @@ export class LockComponent extends BaseLockComponent { passwordStrengthService: PasswordStrengthServiceAbstraction, dialogService: DialogService, deviceTrustCryptoService: DeviceTrustCryptoServiceAbstraction, - userVerificationService: UserVerificationService + userVerificationService: UserVerificationService, ) { super( router, @@ -62,7 +62,7 @@ export class LockComponent extends BaseLockComponent { passwordStrengthService, dialogService, deviceTrustCryptoService, - userVerificationService + userVerificationService, ); } diff --git a/apps/web/src/app/auth/login/login-via-auth-request.component.ts b/apps/web/src/app/auth/login/login-via-auth-request.component.ts index 118565a4766..f864b78c838 100644 --- a/apps/web/src/app/auth/login/login-via-auth-request.component.ts +++ b/apps/web/src/app/auth/login/login-via-auth-request.component.ts @@ -45,7 +45,7 @@ export class LoginViaAuthRequestComponent stateService: StateService, loginService: LoginService, deviceTrustCryptoService: DeviceTrustCryptoServiceAbstraction, - authReqCryptoService: AuthRequestCryptoServiceAbstraction + authReqCryptoService: AuthRequestCryptoServiceAbstraction, ) { super( router, @@ -64,7 +64,7 @@ export class LoginViaAuthRequestComponent stateService, loginService, deviceTrustCryptoService, - authReqCryptoService + authReqCryptoService, ); } } diff --git a/apps/web/src/app/auth/login/login.component.ts b/apps/web/src/app/auth/login/login.component.ts index 3a5c6d0eb2e..85a36be4d0b 100644 --- a/apps/web/src/app/auth/login/login.component.ts +++ b/apps/web/src/app/auth/login/login.component.ts @@ -64,7 +64,7 @@ export class LoginComponent extends BaseLoginComponent implements OnInit { formBuilder: FormBuilder, formValidationErrorService: FormValidationErrorsService, loginService: LoginService, - webAuthnLoginService: WebAuthnLoginServiceAbstraction + webAuthnLoginService: WebAuthnLoginServiceAbstraction, ) { super( devicesApiService, @@ -83,7 +83,7 @@ export class LoginComponent extends BaseLoginComponent implements OnInit { formValidationErrorService, route, loginService, - webAuthnLoginService + webAuthnLoginService, ); this.onSuccessfulLogin = async () => { this.messagingService.send("setFullWidth"); @@ -122,7 +122,7 @@ export class LoginComponent extends BaseLoginComponent implements OnInit { invite.organizationId, invite.token, invite.email, - invite.organizationUserId + invite.organizationUserId, ); policyList = this.policyService.mapPoliciesFromToken(this.policies); } catch (e) { @@ -132,7 +132,7 @@ export class LoginComponent extends BaseLoginComponent implements OnInit { if (policyList != null) { const resetPasswordPolicy = this.policyService.getResetPasswordPolicyOptions( policyList, - invite.organizationId + invite.organizationId, ); // Set to true if policy enabled and auto-enroll enabled this.showResetPasswordAutoEnrollWarning = @@ -155,7 +155,7 @@ export class LoginComponent extends BaseLoginComponent implements OnInit { if (this.enforcedPasswordPolicyOptions != null) { const strengthResult = this.passwordStrengthService.getPasswordStrength( masterPassword, - this.formGroup.value.email + this.formGroup.value.email, ); const masterPasswordScore = strengthResult == null ? null : strengthResult.score; @@ -164,7 +164,7 @@ export class LoginComponent extends BaseLoginComponent implements OnInit { !this.policyService.evaluateMasterPassword( masterPasswordScore, masterPassword, - this.enforcedPasswordPolicyOptions + this.enforcedPasswordPolicyOptions, ) ) { const policiesData: { [id: string]: PolicyData } = {}; diff --git a/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.component.ts b/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.component.ts index b5ed677e2a4..f2cfd17c082 100644 --- a/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.component.ts +++ b/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.component.ts @@ -31,7 +31,7 @@ export class MigrateFromLegacyEncryptionComponent { private migrationService: MigrateFromLegacyEncryptionService, private cryptoService: CryptoService, private messagingService: MessagingService, - private logService: LogService + private logService: LogService, ) {} submit = async () => { @@ -51,9 +51,8 @@ export class MigrateFromLegacyEncryptionComponent { try { // Create new user key - const [newUserKey, masterKeyEncUserKey] = await this.migrationService.createNewUserKey( - masterPassword - ); + const [newUserKey, masterKeyEncUserKey] = + await this.migrationService.createNewUserKey(masterPassword); // Update admin recover keys await this.migrationService.updateAllAdminRecoveryKeys(masterPassword, newUserKey); @@ -65,14 +64,14 @@ export class MigrateFromLegacyEncryptionComponent { await this.migrationService.updateKeysAndEncryptedData( masterPassword, newUserKey, - masterKeyEncUserKey + masterKeyEncUserKey, ); this.platformUtilsService.showToast( "success", this.i18nService.t("keyUpdated"), this.i18nService.t("logBackInOthersToo"), - { timeout: 15000 } + { timeout: 15000 }, ); this.messagingService.send("logout"); } catch (e) { diff --git a/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.spec.ts b/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.spec.ts index 16f2e9ca62f..26b1e44f995 100644 --- a/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.spec.ts +++ b/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.spec.ts @@ -2,12 +2,6 @@ import { BehaviorSubject } from "rxjs"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; -import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; -import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests"; -import { Organization } from "@bitwarden/common/admin-console/models/domain/organization"; -import { OrganizationKeysResponse } from "@bitwarden/common/admin-console/models/response/organization-keys.response"; -import { OrganizationApiService } from "@bitwarden/common/admin-console/services/organization/organization-api.service"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; @@ -29,6 +23,7 @@ import { Folder } from "@bitwarden/common/vault/models/domain/folder"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FolderView } from "@bitwarden/common/vault/models/view/folder.view"; +import { AccountRecoveryService } from "../../admin-console/organizations/members/services/account-recovery/account-recovery.service"; import { EmergencyAccessService } from "../emergency-access"; import { MigrateFromLegacyEncryptionService } from "./migrate-legacy-encryption.service"; @@ -36,10 +31,8 @@ import { MigrateFromLegacyEncryptionService } from "./migrate-legacy-encryption. describe("migrateFromLegacyEncryptionService", () => { let migrateFromLegacyEncryptionService: MigrateFromLegacyEncryptionService; - const organizationService = mock(); - const organizationApiService = mock(); - const organizationUserService = mock(); const emergencyAccessService = mock(); + const accountRecoveryService = mock(); const apiService = mock(); const encryptService = mock(); const cryptoService = mock(); @@ -55,10 +48,8 @@ describe("migrateFromLegacyEncryptionService", () => { jest.clearAllMocks(); migrateFromLegacyEncryptionService = new MigrateFromLegacyEncryptionService( - organizationService, - organizationApiService, - organizationUserService, emergencyAccessService, + accountRecoveryService, apiService, cryptoService, encryptService, @@ -66,7 +57,7 @@ describe("migrateFromLegacyEncryptionService", () => { cipherService, folderService, sendService, - stateService + stateService, ); }); @@ -86,7 +77,7 @@ describe("migrateFromLegacyEncryptionService", () => { cryptoService.isLegacyUser.mockResolvedValue(false); await expect( - migrateFromLegacyEncryptionService.createNewUserKey(mockMasterPassword) + migrateFromLegacyEncryptionService.createNewUserKey(mockMasterPassword), ).rejects.toThrowError("Invalid master password or user may not be legacy"); }); }); @@ -109,7 +100,7 @@ describe("migrateFromLegacyEncryptionService", () => { cryptoService.getPrivateKey.mockResolvedValue(new Uint8Array(64) as CsprngArray); cryptoService.rsaEncrypt.mockResolvedValue( - new EncString(EncryptionType.AesCbc256_HmacSha256_B64, "Encrypted") + new EncString(EncryptionType.AesCbc256_HmacSha256_B64, "Encrypted"), ); folderViews = new BehaviorSubject(mockFolders); @@ -122,7 +113,7 @@ describe("migrateFromLegacyEncryptionService", () => { encryptService.encrypt.mockImplementation((plainValue, userKey) => { return Promise.resolve( - new EncString(EncryptionType.AesCbc256_HmacSha256_B64, "Encrypted: " + plainValue) + new EncString(EncryptionType.AesCbc256_HmacSha256_B64, "Encrypted: " + plainValue), ); }); @@ -131,7 +122,7 @@ describe("migrateFromLegacyEncryptionService", () => { encryptedFolder.id = folder.id; encryptedFolder.name = new EncString( EncryptionType.AesCbc256_HmacSha256_B64, - "Encrypted: " + folder.name + "Encrypted: " + folder.name, ); return Promise.resolve(encryptedFolder); }); @@ -141,7 +132,7 @@ describe("migrateFromLegacyEncryptionService", () => { encryptedCipher.id = cipher.id; encryptedCipher.name = new EncString( EncryptionType.AesCbc256_HmacSha256_B64, - "Encrypted: " + cipher.name + "Encrypted: " + cipher.name, ); return Promise.resolve(encryptedCipher); }); @@ -151,7 +142,7 @@ describe("migrateFromLegacyEncryptionService", () => { await migrateFromLegacyEncryptionService.updateKeysAndEncryptedData( mockMasterPassword, mockUserKey, - mockEncUserKey + mockEncUserKey, ); expect(cryptoService.getOrDeriveMasterKey).toHaveBeenCalled(); @@ -161,7 +152,7 @@ describe("migrateFromLegacyEncryptionService", () => { await migrateFromLegacyEncryptionService.updateKeysAndEncryptedData( mockMasterPassword, mockUserKey, - mockEncUserKey + mockEncUserKey, ); expect(syncService.fullSync).toHaveBeenCalledWith(true); }); @@ -173,8 +164,8 @@ describe("migrateFromLegacyEncryptionService", () => { migrateFromLegacyEncryptionService.updateKeysAndEncryptedData( mockMasterPassword, mockUserKey, - mockEncUserKey - ) + mockEncUserKey, + ), ).rejects.toThrowError("sync failed"); expect(apiService.postAccountKey).not.toHaveBeenCalled(); @@ -189,8 +180,8 @@ describe("migrateFromLegacyEncryptionService", () => { migrateFromLegacyEncryptionService.updateKeysAndEncryptedData( mockMasterPassword, mockUserKey, - mockEncUserKey - ) + mockEncUserKey, + ), ).rejects.toThrowError("Ciphers failed to be retrieved"); expect(apiService.postAccountKey).not.toHaveBeenCalled(); @@ -211,68 +202,6 @@ describe("migrateFromLegacyEncryptionService", () => { expect(emergencyAccessService.rotate).toHaveBeenCalled(); }); }); - - describe("updateAllAdminRecoveryKeys", () => { - let mockMasterPassword: string; - let mockUserKey: UserKey; - - beforeEach(() => { - mockMasterPassword = "mockMasterPassword"; - - const mockRandomBytes = new Uint8Array(64) as CsprngArray; - mockUserKey = new SymmetricCryptoKey(mockRandomBytes) as UserKey; - - organizationService.getAll.mockResolvedValue([ - createOrganization("1", "Org 1", true), - createOrganization("2", "Org 2", true), - createOrganization("3", "Org 3", false), - createOrganization("4", "Org 4", false), - ]); - - organizationApiService.getKeys.mockImplementation((orgId) => { - return Promise.resolve({ - publicKey: orgId + "mockPublicKey", - privateKey: orgId + "mockPrivateKey", - } as OrganizationKeysResponse); - }); - }); - - it("Only updates organizations that are enrolled in admin recovery", async () => { - await migrateFromLegacyEncryptionService.updateAllAdminRecoveryKeys( - mockMasterPassword, - mockUserKey - ); - - expect( - organizationUserService.putOrganizationUserResetPasswordEnrollment - ).toHaveBeenCalledWith( - "1", - expect.any(String), - expect.any(OrganizationUserResetPasswordEnrollmentRequest) - ); - expect( - organizationUserService.putOrganizationUserResetPasswordEnrollment - ).toHaveBeenCalledWith( - "2", - expect.any(String), - expect.any(OrganizationUserResetPasswordEnrollmentRequest) - ); - expect( - organizationUserService.putOrganizationUserResetPasswordEnrollment - ).not.toHaveBeenCalledWith( - "3", - expect.any(String), - expect.any(OrganizationUserResetPasswordEnrollmentRequest) - ); - expect( - organizationUserService.putOrganizationUserResetPasswordEnrollment - ).not.toHaveBeenCalledWith( - "4", - expect.any(String), - expect.any(OrganizationUserResetPasswordEnrollmentRequest) - ); - }); - }); }); function createMockFolder(id: string, name: string): FolderView { @@ -295,12 +224,3 @@ function createMockSend(id: string, name: string): Send { send.name = new EncString(EncryptionType.AesCbc256_HmacSha256_B64, name); return send; } - -function createOrganization(id: string, name: string, resetPasswordEnrolled: boolean) { - const org = new Organization(); - org.id = id; - org.name = name; - org.resetPasswordEnrolled = resetPasswordEnrolled; - org.userId = "mockUserID"; - return org; -} diff --git a/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.ts b/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.ts index df8158dd747..31d5e420272 100644 --- a/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.ts +++ b/apps/web/src/app/auth/migrate-encryption/migrate-legacy-encryption.service.ts @@ -2,15 +2,10 @@ import { firstValueFrom } from "rxjs"; import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; -import { OrganizationService } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction"; -import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service"; -import { OrganizationUserResetPasswordEnrollmentRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests"; import { UpdateKeyRequest } from "@bitwarden/common/models/request/update-key.request"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; -import { Utils } from "@bitwarden/common/platform/misc/utils"; import { EncryptedString, EncString } from "@bitwarden/common/platform/models/domain/enc-string"; import { UserKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; import { SendWithIdRequest } from "@bitwarden/common/tools/send/models/request/send-with-id.request"; @@ -21,16 +16,15 @@ import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.serv import { CipherWithIdRequest } from "@bitwarden/common/vault/models/request/cipher-with-id.request"; import { FolderWithIdRequest } from "@bitwarden/common/vault/models/request/folder-with-id.request"; +import { AccountRecoveryService } from "../../admin-console/organizations/members/services/account-recovery/account-recovery.service"; import { EmergencyAccessService } from "../emergency-access"; // TODO: PM-3797 - This service should be expanded and used for user key rotations in change-password.component.ts @Injectable() export class MigrateFromLegacyEncryptionService { constructor( - private organizationService: OrganizationService, - private organizationApiService: OrganizationApiServiceAbstraction, - private organizationUserService: OrganizationUserService, private emergencyAccessService: EmergencyAccessService, + private accountRecoveryService: AccountRecoveryService, private apiService: ApiService, private cryptoService: CryptoService, private encryptService: EncryptService, @@ -38,7 +32,7 @@ export class MigrateFromLegacyEncryptionService { private cipherService: CipherService, private folderService: FolderService, private sendService: SendService, - private stateService: StateService + private stateService: StateService, ) {} /** @@ -51,7 +45,7 @@ export class MigrateFromLegacyEncryptionService { masterPassword, await this.stateService.getEmail(), await this.stateService.getKdfType(), - await this.stateService.getKdfConfig() + await this.stateService.getKdfConfig(), ); if (!masterKey) { @@ -77,14 +71,14 @@ export class MigrateFromLegacyEncryptionService { async updateKeysAndEncryptedData( masterPassword: string, newUserKey: UserKey, - newEncUserKey: EncString + newEncUserKey: EncString, ): Promise { // Create new request and add master key and hash const request = new UpdateKeyRequest(); request.key = newEncUserKey.encryptedString; request.masterPasswordHash = await this.cryptoService.hashMasterKey( masterPassword, - await this.cryptoService.getOrDeriveMasterKey(masterPassword) + await this.cryptoService.getOrDeriveMasterKey(masterPassword), ); // Sync before encrypting to make sure we have latest data @@ -112,35 +106,11 @@ export class MigrateFromLegacyEncryptionService { * @param newUserKey The new user key */ async updateAllAdminRecoveryKeys(masterPassword: string, newUserKey: UserKey) { - const allOrgs = await this.organizationService.getAll(); - - for (const org of allOrgs) { - // If not already enrolled, skip - if (!org.resetPasswordEnrolled) { - continue; - } - - // Retrieve public key - const response = await this.organizationApiService.getKeys(org.id); - const publicKey = Utils.fromB64ToArray(response?.publicKey); - - // Re-enroll - encrypt user key with organization public key - const encryptedKey = await this.cryptoService.rsaEncrypt(newUserKey.key, publicKey); - - // Create/Execute request - const request = new OrganizationUserResetPasswordEnrollmentRequest(); - request.resetPasswordKey = encryptedKey.encryptedString; - request.masterPasswordHash = await this.cryptoService.hashMasterKey( - masterPassword, - await this.cryptoService.getOrDeriveMasterKey(masterPassword) - ); - - await this.organizationUserService.putOrganizationUserResetPasswordEnrollment( - org.id, - org.userId, - request - ); - } + const masterPasswordHash = await this.cryptoService.hashMasterKey( + masterPassword, + await this.cryptoService.getOrDeriveMasterKey(masterPassword), + ); + await this.accountRecoveryService.rotate(newUserKey, masterPasswordHash); } private async encryptPrivateKey(newUserKey: UserKey): Promise { @@ -160,7 +130,7 @@ export class MigrateFromLegacyEncryptionService { folders.map(async (folder) => { const encryptedFolder = await this.folderService.encrypt(folder, newUserKey); return new FolderWithIdRequest(encryptedFolder); - }) + }), ); } @@ -173,7 +143,7 @@ export class MigrateFromLegacyEncryptionService { ciphers.map(async (cipher) => { const encryptedCipher = await this.cipherService.encrypt(cipher, newUserKey); return new CipherWithIdRequest(encryptedCipher); - }) + }), ); } @@ -187,7 +157,7 @@ export class MigrateFromLegacyEncryptionService { const sendKey = await this.encryptService.decryptToBytes(send.key, null); send.key = (await this.encryptService.encrypt(sendKey, newUserKey)) ?? send.key; return new SendWithIdRequest(send); - }) + }), ); } } diff --git a/apps/web/src/app/auth/recover-delete.component.ts b/apps/web/src/app/auth/recover-delete.component.ts index c0e4314a2bc..f28cc24f29f 100644 --- a/apps/web/src/app/auth/recover-delete.component.ts +++ b/apps/web/src/app/auth/recover-delete.component.ts @@ -20,7 +20,7 @@ export class RecoverDeleteComponent { private apiService: ApiService, private platformUtilsService: PlatformUtilsService, private i18nService: I18nService, - private logService: LogService + private logService: LogService, ) {} async submit() { @@ -32,7 +32,7 @@ export class RecoverDeleteComponent { this.platformUtilsService.showToast( "success", null, - this.i18nService.t("deleteRecoverEmailSent") + this.i18nService.t("deleteRecoverEmailSent"), ); this.router.navigate(["/"]); } catch (e) { diff --git a/apps/web/src/app/auth/recover-two-factor.component.ts b/apps/web/src/app/auth/recover-two-factor.component.ts index 2d6140780a0..79abce9f5ad 100644 --- a/apps/web/src/app/auth/recover-two-factor.component.ts +++ b/apps/web/src/app/auth/recover-two-factor.component.ts @@ -26,7 +26,7 @@ export class RecoverTwoFactorComponent { private i18nService: I18nService, private cryptoService: CryptoService, private authService: AuthService, - private logService: LogService + private logService: LogService, ) {} async submit() { @@ -41,7 +41,7 @@ export class RecoverTwoFactorComponent { this.platformUtilsService.showToast( "success", null, - this.i18nService.t("twoStepRecoverDisabled") + this.i18nService.t("twoStepRecoverDisabled"), ); this.router.navigate(["/"]); } catch (e) { diff --git a/apps/web/src/app/auth/register-form/register-form.component.ts b/apps/web/src/app/auth/register-form/register-form.component.ts index a63a44e4af2..1b6a9e46a58 100644 --- a/apps/web/src/app/auth/register-form/register-form.component.ts +++ b/apps/web/src/app/auth/register-form/register-form.component.ts @@ -46,7 +46,7 @@ export class RegisterFormComponent extends BaseRegisterComponent { environmentService: EnvironmentService, logService: LogService, auditService: AuditService, - dialogService: DialogService + dialogService: DialogService, ) { super( formValidationErrorService, @@ -62,7 +62,7 @@ export class RegisterFormComponent extends BaseRegisterComponent { environmentService, logService, auditService, - dialogService + dialogService, ); } @@ -87,13 +87,13 @@ export class RegisterFormComponent extends BaseRegisterComponent { !this.policyService.evaluateMasterPassword( this.passwordStrengthResult.score, this.formGroup.value.masterPassword, - this.enforcedPolicyOptions + this.enforcedPolicyOptions, ) ) { this.platformUtilsService.showToast( "error", this.i18nService.t("errorOccurred"), - this.i18nService.t("masterPasswordPolicyRequirementsNotMet") + this.i18nService.t("masterPasswordPolicyRequirementsNotMet"), ); return; } diff --git a/apps/web/src/app/auth/remove-password.component.html b/apps/web/src/app/auth/remove-password.component.html index 421cda1a564..19e0d63572b 100644 --- a/apps/web/src/app/auth/remove-password.component.html +++ b/apps/web/src/app/auth/remove-password.component.html @@ -18,7 +18,7 @@
-

{{ "convertOrganizationEncryptionDesc" | i18n : organization.name }}

+

{{ "convertOrganizationEncryptionDesc" | i18n: organization.name }}

- {{ "verificationCodeEmailSent" | i18n : sentEmail }} + {{ "verificationCodeEmailSent" | i18n: sentEmail }}
diff --git a/apps/web/src/app/auth/settings/two-factor-email.component.ts b/apps/web/src/app/auth/settings/two-factor-email.component.ts index 1ca6d31b46f..cfbe10823c7 100644 --- a/apps/web/src/app/auth/settings/two-factor-email.component.ts +++ b/apps/web/src/app/auth/settings/two-factor-email.component.ts @@ -36,7 +36,7 @@ export class TwoFactorEmailComponent extends TwoFactorBaseComponent { logService: LogService, userVerificationService: UserVerificationService, private stateService: StateService, - dialogService: DialogService + dialogService: DialogService, ) { super( apiService, @@ -44,7 +44,7 @@ export class TwoFactorEmailComponent extends TwoFactorBaseComponent { platformUtilsService, logService, userVerificationService, - dialogService + dialogService, ); } diff --git a/apps/web/src/app/auth/settings/two-factor-recovery.component.ts b/apps/web/src/app/auth/settings/two-factor-recovery.component.ts index 74df384e5db..6cbc03c6b44 100644 --- a/apps/web/src/app/auth/settings/two-factor-recovery.component.ts +++ b/apps/web/src/app/auth/settings/two-factor-recovery.component.ts @@ -33,7 +33,7 @@ export class TwoFactorRecoveryComponent { "
" + '

' + new Date() + - "

" + "

", ); w.onafterprint = () => w.close(); w.print(); diff --git a/apps/web/src/app/auth/settings/two-factor-setup.component.ts b/apps/web/src/app/auth/settings/two-factor-setup.component.ts index 44955347b5c..b2f31648c83 100644 --- a/apps/web/src/app/auth/settings/two-factor-setup.component.ts +++ b/apps/web/src/app/auth/settings/two-factor-setup.component.ts @@ -56,7 +56,7 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy { protected modalService: ModalService, protected messagingService: MessagingService, protected policyService: PolicyService, - private stateService: StateService + private stateService: StateService, ) {} async ngOnInit() { @@ -119,7 +119,7 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy { case TwoFactorProviderType.Authenticator: { const authComp = await this.openModal( this.authenticatorModalRef, - TwoFactorAuthenticatorComponent + TwoFactorAuthenticatorComponent, ); // eslint-disable-next-line rxjs-angular/prefer-takeuntil authComp.onUpdated.subscribe((enabled: boolean) => { @@ -154,7 +154,7 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy { case TwoFactorProviderType.WebAuthn: { const webAuthnComp = await this.openModal( this.webAuthnModalRef, - TwoFactorWebAuthnComponent + TwoFactorWebAuthnComponent, ); // eslint-disable-next-line rxjs-angular/prefer-takeuntil webAuthnComp.onUpdated.subscribe((enabled: boolean) => { diff --git a/apps/web/src/app/auth/settings/two-factor-verify.component.ts b/apps/web/src/app/auth/settings/two-factor-verify.component.ts index f9ee53f54f4..145573f6681 100644 --- a/apps/web/src/app/auth/settings/two-factor-verify.component.ts +++ b/apps/web/src/app/auth/settings/two-factor-verify.component.ts @@ -25,7 +25,7 @@ export class TwoFactorVerifyComponent { constructor( private apiService: ApiService, private logService: LogService, - private userVerificationService: UserVerificationService + private userVerificationService: UserVerificationService, ) {} async submit() { diff --git a/apps/web/src/app/auth/settings/two-factor-webauthn.component.html b/apps/web/src/app/auth/settings/two-factor-webauthn.component.html index 3916a3115d6..72f9d66c2c7 100644 --- a/apps/web/src/app/auth/settings/two-factor-webauthn.component.html +++ b/apps/web/src/app/auth/settings/two-factor-webauthn.component.html @@ -52,7 +52,7 @@ [appApiAction]="k.removePromise" > - {{ "webAuthnkeyX" | i18n : i + 1 }} + {{ "webAuthnkeyX" | i18n: i + 1 }} {{ k.name }} diff --git a/apps/web/src/app/auth/settings/two-factor-webauthn.component.ts b/apps/web/src/app/auth/settings/two-factor-webauthn.component.ts index 4a9f7ceba31..fc2de267210 100644 --- a/apps/web/src/app/auth/settings/two-factor-webauthn.component.ts +++ b/apps/web/src/app/auth/settings/two-factor-webauthn.component.ts @@ -51,7 +51,7 @@ export class TwoFactorWebAuthnComponent extends TwoFactorBaseComponent { private ngZone: NgZone, logService: LogService, userVerificationService: UserVerificationService, - dialogService: DialogService + dialogService: DialogService, ) { super( apiService, @@ -59,7 +59,7 @@ export class TwoFactorWebAuthnComponent extends TwoFactorBaseComponent { platformUtilsService, logService, userVerificationService, - dialogService + dialogService, ); } diff --git a/apps/web/src/app/auth/settings/two-factor-yubikey.component.html b/apps/web/src/app/auth/settings/two-factor-yubikey.component.html index 4ab81c130a1..d377b303ef1 100644 --- a/apps/web/src/app/auth/settings/two-factor-yubikey.component.html +++ b/apps/web/src/app/auth/settings/two-factor-yubikey.component.html @@ -57,7 +57,7 @@
- + { @@ -35,7 +35,7 @@ export class VerifyEmailComponent { this.platformUtilsService.showToast( "success", null, - this.i18nService.t("checkInboxForVerification") + this.i18nService.t("checkInboxForVerification"), ); } diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.html b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.html index 4b19e73ffce..fd2749361c2 100644 --- a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.html +++ b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.html @@ -42,7 +42,7 @@ {{ "charactersCurrentAndMaximum" - | i18n : formGroup.value.credentialNaming.name.length : NameMaxCharacters + | i18n: formGroup.value.credentialNaming.name.length : NameMaxCharacters }} diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts index 9aef82df582..fcb0e995f4a 100644 --- a/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts +++ b/apps/web/src/app/auth/settings/webauthn-login-settings/create-credential-dialog/create-credential-dialog.component.ts @@ -59,7 +59,7 @@ export class CreateCredentialDialogComponent implements OnInit { private webauthnService: WebauthnLoginAdminService, private platformUtilsService: PlatformUtilsService, private i18nService: I18nService, - private logService: LogService + private logService: LogService, ) {} ngOnInit(): void { @@ -95,7 +95,7 @@ export class CreateCredentialDialogComponent implements OnInit { try { this.credentialOptions = await this.webauthnService.getCredentialCreateOptions( - this.formGroup.value.userVerification.secret + this.formGroup.value.userVerification.secret, ); } catch (error) { if (error instanceof ErrorResponse && error.statusCode === 400) { @@ -105,7 +105,7 @@ export class CreateCredentialDialogComponent implements OnInit { this.platformUtilsService.showToast( "error", this.i18nService.t("unexpectedError"), - error.message + error.message, ); } return; @@ -155,20 +155,20 @@ export class CreateCredentialDialogComponent implements OnInit { await this.webauthnService.saveCredential( this.formGroup.value.credentialNaming.name, this.pendingCredential, - keySet + keySet, ); if (await firstValueFrom(this.hasPasskeys$)) { this.platformUtilsService.showToast( "success", null, - this.i18nService.t("passkeySaved", name) + this.i18nService.t("passkeySaved", name), ); } else { this.platformUtilsService.showToast( "success", null, - this.i18nService.t("loginWithPasskeyEnabled") + this.i18nService.t("loginWithPasskeyEnabled"), ); } @@ -183,10 +183,10 @@ export class CreateCredentialDialogComponent implements OnInit { */ export const openCreateCredentialDialog = ( dialogService: DialogService, - config: DialogConfig + config: DialogConfig, ) => { return dialogService.open( CreateCredentialDialogComponent, - config + config, ); }; diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts index a268e48673d..4fec10d2695 100644 --- a/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts +++ b/apps/web/src/app/auth/settings/webauthn-login-settings/delete-credential-dialog/delete-credential-dialog.component.ts @@ -37,7 +37,7 @@ export class DeleteCredentialDialogComponent implements OnInit, OnDestroy { private webauthnService: WebauthnLoginAdminService, private platformUtilsService: PlatformUtilsService, private i18nService: I18nService, - private logService: LogService + private logService: LogService, ) {} ngOnInit(): void { @@ -64,7 +64,7 @@ export class DeleteCredentialDialogComponent implements OnInit, OnDestroy { this.platformUtilsService.showToast( "error", this.i18nService.t("unexpectedError"), - error.message + error.message, ); } return false; @@ -88,7 +88,7 @@ export class DeleteCredentialDialogComponent implements OnInit, OnDestroy { */ export const openDeleteCredentialDialogComponent = ( dialogService: DialogService, - config: DialogConfig + config: DialogConfig, ) => { return dialogService.open(DeleteCredentialDialogComponent, config); }; diff --git a/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.ts b/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.ts index 57a0b6c29a9..140f1530483 100644 --- a/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.ts +++ b/apps/web/src/app/auth/settings/webauthn-login-settings/webauthn-login-settings.component.ts @@ -31,7 +31,7 @@ export class WebauthnLoginSettingsComponent implements OnInit, OnDestroy { constructor( private webauthnService: WebauthnLoginAdminService, private dialogService: DialogService, - private policyService: PolicyService + private policyService: PolicyService, ) {} @HostBinding("attr.aria-busy") diff --git a/apps/web/src/app/auth/shared/components/user-verification/user-verification-prompt.component.ts b/apps/web/src/app/auth/shared/components/user-verification/user-verification-prompt.component.ts index 17667416174..c3cfff83ddc 100644 --- a/apps/web/src/app/auth/shared/components/user-verification/user-verification-prompt.component.ts +++ b/apps/web/src/app/auth/shared/components/user-verification/user-verification-prompt.component.ts @@ -25,7 +25,7 @@ export class UserVerificationPromptComponent extends BaseUserVerificationPrompt userVerificationService: UserVerificationService, formBuilder: FormBuilder, platformUtilsService: PlatformUtilsService, - i18nService: I18nService + i18nService: I18nService, ) { // TODO: Remove when BaseUserVerificationPrompt has support for CL const modalConfig: ModalConfig = { data }; @@ -35,7 +35,7 @@ export class UserVerificationPromptComponent extends BaseUserVerificationPrompt userVerificationService, formBuilder, platformUtilsService, - i18nService + i18nService, ); } @@ -51,10 +51,10 @@ export class UserVerificationPromptComponent extends BaseUserVerificationPrompt */ export const openUserVerificationPrompt = ( dialogService: DialogService, - config: DialogConfig + config: DialogConfig, ) => { return dialogService.open( UserVerificationPromptComponent, - config + config, ); }; diff --git a/apps/web/src/app/auth/sso.component.ts b/apps/web/src/app/auth/sso.component.ts index b36cc4857ec..ecc2e29ab7a 100644 --- a/apps/web/src/app/auth/sso.component.ts +++ b/apps/web/src/app/auth/sso.component.ts @@ -39,7 +39,7 @@ export class SsoComponent extends BaseSsoComponent { logService: LogService, private orgDomainApiService: OrgDomainApiServiceAbstraction, private validationService: ValidationService, - configService: ConfigServiceAbstraction + configService: ConfigServiceAbstraction, ) { super( authService, @@ -53,7 +53,7 @@ export class SsoComponent extends BaseSsoComponent { environmentService, passwordGenerationService, logService, - configService + configService, ); this.redirectUri = window.location.origin + "/sso-connector.html"; this.clientId = "web"; diff --git a/apps/web/src/app/auth/trial-initiation/confirmation-details.component.html b/apps/web/src/app/auth/trial-initiation/confirmation-details.component.html index 59bb59d3959..69bd57cd3a3 100644 --- a/apps/web/src/app/auth/trial-initiation/confirmation-details.component.html +++ b/apps/web/src/app/auth/trial-initiation/confirmation-details.component.html @@ -1,5 +1,5 @@
-

{{ "trialThankYou" | i18n : orgLabel }}

+

{{ "trialThankYou" | i18n: orgLabel }}

  • @@ -10,7 +10,7 @@

  • - {{ "trialPaidInfoMessage" | i18n : orgLabel }} + {{ "trialPaidInfoMessage" | i18n: orgLabel }}

diff --git a/apps/web/src/app/auth/trial-initiation/trial-initiation.component.html b/apps/web/src/app/auth/trial-initiation/trial-initiation.component.html index 1e2f3950851..7324bf97ef6 100644 --- a/apps/web/src/app/auth/trial-initiation/trial-initiation.component.html +++ b/apps/web/src/app/auth/trial-initiation/trial-initiation.component.html @@ -61,7 +61,7 @@

- {{ "startYour7DayFreeTrialOfBitwardenFor" | i18n : orgDisplayName }} + {{ "startYour7DayFreeTrialOfBitwardenFor" | i18n: orgDisplayName }}

{ token: "token", email: "testEmail", organizationUserId: "123", - }) + }), ); policyApiServiceMock.getPoliciesByToken.mockReturnValueOnce( Promise.resolve({ @@ -135,7 +135,7 @@ describe("TrialInitiationComponent", () => { enabled: true, }, ], - } as ListResponse) + } as ListResponse), ); policyServiceMock.masterPasswordPolicyOptions$.mockReturnValue( of({ @@ -145,7 +145,7 @@ describe("TrialInitiationComponent", () => { requireNumbers: null, requireSpecial: null, requireUpper: null, - } as MasterPasswordPolicyOptions) + } as MasterPasswordPolicyOptions), ); // Need to recreate component with new service mocks diff --git a/apps/web/src/app/auth/trial-initiation/trial-initiation.component.ts b/apps/web/src/app/auth/trial-initiation/trial-initiation.component.ts index 94b7829708d..aacf4a049c9 100644 --- a/apps/web/src/app/auth/trial-initiation/trial-initiation.component.ts +++ b/apps/web/src/app/auth/trial-initiation/trial-initiation.component.ts @@ -119,7 +119,7 @@ export class TrialInitiationComponent implements OnInit, OnDestroy { private policyApiService: PolicyApiServiceAbstraction, private policyService: PolicyService, private i18nService: I18nService, - private routerService: RouterService + private routerService: RouterService, ) {} async ngOnInit(): Promise { @@ -175,7 +175,7 @@ export class TrialInitiationComponent implements OnInit, OnDestroy { invite.organizationId, invite.token, invite.email, - invite.organizationUserId + invite.organizationUserId, ); if (policies.data != null) { const policiesData = policies.data.map((p) => new PolicyData(p)); diff --git a/apps/web/src/app/auth/two-factor-options.component.ts b/apps/web/src/app/auth/two-factor-options.component.ts index 5743711e831..c1e4ae51778 100644 --- a/apps/web/src/app/auth/two-factor-options.component.ts +++ b/apps/web/src/app/auth/two-factor-options.component.ts @@ -15,7 +15,7 @@ export class TwoFactorOptionsComponent extends BaseTwoFactorOptionsComponent { twoFactorService: TwoFactorService, router: Router, i18nService: I18nService, - platformUtilsService: PlatformUtilsService + platformUtilsService: PlatformUtilsService, ) { super(twoFactorService, router, i18nService, platformUtilsService, window); } diff --git a/apps/web/src/app/auth/two-factor.component.html b/apps/web/src/app/auth/two-factor.component.html index 99d40e1f3e0..f830d3c791d 100644 --- a/apps/web/src/app/auth/two-factor.component.html +++ b/apps/web/src/app/auth/two-factor.component.html @@ -28,7 +28,7 @@ {{ "enterVerificationCodeApp" | i18n }}

- {{ "enterVerificationCodeEmail" | i18n : twoFactorEmail }} + {{ "enterVerificationCodeEmail" | i18n: twoFactorEmail }}

diff --git a/apps/web/src/app/auth/two-factor.component.ts b/apps/web/src/app/auth/two-factor.component.ts index 3de77e63ee6..24562081853 100644 --- a/apps/web/src/app/auth/two-factor.component.ts +++ b/apps/web/src/app/auth/two-factor.component.ts @@ -44,7 +44,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent { appIdService: AppIdService, loginService: LoginService, configService: ConfigServiceAbstraction, - @Inject(WINDOW) protected win: Window + @Inject(WINDOW) protected win: Window, ) { super( authService, @@ -60,7 +60,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent { twoFactorService, appIdService, loginService, - configService + configService, ); this.onSuccessfulLoginNavigate = this.goAfterLogIn; } @@ -80,7 +80,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent { comp.onRecoverSelected.subscribe(() => { modal.close(); }); - } + }, ); } diff --git a/apps/web/src/app/auth/update-password.component.ts b/apps/web/src/app/auth/update-password.component.ts index d4e1e360e99..2844d2d8628 100644 --- a/apps/web/src/app/auth/update-password.component.ts +++ b/apps/web/src/app/auth/update-password.component.ts @@ -31,7 +31,7 @@ export class UpdatePasswordComponent extends BaseUpdatePasswordComponent { logService: LogService, stateService: StateService, userVerificationService: UserVerificationService, - dialogService: DialogService + dialogService: DialogService, ) { super( router, @@ -45,7 +45,7 @@ export class UpdatePasswordComponent extends BaseUpdatePasswordComponent { stateService, userVerificationService, logService, - dialogService + dialogService, ); } } diff --git a/apps/web/src/app/auth/verify-email-token.component.ts b/apps/web/src/app/auth/verify-email-token.component.ts index bd4bdf2b254..7a4a2880316 100644 --- a/apps/web/src/app/auth/verify-email-token.component.ts +++ b/apps/web/src/app/auth/verify-email-token.component.ts @@ -22,7 +22,7 @@ export class VerifyEmailTokenComponent implements OnInit { private route: ActivatedRoute, private apiService: ApiService, private logService: LogService, - private stateService: StateService + private stateService: StateService, ) {} ngOnInit() { @@ -31,7 +31,7 @@ export class VerifyEmailTokenComponent implements OnInit { if (qParams.userId != null && qParams.token != null) { try { await this.apiService.postAccountVerifyEmailToken( - new VerifyEmailRequest(qParams.userId, qParams.token) + new VerifyEmailRequest(qParams.userId, qParams.token), ); if (await this.stateService.getIsAuthenticated()) { await this.apiService.refreshIdentityToken(); diff --git a/apps/web/src/app/auth/verify-recover-delete.component.ts b/apps/web/src/app/auth/verify-recover-delete.component.ts index b0258656bf3..0a191992a6d 100644 --- a/apps/web/src/app/auth/verify-recover-delete.component.ts +++ b/apps/web/src/app/auth/verify-recover-delete.component.ts @@ -26,7 +26,7 @@ export class VerifyRecoverDeleteComponent implements OnInit { private platformUtilsService: PlatformUtilsService, private i18nService: I18nService, private route: ActivatedRoute, - private logService: LogService + private logService: LogService, ) {} ngOnInit() { @@ -50,7 +50,7 @@ export class VerifyRecoverDeleteComponent implements OnInit { this.platformUtilsService.showToast( "success", this.i18nService.t("accountDeleted"), - this.i18nService.t("accountDeletedDesc") + this.i18nService.t("accountDeletedDesc"), ); this.router.navigate(["/"]); } catch (e) { diff --git a/apps/web/src/app/billing/accounts/trial-initiation/billing.component.html b/apps/web/src/app/billing/accounts/trial-initiation/billing.component.html index 773b0fe51f0..357634d32f8 100644 --- a/apps/web/src/app/billing/accounts/trial-initiation/billing.component.html +++ b/apps/web/src/app/billing/accounts/trial-initiation/billing.component.html @@ -20,7 +20,7 @@ (selectablePlan.PasswordManager.basePrice === 0 ? selectablePlan.PasswordManager.seatPrice : selectablePlan.PasswordManager.basePrice - ) | currency : "$" + ) | currency: "$" }} /{{ "yr" | i18n }} @@ -30,7 +30,7 @@ (selectablePlan.SecretsManager.basePrice === 0 ? selectablePlan.SecretsManager.seatPrice : selectablePlan.SecretsManager.basePrice - ) | currency : "$" + ) | currency: "$" }} /{{ "yr" | i18n }} @@ -42,7 +42,7 @@ (selectablePlan.PasswordManager.basePrice === 0 ? selectablePlan.PasswordManager.seatPrice : selectablePlan.PasswordManager.basePrice - ) | currency : "$" + ) | currency: "$" }} /{{ "monthAbbr" | i18n }} @@ -52,7 +52,7 @@ (selectablePlan.SecretsManager.basePrice === 0 ? selectablePlan.SecretsManager.seatPrice : selectablePlan.SecretsManager.basePrice - ) | currency : "$" + ) | currency: "$" }} /{{ "monthAbbr" | i18n }} diff --git a/apps/web/src/app/billing/individual/billing-history-view.component.ts b/apps/web/src/app/billing/individual/billing-history-view.component.ts index a2442bcd4b6..cfef0ff8d5c 100644 --- a/apps/web/src/app/billing/individual/billing-history-view.component.ts +++ b/apps/web/src/app/billing/individual/billing-history-view.component.ts @@ -16,7 +16,7 @@ export class BillingHistoryViewComponent implements OnInit { constructor( private apiService: ApiService, private platformUtilsService: PlatformUtilsService, - private router: Router + private router: Router, ) {} async ngOnInit() { diff --git a/apps/web/src/app/billing/individual/premium.component.html b/apps/web/src/app/billing/individual/premium.component.html index 2c8c9d6146a..fb175a5ea35 100644 --- a/apps/web/src/app/billing/individual/premium.component.html +++ b/apps/web/src/app/billing/individual/premium.component.html @@ -46,7 +46,7 @@

{{ - "premiumPriceWithFamilyPlan" | i18n : (premiumPrice | currency : "$") : familyPlanMaxUserCount + "premiumPriceWithFamilyPlan" | i18n: (premiumPrice | currency: "$") : familyPlanMaxUserCount }} {{ "bitwardenFamiliesPlan" | i18n @@ -70,7 +70,7 @@ {{ - "licenseFileDesc" | i18n : "bitwarden_premium_license.json" + "licenseFileDesc" | i18n: "bitwarden_premium_license.json" }}

{{ "summary" | i18n }}

- {{ "premiumMembership" | i18n }}: {{ premiumPrice | currency : "$" }}
+ {{ "premiumMembership" | i18n }}: {{ premiumPrice | currency: "$" }}
{{ "additionalStorageGb" | i18n }}: {{ additionalStorage || 0 }} GB × - {{ storageGbPrice | currency : "$" }} = - {{ additionalStorageTotal | currency : "$" }} + {{ storageGbPrice | currency: "$" }} = + {{ additionalStorageTotal | currency: "$" }}

{{ "paymentInformation" | i18n }}

- {{ "planPrice" | i18n }}: {{ subtotal | currency : "USD $" }} + {{ "planPrice" | i18n }}: {{ subtotal | currency: "USD $" }}
- {{ "estimatedTax" | i18n }}: {{ taxCharges | currency : "USD $" }} + {{ "estimatedTax" | i18n }}: {{ taxCharges | currency: "USD $" }}

- {{ "total" | i18n }}: {{ total | currency : "USD $" }}/{{ "year" | i18n }} + {{ "total" | i18n }}: {{ total | currency: "USD $" }}/{{ "year" | i18n }}

{{ "paymentChargedAnnually" | i18n }} diff --git a/apps/web/src/app/billing/individual/premium.component.ts b/apps/web/src/app/billing/individual/premium.component.ts index 4044caa1db3..4cfd2196c9e 100644 --- a/apps/web/src/app/billing/individual/premium.component.ts +++ b/apps/web/src/app/billing/individual/premium.component.ts @@ -40,7 +40,7 @@ export class PremiumComponent implements OnInit { private syncService: SyncService, private logService: LogService, private stateService: StateService, - private environmentService: EnvironmentService + private environmentService: EnvironmentService, ) { this.selfHosted = platformUtilsService.isSelfHost(); this.cloudWebVaultUrl = this.environmentService.getCloudWebVaultUrl(); @@ -64,7 +64,7 @@ export class PremiumComponent implements OnInit { this.platformUtilsService.showToast( "error", this.i18nService.t("errorOccurred"), - this.i18nService.t("selectFile") + this.i18nService.t("selectFile"), ); return; } @@ -77,7 +77,7 @@ export class PremiumComponent implements OnInit { this.platformUtilsService.showToast( "error", this.i18nService.t("errorOccurred"), - this.i18nService.t("verifyEmailFirst") + this.i18nService.t("verifyEmailFirst"), ); return; } @@ -105,7 +105,7 @@ export class PremiumComponent implements OnInit { if (!paymentResponse.success && paymentResponse.paymentIntentClientSecret != null) { return this.paymentComponent.handleStripeCardPayment( paymentResponse.paymentIntentClientSecret, - () => this.finalizePremium() + () => this.finalizePremium(), ); } else { return this.finalizePremium(); diff --git a/apps/web/src/app/billing/individual/subscription.component.ts b/apps/web/src/app/billing/individual/subscription.component.ts index 94381fbce5e..143d531e1d6 100644 --- a/apps/web/src/app/billing/individual/subscription.component.ts +++ b/apps/web/src/app/billing/individual/subscription.component.ts @@ -12,7 +12,7 @@ export class SubscriptionComponent { constructor( private stateService: StateService, - private platformUtilsService: PlatformUtilsService + private platformUtilsService: PlatformUtilsService, ) {} async ngOnInit() { diff --git a/apps/web/src/app/billing/individual/user-subscription.component.html b/apps/web/src/app/billing/individual/user-subscription.component.html index 4c600b421c2..0b709eec5b7 100644 --- a/apps/web/src/app/billing/individual/user-subscription.component.html +++ b/apps/web/src/app/billing/individual/user-subscription.component.html @@ -54,7 +54,7 @@
{{ "expiration" | i18n }}
-
{{ sub.expiration | date : "mediumDate" }}
+
{{ sub.expiration | date: "mediumDate" }}
{{ "neverExpires" | i18n }}
@@ -71,9 +71,9 @@
{{ nextInvoice - ? (nextInvoice.date | date : "mediumDate") + + ? (nextInvoice.date | date: "mediumDate") + ", " + - (nextInvoice.amount | currency : "$") + (nextInvoice.amount | currency: "$") : "-" }}
@@ -86,9 +86,9 @@ {{ i.name }} {{ i.quantity > 1 ? "×" + i.quantity : "" }} @ - {{ i.amount | currency : "$" }} + {{ i.amount | currency: "$" }} - {{ i.quantity * i.amount | currency : "$" }} /{{ i.interval | i18n }} + {{ i.quantity * i.amount | currency: "$" }} /{{ i.interval | i18n }} @@ -155,7 +155,7 @@

{{ "storage" | i18n }}

-

{{ "subscriptionStorage" | i18n : sub.maxStorageGb || 0 : sub.storageName || "0 MB" }}

+

{{ "subscriptionStorage" | i18n: sub.maxStorageGb || 0 : sub.storageName || "0 MB" }}

{{ "total" | i18n }}: {{ additionalSeatCount || 0 }} × - {{ seatPrice | currency : "$" }} = {{ adjustedSeatTotal | currency : "$" }} / + {{ seatPrice | currency: "$" }} = {{ adjustedSeatTotal | currency: "$" }} / {{ interval | i18n }}
@@ -51,7 +51,7 @@ /> {{ "maxSeatCost" | i18n }}: {{ additionalMaxSeatCount || 0 }} × - {{ seatPrice | currency : "$" }} = {{ maxSeatTotal | currency : "$" }} / + {{ seatPrice | currency: "$" }} = {{ maxSeatTotal | currency: "$" }} / {{ interval | i18n }}
diff --git a/apps/web/src/app/billing/organizations/adjust-subscription.component.ts b/apps/web/src/app/billing/organizations/adjust-subscription.component.ts index a6f67e0138a..4290a1281b0 100644 --- a/apps/web/src/app/billing/organizations/adjust-subscription.component.ts +++ b/apps/web/src/app/billing/organizations/adjust-subscription.component.ts @@ -27,7 +27,7 @@ export class AdjustSubscription { private i18nService: I18nService, private platformUtilsService: PlatformUtilsService, private logService: LogService, - private organizationApiService: OrganizationApiServiceAbstraction + private organizationApiService: OrganizationApiServiceAbstraction, ) {} ngOnInit() { @@ -40,11 +40,11 @@ export class AdjustSubscription { try { const request = new OrganizationSubscriptionUpdateRequest( this.additionalSeatCount, - this.newMaxSeats + this.newMaxSeats, ); this.formPromise = this.organizationApiService.updatePasswordManagerSeats( this.organizationId, - request + request, ); await this.formPromise; @@ -52,7 +52,7 @@ export class AdjustSubscription { this.platformUtilsService.showToast( "success", null, - this.i18nService.t("subscriptionUpdated") + this.i18nService.t("subscriptionUpdated"), ); } catch (e) { this.logService.error(e); diff --git a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html index f5225bc29a0..e1f5431c45b 100644 --- a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html +++ b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.html @@ -36,12 +36,12 @@
{{ "lastSync" | i18n }}: - {{ lastSyncDate | date : "medium" }} + {{ lastSyncDate | date: "medium" }}
{{ - (daysBetween === 1 ? "awaitingSyncSingular" : "awaitingSyncPlural") | i18n : daysBetween + (daysBetween === 1 ? "awaitingSyncSingular" : "awaitingSyncPlural") | i18n: daysBetween }}
diff --git a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts index a36cc8727fd..95a29229cf6 100644 --- a/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts +++ b/apps/web/src/app/billing/organizations/billing-sync-api-key.component.ts @@ -42,7 +42,7 @@ export class BillingSyncApiKeyComponent { private platformUtilsService: PlatformUtilsService, private i18nService: I18nService, private organizationApiService: OrganizationApiServiceAbstraction, - private logService: LogService + private logService: LogService, ) { this.organizationId = data.organizationId; this.hasBillingToken = data.hasBillingToken; @@ -70,7 +70,7 @@ export class BillingSyncApiKeyComponent { this.platformUtilsService.showToast( "success", null, - this.i18nService.t("billingSyncApiKeyRotated") + this.i18nService.t("billingSyncApiKeyRotated"), ); } else { const response = await request.then((request) => { diff --git a/apps/web/src/app/billing/organizations/billing-sync-key.component.ts b/apps/web/src/app/billing/organizations/billing-sync-key.component.ts index aa6c1445352..1f89f66c723 100644 --- a/apps/web/src/app/billing/organizations/billing-sync-key.component.ts +++ b/apps/web/src/app/billing/organizations/billing-sync-key.component.ts @@ -26,7 +26,7 @@ export class BillingSyncKeyComponent { protected existingConnectionId: string; protected billingSyncKey: string; protected setParentConnection: ( - connection: OrganizationConnectionResponse + connection: OrganizationConnectionResponse, ) => void; protected formGroup: FormGroup; @@ -35,7 +35,7 @@ export class BillingSyncKeyComponent { private dialogRef: DialogRef, @Inject(DIALOG_DATA) protected data: BillingSyncKeyModalData, private apiService: ApiService, - private logService: LogService + private logService: LogService, ) { this.entityId = data.entityId; this.existingConnectionId = data.existingConnectionId; @@ -53,7 +53,7 @@ export class BillingSyncKeyComponent { this.entityId, OrganizationConnectionType.CloudBillingSync, true, - new BillingSyncConfigRequest(this.formGroup.value.billingSyncKey) + new BillingSyncConfigRequest(this.formGroup.value.billingSyncKey), ); const response = @@ -62,7 +62,7 @@ export class BillingSyncKeyComponent { : await this.apiService.updateOrganizationConnection( request, BillingSyncConfigApi, - this.existingConnectionId + this.existingConnectionId, ); this.existingConnectionId = response?.id; diff --git a/apps/web/src/app/billing/organizations/download-license.component.ts b/apps/web/src/app/billing/organizations/download-license.component.ts index 0247d8b76dc..88a37a28aab 100644 --- a/apps/web/src/app/billing/organizations/download-license.component.ts +++ b/apps/web/src/app/billing/organizations/download-license.component.ts @@ -19,7 +19,7 @@ export class DownloadLicenseComponent { constructor( private fileDownloadService: FileDownloadService, private logService: LogService, - private organizationApiService: OrganizationApiServiceAbstraction + private organizationApiService: OrganizationApiServiceAbstraction, ) {} async submit() { @@ -30,7 +30,7 @@ export class DownloadLicenseComponent { try { this.formPromise = this.organizationApiService.getLicense( this.organizationId, - this.installationId + this.installationId, ); const license = await this.formPromise; const licenseString = JSON.stringify(license, null, 2); diff --git a/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts b/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts index 7f13f5e08f4..78872aa6a99 100644 --- a/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts +++ b/apps/web/src/app/billing/organizations/organization-billing-history-view.component.ts @@ -18,7 +18,7 @@ export class OrgBillingHistoryViewComponent implements OnInit, OnDestroy { constructor( private organizationApiService: OrganizationApiServiceAbstraction, - private route: ActivatedRoute + private route: ActivatedRoute, ) {} async ngOnInit() { @@ -29,7 +29,7 @@ export class OrgBillingHistoryViewComponent implements OnInit, OnDestroy { await this.load(); this.firstLoaded = true; }), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe(); } diff --git a/apps/web/src/app/billing/organizations/organization-billing-tab.component.ts b/apps/web/src/app/billing/organizations/organization-billing-tab.component.ts index 90f5f6a4ddd..25d4ea48924 100644 --- a/apps/web/src/app/billing/organizations/organization-billing-tab.component.ts +++ b/apps/web/src/app/billing/organizations/organization-billing-tab.component.ts @@ -14,7 +14,7 @@ export class OrganizationBillingTabComponent implements OnInit { constructor( private route: ActivatedRoute, private organizationService: OrganizationService, - private platformUtilsService: PlatformUtilsService + private platformUtilsService: PlatformUtilsService, ) {} ngOnInit() { @@ -24,8 +24,8 @@ export class OrganizationBillingTabComponent implements OnInit { (org) => !this.platformUtilsService.isSelfHost() && org.canViewBillingHistory && - org.canEditPaymentMethods - ) + org.canEditPaymentMethods, + ), ); } } diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.html b/apps/web/src/app/billing/organizations/organization-plans.component.html index 0a925dc2288..a77d42a3594 100644 --- a/apps/web/src/app/billing/organizations/organization-plans.component.html +++ b/apps/web/src/app/billing/organizations/organization-plans.component.html @@ -13,7 +13,7 @@ {{ - "licenseFileDesc" | i18n : "bitwarden_organization_license.json" + "licenseFileDesc" | i18n: "bitwarden_organization_license.json" }}
@@ -247,7 +243,7 @@ "additionalStorageIntervalDesc" | i18n : "1 GB" - : (additionalStoragePriceMonthly(selectedPlan) | currency : "$") + : (additionalStoragePriceMonthly(selectedPlan) | currency: "$") : ("month" | i18n) }}
@@ -267,7 +263,7 @@ }}
{{ - "premiumAccessDesc" | i18n : (3.33 | currency : "$") : ("month" | i18n) + "premiumAccessDesc" | i18n: (3.33 | currency: "$") : ("month" | i18n) }}
@@ -290,19 +286,19 @@ (selectablePlan.isAnnual ? selectablePlan.PasswordManager.basePrice / 12 : selectablePlan.PasswordManager.basePrice - ) | currency : "$" + ) | currency: "$" }} × 12 {{ "monthAbbr" | i18n }} = {{ - selectablePlan.PasswordManager.basePrice | currency : "$" + selectablePlan.PasswordManager.basePrice | currency: "$" }} {{ "freeWithSponsorship" | i18n }} - {{ selectablePlan.PasswordManager.basePrice | currency : "$" }} + {{ selectablePlan.PasswordManager.basePrice | currency: "$" }} /{{ "year" | i18n }} @@ -316,12 +312,12 @@ (selectablePlan.isAnnual ? selectablePlan.PasswordManager.seatPrice / 12 : selectablePlan.PasswordManager.seatPrice - ) | currency : "$" + ) | currency: "$" }} × 12 {{ "monthAbbr" | i18n }} = {{ passwordManagerSeatTotal(selectablePlan, formGroup.value.additionalSeats) - | currency : "$" + | currency: "$" }} /{{ "year" | i18n }} @@ -332,20 +328,20 @@ (selectablePlan.isAnnual ? selectablePlan.PasswordManager.additionalStoragePricePerGb / 12 : selectablePlan.PasswordManager.additionalStoragePricePerGb - ) | currency : "$" + ) | currency: "$" }} × 12 {{ "monthAbbr" | i18n }} = - {{ additionalStorageTotal(selectablePlan) | currency : "$" }} /{{ "year" | i18n }} + {{ additionalStorageTotal(selectablePlan) | currency: "$" }} /{{ "year" | i18n }} {{ "monthly" | i18n }} {{ "basePrice" | i18n }}: - {{ selectablePlan.PasswordManager.basePrice | currency : "$" }} + {{ selectablePlan.PasswordManager.basePrice | currency: "$" }} {{ "monthAbbr" | i18n }} = - {{ selectablePlan.PasswordManager.basePrice | currency : "$" }} + {{ selectablePlan.PasswordManager.basePrice | currency: "$" }} /{{ "month" | i18n }} @@ -354,20 +350,20 @@ > {{ "users" | i18n }}: {{ formGroup.controls["additionalSeats"].value || 0 }} × - {{ selectablePlan.PasswordManager.seatPrice | currency : "$" }} + {{ selectablePlan.PasswordManager.seatPrice | currency: "$" }} {{ "monthAbbr" | i18n }} = {{ passwordManagerSeatTotal(selectablePlan, formGroup.value.additionalSeats) - | currency : "$" + | currency: "$" }} /{{ "month" | i18n }} {{ "additionalStorageGb" | i18n }}: {{ formGroup.controls["additionalStorage"].value || 0 }} × - {{ selectablePlan.PasswordManager.additionalStoragePricePerGb | currency : "$" }} + {{ selectablePlan.PasswordManager.additionalStoragePricePerGb | currency: "$" }} {{ "monthAbbr" | i18n }} = - {{ additionalStorageTotal(selectablePlan) | currency : "$" }} /{{ "month" | i18n }} + {{ additionalStorageTotal(selectablePlan) | currency: "$" }} /{{ "month" | i18n }} @@ -399,19 +395,19 @@
- {{ "passwordManagerPlanPrice" | i18n }}: {{ passwordManagerSubtotal | currency : "USD $" }} + {{ "passwordManagerPlanPrice" | i18n }}: {{ passwordManagerSubtotal | currency: "USD $" }}
- {{ "secretsManagerPlanPrice" | i18n }}: {{ secretsManagerSubtotal | currency : "USD $" }} + {{ "secretsManagerPlanPrice" | i18n }}: {{ secretsManagerSubtotal | currency: "USD $" }}
- {{ "estimatedTax" | i18n }}: {{ taxCharges | currency : "USD $" }} + {{ "estimatedTax" | i18n }}: {{ taxCharges | currency: "USD $" }}

- {{ "total" | i18n }}: {{ total | currency : "USD $" }}/{{ + {{ "total" | i18n }}: {{ total | currency: "USD $" }}/{{ selectedPlanInterval | i18n }}

diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.ts b/apps/web/src/app/billing/organizations/organization-plans.component.ts index afcd9cb18d8..b8dd447100d 100644 --- a/apps/web/src/app/billing/organizations/organization-plans.component.ts +++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts @@ -134,7 +134,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { private logService: LogService, private messagingService: MessagingService, private formBuilder: FormBuilder, - private organizationApiService: OrganizationApiServiceAbstraction + private organizationApiService: OrganizationApiServiceAbstraction, ) { this.selfHosted = platformUtilsService.isSelfHost(); } @@ -200,13 +200,13 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { get selectedPlan() { return this.passwordManagerPlans.find( - (plan) => plan.type === this.formGroup.controls.plan.value + (plan) => plan.type === this.formGroup.controls.plan.value, ); } get selectedSecretsManagerPlan() { return this.secretsManagerPlans.find( - (plan) => plan.type === this.formGroup.controls.plan.value + (plan) => plan.type === this.formGroup.controls.plan.value, ); } @@ -217,7 +217,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { get selectableProducts() { if (this.acceptingSponsorship) { const familyPlan = this.passwordManagerPlans.find( - (plan) => plan.type === PlanType.FamiliesAnnually + (plan) => plan.type === PlanType.FamiliesAnnually, ); this.discount = familyPlan.PasswordManager.basePrice; return [familyPlan]; @@ -237,7 +237,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { (this.currentProductType !== ProductType.TeamsStarter || plan.product === ProductType.Teams || plan.product === ProductType.Enterprise) && - (!this.providerId || plan.product !== ProductType.TeamsStarter) + (!this.providerId || plan.product !== ProductType.TeamsStarter), ); result.sort((planA, planB) => planA.displaySortOrder - planB.displaySortOrder); @@ -248,17 +248,13 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { get selectablePlans() { const selectedProductType = this.formGroup.controls.product.value; const result = this.passwordManagerPlans?.filter( - (plan) => this.planIsEnabled(plan) && plan.product === selectedProductType + (plan) => this.planIsEnabled(plan) && plan.product === selectedProductType, ); result.sort((planA, planB) => planA.displaySortOrder - planB.displaySortOrder); return result; } - get teamsStarterPlanFeatureFlagIsEnabled(): boolean { - return this.passwordManagerPlans.some((plan) => plan.product === ProductType.TeamsStarter); - } - get hasProvider() { return this.providerId != null; } @@ -323,7 +319,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { ) { subTotal += this.passwordManagerSeatTotal( this.selectedPlan, - this.formGroup.value.additionalSeats + this.formGroup.value.additionalSeats, ); } if ( @@ -420,13 +416,8 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { if (!this.formGroup.controls.businessOwned.value || this.selectedPlan.canBeUsedByBusiness) { return; } - if (this.teamsStarterPlanFeatureFlagIsEnabled) { - this.formGroup.controls.product.setValue(ProductType.TeamsStarter); - this.formGroup.controls.plan.setValue(PlanType.TeamsStarter); - } else { - this.formGroup.controls.product.setValue(ProductType.Teams); - this.formGroup.controls.plan.setValue(PlanType.TeamsAnnually); - } + this.formGroup.controls.product.setValue(ProductType.TeamsStarter); + this.formGroup.controls.plan.setValue(PlanType.TeamsStarter); this.changedProduct(); } @@ -459,7 +450,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { const key = orgKey[0].encryptedString; const collection = await this.cryptoService.encrypt( this.i18nService.t("defaultCollection"), - orgKey[1] + orgKey[1], ); const collectionCt = collection.encryptedString; const orgKeys = await this.cryptoService.makeKeyPair(orgKey[1]); @@ -473,14 +464,14 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { this.platformUtilsService.showToast( "success", this.i18nService.t("organizationCreated"), - this.i18nService.t("organizationReadyToGo") + this.i18nService.t("organizationReadyToGo"), ); } else { orgId = await this.updateOrganization(orgId); this.platformUtilsService.showToast( "success", null, - this.i18nService.t("organizationUpgraded") + this.i18nService.t("organizationUpgraded"), ); } @@ -555,7 +546,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { key: string, collectionCt: string, orgKeys: [string, EncString], - orgKey: SymmetricCryptoKey + orgKey: SymmetricCryptoKey, ) { const request = new OrganizationCreateRequest(); request.key = key; @@ -597,7 +588,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { if (this.hasProvider) { const providerRequest = new ProviderOrganizationCreateRequest( this.formGroup.controls.clientOwnerEmail.value, - request + request, ); const providerKey = await this.cryptoService.getProviderKey(this.providerId); providerRequest.organizationCreateRequest.key = ( @@ -654,7 +645,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { } private buildSecretsManagerRequest( - request: OrganizationCreateRequest | OrganizationUpgradeRequest + request: OrganizationCreateRequest | OrganizationUpgradeRequest, ): void { const formValues = this.secretsManagerForm.value; diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html index da115459b42..0ffe79cc6cb 100644 --- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html +++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html @@ -57,7 +57,7 @@ {{ "subscriptionExpiration" | i18n }}
- {{ nextInvoice ? (nextInvoice.date | date : "mediumDate") : "-" }} + {{ nextInvoice ? (nextInvoice.date | date: "mediumDate") : "-" }}
@@ -73,10 +73,10 @@ {{ i.productName | i18n }} - {{ i.name }} {{ i.quantity > 1 ? "×" + i.quantity : "" }} @ - {{ i.amount | currency : "$" }} + {{ i.amount | currency: "$" }} - {{ i.quantity * i.amount | currency : "$" }} /{{ i.interval | i18n }} + {{ i.quantity * i.amount | currency: "$" }} /{{ i.interval | i18n }} @@ -95,12 +95,12 @@ {{ "secretsManager" | i18n }} - {{ "beta" | i18n }} ({{ "annually" | i18n }}) @ - {{ 0 | currency : "$" }} + {{ 0 | currency: "$" }} {{ "betaEnding" | i18n | uppercase }} - {{ 0 | currency : "$" }} /{{ "year" | i18n }} + {{ 0 | currency: "$" }} /{{ "year" | i18n }} @@ -176,7 +176,7 @@

{{ "storage" | i18n }}

- {{ "subscriptionStorage" | i18n : sub.maxStorageGb || 0 : sub.storageName || "0 MB" }} + {{ "subscriptionStorage" | i18n: sub.maxStorageGb || 0 : sub.storageName || "0 MB" }}

diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts index 5cb7136a67b..dd7060f848b 100644 --- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts +++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.ts @@ -57,7 +57,7 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy private organizationApiService: OrganizationApiServiceAbstraction, private route: ActivatedRoute, private dialogService: DialogService, - private datePipe: DatePipe + private datePipe: DatePipe, ) {} async ngOnInit() { @@ -72,7 +72,7 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy await this.load(); this.firstLoaded = true; }), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe(); } @@ -107,10 +107,10 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy } const apiKeyResponse = await this.organizationApiService.getApiKeyInformation( - this.organizationId + this.organizationId, ); this.hasBillingSyncToken = apiKeyResponse.data.some( - (i) => i.keyType === OrganizationApiKeyType.BillingSync + (i) => i.keyType === OrganizationApiKeyType.BillingSync, ); this.showSecretsManagerSubscribe = @@ -204,7 +204,7 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy this.sub.smServiceAccounts - this.sub.plan.SecretsManager.baseServiceAccount, interval: this.sub.plan.isAnnual ? "year" : "month", additionalServiceAccountPrice: this.discountPrice( - this.sub.plan.SecretsManager.additionalPricePerServiceAccount + this.sub.plan.SecretsManager.additionalPricePerServiceAccount, ), baseServiceAccountCount: this.sub.plan.SecretsManager.baseServiceAccount, }; @@ -265,7 +265,7 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy } else { return this.i18nService.t( "subscriptionUserSeatsLimitedAutoscale", - this.sub.maxAutoscaleSeats.toString() + this.sub.maxAutoscaleSeats.toString(), ); } } @@ -280,7 +280,7 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy return this.i18nService.translate( "smBetaEndedDesc", this.datePipe.transform(this._smBetaEndingDate), - Utils.daysRemaining(this._smGracePeriodEndingDate).toString() + Utils.daysRemaining(this._smGracePeriodEndingDate).toString(), ); } @@ -304,7 +304,7 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy this.platformUtilsService.showToast( "success", null, - this.i18nService.t("canceledSubscription") + this.i18nService.t("canceledSubscription"), ); this.load(); } catch (e) { @@ -395,7 +395,7 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy this.platformUtilsService.showToast( "success", null, - this.i18nService.t("removeSponsorshipSuccess") + this.i18nService.t("removeSponsorshipSuccess"), ); await this.load(); } catch (e) { @@ -422,7 +422,7 @@ export class OrganizationSubscriptionCloudComponent implements OnInit, OnDestroy */ function sortSubscriptionItems( a: BillingSubscriptionItemResponse, - b: BillingSubscriptionItemResponse + b: BillingSubscriptionItemResponse, ) { if (a.productName == b.productName) { if (a.addonSubscriptionItem == b.addonSubscriptionItem) { diff --git a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html index d9f815c3e42..de63f5e3496 100644 --- a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html +++ b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html @@ -29,7 +29,7 @@
{{ "lastLicenseSync" | i18n }}
- {{ lastLicenseSync != null ? (lastLicenseSync | date : "medium") : ("never" | i18n) }} + {{ lastLicenseSync != null ? (lastLicenseSync | date: "medium") : ("never" | i18n) }}
@@ -51,12 +51,12 @@ (subscription.hasSeparateGracePeriod ? subscription.expirationWithoutGracePeriod : subscription.expirationWithGracePeriod - ) | date : "mediumDate" + ) | date: "mediumDate" }}
{{ "selfHostGracePeriodHelp" - | i18n : (subscription.expirationWithGracePeriod | date : "mediumDate") + | i18n: (subscription.expirationWithGracePeriod | date: "mediumDate") }}
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts index c6c6adaa35d..7898083454c 100644 --- a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts +++ b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.ts @@ -81,7 +81,7 @@ export class OrganizationSubscriptionSelfhostComponent implements OnInit, OnDest private platformUtilsService: PlatformUtilsService, private i18nService: I18nService, private environmentService: EnvironmentService, - private dialogService: DialogService + private dialogService: DialogService, ) { this.cloudWebVaultUrl = this.environmentService.getCloudWebVaultUrl(); } @@ -95,7 +95,7 @@ export class OrganizationSubscriptionSelfhostComponent implements OnInit, OnDest await this.loadOrganizationConnection(); this.firstLoaded = true; }), - takeUntil(this.destroy$) + takeUntil(this.destroy$), ) .subscribe(); } @@ -113,7 +113,7 @@ export class OrganizationSubscriptionSelfhostComponent implements OnInit, OnDest this.userOrg = this.organizationService.get(this.organizationId); if (this.userOrg.canViewSubscription) { const subscriptionResponse = await this.organizationApiService.getSubscription( - this.organizationId + this.organizationId, ); this.subscription = new SelfHostedOrganizationSubscriptionView(subscriptionResponse); } @@ -134,7 +134,7 @@ export class OrganizationSubscriptionSelfhostComponent implements OnInit, OnDest this.existingBillingSyncConnection = await this.apiService.getOrganizationConnection( this.organizationId, OrganizationConnectionType.CloudBillingSync, - BillingSyncConfigApi + BillingSyncConfigApi, ); } diff --git a/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.html b/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.html index 6aece8fe897..c10ef9af286 100644 --- a/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.html +++ b/apps/web/src/app/billing/organizations/sm-adjust-subscription.component.html @@ -4,8 +4,8 @@ {{ "total" | i18n }}: - {{ formGroup.value.seatCount || 0 }} × {{ options.seatPrice | currency : "$" }} = - {{ seatTotalCost | currency : "$" }} / {{ options.interval | i18n }} + {{ formGroup.value.seatCount || 0 }} × {{ options.seatPrice | currency: "$" }} = + {{ seatTotalCost | currency: "$" }} / {{ options.interval | i18n }} @@ -27,8 +27,8 @@ /> {{ "maxSeatCost" | i18n }}: - {{ formGroup.value.maxAutoscaleSeats || 0 }} × - {{ options.seatPrice | currency : "$" }} = {{ maxSeatTotalCost | currency : "$" }} / + {{ formGroup.value.maxAutoscaleSeats || 0 }} × {{ options.seatPrice | currency: "$" }} = + {{ maxSeatTotalCost | currency: "$" }} / {{ options.interval | i18n }} @@ -44,14 +44,14 @@ />
- {{ "includedServiceAccounts" | i18n : options.baseServiceAccountCount }} - {{ "addAdditionalServiceAccounts" | i18n : (monthlyServiceAccountPrice | currency : "$") }} + {{ "includedServiceAccounts" | i18n: options.baseServiceAccountCount }} + {{ "addAdditionalServiceAccounts" | i18n: (monthlyServiceAccountPrice | currency: "$") }}
{{ "total" | i18n }}: {{ formGroup.value.additionalServiceAccounts || 0 }} × - {{ options.additionalServiceAccountPrice | currency : "$" }} = - {{ serviceAccountTotalCost | currency : "$" }} / {{ options.interval | i18n }} + {{ options.additionalServiceAccountPrice | currency: "$" }} = + {{ serviceAccountTotalCost | currency: "$" }} / {{ options.interval | i18n }}
@@ -79,12 +79,12 @@ />
- {{ "includedServiceAccounts" | i18n : options.baseServiceAccountCount }} + {{ "includedServiceAccounts" | i18n: options.baseServiceAccountCount }}
{{ "maxServiceAccountCost" | i18n }}: {{ maxAdditionalServiceAccounts }} × - {{ options.additionalServiceAccountPrice | currency : "$" }} = - {{ maxServiceAccountTotalCost | currency : "$" }} / {{ options.interval | i18n }} + {{ options.additionalServiceAccountPrice | currency: "$" }} = + {{ maxServiceAccountTotalCost | currency: "$" }} / {{ options.interval | i18n }}
{{ "total" | i18n }}: {{ storageAdjustment || 0 }} GB × - {{ storageGbPrice | currency : "$" }} = {{ adjustedStorageTotal | currency : "$" }} /{{ + {{ storageGbPrice | currency: "$" }} = {{ adjustedStorageTotal | currency: "$" }} /{{ interval | i18n }}
diff --git a/apps/web/src/app/billing/shared/adjust-storage.component.ts b/apps/web/src/app/billing/shared/adjust-storage.component.ts index f4b55e603be..9474324fe60 100644 --- a/apps/web/src/app/billing/shared/adjust-storage.component.ts +++ b/apps/web/src/app/billing/shared/adjust-storage.component.ts @@ -35,7 +35,7 @@ export class AdjustStorageComponent { private router: Router, private activatedRoute: ActivatedRoute, private logService: LogService, - private organizationApiService: OrganizationApiServiceAbstraction + private organizationApiService: OrganizationApiServiceAbstraction, ) {} async submit() { @@ -54,7 +54,7 @@ export class AdjustStorageComponent { } else { response = this.formPromise = this.organizationApiService.updateStorage( this.organizationId, - request + request, ); } const result = await response; @@ -62,7 +62,7 @@ export class AdjustStorageComponent { try { await this.paymentComponent.handleStripeCardPayment( result.paymentIntentClientSecret, - null + null, ); } catch { paymentFailed = true; @@ -77,14 +77,14 @@ export class AdjustStorageComponent { "warning", null, this.i18nService.t("couldNotChargeCardPayInvoice"), - { timeout: 10000 } + { timeout: 10000 }, ); this.router.navigate(["../billing"], { relativeTo: this.activatedRoute }); } else { this.platformUtilsService.showToast( "success", null, - this.i18nService.t("adjustedStorage", request.storageGbAdjustment.toString()) + this.i18nService.t("adjustedStorage", request.storageGbAdjustment.toString()), ); } } catch (e) { diff --git a/apps/web/src/app/billing/shared/billing-history.component.html b/apps/web/src/app/billing/shared/billing-history.component.html index 15a0c707765..27fd038a3b5 100644 --- a/apps/web/src/app/billing/shared/billing-history.component.html +++ b/apps/web/src/app/billing/shared/billing-history.component.html @@ -3,7 +3,7 @@ - + - +
{{ i.date | date : "mediumDate" }}{{ i.date | date: "mediumDate" }} - {{ "invoiceNumber" | i18n : i.number }} {{ i.amount | currency : "$" }}{{ i.amount | currency: "$" }} @@ -37,7 +37,7 @@ - +
{{ t.createdDate | date : "mediumDate" }}{{ t.createdDate | date: "mediumDate" }} {{ "chargeNoun" | i18n }} @@ -57,9 +57,9 @@ [ngClass]="{ 'text-strike': t.refunded }" title="{{ (t.refunded ? 'refunded' : '') | i18n }}" > - {{ t.amount | currency : "$" }} + {{ t.amount | currency: "$" }}
-* {{ "chargesStatement" | i18n : "BITWARDEN" }} +* {{ "chargesStatement" | i18n: "BITWARDEN" }} diff --git a/apps/web/src/app/billing/shared/payment-method.component.html b/apps/web/src/app/billing/shared/payment-method.component.html index 16e9d7bfcd6..75380352bc6 100644 --- a/apps/web/src/app/billing/shared/payment-method.component.html +++ b/apps/web/src/app/billing/shared/payment-method.component.html @@ -26,7 +26,7 @@

{{ (isCreditBalance ? "accountCredit" : "accountBalance") | i18n }}

- {{ creditOrBalance | currency : "$" }} + {{ creditOrBalance | currency: "$" }}

{{ "creditAppliedDesc" | i18n }}

- + `, }); export const WithTabs: Story = (args) => ({ props: args, template: ` - + Foo Bar - + `, }); export const WithCustomTitleComponent: Story = (args) => ({ props: args, template: ` - +

Bitwarden

- + `, }); diff --git a/apps/web/src/app/layouts/navbar.component.html b/apps/web/src/app/layouts/navbar.component.html index cecd5599abd..72dd17d0dc3 100644 --- a/apps/web/src/app/layouts/navbar.component.html +++ b/apps/web/src/app/layouts/navbar.component.html @@ -45,7 +45,7 @@ type="button" [bitMenuTriggerFor]="accountMenu" class="tw-border-0 tw-bg-transparent tw-text-alt2 tw-opacity-70 hover:tw-opacity-90" - attr.aria-label="{{ 'accountLoggedInAsName' | i18n : name }}" + attr.aria-label="{{ 'accountLoggedInAsName' | i18n: name }}" > import("./auth/emergency-access/accept/accept-emergency.component").then( - (mod) => mod.AcceptEmergencyComponent + (mod) => mod.AcceptEmergencyComponent, ), }, { @@ -190,7 +190,7 @@ const routes: Routes = [ path: "migrate-legacy-encryption", loadComponent: () => import("./auth/migrate-encryption/migrate-legacy-encryption.component").then( - (mod) => mod.MigrateFromLegacyEncryptionComponent + (mod) => mod.MigrateFromLegacyEncryptionComponent, ), }, ], @@ -234,7 +234,7 @@ const routes: Routes = [ path: "subscription", loadChildren: () => import("./billing/individual/individual-billing.module").then( - (m) => m.IndividualBillingModule + (m) => m.IndividualBillingModule, ), }, { diff --git a/apps/web/src/app/reports/pages/breach-report.component.html b/apps/web/src/app/reports/pages/breach-report.component.html index 5f514c23582..40d0161901a 100644 --- a/apps/web/src/app/reports/pages/breach-report.component.html +++ b/apps/web/src/app/reports/pages/breach-report.component.html @@ -25,10 +25,10 @@

{{ "reportError" | i18n }}...

- {{ "breachUsernameNotFound" | i18n : checkedUsername }} + {{ "breachUsernameNotFound" | i18n: checkedUsername }} - {{ "breachUsernameFound" | i18n : checkedUsername : breachedAccounts.length }} + {{ "breachUsernameFound" | i18n: checkedUsername : breachedAccounts.length }}
  • @@ -51,9 +51,9 @@
    {{ "affectedUsers" | i18n }}
    {{ a.pwnCount | number }}
    {{ "breachOccurred" | i18n }}
    -
    {{ a.breachDate | date : "mediumDate" }}
    +
    {{ a.breachDate | date: "mediumDate" }}
    {{ "breachReported" | i18n }}
    -
    {{ a.addedDate | date : "mediumDate" }}
    +
    {{ a.addedDate | date: "mediumDate" }}
    diff --git a/apps/web/src/app/reports/pages/breach-report.component.ts b/apps/web/src/app/reports/pages/breach-report.component.ts index 88851d26ad6..8f371cf754c 100644 --- a/apps/web/src/app/reports/pages/breach-report.component.ts +++ b/apps/web/src/app/reports/pages/breach-report.component.ts @@ -15,7 +15,10 @@ export class BreachReportComponent implements OnInit { breachedAccounts: BreachAccountResponse[] = []; formPromise: Promise; - constructor(private auditService: AuditService, private stateService: StateService) {} + constructor( + private auditService: AuditService, + private stateService: StateService, + ) {} async ngOnInit() { this.username = await this.stateService.getEmail(); diff --git a/apps/web/src/app/reports/pages/cipher-report.component.ts b/apps/web/src/app/reports/pages/cipher-report.component.ts index 984b547fb75..50456493518 100644 --- a/apps/web/src/app/reports/pages/cipher-report.component.ts +++ b/apps/web/src/app/reports/pages/cipher-report.component.ts @@ -25,7 +25,7 @@ export class CipherReportComponent { constructor( private modalService: ModalService, protected passwordRepromptService: PasswordRepromptService, - protected organizationService: OrganizationService + protected organizationService: OrganizationService, ) { this.organizations$ = this.organizationService.organizations$; } @@ -69,7 +69,7 @@ export class CipherReportComponent { modal.close(); await this.load(); }); - } + }, ); return childComponent; diff --git a/apps/web/src/app/reports/pages/exposed-passwords-report.component.html b/apps/web/src/app/reports/pages/exposed-passwords-report.component.html index f88d3a082e6..03af0e6cb47 100644 --- a/apps/web/src/app/reports/pages/exposed-passwords-report.component.html +++ b/apps/web/src/app/reports/pages/exposed-passwords-report.component.html @@ -11,7 +11,7 @@ - {{ "exposedPasswordsFoundDesc" | i18n : (ciphers.length | number) }} + {{ "exposedPasswordsFoundDesc" | i18n: (ciphers.length | number) }} @@ -54,14 +54,14 @@ *ngIf="!organization" [disabled]="disabled" [organizationId]="c.organizationId" - [organizationName]="c.organizationId | orgNameFromId : (organizations$ | async)" + [organizationName]="c.organizationId | orgNameFromId: (organizations$ | async)" appStopProp > diff --git a/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts b/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts index 4553745267d..631e9ef8a85 100644 --- a/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts +++ b/apps/web/src/app/reports/pages/exposed-passwords-report.component.ts @@ -23,7 +23,7 @@ export class ExposedPasswordsReportComponent extends CipherReportComponent imple protected auditService: AuditService, protected organizationService: OrganizationService, modalService: ModalService, - passwordRepromptService: PasswordRepromptService + passwordRepromptService: PasswordRepromptService, ) { super(modalService, passwordRepromptService, organizationService); } diff --git a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.html b/apps/web/src/app/reports/pages/inactive-two-factor-report.component.html index 076f2f03ed5..2284240386d 100644 --- a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.html +++ b/apps/web/src/app/reports/pages/inactive-two-factor-report.component.html @@ -26,7 +26,7 @@ - {{ "inactive2faFoundDesc" | i18n : (ciphers.length | number) }} + {{ "inactive2faFoundDesc" | i18n: (ciphers.length | number) }}
    - {{ "exposedXTimes" | i18n : (exposedPasswordMap.get(c.id) | number) }} + {{ "exposedXTimes" | i18n: (exposedPasswordMap.get(c.id) | number) }}
    @@ -64,7 +64,7 @@ *ngIf="!organization" [disabled]="disabled" [organizationId]="c.organizationId" - [organizationName]="c.organizationId | orgNameFromId : (organizations$ | async)" + [organizationName]="c.organizationId | orgNameFromId: (organizations$ | async)" appStopProp > diff --git a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.spec.ts b/apps/web/src/app/reports/pages/inactive-two-factor-report.component.spec.ts index 39958dddb2c..56c14b92fb1 100644 --- a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.spec.ts +++ b/apps/web/src/app/reports/pages/inactive-two-factor-report.component.spec.ts @@ -65,11 +65,11 @@ describe("InactiveTwoFactorReportComponent", () => { const expectedIdTwo: any = "cbea34a8-bde4-46ad-9d19-b05001227nm5"; component.services.set( "101domain.com", - "https://help.101domain.com/account-management/account-security/enabling-disabling-two-factor-verification" + "https://help.101domain.com/account-management/account-security/enabling-disabling-two-factor-verification", ); component.services.set( "123formbuilder.com", - "https://www.123formbuilder.com/docs/multi-factor-authentication-login" + "https://www.123formbuilder.com/docs/multi-factor-authentication-login", ); jest.spyOn(component as any, "getAllCiphers").mockReturnValue(Promise.resolve(cipherData)); diff --git a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts b/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts index e01a4d590f5..e0090778662 100644 --- a/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts +++ b/apps/web/src/app/reports/pages/inactive-two-factor-report.component.ts @@ -25,7 +25,7 @@ export class InactiveTwoFactorReportComponent extends CipherReportComponent impl protected organizationService: OrganizationService, modalService: ModalService, private logService: LogService, - passwordRepromptService: PasswordRepromptService + passwordRepromptService: PasswordRepromptService, ) { super(modalService, passwordRepromptService, organizationService); } diff --git a/apps/web/src/app/reports/pages/reused-passwords-report.component.html b/apps/web/src/app/reports/pages/reused-passwords-report.component.html index c4b80a88f31..4bb26580ccc 100644 --- a/apps/web/src/app/reports/pages/reused-passwords-report.component.html +++ b/apps/web/src/app/reports/pages/reused-passwords-report.component.html @@ -26,7 +26,7 @@ - {{ "reusedPasswordsFoundDesc" | i18n : (ciphers.length | number) }} + {{ "reusedPasswordsFoundDesc" | i18n: (ciphers.length | number) }}
    @@ -69,14 +69,14 @@ *ngIf="!organization" [disabled]="disabled" [organizationId]="c.organizationId" - [organizationName]="c.organizationId | orgNameFromId : (organizations$ | async)" + [organizationName]="c.organizationId | orgNameFromId: (organizations$ | async)" appStopProp > diff --git a/apps/web/src/app/reports/pages/reused-passwords-report.component.ts b/apps/web/src/app/reports/pages/reused-passwords-report.component.ts index 1587fc08de4..f785186c158 100644 --- a/apps/web/src/app/reports/pages/reused-passwords-report.component.ts +++ b/apps/web/src/app/reports/pages/reused-passwords-report.component.ts @@ -21,7 +21,7 @@ export class ReusedPasswordsReportComponent extends CipherReportComponent implem protected cipherService: CipherService, protected organizationService: OrganizationService, modalService: ModalService, - passwordRepromptService: PasswordRepromptService + passwordRepromptService: PasswordRepromptService, ) { super(modalService, passwordRepromptService, organizationService); } @@ -55,7 +55,7 @@ export class ReusedPasswordsReportComponent extends CipherReportComponent implem }); const reusedPasswordCiphers = ciphersWithPasswords.filter( (c) => - this.passwordUseMap.has(c.login.password) && this.passwordUseMap.get(c.login.password) > 1 + this.passwordUseMap.has(c.login.password) && this.passwordUseMap.get(c.login.password) > 1, ); this.ciphers = reusedPasswordCiphers; } diff --git a/apps/web/src/app/reports/pages/unsecured-websites-report.component.html b/apps/web/src/app/reports/pages/unsecured-websites-report.component.html index 61feed5cefa..bf4a1cdda06 100644 --- a/apps/web/src/app/reports/pages/unsecured-websites-report.component.html +++ b/apps/web/src/app/reports/pages/unsecured-websites-report.component.html @@ -26,7 +26,7 @@ - {{ "unsecuredWebsitesFoundDesc" | i18n : (ciphers.length | number) }} + {{ "unsecuredWebsitesFoundDesc" | i18n: (ciphers.length | number) }}
    - {{ "reusedXTimes" | i18n : passwordUseMap.get(c.login.password) }} + {{ "reusedXTimes" | i18n: passwordUseMap.get(c.login.password) }}
    @@ -64,7 +64,7 @@ *ngIf="!organization" [disabled]="disabled" [organizationId]="c.organizationId" - [organizationName]="c.organizationId | orgNameFromId : (organizations$ | async)" + [organizationName]="c.organizationId | orgNameFromId: (organizations$ | async)" appStopProp > diff --git a/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts b/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts index 53beccdcc51..2de70e928bb 100644 --- a/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts +++ b/apps/web/src/app/reports/pages/unsecured-websites-report.component.ts @@ -20,7 +20,7 @@ export class UnsecuredWebsitesReportComponent extends CipherReportComponent impl protected cipherService: CipherService, protected organizationService: OrganizationService, modalService: ModalService, - passwordRepromptService: PasswordRepromptService + passwordRepromptService: PasswordRepromptService, ) { super(modalService, passwordRepromptService, organizationService); } @@ -38,7 +38,7 @@ export class UnsecuredWebsitesReportComponent extends CipherReportComponent impl return c.login.uris.some((u) => u.uri != null && u.uri.indexOf("http://") === 0); }); this.ciphers = unsecuredCiphers.filter( - (c) => (!this.organization && c.edit) || (this.organization && !c.edit) + (c) => (!this.organization && c.edit) || (this.organization && !c.edit), ); } diff --git a/apps/web/src/app/reports/pages/weak-passwords-report.component.html b/apps/web/src/app/reports/pages/weak-passwords-report.component.html index 044483a5de8..562a0b504cc 100644 --- a/apps/web/src/app/reports/pages/weak-passwords-report.component.html +++ b/apps/web/src/app/reports/pages/weak-passwords-report.component.html @@ -26,7 +26,7 @@ - {{ "weakPasswordsFoundDesc" | i18n : (ciphers.length | number) }} + {{ "weakPasswordsFoundDesc" | i18n: (ciphers.length | number) }}
    @@ -69,7 +69,7 @@ *ngIf="!organization" [disabled]="disabled" [organizationId]="c.organizationId" - [organizationName]="c.organizationId | orgNameFromId : (organizations$ | async)" + [organizationName]="c.organizationId | orgNameFromId: (organizations$ | async)" appStopProp > diff --git a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts index cd2c8fb2fdc..9da96434489 100644 --- a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts +++ b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts @@ -28,7 +28,7 @@ export class WeakPasswordsReportComponent extends CipherReportComponent implemen protected passwordStrengthService: PasswordStrengthServiceAbstraction, protected organizationService: OrganizationService, modalService: ModalService, - passwordRepromptService: PasswordRepromptService + passwordRepromptService: PasswordRepromptService, ) { super(modalService, passwordRepromptService, organizationService); } @@ -68,7 +68,7 @@ export class WeakPasswordsReportComponent extends CipherReportComponent implemen .substr(0, atPosition) .trim() .toLowerCase() - .split(/[^A-Za-z0-9]/) + .split(/[^A-Za-z0-9]/), ) .filter((i) => i.length >= 3); } else { @@ -82,7 +82,7 @@ export class WeakPasswordsReportComponent extends CipherReportComponent implemen const result = this.passwordStrengthService.getPasswordStrength( login.password, null, - userInput.length > 0 ? userInput : null + userInput.length > 0 ? userInput : null, ); this.passwordStrengthCache.set(cacheKey, result.score); } diff --git a/apps/web/src/app/reports/reports-routing.module.ts b/apps/web/src/app/reports/reports-routing.module.ts index 6bbba15c9b4..6bd26837764 100644 --- a/apps/web/src/app/reports/reports-routing.module.ts +++ b/apps/web/src/app/reports/reports-routing.module.ts @@ -3,7 +3,7 @@ import { RouterModule, Routes } from "@angular/router"; import { AuthGuard } from "@bitwarden/angular/auth/guards"; -import { HasPremiumGuard } from "../core/guards/has-premium.guard"; +import { hasPremiumGuard } from "../core/guards/has-premium.guard"; import { BreachReportComponent } from "./pages/breach-report.component"; import { ExposedPasswordsReportComponent } from "./pages/exposed-passwords-report.component"; @@ -30,31 +30,31 @@ const routes: Routes = [ path: "reused-passwords-report", component: ReusedPasswordsReportComponent, data: { titleId: "reusedPasswordsReport" }, - canActivate: [HasPremiumGuard], + canActivate: [hasPremiumGuard()], }, { path: "unsecured-websites-report", component: UnsecuredWebsitesReportComponent, data: { titleId: "unsecuredWebsitesReport" }, - canActivate: [HasPremiumGuard], + canActivate: [hasPremiumGuard()], }, { path: "weak-passwords-report", component: WeakPasswordsReportComponent, data: { titleId: "weakPasswordsReport" }, - canActivate: [HasPremiumGuard], + canActivate: [hasPremiumGuard()], }, { path: "exposed-passwords-report", component: ExposedPasswordsReportComponent, data: { titleId: "exposedPasswordsReport" }, - canActivate: [HasPremiumGuard], + canActivate: [hasPremiumGuard()], }, { path: "inactive-two-factor-report", component: InactiveTwoFactorReportComponent, data: { titleId: "inactive2faReport" }, - canActivate: [HasPremiumGuard], + canActivate: [hasPremiumGuard()], }, ], }, diff --git a/apps/web/src/app/settings/domain-rules.component.html b/apps/web/src/app/settings/domain-rules.component.html index ff947c127c6..ce9b103d20b 100644 --- a/apps/web/src/app/settings/domain-rules.component.html +++ b/apps/web/src/app/settings/domain-rules.component.html @@ -16,7 +16,7 @@
    {{ "expiresOnAccessToken" | i18n }} - {{ data.expirationDate === null ? ("never" | i18n) : (data.expirationDate | date : "medium") }} + {{ data.expirationDate === null ? ("never" | i18n) : (data.expirationDate | date: "medium") }}
    diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.ts index 4244c4aa50a..caa9407903b 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/access-token-dialog.component.ts @@ -18,7 +18,7 @@ export class AccessTokenDialogComponent implements OnInit { public dialogRef: DialogRef, @Inject(DIALOG_DATA) public data: AccessTokenDetails, private platformUtilsService: PlatformUtilsService, - private i18nService: I18nService + private i18nService: I18nService, ) { this.dialogRef.disableClose = true; } @@ -36,7 +36,7 @@ export class AccessTokenDialogComponent implements OnInit { this.platformUtilsService.showToast( "success", null, - this.i18nService.t("accessTokenCreatedAndCopied") + this.i18nService.t("accessTokenCreatedAndCopied"), ); this.dialogRef.close(); } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/expiration-options.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/expiration-options.component.html index 9de09a1e3fe..f1aaf2cc31c 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/expiration-options.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/expiration-options.component.html @@ -4,7 +4,7 @@ @@ -14,7 +14,7 @@ diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/expiration-options.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/expiration-options.component.ts index 7eb7fd894b8..e224b8e1e9a 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/expiration-options.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/access/dialogs/expiration-options.component.ts @@ -52,7 +52,10 @@ export class ExpirationOptionsComponent expireDateTime: new FormControl("", [Validators.required, this.expiresInFutureValidator()]), }); - constructor(private datePipe: DatePipe, private i18nService: I18nService) {} + constructor( + private datePipe: DatePipe, + private i18nService: I18nService, + ) {} async ngOnInit() { this.form.valueChanges.pipe(takeUntil(this.destroy$)).subscribe(() => { diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.ts index ccc99bd6b8a..3d136aa92aa 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-delete-dialog.component.ts @@ -38,7 +38,7 @@ export class ServiceAccountDeleteDialogComponent { private serviceAccountService: ServiceAccountService, private i18nService: I18nService, private platformUtilsService: PlatformUtilsService, - private dialogService: DialogService + private dialogService: DialogService, ) {} get title() { @@ -101,7 +101,7 @@ export class ServiceAccountDeleteDialogComponent { ? this.i18nService.t("deleteProjectConfirmMessage", this.data.serviceAccounts[0].name) : this.i18nService.t( "deleteServiceAccountsConfirmMessage", - this.data.serviceAccounts?.length.toString() + this.data.serviceAccounts?.length.toString(), ); } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts index decd042cc14..205e157cbe7 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/dialog/service-account-dialog.component.ts @@ -32,7 +32,7 @@ export class ServiceAccountDialogComponent { updateOn: "submit", }), }, - {} + {}, ); protected loading = false; @@ -42,7 +42,7 @@ export class ServiceAccountDialogComponent { @Inject(DIALOG_DATA) private data: ServiceAccountOperation, private serviceAccountService: ServiceAccountService, private i18nService: I18nService, - private platformUtilsService: PlatformUtilsService + private platformUtilsService: PlatformUtilsService, ) {} async ngOnInit() { @@ -56,7 +56,7 @@ export class ServiceAccountDialogComponent { const serviceAccount: ServiceAccountView = await this.serviceAccountService.getByServiceAccountId( this.data.serviceAccountId, - this.data.organizationId + this.data.organizationId, ); this.formGroup.patchValue({ name: serviceAccount.name }); this.loading = false; @@ -67,7 +67,7 @@ export class ServiceAccountDialogComponent { this.platformUtilsService.showToast( "error", null, - this.i18nService.t("serviceAccountsCannotCreate") + this.i18nService.t("serviceAccountsCannotCreate"), ); return; } @@ -88,7 +88,7 @@ export class ServiceAccountDialogComponent { await this.serviceAccountService.update( this.data.serviceAccountId, this.data.organizationId, - serviceAccountView + serviceAccountView, ); serviceAccountMessage = this.i18nService.t("serviceAccountUpdated"); } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-account-event-log-api.service.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-account-event-log-api.service.ts index 669c063e988..c7278479bc8 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-account-event-log-api.service.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-account-event-log-api.service.ts @@ -14,14 +14,14 @@ export class ServiceAccountEventLogApiService { serviceAccountId: string, start: string, end: string, - token: string + token: string, ): Promise> { const r = await this.apiService.send( "GET", this.addEventParameters("/sm/events/service-accounts/" + serviceAccountId, start, end, token), null, true, - true + true, ); return new ListResponse(r, EventResponse); } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.html index e5a7ce64da8..8fe67a95561 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.html @@ -76,7 +76,7 @@
    - + diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts index f094ab2ed59..1ef71811a16 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/event-logs/service-accounts-events.component.ts @@ -29,7 +29,7 @@ export class ServiceAccountEventsComponent extends BaseEventsComponent implement exportService: EventExportService, platformUtilsService: PlatformUtilsService, logService: LogService, - fileDownloadService: FileDownloadService + fileDownloadService: FileDownloadService, ) { super( eventService, @@ -37,7 +37,7 @@ export class ServiceAccountEventsComponent extends BaseEventsComponent implement exportService, platformUtilsService, logService, - fileDownloadService + fileDownloadService, ); } @@ -59,7 +59,7 @@ export class ServiceAccountEventsComponent extends BaseEventsComponent implement this.serviceAccountId, startDate, endDate, - continuationToken + continuationToken, ); } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.ts index a1c54a6bfaa..6258f6f9dbc 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/guards/service-account-access.guard.ts @@ -12,7 +12,7 @@ export const serviceAccountAccessGuard: CanActivateFn = async (route: ActivatedR try { const serviceAccount = await serviceAccountService.getByServiceAccountId( route.params.serviceAccountId, - route.params.organizationId + route.params.organizationId, ); if (serviceAccount) { return true; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.html index 2a490d7914a..79c8132bbc3 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.html @@ -1,16 +1,22 @@ -
    -

    - {{ "serviceAccountPeopleDescription" | i18n }} -

    - - -
    + +
    +

    + {{ "serviceAccountPeopleDescription" | i18n }} +

    + + + +
    + diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.ts index 296ef1c1325..04e0617815f 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/people/service-account-people.component.ts @@ -1,162 +1,93 @@ -import { Component } from "@angular/core"; -import { ActivatedRoute } from "@angular/router"; -import { - combineLatestWith, - map, - Observable, - share, - startWith, - Subject, - switchMap, - takeUntil, -} from "rxjs"; +import { ChangeDetectorRef, Component, OnDestroy, OnInit } from "@angular/core"; +import { FormControl, FormGroup } from "@angular/forms"; +import { ActivatedRoute, Router } from "@angular/router"; +import { catchError, combineLatest, EMPTY, Subject, switchMap, takeUntil } from "rxjs"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service"; -import { DialogService, SimpleDialogOptions } from "@bitwarden/components"; -import { SelectItemView } from "@bitwarden/components/src/multi-select/models/select-item-view"; +import { DialogService } from "@bitwarden/components"; +import { AccessPolicySelectorService } from "../../shared/access-policies/access-policy-selector/access-policy-selector.service"; import { - GroupServiceAccountAccessPolicyView, - ServiceAccountAccessPoliciesView, - UserServiceAccountAccessPolicyView, -} from "../../models/view/access-policy.view"; + ApItemValueType, + convertToServiceAccountPeopleAccessPoliciesView, +} from "../../shared/access-policies/access-policy-selector/models/ap-item-value.type"; +import { + ApItemViewType, + convertPotentialGranteesToApItemViewType, + convertToAccessPolicyItemViews, +} from "../../shared/access-policies/access-policy-selector/models/ap-item-view.type"; +import { ApItemEnum } from "../../shared/access-policies/access-policy-selector/models/enums/ap-item.enum"; +import { ApPermissionEnum } from "../../shared/access-policies/access-policy-selector/models/enums/ap-permission.enum"; import { AccessPolicyService } from "../../shared/access-policies/access-policy.service"; -import { - AccessSelectorComponent, - AccessSelectorRowView, -} from "../../shared/access-policies/access-selector.component"; -import { - AccessRemovalDetails, - AccessRemovalDialogComponent, -} from "../../shared/access-policies/dialogs/access-removal-dialog.component"; @Component({ selector: "sm-service-account-people", templateUrl: "./service-account-people.component.html", }) -export class ServiceAccountPeopleComponent { +export class ServiceAccountPeopleComponent implements OnInit, OnDestroy { + private currentAccessPolicies: ApItemViewType[]; private destroy$ = new Subject(); - private serviceAccountId: string; private organizationId: string; - private rows: AccessSelectorRowView[]; + private serviceAccountId: string; - protected rows$: Observable = - this.accessPolicyService.serviceAccountAccessPolicyChanges$.pipe( - startWith(null), - combineLatestWith(this.route.params), - switchMap(([_, params]) => - this.accessPolicyService.getServiceAccountAccessPolicies(params.serviceAccountId) - ), - map((policies) => { - const rows: AccessSelectorRowView[] = []; - policies.userAccessPolicies.forEach((policy) => { - rows.push({ - type: "user", - name: policy.organizationUserName, - id: policy.organizationUserId, - accessPolicyId: policy.id, - read: policy.read, - write: policy.write, - userId: policy.userId, - icon: AccessSelectorComponent.userIcon, - static: true, - }); - }); + private currentAccessPolicies$ = combineLatest([this.route.params]).pipe( + switchMap(([params]) => + this.accessPolicyService + .getServiceAccountPeopleAccessPolicies(params.serviceAccountId) + .then((policies) => { + return convertToAccessPolicyItemViews(policies); + }), + ), + catchError(() => { + this.router.navigate(["/sm", this.organizationId, "service-accounts"]); + return EMPTY; + }), + ); - policies.groupAccessPolicies.forEach((policy) => { - rows.push({ - type: "group", - name: policy.groupName, - id: policy.groupId, - accessPolicyId: policy.id, - read: policy.read, - write: policy.write, - currentUserInGroup: policy.currentUserInGroup, - icon: AccessSelectorComponent.groupIcon, - static: true, - }); - }); + private potentialGrantees$ = combineLatest([this.route.params]).pipe( + switchMap(([params]) => + this.accessPolicyService + .getPeoplePotentialGrantees(params.organizationId) + .then((grantees) => { + return convertPotentialGranteesToApItemViewType(grantees); + }), + ), + ); - return rows; - }), - share() - ); + protected formGroup = new FormGroup({ + accessPolicies: new FormControl([] as ApItemValueType[]), + }); - protected handleCreateAccessPolicies(selected: SelectItemView[]) { - const serviceAccountAccessPoliciesView = new ServiceAccountAccessPoliciesView(); - serviceAccountAccessPoliciesView.userAccessPolicies = selected - .filter((selection) => AccessSelectorComponent.getAccessItemType(selection) === "user") - .map((filtered) => { - const view = new UserServiceAccountAccessPolicyView(); - view.grantedServiceAccountId = this.serviceAccountId; - view.organizationUserId = filtered.id; - view.read = true; - view.write = true; - return view; - }); - - serviceAccountAccessPoliciesView.groupAccessPolicies = selected - .filter((selection) => AccessSelectorComponent.getAccessItemType(selection) === "group") - .map((filtered) => { - const view = new GroupServiceAccountAccessPolicyView(); - view.grantedServiceAccountId = this.serviceAccountId; - view.groupId = filtered.id; - view.read = true; - view.write = true; - return view; - }); - - return this.accessPolicyService.createServiceAccountAccessPolicies( - this.serviceAccountId, - serviceAccountAccessPoliciesView - ); - } - - protected async handleDeleteAccessPolicy(policy: AccessSelectorRowView) { - if ( - await this.accessPolicyService.needToShowAccessRemovalWarning( - this.organizationId, - policy, - this.rows - ) - ) { - this.launchDeleteWarningDialog(policy); - return; - } - - try { - await this.accessPolicyService.deleteAccessPolicy(policy.accessPolicyId); - const simpleDialogOpts: SimpleDialogOptions = { - title: this.i18nService.t("saPeopleWarningTitle"), - content: this.i18nService.t("saPeopleWarningMessage"), - type: "warning", - acceptButtonText: { key: "close" }, - cancelButtonText: null, - }; - this.dialogService.openSimpleDialogRef(simpleDialogOpts); - } catch (e) { - this.validationService.showError(e); - } - } + protected loading = true; + protected potentialGrantees: ApItemViewType[]; + protected staticPermission = ApPermissionEnum.CanReadWrite; constructor( private route: ActivatedRoute, private dialogService: DialogService, - private i18nService: I18nService, + private changeDetectorRef: ChangeDetectorRef, private validationService: ValidationService, - private accessPolicyService: AccessPolicyService + private accessPolicyService: AccessPolicyService, + private router: Router, + private platformUtilsService: PlatformUtilsService, + private i18nService: I18nService, + private accessPolicySelectorService: AccessPolicySelectorService, ) {} ngOnInit(): void { this.route.params.pipe(takeUntil(this.destroy$)).subscribe((params) => { - this.serviceAccountId = params.serviceAccountId; this.organizationId = params.organizationId; + this.serviceAccountId = params.serviceAccountId; }); - this.rows$.pipe(takeUntil(this.destroy$)).subscribe((rows) => { - this.rows = rows; - }); + combineLatest([this.potentialGrantees$, this.currentAccessPolicies$]) + .pipe(takeUntil(this.destroy$)) + .subscribe(([potentialGrantees, currentAccessPolicies]) => { + this.potentialGrantees = potentialGrantees; + this.setSelected(currentAccessPolicies); + }); } ngOnDestroy(): void { @@ -164,16 +95,133 @@ export class ServiceAccountPeopleComponent { this.destroy$.complete(); } - private launchDeleteWarningDialog(policy: AccessSelectorRowView) { - this.dialogService.open(AccessRemovalDialogComponent, { - data: { - title: "smAccessRemovalWarningSaTitle", - message: "smAccessRemovalWarningSaMessage", - operation: "delete", - type: "service-account", - returnRoute: ["sm", this.organizationId, "service-accounts"], - policy, - }, + submit = async () => { + if (this.isFormInvalid()) { + return; + } + + const showAccessRemovalWarning = + await this.accessPolicySelectorService.showAccessRemovalWarning( + this.organizationId, + this.formGroup.value.accessPolicies, + ); + + if ( + await this.handleAccessRemovalWarning(showAccessRemovalWarning, this.currentAccessPolicies) + ) { + return; + } + + try { + const peoplePoliciesViews = await this.updateServiceAccountPeopleAccessPolicies( + this.serviceAccountId, + this.formGroup.value.accessPolicies, + ); + + await this.handleAccessTokenAvailableWarning( + showAccessRemovalWarning, + this.currentAccessPolicies, + this.formGroup.value.accessPolicies, + ); + + this.currentAccessPolicies = convertToAccessPolicyItemViews(peoplePoliciesViews); + + this.platformUtilsService.showToast( + "success", + null, + this.i18nService.t("serviceAccountAccessUpdated"), + ); + } catch (e) { + this.validationService.showError(e); + this.setSelected(this.currentAccessPolicies); + } + }; + + private setSelected(policiesToSelect: ApItemViewType[]) { + this.loading = true; + this.currentAccessPolicies = policiesToSelect; + if (policiesToSelect != undefined) { + // Must detect changes so that AccessSelector @Inputs() are aware of the latest + // potentialGrantees, otherwise no selected values will be patched below + this.changeDetectorRef.detectChanges(); + this.formGroup.patchValue({ + accessPolicies: policiesToSelect.map((m) => ({ + type: m.type, + id: m.id, + permission: m.permission, + currentUser: m.type == ApItemEnum.User ? m.currentUser : null, + currentUserInGroup: m.type == ApItemEnum.Group ? m.currentUserInGroup : null, + })), + }); + } + this.loading = false; + } + + private isFormInvalid(): boolean { + this.formGroup.markAllAsTouched(); + return this.formGroup.invalid; + } + + private async handleAccessRemovalWarning( + showAccessRemovalWarning: boolean, + currentAccessPolicies: ApItemViewType[], + ): Promise { + if (showAccessRemovalWarning) { + const confirmed = await this.showWarning(); + if (!confirmed) { + this.setSelected(currentAccessPolicies); + return true; + } + } + return false; + } + + private async updateServiceAccountPeopleAccessPolicies( + serviceAccountId: string, + selectedPolicies: ApItemValueType[], + ) { + const serviceAccountPeopleView = convertToServiceAccountPeopleAccessPoliciesView( + serviceAccountId, + selectedPolicies, + ); + return await this.accessPolicyService.putServiceAccountPeopleAccessPolicies( + serviceAccountId, + serviceAccountPeopleView, + ); + } + + private async handleAccessTokenAvailableWarning( + showAccessRemovalWarning: boolean, + currentAccessPolicies: ApItemViewType[], + selectedPolicies: ApItemValueType[], + ): Promise { + if (showAccessRemovalWarning) { + this.router.navigate(["sm", this.organizationId, "service-accounts"]); + } else if ( + this.accessPolicySelectorService.isAccessRemoval(currentAccessPolicies, selectedPolicies) + ) { + await this.showAccessTokenStillAvailableWarning(); + } + } + + private async showWarning(): Promise { + const confirmed = await this.dialogService.openSimpleDialog({ + title: { key: "smAccessRemovalWarningSaTitle" }, + content: { key: "smAccessRemovalWarningSaMessage" }, + acceptButtonText: { key: "removeAccess" }, + cancelButtonText: { key: "cancel" }, + type: "warning", + }); + return confirmed; + } + + private async showAccessTokenStillAvailableWarning(): Promise { + await this.dialogService.openSimpleDialog({ + title: { key: "saPeopleWarningTitle" }, + content: { key: "saPeopleWarningMessage" }, + type: "warning", + acceptButtonText: { key: "close" }, + cancelButtonText: null, }); } } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/projects/service-account-projects.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/projects/service-account-projects.component.ts index aed98a42351..2fcc10988df 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/projects/service-account-projects.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/projects/service-account-projects.component.ts @@ -26,7 +26,7 @@ export class ServiceAccountProjectsComponent implements OnInit, OnDestroy { startWith(null), combineLatestWith(this.route.params), switchMap(([_, params]) => - this.accessPolicyService.getGrantedPolicies(params.serviceAccountId, params.organizationId) + this.accessPolicyService.getGrantedPolicies(params.serviceAccountId, params.organizationId), ), map((policies) => { return policies.map((policy) => { @@ -41,7 +41,7 @@ export class ServiceAccountProjectsComponent implements OnInit, OnDestroy { static: false, } as AccessSelectorRowView; }); - }) + }), ); protected handleCreateAccessPolicies(selected: SelectItemView[]) { @@ -59,14 +59,14 @@ export class ServiceAccountProjectsComponent implements OnInit, OnDestroy { return this.accessPolicyService.createGrantedPolicies( this.organizationId, this.serviceAccountId, - serviceAccountProjectAccessPolicyView + serviceAccountProjectAccessPolicyView, ); } protected async handleUpdateAccessPolicy(policy: AccessSelectorRowView) { try { return await this.accessPolicyService.updateAccessPolicy( - AccessSelectorComponent.getBaseAccessPolicyView(policy) + AccessSelectorComponent.getBaseAccessPolicyView(policy), ); } catch (e) { this.validationService.showError(e); @@ -84,7 +84,7 @@ export class ServiceAccountProjectsComponent implements OnInit, OnDestroy { constructor( private route: ActivatedRoute, private validationService: ValidationService, - private accessPolicyService: AccessPolicyService + private accessPolicyService: AccessPolicyService, ) {} ngOnInit(): void { diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html index 8b7991b1214..2cda63c02f0 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.html @@ -1,4 +1,4 @@ - + diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts index 06b91f71f75..19a10b9e41f 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.component.ts @@ -31,7 +31,7 @@ export class ServiceAccountComponent implements OnInit, OnDestroy { private onChange$ = this.serviceAccountService.serviceAccount$.pipe( filter((sa) => sa?.id === this.serviceAccountId), - startWith(null) + startWith(null), ); private serviceAccountView: ServiceAccountView; @@ -39,19 +39,19 @@ export class ServiceAccountComponent implements OnInit, OnDestroy { switchMap(([params, _]) => this.serviceAccountService.getByServiceAccountId( params.serviceAccountId, - params.organizationId - ) + params.organizationId, + ), ), catchError(() => { this.router.navigate(["/sm", this.organizationId, "service-accounts"]).then(() => { this.platformUtilsService.showToast( "error", null, - this.i18nService.t("notFound", this.i18nService.t("serviceAccount")) + this.i18nService.t("notFound", this.i18nService.t("serviceAccount")), ); }); return EMPTY; - }) + }), ); constructor( @@ -60,7 +60,7 @@ export class ServiceAccountComponent implements OnInit, OnDestroy { private dialogService: DialogService, private router: Router, private platformUtilsService: PlatformUtilsService, - private i18nService: I18nService + private i18nService: I18nService, ) {} ngOnInit(): void { @@ -77,7 +77,7 @@ export class ServiceAccountComponent implements OnInit, OnDestroy { protected openNewAccessTokenDialog() { AccessTokenCreateDialogComponent.openNewAccessTokenDialog( this.dialogService, - this.serviceAccountView + this.serviceAccountView, ); } } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts index c3354c70b2d..33f99040b92 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts @@ -31,12 +31,12 @@ export class ServiceAccountService { constructor( private cryptoService: CryptoService, private apiService: ApiService, - private encryptService: EncryptService + private encryptService: EncryptService, ) {} async getServiceAccounts( organizationId: string, - includeAccessToSecrets?: boolean + includeAccessToSecrets?: boolean, ): Promise { const params = new URLSearchParams(); if (includeAccessToSecrets) { @@ -48,7 +48,7 @@ export class ServiceAccountService { "/organizations/" + organizationId + "/service-accounts?" + params.toString(), null, true, - true + true, ); const results = new ListResponse(r, ServiceAccountSecretsDetailsResponse); return await this.createServiceAccountSecretsDetailsViews(organizationId, results.data); @@ -56,7 +56,7 @@ export class ServiceAccountService { async getByServiceAccountId( serviceAccountId: string, - organizationId: string + organizationId: string, ): Promise { const orgKey = await this.getOrganizationKey(organizationId); const r = await this.apiService.send( @@ -64,7 +64,7 @@ export class ServiceAccountService { "/service-accounts/" + serviceAccountId, null, true, - true + true, ); return await this.createServiceAccountView(orgKey, new ServiceAccountResponse(r)); @@ -73,7 +73,7 @@ export class ServiceAccountService { async update( serviceAccountId: string, organizationId: string, - serviceAccountView: ServiceAccountView + serviceAccountView: ServiceAccountView, ) { const orgKey = await this.getOrganizationKey(organizationId); const request = await this.getServiceAccountRequest(orgKey, serviceAccountView); @@ -82,10 +82,10 @@ export class ServiceAccountService { "/service-accounts/" + serviceAccountId, request, true, - true + true, ); this._serviceAccount.next( - await this.createServiceAccountView(orgKey, new ServiceAccountResponse(r)) + await this.createServiceAccountView(orgKey, new ServiceAccountResponse(r)), ); } @@ -97,10 +97,10 @@ export class ServiceAccountService { "/organizations/" + organizationId + "/service-accounts", request, true, - true + true, ); this._serviceAccount.next( - await this.createServiceAccountView(orgKey, new ServiceAccountResponse(r)) + await this.createServiceAccountView(orgKey, new ServiceAccountResponse(r)), ); } @@ -125,7 +125,7 @@ export class ServiceAccountService { private async getServiceAccountRequest( organizationKey: SymmetricCryptoKey, - serviceAccountView: ServiceAccountView + serviceAccountView: ServiceAccountView, ) { const request = new ServiceAccountRequest(); request.name = await this.encryptService.encrypt(serviceAccountView.name, organizationKey); @@ -134,7 +134,7 @@ export class ServiceAccountService { private async createServiceAccountView( organizationKey: SymmetricCryptoKey, - serviceAccountResponse: ServiceAccountResponse + serviceAccountResponse: ServiceAccountResponse, ): Promise { const serviceAccountView = new ServiceAccountView(); serviceAccountView.id = serviceAccountResponse.id; @@ -144,7 +144,7 @@ export class ServiceAccountService { serviceAccountView.name = serviceAccountResponse.name ? await this.encryptService.decryptToUtf8( new EncString(serviceAccountResponse.name), - organizationKey + organizationKey, ) : null; return serviceAccountView; @@ -152,7 +152,7 @@ export class ServiceAccountService { private async createServiceAccountSecretsDetailsView( organizationKey: SymmetricCryptoKey, - response: ServiceAccountSecretsDetailsResponse + response: ServiceAccountSecretsDetailsResponse, ): Promise { const view = new ServiceAccountSecretsDetailsView(); view.id = response.id; @@ -168,13 +168,13 @@ export class ServiceAccountService { private async createServiceAccountSecretsDetailsViews( organizationId: string, - serviceAccountResponses: ServiceAccountSecretsDetailsResponse[] + serviceAccountResponses: ServiceAccountSecretsDetailsResponse[], ): Promise { const orgKey = await this.getOrganizationKey(organizationId); return await Promise.all( serviceAccountResponses.map(async (s: ServiceAccountSecretsDetailsResponse) => { return await this.createServiceAccountSecretsDetailsView(orgKey, s); - }) + }), ); } } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html index bff5cbf4d31..fb8d953e107 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-accounts-list.component.html @@ -66,7 +66,7 @@ - + - + - + diff --git a/libs/importer/src/components/dialog/import-success-dialog.component.ts b/libs/importer/src/components/dialog/import-success-dialog.component.ts index 7f34ea1869c..1e0d4f7fda9 100644 --- a/libs/importer/src/components/dialog/import-success-dialog.component.ts +++ b/libs/importer/src/components/dialog/import-success-dialog.component.ts @@ -22,7 +22,10 @@ export interface ResultList { export class ImportSuccessDialogComponent implements OnInit { protected dataSource = new TableDataSource(); - constructor(public dialogRef: DialogRef, @Inject(DIALOG_DATA) public data: ImportResult) {} + constructor( + public dialogRef: DialogRef, + @Inject(DIALOG_DATA) public data: ImportResult, + ) {} ngOnInit(): void { if (this.data != null) { diff --git a/libs/importer/src/components/import.component.html b/libs/importer/src/components/import.component.html index 8b09e42e6f0..7e2fd4f1631 100644 --- a/libs/importer/src/components/import.component.html +++ b/libs/importer/src/components/import.component.html @@ -54,8 +54,7 @@ {{ "importTargetHint" - | i18n - : (organizationId ? ("collection" | i18n | lowercase) : ("folder" | i18n | lowercase)) + | i18n: (organizationId ? ("collection" | i18n | lowercase) : ("folder" | i18n | lowercase)) }} diff --git a/libs/importer/src/components/import.component.ts b/libs/importer/src/components/import.component.ts index bed84fe72fd..557ed86f841 100644 --- a/libs/importer/src/components/import.component.ts +++ b/libs/importer/src/components/import.component.ts @@ -178,7 +178,7 @@ export class ImportComponent implements OnInit, OnDestroy { protected folderService: FolderService, protected collectionService: CollectionService, protected organizationService: OrganizationService, - protected formBuilder: FormBuilder + protected formBuilder: FormBuilder, ) {} protected get importBlockedByPolicy(): boolean { @@ -202,8 +202,8 @@ export class ImportComponent implements OnInit, OnDestroy { this.organizations$ = concat( this.organizationService.memberOrganizations$.pipe( canAccessImportExport(this.i18nService), - map((orgs) => orgs.sort(Utils.getSortFunction(this.i18nService, "name"))) - ) + map((orgs) => orgs.sort(Utils.getSortFunction(this.i18nService, "name"))), + ), ); combineLatest([ @@ -225,12 +225,12 @@ export class ImportComponent implements OnInit, OnDestroy { this.collections$ = Utils.asyncToObservable(() => this.collectionService .getAllDecrypted() - .then((c) => c.filter((c2) => c2.organizationId === this.organizationId)) + .then((c) => c.filter((c2) => c2.organizationId === this.organizationId)), ); } else { // Filter out the `no folder`-item from folderViews$ this.folders$ = this.folderService.folderViews$.pipe( - map((folders) => folders.filter((f) => f.id != null)) + map((folders) => folders.filter((f) => f.id != null)), ); this.formGroup.controls.targetSelector.disable(); @@ -245,7 +245,7 @@ export class ImportComponent implements OnInit, OnDestroy { this.collections$ = Utils.asyncToObservable(() => this.collectionService .getAllDecrypted() - .then((c) => c.filter((c2) => c2.organizationId === value)) + .then((c) => c.filter((c2) => c2.organizationId === value)), ); } }); @@ -273,7 +273,7 @@ export class ImportComponent implements OnInit, OnDestroy { private async asyncValidatorsFinished() { if (this.formGroup.pending) { await firstValueFrom( - this.formGroup.statusChanges.pipe(filter((status) => status !== "PENDING")) + this.formGroup.statusChanges.pipe(filter((status) => status !== "PENDING")), ); } } @@ -295,7 +295,7 @@ export class ImportComponent implements OnInit, OnDestroy { this.platformUtilsService.showToast( "error", null, - this.i18nService.t("personalOwnershipPolicyInEffectImports") + this.i18nService.t("personalOwnershipPolicyInEffectImports"), ); return; } @@ -307,14 +307,14 @@ export class ImportComponent implements OnInit, OnDestroy { const importer = this.importService.getImporter( this.format, promptForPassword_callback, - this.organizationId + this.organizationId, ); if (importer === null) { this.platformUtilsService.showToast( "error", this.i18nService.t("errorOccurred"), - this.i18nService.t("selectFormat") + this.i18nService.t("selectFormat"), ); return; } @@ -326,7 +326,7 @@ export class ImportComponent implements OnInit, OnDestroy { this.platformUtilsService.showToast( "error", this.i18nService.t("errorOccurred"), - this.i18nService.t("selectFile") + this.i18nService.t("selectFile"), ); return; } @@ -346,7 +346,7 @@ export class ImportComponent implements OnInit, OnDestroy { this.platformUtilsService.showToast( "error", this.i18nService.t("errorOccurred"), - this.i18nService.t("selectFile") + this.i18nService.t("selectFile"), ); return; } @@ -361,7 +361,7 @@ export class ImportComponent implements OnInit, OnDestroy { fileContents, this.organizationId, this.formGroup.controls.targetSelector.value, - this.canAccessImportExport(this.organizationId) + this.canAccessImportExport(this.organizationId), ); //No errors, display success message @@ -486,7 +486,7 @@ export class ImportComponent implements OnInit, OnDestroy { }, function error(e) { return ""; - } + }, ); } diff --git a/libs/importer/src/components/lastpass/dialog/lastpass-multifactor-prompt.component.ts b/libs/importer/src/components/lastpass/dialog/lastpass-multifactor-prompt.component.ts index c3167bfea43..2d08e1b05f0 100644 --- a/libs/importer/src/components/lastpass/dialog/lastpass-multifactor-prompt.component.ts +++ b/libs/importer/src/components/lastpass/dialog/lastpass-multifactor-prompt.component.ts @@ -59,7 +59,7 @@ export class LastPassMultifactorPromptComponent { constructor( public dialogRef: DialogRef, - @Inject(DIALOG_DATA) protected data: LastPassMultifactorPromptData + @Inject(DIALOG_DATA) protected data: LastPassMultifactorPromptData, ) {} submit = () => { diff --git a/libs/importer/src/components/lastpass/import-lastpass.component.ts b/libs/importer/src/components/lastpass/import-lastpass.component.ts index 281d93c40e6..c7c205484fb 100644 --- a/libs/importer/src/components/lastpass/import-lastpass.component.ts +++ b/libs/importer/src/components/lastpass/import-lastpass.component.ts @@ -56,7 +56,7 @@ export class ImportLastPassComponent implements OnInit, OnDestroy { if (status === "PENDING") { return this.i18nService.t("importingYourAccount"); } - }) + }), ); @Output() csvDataLoaded = new EventEmitter(); @@ -66,7 +66,7 @@ export class ImportLastPassComponent implements OnInit, OnDestroy { private controlContainer: ControlContainer, private logService: LogService, private lastPassDirectImportService: LastPassDirectImportService, - private i18nService: I18nService + private i18nService: I18nService, ) {} ngOnInit(): void { @@ -88,7 +88,7 @@ export class ImportLastPassComponent implements OnInit, OnDestroy { try { const csvData = await this.lastPassDirectImportService.handleImport( this.formGroup.controls.email.value, - this.formGroup.controls.includeSharedFolders.value + this.formGroup.controls.includeSharedFolders.value, ); this.csvDataLoaded.emit(csvData); return null; diff --git a/libs/importer/src/components/lastpass/lastpass-direct-import.service.ts b/libs/importer/src/components/lastpass/lastpass-direct-import.service.ts index 4995e379139..9c40530d385 100644 --- a/libs/importer/src/components/lastpass/lastpass-direct-import.service.ts +++ b/libs/importer/src/components/lastpass/lastpass-direct-import.service.ts @@ -41,7 +41,7 @@ export class LastPassDirectImportService { private passwordGenerationService: PasswordGenerationServiceAbstraction, private broadcasterService: BroadcasterService, private ngZone: NgZone, - private dialogService: DialogService + private dialogService: DialogService, ) { this.vault = new Vault(this.cryptoFunctionService, this.tokenService); @@ -73,7 +73,7 @@ export class LastPassDirectImportService { const csvData = await this.handleFederatedImport( oidc.oidcCode, oidc.oidcState, - includeSharedFolders + includeSharedFolders, ); return csvData; } @@ -155,7 +155,7 @@ export class LastPassDirectImportService { private async handleStandardImport( email: string, password: string, - includeSharedFolders: boolean + includeSharedFolders: boolean, ): Promise { const clientInfo = await this.createClientInfo(email); await this.vault.open(email, password, clientInfo, this.lastPassDirectImportUIService, { @@ -168,10 +168,10 @@ export class LastPassDirectImportService { private async handleFederatedImport( oidcCode: string, oidcState: string, - includeSharedFolders: boolean + includeSharedFolders: boolean, ): Promise { const response = await this.oidcClient.processSigninResponse( - this.getOidcRedirectUrlWithParams(oidcCode, oidcState) + this.getOidcRedirectUrlWithParams(oidcCode, oidcState), ); const userState = response.userState as any; diff --git a/libs/importer/src/importers/avira-csv-importer.ts b/libs/importer/src/importers/avira-csv-importer.ts index 6a686930232..5f86f2df2aa 100644 --- a/libs/importer/src/importers/avira-csv-importer.ts +++ b/libs/importer/src/importers/avira-csv-importer.ts @@ -16,7 +16,7 @@ export class AviraCsvImporter extends BaseImporter implements Importer { const cipher = this.initLoginCipher(); cipher.name = this.getValueOrDefault( value.name, - this.getValueOrDefault(this.nameFromUrl(value.website), "--") + this.getValueOrDefault(this.nameFromUrl(value.website), "--"), ); cipher.login.uris = this.makeUriArray(value.website); cipher.login.password = this.getValueOrDefault(value.password); diff --git a/libs/importer/src/importers/base-importer.ts b/libs/importer/src/importers/base-importer.ts index 0db20fa4b4d..116a278e354 100644 --- a/libs/importer/src/importers/base-importer.ts +++ b/libs/importer/src/importers/base-importer.ts @@ -137,6 +137,10 @@ export abstract class BaseImporter { } protected parseXml(data: string): Document { + // Ensure there are no external entity elements in the XML to prevent against XXE attacks. + if (!this.validateNoExternalEntities(data)) { + return null; + } const parser = new DOMParser(); const doc = parser.parseFromString(data, "application/xml"); return doc != null && doc.querySelector("parsererror") == null ? doc : null; @@ -146,7 +150,7 @@ export abstract class BaseImporter { const parseOptions: papa.ParseConfig = Object.assign( { header: header }, this.parseCsvOptions, - options + options, ); data = this.splitNewLine(data).join("\n").trim(); const result = papa.parse(data, parseOptions); @@ -321,7 +325,7 @@ export abstract class BaseImporter { cipher: CipherView, key: string, value: string, - type: FieldType = FieldType.Text + type: FieldType = FieldType.Text, ) { if (this.isNullOrWhitespace(value)) { return; @@ -402,4 +406,10 @@ export abstract class BaseImporter { cipher.identity.lastName = nameParts.slice(2, nameParts.length).join(" "); } } + + private validateNoExternalEntities(data: string): boolean { + const regex = new RegExp("> | null { if (data.folders == null) { return null; @@ -179,7 +179,7 @@ export class BitwardenJsonImporter extends BaseImporter implements Importer { } private async parseCollections( - data: BitwardenUnEncryptedOrgJsonExport | BitwardenEncryptedOrgJsonExport + data: BitwardenUnEncryptedOrgJsonExport | BitwardenEncryptedOrgJsonExport, ): Promise> | null { if (data.collections == null) { return null; diff --git a/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts b/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts index 7759f5ffce3..7215496b301 100644 --- a/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts +++ b/libs/importer/src/importers/bitwarden/bitwarden-password-protected-importer.ts @@ -19,7 +19,7 @@ export class BitwardenPasswordProtectedImporter extends BitwardenJsonImporter im cryptoService: CryptoService, i18nService: I18nService, cipherService: CipherService, - private promptForPassword_callback: () => Promise + private promptForPassword_callback: () => Promise, ) { super(cryptoService, i18nService, cipherService); } @@ -63,7 +63,7 @@ export class BitwardenPasswordProtectedImporter extends BitwardenJsonImporter im private async checkPassword( jdoc: BitwardenPasswordProtectedFileFormat, - password: string + password: string, ): Promise { if (this.isNullOrWhitespace(password)) { return false; @@ -73,14 +73,14 @@ export class BitwardenPasswordProtectedImporter extends BitwardenJsonImporter im password, jdoc.salt, jdoc.kdfType, - new KdfConfig(jdoc.kdfIterations, jdoc.kdfMemory, jdoc.kdfParallelism) + new KdfConfig(jdoc.kdfIterations, jdoc.kdfMemory, jdoc.kdfParallelism), ); const encKeyValidation = new EncString(jdoc.encKeyValidation_DO_NOT_EDIT); const encKeyValidationDecrypt = await this.cryptoService.decryptToUtf8( encKeyValidation, - this.key + this.key, ); if (encKeyValidationDecrypt === null) { return false; diff --git a/libs/importer/src/importers/blur-csv-importer.ts b/libs/importer/src/importers/blur-csv-importer.ts index 1b2f29791b4..645bdbf3e48 100644 --- a/libs/importer/src/importers/blur-csv-importer.ts +++ b/libs/importer/src/importers/blur-csv-importer.ts @@ -19,7 +19,7 @@ export class BlurCsvImporter extends BaseImporter implements Importer { const cipher = this.initLoginCipher(); cipher.name = this.getValueOrDefault( value.label, - this.getValueOrDefault(this.nameFromUrl(value.domain), "--") + this.getValueOrDefault(this.nameFromUrl(value.domain), "--"), ); cipher.login.uris = this.makeUriArray(value.domain); cipher.login.password = this.getValueOrDefault(value.password); diff --git a/libs/importer/src/importers/dashlane/dashlane-json-importer.ts b/libs/importer/src/importers/dashlane/dashlane-json-importer.ts index d4d40a56701..ddb793b6ed5 100644 --- a/libs/importer/src/importers/dashlane/dashlane-json-importer.ts +++ b/libs/importer/src/importers/dashlane/dashlane-json-importer.ts @@ -67,7 +67,7 @@ export class DashlaneJsonImporter extends BaseImporter implements Importer { cipher.login.username = this.getValueOrDefault( credential.login, - this.getValueOrDefault(credential.secondaryLogin) + this.getValueOrDefault(credential.secondaryLogin), ); if (this.isNullOrWhitespace(cipher.login.username)) { cipher.login.username = this.getValueOrDefault(credential.email); diff --git a/libs/importer/src/importers/enpass/enpass-json-importer.ts b/libs/importer/src/importers/enpass/enpass-json-importer.ts index 733926b3b1a..b8ab6accf27 100644 --- a/libs/importer/src/importers/enpass/enpass-json-importer.ts +++ b/libs/importer/src/importers/enpass/enpass-json-importer.ts @@ -102,7 +102,7 @@ export class EnpassJsonImporter extends BaseImporter implements Importer { cipher, field.label, field.value, - field.sensitive === 1 ? FieldType.Hidden : FieldType.Text + field.sensitive === 1 ? FieldType.Hidden : FieldType.Text, ); } }); @@ -134,7 +134,7 @@ export class EnpassJsonImporter extends BaseImporter implements Importer { cipher, field.label, field.value, - field.sensitive === 1 ? FieldType.Hidden : FieldType.Text + field.sensitive === 1 ? FieldType.Hidden : FieldType.Text, ); } } else { @@ -142,7 +142,7 @@ export class EnpassJsonImporter extends BaseImporter implements Importer { cipher, field.label, field.value, - field.sensitive === 1 ? FieldType.Hidden : FieldType.Text + field.sensitive === 1 ? FieldType.Hidden : FieldType.Text, ); } }); @@ -157,7 +157,7 @@ export class EnpassJsonImporter extends BaseImporter implements Importer { cipher, field.label, field.value, - field.sensitive === 1 ? FieldType.Hidden : FieldType.Text + field.sensitive === 1 ? FieldType.Hidden : FieldType.Text, ); }); } @@ -185,7 +185,7 @@ export class EnpassJsonImporter extends BaseImporter implements Importer { private flattenFolderTree( titlePrefix: string, tree: EnpassFolderTreeItem[], - map: Map + map: Map, ) { if (tree == null) { return; diff --git a/libs/importer/src/importers/lastpass/access/models/oob-result.ts b/libs/importer/src/importers/lastpass/access/models/oob-result.ts index ddd8b0d9671..1564f18d480 100644 --- a/libs/importer/src/importers/lastpass/access/models/oob-result.ts +++ b/libs/importer/src/importers/lastpass/access/models/oob-result.ts @@ -4,7 +4,7 @@ export class OobResult { constructor( public waitForOutOfBand: boolean, public passcode: string, - public rememberMe: boolean + public rememberMe: boolean, ) {} waitForApproval(rememberMe: boolean) { diff --git a/libs/importer/src/importers/lastpass/access/models/otp-result.ts b/libs/importer/src/importers/lastpass/access/models/otp-result.ts index 52c2c565f65..adece18f297 100644 --- a/libs/importer/src/importers/lastpass/access/models/otp-result.ts +++ b/libs/importer/src/importers/lastpass/access/models/otp-result.ts @@ -1,5 +1,8 @@ export class OtpResult { static cancel = new OtpResult("cancel", false); - constructor(public passcode: string, public rememberMe: boolean) {} + constructor( + public passcode: string, + public rememberMe: boolean, + ) {} } diff --git a/libs/importer/src/importers/lastpass/access/services/client.ts b/libs/importer/src/importers/lastpass/access/services/client.ts index f55863e96c0..341bbc59ce7 100644 --- a/libs/importer/src/importers/lastpass/access/services/client.ts +++ b/libs/importer/src/importers/lastpass/access/services/client.ts @@ -31,14 +31,17 @@ const KnownOtpMethods = new Map([ ]); export class Client { - constructor(private parser: Parser, private cryptoUtils: CryptoUtils) {} + constructor( + private parser: Parser, + private cryptoUtils: CryptoUtils, + ) {} async openVault( username: string, password: string, clientInfo: ClientInfo, ui: Ui, - options: ParserOptions + options: ParserOptions, ): Promise { const lowercaseUsername = username.toLowerCase(); const [session, rest] = await this.login(lowercaseUsername, password, clientInfo, ui); @@ -47,7 +50,7 @@ export class Client { const key = await this.cryptoUtils.deriveKey( lowercaseUsername, password, - session.keyIterationCount + session.keyIterationCount, ); let privateKey: Uint8Array = null; @@ -65,7 +68,7 @@ export class Client { blob: Uint8Array, encryptionKey: Uint8Array, privateKey: Uint8Array, - options: ParserOptions + options: ParserOptions, ): Promise { const reader = new BinaryReader(blob); const chunks = this.parser.extractChunks(reader); @@ -79,7 +82,7 @@ export class Client { chunks: Chunk[], encryptionKey: Uint8Array, privateKey: Uint8Array, - options: ParserOptions + options: ParserOptions, ): Promise { const accounts = new Array(); let folder: SharedFolder = null; @@ -109,7 +112,7 @@ export class Client { username: string, password: string, clientInfo: ClientInfo, - ui: Ui + ui: Ui, ): Promise<[Session, RestClient]> { const rest = new RestClient(); rest.baseUrl = "https://lastpass.com"; @@ -142,7 +145,7 @@ export class Client { keyIterationCount, new Map(), clientInfo, - rest + rest, ); session = this.extractSessionFromLoginResponse(response, keyIterationCount, clientInfo); @@ -192,7 +195,7 @@ export class Client { optMethod, clientInfo, ui, - rest + rest, ); } else if (cause === "outofbandrequired") { // 3.2. Some out-of-bound authentication is enabled. This does not require any @@ -204,7 +207,7 @@ export class Client { this.getAllErrorAttributes(response), clientInfo, ui, - rest + rest, ); } @@ -224,7 +227,7 @@ export class Client { method: OtpMethod, clientInfo: ClientInfo, ui: Ui, - rest: RestClient + rest: RestClient, ): Promise { let passcode: OtpResult = null; switch (method) { @@ -251,7 +254,7 @@ export class Client { keyIterationCount, new Map([["otp", passcode.passcode]]), clientInfo, - rest + rest, ); const session = this.extractSessionFromLoginResponse(response, keyIterationCount, clientInfo); @@ -271,7 +274,7 @@ export class Client { parameters: Map, clientInfo: ClientInfo, ui: Ui, - rest: RestClient + rest: RestClient, ): Promise { // In case of the OOB auth the server doesn't respond instantly. This works more like a long poll. // The server times out in about 10 seconds so there's no need to back off. @@ -282,7 +285,7 @@ export class Client { keyIterationCount, extraParameters, clientInfo, - rest + rest, ); const session = this.extractSessionFromLoginResponse(response, keyIterationCount, clientInfo); @@ -335,7 +338,7 @@ export class Client { username: string, parameters: Map, ui: Ui, - rest: RestClient + rest: RestClient, ): Promise { const method = parameters.get("outofbandtype"); if (method == null) { @@ -357,7 +360,7 @@ export class Client { username: string, parameters: Map, ui: Ui, - rest: RestClient + rest: RestClient, ): Promise { return parameters.get("preferduowebsdk") == "1" ? this.approveDuoWebSdk(username, parameters, ui, rest) @@ -368,7 +371,7 @@ export class Client { username: string, parameters: Map, ui: Ui, - rest: RestClient + rest: RestClient, ): Promise { // TODO: implement this instead of calling `approveDuo` return ui.approveDuo(); @@ -384,7 +387,7 @@ export class Client { "trust.php", parameters, null, - this.getSessionCookies(session) + this.getSessionCookies(session), ); if (response.status == HttpStatusCode.Ok) { return; @@ -401,7 +404,7 @@ export class Client { "logout.php", parameters, null, - this.getSessionCookies(session) + this.getSessionCookies(session), ); if (response.status == HttpStatusCode.Ok) { return; @@ -460,7 +463,7 @@ export class Client { private extractSessionFromLoginResponse( response: Document, keyIterationCount: number, - clientInfo: ClientInfo + clientInfo: ClientInfo, ): Session { const ok = response.querySelector("response > ok"); if (ok == null) { @@ -494,7 +497,7 @@ export class Client { keyIterationCount: number, extraParameters: Map, clientInfo: ClientInfo, - rest: RestClient + rest: RestClient, ) { const hash = await this.cryptoUtils.deriveKeyHash(username, password, keyIterationCount); @@ -526,7 +529,7 @@ export class Client { private makeError(response: Response) { // TODO: error parsing throw new Error( - "HTTP request to " + response.url + " failed with status " + response.status + "." + "HTTP request to " + response.url + " failed with status " + response.status + ".", ); } diff --git a/libs/importer/src/importers/lastpass/access/services/crypto-utils.ts b/libs/importer/src/importers/lastpass/access/services/crypto-utils.ts index 4de046f2aa3..4cf81505184 100644 --- a/libs/importer/src/importers/lastpass/access/services/crypto-utils.ts +++ b/libs/importer/src/importers/lastpass/access/services/crypto-utils.ts @@ -19,7 +19,7 @@ export class CryptoUtils { if (iterationCount == 1) { return await this.cryptoFunctionService.hash( Utils.fromBufferToHex(key.buffer) + password, - "sha256" + "sha256", ); } return await this.cryptoFunctionService.pbkdf2(key, password, "sha256", 1); @@ -39,7 +39,7 @@ export class CryptoUtils { async decryptAes256PlainWithDefault( data: Uint8Array, encryptionKey: Uint8Array, - defaultValue: string + defaultValue: string, ) { try { return this.decryptAes256Plain(data, encryptionKey); @@ -51,7 +51,7 @@ export class CryptoUtils { async decryptAes256Base64WithDefault( data: Uint8Array, encryptionKey: Uint8Array, - defaultValue: string + defaultValue: string, ) { try { return this.decryptAes256Base64(data, encryptionKey); @@ -86,7 +86,7 @@ export class CryptoUtils { data: Uint8Array, encryptionKey: Uint8Array, mode: "cbc" | "ecb", - iv: Uint8Array = new Uint8Array(16) + iv: Uint8Array = new Uint8Array(16), ): Promise { if (data.length === 0) { return ""; diff --git a/libs/importer/src/importers/lastpass/access/services/parser.ts b/libs/importer/src/importers/lastpass/access/services/parser.ts index 3d64490be12..41fa7dfd34b 100644 --- a/libs/importer/src/importers/lastpass/access/services/parser.ts +++ b/libs/importer/src/importers/lastpass/access/services/parser.ts @@ -16,7 +16,7 @@ const AllowedSecureNoteTypes = new Set([ export class Parser { constructor( private cryptoFunctionService: CryptoFunctionService, - private cryptoUtils: CryptoUtils + private cryptoUtils: CryptoUtils, ) {} /* @@ -30,7 +30,7 @@ export class Parser { chunk: Chunk, encryptionKey: Uint8Array, folder: SharedFolder, - options: ParserOptions + options: ParserOptions, ): Promise { const placeholder = "decryption failed"; const reader = new BinaryReader(chunk.payload); @@ -43,19 +43,19 @@ export class Parser { const name = await this.cryptoUtils.decryptAes256PlainWithDefault( this.readItem(reader), encryptionKey, - placeholder + placeholder, ); // 2: group const group = await this.cryptoUtils.decryptAes256PlainWithDefault( this.readItem(reader), encryptionKey, - placeholder + placeholder, ); // 3: url let url = Utils.fromBufferToUtf8( - Utils.fromHexToArray(Utils.fromBufferToUtf8(this.readItem(reader))) + Utils.fromHexToArray(Utils.fromBufferToUtf8(this.readItem(reader))), ); // Ignore "group" accounts. They have no credentials. @@ -67,7 +67,7 @@ export class Parser { const notes = await this.cryptoUtils.decryptAes256PlainWithDefault( this.readItem(reader), encryptionKey, - placeholder + placeholder, ); // 5: fav (is favorite) @@ -80,14 +80,14 @@ export class Parser { let username = await this.cryptoUtils.decryptAes256PlainWithDefault( this.readItem(reader), encryptionKey, - placeholder + placeholder, ); // 8: password let password = await this.cryptoUtils.decryptAes256PlainWithDefault( this.readItem(reader), encryptionKey, - placeholder + placeholder, ); // 9: pwprotect (?) @@ -215,7 +215,7 @@ export class Parser { const totp = await this.cryptoUtils.decryptAes256PlainWithDefault( this.readItem(reader), encryptionKey, - placeholder + placeholder, ); // 3 more left. Don't even bother skipping them. @@ -244,7 +244,7 @@ export class Parser { async parseShar( chunk: Chunk, encryptionKey: Uint8Array, - rsaKey: Uint8Array + rsaKey: Uint8Array, ): Promise { const reader = new BinaryReader(chunk.payload); @@ -257,7 +257,7 @@ export class Parser { const decFolderKey = await this.cryptoFunctionService.rsaDecrypt( rsaEncryptedFolderKey, rsaKey, - "sha1" + "sha1", ); const key = Utils.fromHexToArray(Utils.fromBufferToUtf8(decFolderKey)); @@ -277,7 +277,7 @@ export class Parser { Utils.fromHexToArray(encryptedPrivateKey), encryptionKey, "cbc", - encryptionKey.subarray(0, 16) + encryptionKey.subarray(0, 16), ); const header = "LastPassPrivateKey<"; diff --git a/libs/importer/src/importers/lastpass/access/services/rest-client.ts b/libs/importer/src/importers/lastpass/access/services/rest-client.ts index ce5fede33cb..f11753539c2 100644 --- a/libs/importer/src/importers/lastpass/access/services/rest-client.ts +++ b/libs/importer/src/importers/lastpass/access/services/rest-client.ts @@ -5,7 +5,7 @@ export class RestClient { async get( endpoint: string, headers: Map = null, - cookies: Map = null + cookies: Map = null, ): Promise { const requestInit: RequestInit = { method: "GET", @@ -21,7 +21,7 @@ export class RestClient { endpoint: string, parameters: Map = null, headers: Map = null, - cookies: Map = null + cookies: Map = null, ): Promise { const setBody = (requestInit: RequestInit, headerMap: Map) => { if (parameters != null && parameters.size > 0) { @@ -39,7 +39,7 @@ export class RestClient { endpoint: string, body: any, headers: Map = null, - cookies: Map = null + cookies: Map = null, ): Promise { const setBody = (requestInit: RequestInit, headerMap: Map) => { if (body != null) { @@ -54,7 +54,7 @@ export class RestClient { endpoint: string, setBody: (requestInit: RequestInit, headers: Map) => void, headers: Map = null, - cookies: Map = null + cookies: Map = null, ) { const requestInit: RequestInit = { method: "POST", @@ -73,7 +73,7 @@ export class RestClient { private setHeaders( requestInit: RequestInit, headers: Map = null, - cookies: Map = null + cookies: Map = null, ) { const requestHeaders = new Headers(); let setHeaders = false; diff --git a/libs/importer/src/importers/lastpass/access/vault.ts b/libs/importer/src/importers/lastpass/access/vault.ts index 5f614ebb840..f6e0f9f1671 100644 --- a/libs/importer/src/importers/lastpass/access/vault.ts +++ b/libs/importer/src/importers/lastpass/access/vault.ts @@ -26,7 +26,7 @@ export class Vault { constructor( private cryptoFunctionService: CryptoFunctionService, - private tokenService: TokenService + private tokenService: TokenService, ) { this.cryptoUtils = new CryptoUtils(cryptoFunctionService); const parser = new Parser(cryptoFunctionService, this.cryptoUtils); @@ -38,7 +38,7 @@ export class Vault { password: string, clientInfo: ClientInfo, ui: Ui, - parserOptions: ParserOptions = ParserOptions.default + parserOptions: ParserOptions = ParserOptions.default, ): Promise { this.accounts = await this.client.openVault(username, password, clientInfo, ui, parserOptions); } @@ -47,7 +47,7 @@ export class Vault { federatedUser: FederatedUserContext, clientInfo: ClientInfo, ui: Ui, - parserOptions: ParserOptions = ParserOptions.default + parserOptions: ParserOptions = ParserOptions.default, ): Promise { if (federatedUser == null) { throw new Error("Federated user context is not set."); @@ -56,7 +56,7 @@ export class Vault { const k2 = await this.getK2(federatedUser); const hiddenPasswordArr = await this.cryptoFunctionService.hash( this.cryptoUtils.ExclusiveOr(k1, k2), - "sha256" + "sha256", ); const hiddenPassword = Utils.fromBufferToB64(hiddenPasswordArr); await this.open(federatedUser.username, hiddenPassword, clientInfo, ui, parserOptions); @@ -138,7 +138,7 @@ export class Vault { rest.baseUrl = "https://graph.microsoft.com"; const response = await rest.get( "v1.0/me?$select=id,displayName,mail&$expand=extensions", - new Map([["Authorization", "Bearer " + federatedUser.accessToken]]) + new Map([["Authorization", "Bearer " + federatedUser.accessToken]]), ); if (response.status === HttpStatusCode.Ok) { const json = await response.json(); @@ -164,7 +164,7 @@ export class Vault { "&q=name%20%3D%20%27k1.lp%27" + "&spaces=appDataFolder" + "&fields=nextPageToken%2C%20files(id%2C%20name)", - accessTokenAuthHeader + accessTokenAuthHeader, ); if (response.status === HttpStatusCode.Ok) { const json = await response.json(); @@ -174,7 +174,7 @@ export class Vault { rest.baseUrl = "https://www.googleapis.com"; const response = await rest.get( "drive/v3/files/" + files[0].id + "?alt=media", - accessTokenAuthHeader + accessTokenAuthHeader, ); if (response.status === HttpStatusCode.Ok) { const k1 = await response.text(); diff --git a/libs/importer/src/importers/myki-csv-importer.ts b/libs/importer/src/importers/myki-csv-importer.ts index 0ad1349acf0..1180e2fbee1 100644 --- a/libs/importer/src/importers/myki-csv-importer.ts +++ b/libs/importer/src/importers/myki-csv-importer.ts @@ -11,10 +11,10 @@ import { Importer } from "./importer"; const mappedBaseColumns = ["nickname", "additionalInfo"]; const _mappedUserAccountColumns = new Set( - mappedBaseColumns.concat(["url", "username", "password", "twofaSecret"]) + mappedBaseColumns.concat(["url", "username", "password", "twofaSecret"]), ); const _mappedCreditCardColumns = new Set( - mappedBaseColumns.concat(["cardNumber", "cardName", "exp_month", "exp_year", "cvv"]) + mappedBaseColumns.concat(["cardNumber", "cardName", "exp_month", "exp_year", "cvv"]), ); const _mappedIdentityColumns = new Set( @@ -29,7 +29,7 @@ const _mappedIdentityColumns = new Set( "city", "country", "zipCode", - ]) + ]), ); const _mappedIdCardColumns = new Set(mappedBaseColumns.concat(["idName", "idNumber", "idCountry"])); diff --git a/libs/importer/src/importers/onepassword/cipher-import-context.ts b/libs/importer/src/importers/onepassword/cipher-import-context.ts index db52d969bc8..43f24a5f587 100644 --- a/libs/importer/src/importers/onepassword/cipher-import-context.ts +++ b/libs/importer/src/importers/onepassword/cipher-import-context.ts @@ -2,7 +2,11 @@ import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; export class CipherImportContext { lowerProperty: string; - constructor(public importRecord: any, public property: string, public cipher: CipherView) { + constructor( + public importRecord: any, + public property: string, + public cipher: CipherView, + ) { this.lowerProperty = property.toLowerCase(); } } diff --git a/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts b/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts index a3db3ff3851..1ce1851238e 100644 --- a/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts +++ b/libs/importer/src/importers/onepassword/onepassword-1pif-importer.ts @@ -161,7 +161,7 @@ export class OnePassword1PifImporter extends BaseImporter implements Importer { cipher: CipherView, designationKey: string, valueKey: string, - nameKey: string + nameKey: string, ) { fields.forEach((field: any) => { if (field[valueKey] == null || field[valueKey].toString().trim() === "") { diff --git a/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts index cf9177fcf4c..fbc62c733cf 100644 --- a/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts +++ b/libs/importer/src/importers/onepassword/onepassword-1pux-importer.ts @@ -451,7 +451,7 @@ export class OnePassword1PuxImporter extends BaseImporter implements Importer { field: FieldsEntity, fieldValue: string, cipher: CipherView, - valueKey: string + valueKey: string, ): boolean { if (this.isNullOrWhitespace(cipher.identity.firstName) && field.id === "firstname") { cipher.identity.firstName = fieldValue; diff --git a/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts b/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts index 5a90bdb2175..beda0ad5e48 100644 --- a/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts +++ b/libs/importer/src/importers/onepassword/onepassword-csv-importer.ts @@ -189,7 +189,7 @@ export abstract class OnePasswordCsvImporter extends BaseImporter implements Imp context.lowerProperty === "modified date" ) { const readableDate = new Date( - parseInt(context.importRecord[context.property], 10) * 1000 + parseInt(context.importRecord[context.property], 10) * 1000, ).toUTCString(); this.processKvp(context.cipher, "1Password " + context.property, readableDate); return null; @@ -203,7 +203,7 @@ export abstract class OnePasswordCsvImporter extends BaseImporter implements Imp context.cipher, context.property, context.importRecord[context.property], - FieldType.Hidden + FieldType.Hidden, ); } else { this.processKvp(context.cipher, context.property, context.importRecord[context.property]); @@ -331,7 +331,7 @@ export abstract class OnePasswordCsvImporter extends BaseImporter implements Imp ) { context.cipher.card.expMonth = (context.importRecord[context.property] as string).substr( 0, - 2 + 2, ); if (context.cipher.card.expMonth[0] === "0") { context.cipher.card.expMonth = context.cipher.card.expMonth.substr(1, 1); diff --git a/libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts b/libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts index 46ee06197b8..ebb52386545 100644 --- a/libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts +++ b/libs/importer/src/importers/onepassword/types/onepassword-1pux-importer-types.ts @@ -74,7 +74,7 @@ export enum LoginFieldTypeEnum { Number = "N", Password = "P", TextArea = "A", - PhoneNumber = "T", + PhoneNumber = "TEL", CheckBox = "C", } export interface LoginFieldsEntity { diff --git a/libs/importer/src/importers/protonpass/protonpass-json-importer.ts b/libs/importer/src/importers/protonpass/protonpass-json-importer.ts index f1d8763a13d..22de8c74477 100644 --- a/libs/importer/src/importers/protonpass/protonpass-json-importer.ts +++ b/libs/importer/src/importers/protonpass/protonpass-json-importer.ts @@ -56,7 +56,7 @@ export class ProtonPassJsonImporter extends BaseImporter implements Importer { cipher, extraField.fieldName, extraField.type == "totp" ? extraField.data.totpUri : extraField.data.content, - extraField.type == "text" ? FieldType.Text : FieldType.Hidden + extraField.type == "text" ? FieldType.Text : FieldType.Hidden, ); } break; diff --git a/libs/importer/src/importers/psono/psono-json-importer.ts b/libs/importer/src/importers/psono/psono-json-importer.ts index 2bd886c8e8a..e79dd8ddf4d 100644 --- a/libs/importer/src/importers/psono/psono-json-importer.ts +++ b/libs/importer/src/importers/psono/psono-json-importer.ts @@ -131,7 +131,7 @@ export class PsonoJsonImporter extends BaseImporter implements Importer { cipher, "website_password_auto_submit", entry.website_password_auto_submit?.toString(), - FieldType.Boolean + FieldType.Boolean, ); this.processKvp(cipher, "website_password_url_filter", entry.website_password_url_filter); @@ -260,7 +260,7 @@ export class PsonoJsonImporter extends BaseImporter implements Importer { cipher, "mail_gpg_own_key_private", entry.mail_gpg_own_key_private, - FieldType.Hidden + FieldType.Hidden, ); this.importUnmappedFields(cipher, entry, this.GPG_mappedValues); @@ -269,7 +269,7 @@ export class PsonoJsonImporter extends BaseImporter implements Importer { private importUnmappedFields( cipher: CipherView, entry: PsonoItemTypes, - mappedValues: Set + mappedValues: Set, ) { const unmappedFields = Object.keys(entry).filter((x) => !mappedValues.has(x)); unmappedFields.forEach((key) => { diff --git a/libs/importer/src/importers/stickypassword-xml-importer.ts b/libs/importer/src/importers/stickypassword-xml-importer.ts index c8a81a6fe82..210798ae3f2 100644 --- a/libs/importer/src/importers/stickypassword-xml-importer.ts +++ b/libs/importer/src/importers/stickypassword-xml-importer.ts @@ -31,7 +31,7 @@ export class StickyPasswordXmlImporter extends BaseImporter implements Importer "root > Database > Accounts > Account > " + 'LoginLinks > Login[SourceLoginID="' + accountId + - '"]' + '"]', ); if (accountLogin != null) { const account = accountLogin.parentElement.parentElement; diff --git a/libs/importer/src/importers/zohovault-csv-importer.ts b/libs/importer/src/importers/zohovault-csv-importer.ts index cfbd851e610..6ae4b6a88a3 100644 --- a/libs/importer/src/importers/zohovault-csv-importer.ts +++ b/libs/importer/src/importers/zohovault-csv-importer.ts @@ -27,10 +27,10 @@ export class ZohoVaultCsvImporter extends BaseImporter implements Importer { cipher.notes = this.getValueOrDefault(value.Notes); cipher.name = this.getValueOrDefault( value["Password Name"], - this.getValueOrDefault(value["Secret Name"], "--") + this.getValueOrDefault(value["Secret Name"], "--"), ); cipher.login.uris = this.makeUriArray( - this.getValueOrDefault(value["Password URL"], this.getValueOrDefault(value["Secret URL"])) + this.getValueOrDefault(value["Password URL"], this.getValueOrDefault(value["Secret URL"])), ); this.parseData(cipher, value.SecretData); this.parseData(cipher, value.CustomData); diff --git a/libs/importer/src/services/import-api.service.abstraction.ts b/libs/importer/src/services/import-api.service.abstraction.ts index 45142b30912..78460a96da9 100644 --- a/libs/importer/src/services/import-api.service.abstraction.ts +++ b/libs/importer/src/services/import-api.service.abstraction.ts @@ -5,6 +5,6 @@ export abstract class ImportApiServiceAbstraction { postImportCiphers: (request: ImportCiphersRequest) => Promise; postImportOrganizationCiphers: ( organizationId: string, - request: ImportOrganizationCiphersRequest + request: ImportOrganizationCiphersRequest, ) => Promise; } diff --git a/libs/importer/src/services/import-api.service.ts b/libs/importer/src/services/import-api.service.ts index da950611079..fb3c3597e1d 100644 --- a/libs/importer/src/services/import-api.service.ts +++ b/libs/importer/src/services/import-api.service.ts @@ -13,14 +13,14 @@ export class ImportApiService implements ImportApiServiceAbstraction { async postImportOrganizationCiphers( organizationId: string, - request: ImportOrganizationCiphersRequest + request: ImportOrganizationCiphersRequest, ): Promise { return await this.apiService.send( "POST", "/ciphers/import-organization?organizationId=" + organizationId, request, true, - false + false, ); } } diff --git a/libs/importer/src/services/import.service.abstraction.ts b/libs/importer/src/services/import.service.abstraction.ts index 89c383f2252..95208c9b99f 100644 --- a/libs/importer/src/services/import.service.abstraction.ts +++ b/libs/importer/src/services/import.service.abstraction.ts @@ -11,11 +11,11 @@ export abstract class ImportServiceAbstraction { fileContents: string, organizationId?: string, selectedImportTarget?: string, - canAccessImportExport?: boolean + canAccessImportExport?: boolean, ) => Promise; getImporter: ( format: ImportType | "bitwardenpasswordprotected", promptForPassword_callback: () => Promise, - organizationId: string + organizationId: string, ) => Importer; } diff --git a/libs/importer/src/services/import.service.spec.ts b/libs/importer/src/services/import.service.spec.ts index ef21f2aa0f0..6a2e0a339c7 100644 --- a/libs/importer/src/services/import.service.spec.ts +++ b/libs/importer/src/services/import.service.spec.ts @@ -39,7 +39,7 @@ describe("ImportService", () => { importApiService, i18nService, collectionService, - cryptoService + cryptoService, ); }); @@ -56,7 +56,7 @@ describe("ImportService", () => { importer = importService.getImporter( "bitwardenpasswordprotected", promptForPassword_callback, - organizationId + organizationId, ); }); @@ -96,7 +96,7 @@ describe("ImportService", () => { it("passing importTarget adds it to folders", async () => { folderService.getAllDecryptedFromState.mockReturnValue( - Promise.resolve([mockImportTargetFolder]) + Promise.resolve([mockImportTargetFolder]), ); await importService["setImportTarget"](importResult, null, "myImportTarget"); diff --git a/libs/importer/src/services/import.service.ts b/libs/importer/src/services/import.service.ts index 25357f28639..25aae1a58c5 100644 --- a/libs/importer/src/services/import.service.ts +++ b/libs/importer/src/services/import.service.ts @@ -99,7 +99,7 @@ export class ImportService implements ImportServiceAbstraction { private importApiService: ImportApiServiceAbstraction, private i18nService: I18nService, private collectionService: CollectionService, - private cryptoService: CryptoService + private cryptoService: CryptoService, ) {} getImportOptions(): ImportOption[] { @@ -111,7 +111,7 @@ export class ImportService implements ImportServiceAbstraction { fileContents: string, organizationId: string = null, selectedImportTarget: string = null, - canAccessImportExport: boolean + canAccessImportExport: boolean, ): Promise { let importResult: ImportResult; try { @@ -153,7 +153,7 @@ export class ImportService implements ImportServiceAbstraction { !canAccessImportExport ) { const hasUnassignedCollections = importResult.ciphers.some( - (c) => !Array.isArray(c.collectionIds) || c.collectionIds.length == 0 + (c) => !Array.isArray(c.collectionIds) || c.collectionIds.length == 0, ); if (hasUnassignedCollections) { throw new Error(this.i18nService.t("importUnassignedItemsError")); @@ -177,7 +177,7 @@ export class ImportService implements ImportServiceAbstraction { getImporter( format: ImportType | "bitwardenpasswordprotected", promptForPassword_callback: () => Promise, - organizationId: string = null + organizationId: string = null, ): Importer { if (promptForPassword_callback == null) { return null; @@ -193,7 +193,7 @@ export class ImportService implements ImportServiceAbstraction { private getImporterInstance( format: ImportType | "bitwardenpasswordprotected", - promptForPassword_callback: () => Promise + promptForPassword_callback: () => Promise, ) { if (format == null) { return null; @@ -208,7 +208,7 @@ export class ImportService implements ImportServiceAbstraction { this.cryptoService, this.i18nService, this.cipherService, - promptForPassword_callback + promptForPassword_callback, ); case "lastpasscsv": case "passboltcsv": @@ -346,7 +346,7 @@ export class ImportService implements ImportServiceAbstraction { } if (importResult.folderRelationships != null) { importResult.folderRelationships.forEach((r) => - request.folderRelationships.push(new KvpRequest(r[0], r[1])) + request.folderRelationships.push(new KvpRequest(r[0], r[1])), ); } return await this.importApiService.postImportCiphers(request); @@ -368,7 +368,7 @@ export class ImportService implements ImportServiceAbstraction { } if (importResult.collectionRelationships != null) { importResult.collectionRelationships.forEach((r) => - request.collectionRelationships.push(new KvpRequest(r[0], r[1])) + request.collectionRelationships.push(new KvpRequest(r[0], r[1])), ); } return await this.importApiService.postImportOrganizationCiphers(organizationId, request); @@ -429,7 +429,7 @@ export class ImportService implements ImportServiceAbstraction { private async setImportTarget( importResult: ImportResult, organizationId: string, - importTarget: string + importTarget: string, ) { if (Utils.isNullOrWhitespace(importTarget)) { return; diff --git a/libs/node/src/services/node-crypto-function.service.spec.ts b/libs/node/src/services/node-crypto-function.service.spec.ts index 50c75d639a7..61200b92855 100644 --- a/libs/node/src/services/node-crypto-function.service.spec.ts +++ b/libs/node/src/services/node-crypto-function.service.spec.ts @@ -82,7 +82,7 @@ describe("NodeCrypto Function Service", () => { prk32Byte, 64, "BnIqJlfnHm0e/2iB/15cbHyR19ARPIcWRp4oNS22CD9BV+" + - "/queOZenPNkDhmlVyL2WZ3OSU5+7ISNF5NhNfvZA==" + "/queOZenPNkDhmlVyL2WZ3OSU5+7ISNF5NhNfvZA==", ); testHkdfExpand("sha512", prk64Byte, 32, "uLWbMWodSBms5uGJ5WTRTesyW+MD7nlpCZvagvIRXlk="); testHkdfExpand( @@ -90,7 +90,7 @@ describe("NodeCrypto Function Service", () => { prk64Byte, 64, "uLWbMWodSBms5uGJ5WTRTesyW+MD7nlpCZvagvIRXlkY5Pv0sB+" + - "MqvaopmkC6sD/j89zDwTV9Ib2fpucUydO8w==" + "MqvaopmkC6sD/j89zDwTV9Ib2fpucUydO8w==", ); it("should fail with prk too small", async () => { @@ -99,7 +99,7 @@ describe("NodeCrypto Function Service", () => { Utils.fromB64ToArray(prk16Byte), "info", 32, - "sha256" + "sha256", ); await expect(f).rejects.toEqual(new Error("prk is too small.")); }); @@ -110,7 +110,7 @@ describe("NodeCrypto Function Service", () => { Utils.fromB64ToArray(prk32Byte), "info", 8161, - "sha256" + "sha256", ); await expect(f).rejects.toEqual(new Error("outputByteSize is too large.")); }); @@ -252,7 +252,7 @@ describe("NodeCrypto Function Service", () => { "A1/p8BQzN9UrbdYxUY2Va5+kPLyfZXF9JsZrjeEXcaclsnHurdxVAJcnbEqYMP3UXV" + "4YAS/mpf+Rxe6/X0WS1boQdA0MAHSgx95hIlAraZYpiMLLiJRKeo2u8YivCdTM9V5vuAEJwf9Tof/qFsFci3sApdbATkorCT" + "zFOIEPF2S1zgperEP23M01mr4dWVdYN18B32YF67xdJHMbFhp5dkQwv9CmscoWq7OE5HIfOb+JAh7BEZb+CmKhM3yWJvoR/D" + - "/5jcercUtK2o+XrzNrL4UQ7yLZcFz6Bfwb/j6ICYvqd/YJwXNE6dwlL57OfwJyCdw2rRYf0/qI00t9u8Iitw==" + "/5jcercUtK2o+XrzNrL4UQ7yLZcFz6Bfwb/j6ICYvqd/YJwXNE6dwlL57OfwJyCdw2rRYf0/qI00t9u8Iitw==", ); const decValue = await nodeCryptoFunctionService.rsaDecrypt(data, privKey, "sha1"); expect(Utils.fromBufferToUtf8(decValue)).toBe("EncryptMe!"); @@ -289,7 +289,7 @@ describe("NodeCrypto Function Service", () => { const randomData = await nodeCryptoFunctionService.randomBytes(16); const randomData2 = await nodeCryptoFunctionService.randomBytes(16); expect( - randomData.byteLength === randomData2.byteLength && randomData !== randomData2 + randomData.byteLength === randomData2.byteLength && randomData !== randomData2, ).toBeTruthy(); }); }); @@ -308,7 +308,7 @@ function testPbkdf2( algorithm: "sha256" | "sha512", regularKey: string, utf8Key: string, - unicodeKey: string + unicodeKey: string, ) { const regularEmail = "user@example.com"; const utf8Email = "üser@example.com"; @@ -341,7 +341,7 @@ function testPbkdf2( Utils.fromUtf8ToArray(regularPassword), Utils.fromUtf8ToArray(regularEmail), algorithm, - 5000 + 5000, ); expect(Utils.fromBufferToB64(key)).toBe(regularKey); }); @@ -351,7 +351,7 @@ function testHkdf( algorithm: "sha256" | "sha512", regularKey: string, utf8Key: string, - unicodeKey: string + unicodeKey: string, ) { const ikm = Utils.fromB64ToArray("criAmKtfzxanbgea5/kelQ=="); @@ -388,7 +388,7 @@ function testHkdf( Utils.fromUtf8ToArray(regularSalt), Utils.fromUtf8ToArray(regularInfo), 32, - algorithm + algorithm, ); expect(Utils.fromBufferToB64(key)).toBe(regularKey); }); @@ -398,7 +398,7 @@ function testHkdfExpand( algorithm: "sha256" | "sha512", b64prk: string, outputByteSize: number, - b64ExpectedOkm: string + b64ExpectedOkm: string, ) { const info = "info"; @@ -408,7 +408,7 @@ function testHkdfExpand( Utils.fromB64ToArray(b64prk), info, outputByteSize, - algorithm + algorithm, ); expect(Utils.fromBufferToB64(okm)).toBe(b64ExpectedOkm); }); @@ -418,7 +418,7 @@ function testHash( algorithm: "sha1" | "sha256" | "sha512" | "md5", regularHash: string, utf8Hash: string, - unicodeHash: string + unicodeHash: string, ) { const regularValue = "HashMe!!"; const utf8Value = "HǻshMe!!"; @@ -514,7 +514,7 @@ function testRsaGenerateKeyPair(length: 1024 | 2048 | 4096) { const publicKey = await cryptoFunctionService.rsaExtractPublicKey(keyPair[1]); expect(Utils.fromBufferToB64(keyPair[0])).toBe(Utils.fromBufferToB64(publicKey)); }, - 30000 + 30000, ); } diff --git a/libs/node/src/services/node-crypto-function.service.ts b/libs/node/src/services/node-crypto-function.service.ts index 25806352a67..c8d676eeaa5 100644 --- a/libs/node/src/services/node-crypto-function.service.ts +++ b/libs/node/src/services/node-crypto-function.service.ts @@ -14,7 +14,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService { password: string | Uint8Array, salt: string | Uint8Array, algorithm: "sha256" | "sha512", - iterations: number + iterations: number, ): Promise { const len = algorithm === "sha256" ? 32 : 64; const nodePassword = this.toNodeValue(password); @@ -35,7 +35,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService { salt: string | Uint8Array, iterations: number, memory: number, - parallelism: number + parallelism: number, ): Promise { const nodePassword = this.toNodeValue(password); const nodeSalt = this.toNodeBuffer(this.toUint8Buffer(salt)); @@ -58,7 +58,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService { salt: string | Uint8Array, info: string | Uint8Array, outputByteSize: number, - algorithm: "sha256" | "sha512" + algorithm: "sha256" | "sha512", ): Promise { const saltBuf = this.toUint8Buffer(salt); const prk = await this.hmac(ikm, saltBuf, algorithm); @@ -70,7 +70,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService { prk: Uint8Array, info: string | Uint8Array, outputByteSize: number, - algorithm: "sha256" | "sha512" + algorithm: "sha256" | "sha512", ): Promise { const hashLen = algorithm === "sha256" ? 32 : 64; if (outputByteSize > 255 * hashLen) { @@ -103,7 +103,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService { hash( value: string | Uint8Array, - algorithm: "sha1" | "sha256" | "sha512" | "md5" + algorithm: "sha1" | "sha256" | "sha512" | "md5", ): Promise { const nodeValue = this.toNodeValue(value); const hash = crypto.createHash(algorithm); @@ -114,7 +114,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService { hmac( value: Uint8Array, key: Uint8Array, - algorithm: "sha1" | "sha256" | "sha512" + algorithm: "sha1" | "sha256" | "sha512", ): Promise { const nodeValue = this.toNodeBuffer(value); const nodeKey = this.toNodeBuffer(key); @@ -145,7 +145,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService { hmacFast( value: Uint8Array, key: Uint8Array, - algorithm: "sha1" | "sha256" | "sha512" + algorithm: "sha1" | "sha256" | "sha512", ): Promise { return this.hmac(value, key, algorithm); } @@ -167,7 +167,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService { data: string, iv: string, mac: string, - key: SymmetricCryptoKey + key: SymmetricCryptoKey, ): DecryptParameters { const p = new DecryptParameters(); p.encKey = key.encKey; @@ -191,7 +191,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService { async aesDecryptFast( parameters: DecryptParameters, - mode: "cbc" | "ecb" + mode: "cbc" | "ecb", ): Promise { const decBuf = await this.aesDecrypt(parameters.data, parameters.iv, parameters.encKey, mode); return Utils.fromBufferToUtf8(decBuf); @@ -201,7 +201,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService { data: Uint8Array, iv: Uint8Array, key: Uint8Array, - mode: "cbc" | "ecb" + mode: "cbc" | "ecb", ): Promise { const nodeData = this.toNodeBuffer(data); const nodeIv = mode === "ecb" ? null : this.toNodeBuffer(iv); @@ -214,7 +214,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService { rsaEncrypt( data: Uint8Array, publicKey: Uint8Array, - algorithm: "sha1" | "sha256" + algorithm: "sha1" | "sha256", ): Promise { if (algorithm === "sha256") { throw new Error("Node crypto does not support RSA-OAEP SHA-256"); @@ -228,7 +228,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService { rsaDecrypt( data: Uint8Array, privateKey: Uint8Array, - algorithm: "sha1" | "sha256" + algorithm: "sha1" | "sha256", ): Promise { if (algorithm === "sha256") { throw new Error("Node crypto does not support RSA-OAEP SHA-256"); @@ -274,7 +274,7 @@ export class NodeCryptoFunctionService implements CryptoFunctionService { const privateKey = Utils.fromByteStringToArray(privateKeyByteString); resolve([publicKey, privateKey]); - } + }, ); }); } diff --git a/libs/vault/src/components/password-reprompt.component.ts b/libs/vault/src/components/password-reprompt.component.ts index fd8da6c574a..dcc20f7982d 100644 --- a/libs/vault/src/components/password-reprompt.component.ts +++ b/libs/vault/src/components/password-reprompt.component.ts @@ -42,23 +42,23 @@ export class PasswordRepromptComponent { protected platformUtilsService: PlatformUtilsService, protected i18nService: I18nService, protected formBuilder: FormBuilder, - protected dialogRef: DialogRef + protected dialogRef: DialogRef, ) {} submit = async () => { const storedMasterKey = await this.cryptoService.getOrDeriveMasterKey( - this.formGroup.value.masterPassword + this.formGroup.value.masterPassword, ); if ( !(await this.cryptoService.compareAndUpdateKeyHash( this.formGroup.value.masterPassword, - storedMasterKey + storedMasterKey, )) ) { this.platformUtilsService.showToast( "error", this.i18nService.t("errorOccurred"), - this.i18nService.t("invalidMasterPassword") + this.i18nService.t("invalidMasterPassword"), ); return; } diff --git a/libs/vault/src/services/password-reprompt.service.ts b/libs/vault/src/services/password-reprompt.service.ts index 4b4a7a65f67..6aba602c16f 100644 --- a/libs/vault/src/services/password-reprompt.service.ts +++ b/libs/vault/src/services/password-reprompt.service.ts @@ -14,7 +14,7 @@ import { PasswordRepromptComponent } from "../components/password-reprompt.compo export class PasswordRepromptService { constructor( private dialogService: DialogService, - private userVerificationService: UserVerificationService + private userVerificationService: UserVerificationService, ) {} protectedFields() { diff --git a/package-lock.json b/package-lock.json index 8a7b3c547fa..51a26850301 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,26 +15,26 @@ "libs/*" ], "dependencies": { - "@angular/animations": "15.2.9", + "@angular/animations": "15.2.10", "@angular/cdk": "15.2.9", - "@angular/common": "15.2.9", - "@angular/compiler": "15.2.9", - "@angular/core": "15.2.9", - "@angular/forms": "15.2.9", - "@angular/platform-browser": "15.2.9", - "@angular/platform-browser-dynamic": "15.2.9", - "@angular/router": "15.2.9", + "@angular/common": "15.2.10", + "@angular/compiler": "15.2.10", + "@angular/core": "15.2.10", + "@angular/forms": "15.2.10", + "@angular/platform-browser": "15.2.10", + "@angular/platform-browser-dynamic": "15.2.10", + "@angular/router": "15.2.10", "@koa/multer": "3.0.2", "@koa/router": "12.0.0", - "@microsoft/signalr": "6.0.21", - "@microsoft/signalr-protocol-msgpack": "6.0.21", + "@microsoft/signalr": "6.0.25", + "@microsoft/signalr-protocol-msgpack": "6.0.25", "@ng-select/ng-select": "10.0.4", "argon2": "0.31.0", "argon2-browser": "1.18.0", "big-integer": "1.6.51", "bootstrap": "4.6.0", "braintree-web-drop-in": "1.40.0", - "bufferutil": "4.0.7", + "bufferutil": "4.0.8", "chalk": "4.1.2", "commander": "7.2.0", "core-js": "3.32.0", @@ -42,8 +42,8 @@ "form-data": "4.0.0", "https-proxy-agent": "5.0.1", "inquirer": "8.2.6", - "jquery": "3.7.0", - "jsdom": "22.1.0", + "jquery": "3.7.1", + "jsdom": "23.0.1", "jszip": "3.10.1", "koa": "2.14.2", "koa-bodyparser": "4.4.1", @@ -56,7 +56,7 @@ "node-fetch": "2.6.12", "node-forge": "1.3.1", "nord": "0.2.1", - "oidc-client-ts": "2.3.0", + "oidc-client-ts": "2.4.0", "open": "8.4.2", "papaparse": "5.4.1", "patch-package": "8.0.0", @@ -65,26 +65,26 @@ "qrious": "4.0.2", "rxjs": "7.8.1", "tabbable": "6.2.0", - "tldts": "6.0.22", - "utf-8-validate": "5.0.10", + "tldts": "6.1.0", + "utf-8-validate": "6.0.3", "zone.js": "0.12.0", "zxcvbn": "4.4.2" }, "devDependencies": { - "@angular-devkit/build-angular": "15.2.9", + "@angular-devkit/build-angular": "15.2.10", "@angular-eslint/eslint-plugin": "15.2.1", "@angular-eslint/eslint-plugin-template": "15.2.1", "@angular-eslint/template-parser": "15.2.1", - "@angular/cli": "15.2.9", - "@angular/compiler-cli": "15.2.9", - "@angular/elements": "15.2.9", - "@compodoc/compodoc": "1.1.21", + "@angular/cli": "15.2.10", + "@angular/compiler-cli": "15.2.10", + "@angular/elements": "15.2.10", + "@compodoc/compodoc": "1.1.23", "@electron/notarize": "2.2.0", - "@electron/rebuild": "3.3.1", - "@ngtools/webpack": "15.2.9", + "@electron/rebuild": "3.4.1", + "@ngtools/webpack": "15.2.10", "@storybook/addon-a11y": "7.3.0", "@storybook/addon-actions": "7.3.0", - "@storybook/addon-designs": "7.0.4", + "@storybook/addon-designs": "7.0.7", "@storybook/addon-essentials": "7.3.0", "@storybook/addon-links": "7.3.0", "@storybook/angular": "7.3.0", @@ -93,9 +93,9 @@ "@types/duo_web_sdk": "2.7.1", "@types/firefox-webext-browser": "111.0.1", "@types/inquirer": "8.2.6", - "@types/jest": "29.5.3", - "@types/jquery": "3.5.16", - "@types/jsdom": "21.1.1", + "@types/jest": "29.5.11", + "@types/jquery": "3.5.29", + "@types/jsdom": "21.1.6", "@types/koa": "2.13.8", "@types/koa__multer": "2.0.4", "@types/koa__router": "12.0.0", @@ -103,63 +103,62 @@ "@types/koa-json": "2.0.20", "@types/lowdb": "1.0.11", "@types/lunr": "2.3.4", - "@types/node": "18.17.5", + "@types/node": "18.19.2", "@types/node-fetch": "2.6.4", - "@types/node-forge": "1.3.4", + "@types/node-forge": "1.3.10", "@types/node-ipc": "9.2.0", "@types/papaparse": "5.3.14", "@types/proper-lockfile": "4.1.2", "@types/react": "16.14.45", "@types/retry": "0.12.2", - "@types/zxcvbn": "4.4.1", - "@typescript-eslint/eslint-plugin": "5.62.0", - "@typescript-eslint/parser": "5.62.0", + "@types/zxcvbn": "4.4.4", + "@typescript-eslint/eslint-plugin": "6.13.2", + "@typescript-eslint/parser": "6.13.2", "@webcomponents/custom-elements": "1.6.0", - "autoprefixer": "10.4.15", + "autoprefixer": "10.4.16", "base64-loader": "1.0.0", "buffer": "6.0.3", - "chromatic": "6.22.0", + "chromatic": "10.0.0", "clean-webpack-plugin": "4.0.0", "concurrently": "8.2.2", "copy-webpack-plugin": "11.0.0", "cross-env": "7.0.3", "css-loader": "6.8.1", - "del": "6.1.1", - "electron": "25.9.1", + "electron": "27.1.3", "electron-builder": "23.6.0", "electron-log": "5.0.1", "electron-reload": "2.0.0-alpha.1", "electron-store": "8.1.0", "electron-updater": "6.1.7", - "eslint": "8.47.0", - "eslint-config-prettier": "8.10.0", - "eslint-import-resolver-typescript": "3.6.0", - "eslint-plugin-import": "2.28.0", + "eslint": "8.55.0", + "eslint-config-prettier": "9.1.0", + "eslint-import-resolver-typescript": "3.6.1", + "eslint-plugin-import": "2.29.0", "eslint-plugin-rxjs": "5.0.3", "eslint-plugin-rxjs-angular": "2.0.1", - "eslint-plugin-storybook": "0.6.13", + "eslint-plugin-storybook": "0.6.15", "eslint-plugin-tailwindcss": "3.13.0", "gulp": "4.0.2", - "gulp-filter": "7.0.0", + "gulp-filter": "9.0.1", "gulp-if": "3.0.0", "gulp-json-editor": "2.5.7", "gulp-replace": "1.1.4", - "gulp-zip": "5.1.0", + "gulp-zip": "6.0.0", "html-loader": "4.2.0", "html-webpack-injector": "1.1.4", - "html-webpack-plugin": "5.5.3", + "html-webpack-plugin": "5.5.4", "husky": "8.0.3", "jest-junit": "16.0.0", "jest-mock-extended": "3.0.5", - "jest-preset-angular": "13.1.1", - "lint-staged": "13.3.0", + "jest-preset-angular": "13.1.4", + "lint-staged": "15.2.0", "mini-css-extract-plugin": "2.7.6", "node-ipc": "9.2.1", "pkg": "5.8.1", "postcss": "8.4.31", "postcss-loader": "7.3.3", - "prettier": "2.8.8", - "prettier-plugin-tailwindcss": "0.4.1", + "prettier": "3.1.1", + "prettier-plugin-tailwindcss": "0.5.7", "process": "0.11.10", "react": "18.2.0", "react-dom": "18.2.0", @@ -170,16 +169,16 @@ "sass-loader": "13.3.2", "storybook": "7.3.0", "style-loader": "3.3.3", - "tailwindcss": "3.3.3", + "tailwindcss": "3.3.5", "ts-jest": "29.1.1", - "ts-loader": "9.4.4", + "ts-loader": "9.5.1", "tsconfig-paths-webpack-plugin": "4.1.0", "type-fest": "2.19.0", "typescript": "4.9.5", "url": "0.11.1", "util": "0.12.5", "wait-on": "7.2.0", - "webpack": "5.88.2", + "webpack": "5.89.0", "webpack-cli": "5.1.4", "webpack-dev-server": "4.15.1", "webpack-node-externals": "3.0.0" @@ -191,11 +190,11 @@ }, "apps/browser": { "name": "@bitwarden/browser", - "version": "2023.10.2" + "version": "2023.12.0" }, "apps/cli": { "name": "@bitwarden/cli", - "version": "2023.10.0", + "version": "2023.12.0", "license": "GPL-3.0-only", "dependencies": { "@koa/multer": "3.0.2", @@ -208,7 +207,7 @@ "form-data": "4.0.0", "https-proxy-agent": "5.0.1", "inquirer": "8.2.6", - "jsdom": "22.1.0", + "jsdom": "23.0.1", "jszip": "3.10.1", "koa": "2.14.2", "koa-bodyparser": "4.4.1", @@ -222,7 +221,7 @@ "papaparse": "5.4.1", "proper-lockfile": "4.1.2", "rxjs": "7.8.1", - "tldts": "6.0.22", + "tldts": "6.1.0", "zxcvbn": "4.4.2" }, "bin": { @@ -231,7 +230,7 @@ }, "apps/desktop": { "name": "@bitwarden/desktop", - "version": "2023.10.2", + "version": "2023.12.1", "hasInstallScript": true, "license": "GPL-3.0" }, @@ -261,7 +260,7 @@ }, "apps/web": { "name": "@bitwarden/web-vault", - "version": "2023.10.2" + "version": "2023.12.0" }, "libs/angular": { "name": "@bitwarden/angular", @@ -368,15 +367,15 @@ } }, "node_modules/@angular-devkit/build-angular": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-15.2.9.tgz", - "integrity": "sha512-djOo2Q22zLrxPccSbINz93hD+pES/nNPoze4Ys/0IdtMlLmxO/YGsA+FG5eNeNAf2jK/JRoNydaYOh7XpGoCzA==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-15.2.10.tgz", + "integrity": "sha512-3pCPVEJilVwHIJC6Su1/PIEqvFfU1Lxew9yItxX4s6dud8HY+fuKrsDnao4NNMFNqCLqL4el5QbSBKnnpWH1sg==", "dev": true, "dependencies": { "@ampproject/remapping": "2.2.0", - "@angular-devkit/architect": "0.1502.9", - "@angular-devkit/build-webpack": "0.1502.9", - "@angular-devkit/core": "15.2.9", + "@angular-devkit/architect": "0.1502.10", + "@angular-devkit/build-webpack": "0.1502.10", + "@angular-devkit/core": "15.2.10", "@babel/core": "7.20.12", "@babel/generator": "7.20.14", "@babel/helper-annotate-as-pure": "7.18.6", @@ -388,7 +387,7 @@ "@babel/runtime": "7.20.13", "@babel/template": "7.20.7", "@discoveryjs/json-ext": "0.5.7", - "@ngtools/webpack": "15.2.9", + "@ngtools/webpack": "15.2.10", "ansi-colors": "4.1.3", "autoprefixer": "10.4.13", "babel-loader": "9.1.2", @@ -415,7 +414,7 @@ "ora": "5.4.1", "parse5-html-rewriting-stream": "7.0.0", "piscina": "3.2.0", - "postcss": "8.4.21", + "postcss": "8.4.31", "postcss-loader": "7.0.2", "resolve-url-loader": "5.0.0", "rxjs": "6.6.7", @@ -478,12 +477,12 @@ } }, "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/architect": { - "version": "0.1502.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.9.tgz", - "integrity": "sha512-CFn+LbtYeLG7WqO+BBSjogl764StHpwgfJnNAXQ/3UouUktZ92z4lxhUm0PwIPb5k0lILsf81ubcS1vzwoXEEg==", + "version": "0.1502.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.10.tgz", + "integrity": "sha512-S8lN73WYCfpEpw1Q41ZcUinw7JfDeSM8LyGs797OVshnW75QcOkOecWj/3CKR23G44IgFrHN6sqtzWxKmMxLig==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.2.9", + "@angular-devkit/core": "15.2.10", "rxjs": "6.6.7" }, "engines": { @@ -493,9 +492,9 @@ } }, "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/core": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.9.tgz", - "integrity": "sha512-6u44YJ9tEG2hiWITL1rwA9yP6ot4a3cyN/UOMRkYSa/XO2Gz5/dM3U74E2kwg+P1NcxLXffBWl0rz8/Y/lSZyQ==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.10.tgz", + "integrity": "sha512-bFPm7wjvfBds9km2rCJxUhzkqe4h3h/199yJtzC1bNvwRr2LMHvtyoQAzftda+gs7Ulqac5wzUEZX/cVV3WrsA==", "dev": true, "dependencies": { "ajv": "8.12.0", @@ -549,9 +548,9 @@ } }, "node_modules/@angular-devkit/build-angular/node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -832,9 +831,9 @@ } }, "node_modules/@angular-devkit/build-angular/node_modules/ipaddr.js": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz", - "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz", + "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==", "dev": true, "engines": { "node": ">= 10" @@ -894,30 +893,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@angular-devkit/build-angular/node_modules/postcss": { - "version": "8.4.21", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz", - "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - } - ], - "dependencies": { - "nanoid": "^3.3.4", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, "node_modules/@angular-devkit/build-angular/node_modules/postcss-loader": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.2.tgz", @@ -1214,9 +1189,9 @@ } }, "node_modules/@angular-devkit/build-angular/node_modules/webpack/node_modules/schema-utils": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz", - "integrity": "sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", @@ -1232,9 +1207,9 @@ } }, "node_modules/@angular-devkit/build-angular/node_modules/ws": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", - "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", + "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", "dev": true, "engines": { "node": ">=10.0.0" @@ -1259,12 +1234,12 @@ "dev": true }, "node_modules/@angular-devkit/build-webpack": { - "version": "0.1502.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1502.9.tgz", - "integrity": "sha512-VzMXoZjrbL1XlcSegqpZCBDbVvKFGPs3cKp4bXDD5ht95jcCyJPk5FA/wrh0pGGwbOF8ae/XOWFcPRzctC35iA==", + "version": "0.1502.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1502.10.tgz", + "integrity": "sha512-55b9WZIGU4DNgiIV2lkkN6iQxJrgWY5CDaNu0kJC/qazotJgBbcN/8jgBx2DD8HNE1V3iXxWk66pt1h946Po+Q==", "dev": true, "dependencies": { - "@angular-devkit/architect": "0.1502.9", + "@angular-devkit/architect": "0.1502.10", "rxjs": "6.6.7" }, "engines": { @@ -1278,12 +1253,12 @@ } }, "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/architect": { - "version": "0.1502.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.9.tgz", - "integrity": "sha512-CFn+LbtYeLG7WqO+BBSjogl764StHpwgfJnNAXQ/3UouUktZ92z4lxhUm0PwIPb5k0lILsf81ubcS1vzwoXEEg==", + "version": "0.1502.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.10.tgz", + "integrity": "sha512-S8lN73WYCfpEpw1Q41ZcUinw7JfDeSM8LyGs797OVshnW75QcOkOecWj/3CKR23G44IgFrHN6sqtzWxKmMxLig==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.2.9", + "@angular-devkit/core": "15.2.10", "rxjs": "6.6.7" }, "engines": { @@ -1293,9 +1268,9 @@ } }, "node_modules/@angular-devkit/build-webpack/node_modules/@angular-devkit/core": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.9.tgz", - "integrity": "sha512-6u44YJ9tEG2hiWITL1rwA9yP6ot4a3cyN/UOMRkYSa/XO2Gz5/dM3U74E2kwg+P1NcxLXffBWl0rz8/Y/lSZyQ==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.10.tgz", + "integrity": "sha512-bFPm7wjvfBds9km2rCJxUhzkqe4h3h/199yJtzC1bNvwRr2LMHvtyoQAzftda+gs7Ulqac5wzUEZX/cVV3WrsA==", "dev": true, "dependencies": { "ajv": "8.12.0", @@ -1364,12 +1339,12 @@ } }, "node_modules/@angular-devkit/schematics": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.2.9.tgz", - "integrity": "sha512-o08nE8sTpfq/Fknrr1rzBsM8vY36BDox+8dOo9Zc/KqcVPwDy94YKRzHb+xxVaU9jy1VYeCjy63mkyELy7Z3zQ==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-15.2.10.tgz", + "integrity": "sha512-EeoDs4oKFpLZNa21G/8dqBdclEc4U2piI9EeXCVTaN6z5DYXIZ0G1WtCXU8nhD+GckS47rmfZ4/3lMaXAvED+g==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.2.9", + "@angular-devkit/core": "15.2.10", "jsonc-parser": "3.2.0", "magic-string": "0.29.0", "ora": "5.4.1", @@ -1382,9 +1357,9 @@ } }, "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.9.tgz", - "integrity": "sha512-6u44YJ9tEG2hiWITL1rwA9yP6ot4a3cyN/UOMRkYSa/XO2Gz5/dM3U74E2kwg+P1NcxLXffBWl0rz8/Y/lSZyQ==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.10.tgz", + "integrity": "sha512-bFPm7wjvfBds9km2rCJxUhzkqe4h3h/199yJtzC1bNvwRr2LMHvtyoQAzftda+gs7Ulqac5wzUEZX/cVV3WrsA==", "dev": true, "dependencies": { "ajv": "8.12.0", @@ -1492,9 +1467,9 @@ } }, "node_modules/@angular/animations": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-15.2.9.tgz", - "integrity": "sha512-GQujLhI0cQFcl4Q8y0oSYKSRnW23GIeSL+Arl4eFufziJ9hGAAQNuesaNs/7i+9UlTHDMkPH3kd5ScXuYYz6wg==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-15.2.10.tgz", + "integrity": "sha512-yxfN8qQpMaukRU5LjFkJBmy85rqrOp86tYVCsf+hmPEFRiXBMUj6xYLeCMcpk3Mt1JtnWGBR34ivGx+7bNeAow==", "dependencies": { "tslib": "^2.3.0" }, @@ -1502,7 +1477,7 @@ "node": "^14.20.0 || ^16.13.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": "15.2.9" + "@angular/core": "15.2.10" } }, "node_modules/@angular/cdk": { @@ -1522,15 +1497,15 @@ } }, "node_modules/@angular/cli": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-15.2.9.tgz", - "integrity": "sha512-mI6hkGyIJDKd8MRiBl3p5chsUhgnluwmpsq3g1FFPw+wv+eXsPYgCiHqXS/OsK+shFxii9XMxoZQO28bJ4NAOQ==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-15.2.10.tgz", + "integrity": "sha512-/TSnm/ZQML6A4lvunyN2tjTB5utuvk3d1Pnfyehp/FXtV6YfZm6+EZrOpKkKPCxTuAgW6c9KK4yQtt3RuNVpwQ==", "dev": true, "dependencies": { - "@angular-devkit/architect": "0.1502.9", - "@angular-devkit/core": "15.2.9", - "@angular-devkit/schematics": "15.2.9", - "@schematics/angular": "15.2.9", + "@angular-devkit/architect": "0.1502.10", + "@angular-devkit/core": "15.2.10", + "@angular-devkit/schematics": "15.2.10", + "@schematics/angular": "15.2.10", "@yarnpkg/lockfile": "1.1.0", "ansi-colors": "4.1.3", "ini": "3.0.1", @@ -1556,12 +1531,12 @@ } }, "node_modules/@angular/cli/node_modules/@angular-devkit/architect": { - "version": "0.1502.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.9.tgz", - "integrity": "sha512-CFn+LbtYeLG7WqO+BBSjogl764StHpwgfJnNAXQ/3UouUktZ92z4lxhUm0PwIPb5k0lILsf81ubcS1vzwoXEEg==", + "version": "0.1502.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1502.10.tgz", + "integrity": "sha512-S8lN73WYCfpEpw1Q41ZcUinw7JfDeSM8LyGs797OVshnW75QcOkOecWj/3CKR23G44IgFrHN6sqtzWxKmMxLig==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.2.9", + "@angular-devkit/core": "15.2.10", "rxjs": "6.6.7" }, "engines": { @@ -1583,9 +1558,9 @@ } }, "node_modules/@angular/cli/node_modules/@angular-devkit/core": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.9.tgz", - "integrity": "sha512-6u44YJ9tEG2hiWITL1rwA9yP6ot4a3cyN/UOMRkYSa/XO2Gz5/dM3U74E2kwg+P1NcxLXffBWl0rz8/Y/lSZyQ==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.10.tgz", + "integrity": "sha512-bFPm7wjvfBds9km2rCJxUhzkqe4h3h/199yJtzC1bNvwRr2LMHvtyoQAzftda+gs7Ulqac5wzUEZX/cVV3WrsA==", "dev": true, "dependencies": { "ajv": "8.12.0", @@ -1703,9 +1678,9 @@ "dev": true }, "node_modules/@angular/common": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-15.2.9.tgz", - "integrity": "sha512-LM9/UHG2dRrOzlu2KovrFwWIziFMjRxHzSP3Igw6Symw/wIl0kXGq8Fn6RpFP78zmLqnv+IQOoRiby9MCXsI4g==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-15.2.10.tgz", + "integrity": "sha512-jdBn3fctkqoNrJn9VLsUHpcCEhCxWSczdsR+BBbD6T0oLl6vMrAVNjPwfBejnlgfWN1KoRU9kgOYsMxa5apIWQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -1713,14 +1688,14 @@ "node": "^14.20.0 || ^16.13.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": "15.2.9", + "@angular/core": "15.2.10", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/compiler": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-15.2.9.tgz", - "integrity": "sha512-MoKugbjk+E0wRBj12uvIyDLELlVLonnqjA2+XiF+7FxALIeyds3/qQeEoMmYIqAbN3NnTT5pV92RxWwG4tHFwA==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-15.2.10.tgz", + "integrity": "sha512-M0XkeU0O73UlJZwDvOyp8/apetz9UKj78eTFDseMYJDLcxe6MpkbkxqpsGZnKYDj7LIep8PmCAKEkhtenE82zw==", "dependencies": { "tslib": "^2.3.0" }, @@ -1728,7 +1703,7 @@ "node": "^14.20.0 || ^16.13.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": "15.2.9" + "@angular/core": "15.2.10" }, "peerDependenciesMeta": { "@angular/core": { @@ -1737,9 +1712,9 @@ } }, "node_modules/@angular/compiler-cli": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-15.2.9.tgz", - "integrity": "sha512-zsbI8G2xHOeYWI0hjFzrI//ZhZV9il/uQW5dAimfwJp06KZDeXZ3PdwY9JQslf6F+saLwOObxy6QMrIVvfjy9w==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-15.2.10.tgz", + "integrity": "sha512-mCFIxrs60XicKfA2o42hA7LrQvhybi9BQveWuZn/2iIEOXx7R62Iemz8E21pLWftAZHGxEW3NECfBrY1d3gVmA==", "dev": true, "dependencies": { "@babel/core": "7.19.3", @@ -1762,7 +1737,7 @@ "node": "^14.20.0 || ^16.13.0 || >=18.10.0" }, "peerDependencies": { - "@angular/compiler": "15.2.9", + "@angular/compiler": "15.2.10", "typescript": ">=4.8.2 <5.0" } }, @@ -1797,9 +1772,9 @@ } }, "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -1818,9 +1793,9 @@ } }, "node_modules/@angular/core": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-15.2.9.tgz", - "integrity": "sha512-w46Z1yUXCQfKV7XfnamOoLA2VD0MVUUYVrUjO73mHSskDXSXxfZAEHO9kfUS71Cj35PvhP3mbkqWscpea2WeYg==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-15.2.10.tgz", + "integrity": "sha512-meGGidnitQJGDxYd9/LrqYiVlId+vGaLoiLgJdKBz+o2ZO6OmXQGuNw2VBqf17/Cc0/UjzrOY7+kILNFKkk/WQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -1833,9 +1808,9 @@ } }, "node_modules/@angular/elements": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular/elements/-/elements-15.2.9.tgz", - "integrity": "sha512-JtQd7LkQx4bP8HpecH9lb8CSG3O4+xjM9IxLq0Fnst9egBK1/EHpXTl0HoxVWagkjB49RadnNAcj5I5rOAH66w==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular/elements/-/elements-15.2.10.tgz", + "integrity": "sha512-/yZwLsumcFIN0POJ58kfrYcjBnm6dsQGddA8gbaD6JeIkny0sAsZZuKSavs9c4YWn2JHBH/N3L9BToRTOrQX9A==", "dev": true, "dependencies": { "tslib": "^2.3.0" @@ -1844,14 +1819,14 @@ "node": "^14.20.0 || ^16.13.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": "15.2.9", + "@angular/core": "15.2.10", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/forms": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-15.2.9.tgz", - "integrity": "sha512-sk0pC2EFi2Ohg5J0q0NYptbT+2WOkoiERSMYA39ncDvlSZBWsNlxpkbGUSck7NIxjK2QfcVN1ldGbHlZTFvtqg==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-15.2.10.tgz", + "integrity": "sha512-NIntGsNcN6o8L1txsbWXOf6f3K/CUBizdKsxsYVYGJIXEW5qU6UnWmfAZffNNXsT/XvbgUCjgDwT0cAwcqZPuQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -1859,16 +1834,16 @@ "node": "^14.20.0 || ^16.13.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "15.2.9", - "@angular/core": "15.2.9", - "@angular/platform-browser": "15.2.9", + "@angular/common": "15.2.10", + "@angular/core": "15.2.10", + "@angular/platform-browser": "15.2.10", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/platform-browser": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-15.2.9.tgz", - "integrity": "sha512-ufCHeSX+U6d43YOMkn3igwfqtlozoCXADcbyfUEG8m2y9XASobqmCKvdSk/zfl62oyiA8msntWBJVBE2l4xKXg==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-15.2.10.tgz", + "integrity": "sha512-9tbgVGSJqwfrOzT8aA/kWBLNhJSQ9gUg0CJxwFBSJm8VkBUJrszoBlDsnSvlxx8/W2ejNULKHFTXeUzq0O/+RQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -1876,9 +1851,9 @@ "node": "^14.20.0 || ^16.13.0 || >=18.10.0" }, "peerDependencies": { - "@angular/animations": "15.2.9", - "@angular/common": "15.2.9", - "@angular/core": "15.2.9" + "@angular/animations": "15.2.10", + "@angular/common": "15.2.10", + "@angular/core": "15.2.10" }, "peerDependenciesMeta": { "@angular/animations": { @@ -1887,9 +1862,9 @@ } }, "node_modules/@angular/platform-browser-dynamic": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.2.9.tgz", - "integrity": "sha512-ZIYDM6MShblb8OyV1m4+18lJJ2LCeICmeg2uSbpFYptYBSOClrTiYOOFVDJvn7HLvNzljLs16XPrgyaYVqNpcw==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-15.2.10.tgz", + "integrity": "sha512-JHP6W+FX715Qv7DhqvfZLuBZXSDJrboiQsR06gUAgDSjAUyhbqmpVg/2YOtgeWpPkzNDtXdPU2PhcRdIv5J3Yg==", "dependencies": { "tslib": "^2.3.0" }, @@ -1897,16 +1872,16 @@ "node": "^14.20.0 || ^16.13.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "15.2.9", - "@angular/compiler": "15.2.9", - "@angular/core": "15.2.9", - "@angular/platform-browser": "15.2.9" + "@angular/common": "15.2.10", + "@angular/compiler": "15.2.10", + "@angular/core": "15.2.10", + "@angular/platform-browser": "15.2.10" } }, "node_modules/@angular/router": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-15.2.9.tgz", - "integrity": "sha512-UCbh5DLSDhybv0xKYT7kGQMfOVdyhHIHOZz5EYVebbhste6S+W1LE57vTHq7QtxJsyKBa/WSkaUkCLXD6ntCAg==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-15.2.10.tgz", + "integrity": "sha512-LmuqEg0iIXSw7bli6HKJ19cbxP91v37GtRwbGKswyLihqzTgvjBYpvcfMnB5FRQ5LWkTwq5JclkX03dZw290Yg==", "dependencies": { "tslib": "^2.3.0" }, @@ -1914,9 +1889,9 @@ "node": "^14.20.0 || ^16.13.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "15.2.9", - "@angular/core": "15.2.9", - "@angular/platform-browser": "15.2.9", + "@angular/common": "15.2.10", + "@angular/core": "15.2.10", + "@angular/platform-browser": "15.2.10", "rxjs": "^6.5.3 || ^7.4.0" } }, @@ -1939,11 +1914,11 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.10.tgz", - "integrity": "sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", + "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", "dependencies": { - "@babel/highlight": "^7.22.10", + "@babel/highlight": "^7.23.4", "chalk": "^2.4.2" }, "engines": { @@ -2015,32 +1990,32 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz", - "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz", + "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.10.tgz", - "integrity": "sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.5.tgz", + "integrity": "sha512-Cwc2XjUrG4ilcfOw4wBAK+enbdgwAcAJCfGUItPBKR7Mjw4aEfAFYrLxeRp4jWgtNIKn3n2AlBOfwwafl+42/g==", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.10", - "@babel/generator": "^7.22.10", - "@babel/helper-compilation-targets": "^7.22.10", - "@babel/helper-module-transforms": "^7.22.9", - "@babel/helpers": "^7.22.10", - "@babel/parser": "^7.22.10", - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.10", - "@babel/types": "^7.22.10", - "convert-source-map": "^1.7.0", + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.5", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-module-transforms": "^7.23.3", + "@babel/helpers": "^7.23.5", + "@babel/parser": "^7.23.5", + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.5", + "@babel/types": "^7.23.5", + "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.2.2", + "json5": "^2.2.3", "semver": "^6.3.1" }, "engines": { @@ -2052,11 +2027,11 @@ } }, "node_modules/@babel/core/node_modules/@babel/generator": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz", - "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.5.tgz", + "integrity": "sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==", "dependencies": { - "@babel/types": "^7.22.10", + "@babel/types": "^7.23.5", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -2066,13 +2041,13 @@ } }, "node_modules/@babel/core/node_modules/@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" @@ -2091,6 +2066,11 @@ "node": ">=6.0.0" } }, + "node_modules/@babel/core/node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" + }, "node_modules/@babel/core/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -2140,24 +2120,24 @@ } }, "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.10.tgz", - "integrity": "sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz", + "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==", "dev": true, "dependencies": { - "@babel/types": "^7.22.10" + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz", - "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz", + "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==", "dependencies": { "@babel/compat-data": "^7.22.9", - "@babel/helper-validator-option": "^7.22.5", + "@babel/helper-validator-option": "^7.22.15", "browserslist": "^4.21.9", "lru-cache": "^5.1.1", "semver": "^6.3.1" @@ -2206,17 +2186,17 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.10.tgz", - "integrity": "sha512-5IBb77txKYQPpOEdUdIhBx8VrZyDCQ+H82H0+5dX1TmuscP5vJKEE3cKurjtIw/vFwzbVH48VweE78kVDBrqjA==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.5.tgz", + "integrity": "sha512-QELlRWxSpgdwdJzSJn4WAhKC+hvw/AtHbbrIoncKHkhKKR/luAlKkgBDcri1EzWAo8f8VvYVryEHN4tax/V67A==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", - "@babel/helper-member-expression-to-functions": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-member-expression-to-functions": "^7.23.0", "@babel/helper-optimise-call-expression": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.9", + "@babel/helper-replace-supers": "^7.22.20", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", "semver": "^6.3.1" @@ -2262,9 +2242,9 @@ } }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz", - "integrity": "sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz", + "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", @@ -2326,33 +2306,33 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz", - "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz", - "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dependencies": { - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name/node_modules/@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" @@ -2370,38 +2350,38 @@ } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz", - "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz", + "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==", "dev": true, "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz", - "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", + "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz", - "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", + "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", "@babel/helper-simple-access": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/helper-validator-identifier": "^7.22.5" + "@babel/helper-validator-identifier": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -2442,14 +2422,14 @@ } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz", - "integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz", + "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-wrap-function": "^7.22.9" + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-wrap-function": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -2471,13 +2451,13 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz", - "integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz", + "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-member-expression-to-functions": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-member-expression-to-functions": "^7.22.15", "@babel/helper-optimise-call-expression": "^7.22.5" }, "engines": { @@ -2523,89 +2503,89 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", - "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz", - "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", + "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz", - "integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz", + "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==", "dev": true, "dependencies": { "@babel/helper-function-name": "^7.22.5", - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.10" + "@babel/template": "^7.22.15", + "@babel/types": "^7.22.19" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-wrap-function/node_modules/@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.10.tgz", - "integrity": "sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.5.tgz", + "integrity": "sha512-oO7us8FzTEsG3U6ag9MfdF1iA/7Z6dz+MtFhifZk8C8o453rGJFFWUP1t+ULM9TUIAzC9uxXEiXjOiVMyd7QPg==", "dependencies": { - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.10", - "@babel/types": "^7.22.10" + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.5", + "@babel/types": "^7.23.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers/node_modules/@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz", - "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", "dependencies": { - "@babel/helper-validator-identifier": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, @@ -2678,9 +2658,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz", - "integrity": "sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.5.tgz", + "integrity": "sha512-hOOqoiNXrmGdFbhgCzu6GiURxUgM27Xwd/aPuu8RfHEZPBzL1Z54okAHAQjXfcQNwvrlkAmAp4SlRTZ45vlthQ==", "bin": { "parser": "bin/babel-parser.js" }, @@ -2689,9 +2669,9 @@ } }, "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz", - "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz", + "integrity": "sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -2704,14 +2684,14 @@ } }, "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz", - "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz", + "integrity": "sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", - "@babel/plugin-transform-optional-chaining": "^7.22.5" + "@babel/plugin-transform-optional-chaining": "^7.23.3" }, "engines": { "node": ">=6.9.0" @@ -2720,6 +2700,22 @@ "@babel/core": "^7.13.0" } }, + "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.3.tgz", + "integrity": "sha512-XaJak1qcityzrX0/IU5nKHb34VaibwP3saKqG6a/tppelgllOH13LUann4ZCIBcVOeE6H18K4Vx9QKkVww3z/w==", + "dev": true, + "dependencies": { + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, "node_modules/@babel/plugin-proposal-async-generator-functions": { "version": "7.20.7", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz", @@ -3059,9 +3055,9 @@ } }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz", - "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz", + "integrity": "sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -3074,9 +3070,9 @@ } }, "node_modules/@babel/plugin-syntax-import-attributes": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz", - "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz", + "integrity": "sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -3261,9 +3257,9 @@ } }, "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz", - "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz", + "integrity": "sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -3276,14 +3272,14 @@ } }, "node_modules/@babel/plugin-transform-async-generator-functions": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.10.tgz", - "integrity": "sha512-eueE8lvKVzq5wIObKK/7dvoeKJ+xc6TvRn6aysIjS6pSCeLy7S/eVi7pEQknZqyqvzaNKdDtem8nUNTBgDVR2g==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.4.tgz", + "integrity": "sha512-efdkfPhHYTtn0G6n2ddrESE91fgXxjlqLsnUtPWnJs4a4mZIbUaK7ffqKIIUKXSHwcDvaCVX6GXkaJJFqtX7jw==", "dev": true, "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-remap-async-to-generator": "^7.22.9", + "@babel/helper-remap-async-to-generator": "^7.22.20", "@babel/plugin-syntax-async-generators": "^7.8.4" }, "engines": { @@ -3311,9 +3307,9 @@ } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz", - "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz", + "integrity": "sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -3326,9 +3322,9 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz", - "integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz", + "integrity": "sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -3341,12 +3337,12 @@ } }, "node_modules/@babel/plugin-transform-class-properties": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz", - "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz", + "integrity": "sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -3357,12 +3353,12 @@ } }, "node_modules/@babel/plugin-transform-class-static-block": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz", - "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz", + "integrity": "sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-class-static-block": "^7.14.5" }, @@ -3374,18 +3370,18 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz", - "integrity": "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.5.tgz", + "integrity": "sha512-jvOTR4nicqYC9yzOHIhXG5emiFEOpappSJAl73SDSEDcybD+Puuze8Tnpb9p9qEyYup24tq891gkaygIFvWDqg==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-compilation-targets": "^7.22.6", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-optimise-call-expression": "^7.22.5", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.20", "@babel/helper-split-export-declaration": "^7.22.6", "globals": "^11.1.0" }, @@ -3421,13 +3417,13 @@ } }, "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz", - "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz", + "integrity": "sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", - "@babel/template": "^7.22.5" + "@babel/template": "^7.22.15" }, "engines": { "node": ">=6.9.0" @@ -3437,23 +3433,23 @@ } }, "node_modules/@babel/plugin-transform-computed-properties/node_modules/@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz", + "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==", "dev": true, "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz", - "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz", + "integrity": "sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -3466,12 +3462,12 @@ } }, "node_modules/@babel/plugin-transform-dotall-regex": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz", - "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz", + "integrity": "sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-create-regexp-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -3482,9 +3478,9 @@ } }, "node_modules/@babel/plugin-transform-duplicate-keys": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz", - "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz", + "integrity": "sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -3497,9 +3493,9 @@ } }, "node_modules/@babel/plugin-transform-dynamic-import": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz", - "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz", + "integrity": "sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -3513,12 +3509,12 @@ } }, "node_modules/@babel/plugin-transform-exponentiation-operator": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz", - "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz", + "integrity": "sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==", "dev": true, "dependencies": { - "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5", + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -3529,9 +3525,9 @@ } }, "node_modules/@babel/plugin-transform-export-namespace-from": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz", - "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz", + "integrity": "sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -3561,9 +3557,9 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz", - "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.3.tgz", + "integrity": "sha512-X8jSm8X1CMwxmK878qsUGJRmbysKNbdpTv/O1/v0LuY/ZkZrng5WYiekYSdg9m09OTmDDUWeEDsTE+17WYbAZw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -3576,13 +3572,13 @@ } }, "node_modules/@babel/plugin-transform-function-name": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz", - "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz", + "integrity": "sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==", "dev": true, "dependencies": { - "@babel/helper-compilation-targets": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -3593,9 +3589,9 @@ } }, "node_modules/@babel/plugin-transform-json-strings": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz", - "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz", + "integrity": "sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -3609,9 +3605,9 @@ } }, "node_modules/@babel/plugin-transform-literals": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz", - "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz", + "integrity": "sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -3624,9 +3620,9 @@ } }, "node_modules/@babel/plugin-transform-logical-assignment-operators": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz", - "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz", + "integrity": "sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -3640,9 +3636,9 @@ } }, "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz", - "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz", + "integrity": "sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -3655,12 +3651,12 @@ } }, "node_modules/@babel/plugin-transform-modules-amd": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz", - "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz", + "integrity": "sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.22.5", + "@babel/helper-module-transforms": "^7.23.3", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -3671,11 +3667,11 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz", - "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz", + "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==", "dependencies": { - "@babel/helper-module-transforms": "^7.22.5", + "@babel/helper-module-transforms": "^7.23.3", "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-simple-access": "^7.22.5" }, @@ -3687,15 +3683,15 @@ } }, "node_modules/@babel/plugin-transform-modules-systemjs": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz", - "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.3.tgz", + "integrity": "sha512-ZxyKGTkF9xT9YJuKQRo19ewf3pXpopuYQd8cDXqNzc3mUNbOME0RKMoZxviQk74hwzfQsEe66dE92MaZbdHKNQ==", "dev": true, "dependencies": { "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-module-transforms": "^7.22.5", + "@babel/helper-module-transforms": "^7.23.3", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5" + "@babel/helper-validator-identifier": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -3705,12 +3701,12 @@ } }, "node_modules/@babel/plugin-transform-modules-umd": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz", - "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz", + "integrity": "sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==", "dev": true, "dependencies": { - "@babel/helper-module-transforms": "^7.22.5", + "@babel/helper-module-transforms": "^7.23.3", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -3737,9 +3733,9 @@ } }, "node_modules/@babel/plugin-transform-new-target": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz", - "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz", + "integrity": "sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -3752,9 +3748,9 @@ } }, "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz", - "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz", + "integrity": "sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -3768,9 +3764,9 @@ } }, "node_modules/@babel/plugin-transform-numeric-separator": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz", - "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz", + "integrity": "sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -3784,16 +3780,16 @@ } }, "node_modules/@babel/plugin-transform-object-rest-spread": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz", - "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz", + "integrity": "sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.22.5", - "@babel/helper-compilation-targets": "^7.22.5", + "@babel/compat-data": "^7.23.3", + "@babel/helper-compilation-targets": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.22.5" + "@babel/plugin-transform-parameters": "^7.23.3" }, "engines": { "node": ">=6.9.0" @@ -3803,13 +3799,13 @@ } }, "node_modules/@babel/plugin-transform-object-super": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz", - "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz", + "integrity": "sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.5" + "@babel/helper-replace-supers": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -3819,9 +3815,9 @@ } }, "node_modules/@babel/plugin-transform-optional-catch-binding": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz", - "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz", + "integrity": "sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -3835,9 +3831,9 @@ } }, "node_modules/@babel/plugin-transform-optional-chaining": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.10.tgz", - "integrity": "sha512-MMkQqZAZ+MGj+jGTG3OTuhKeBpNcO+0oCEbrGNEaOmiEn+1MzRyQlYsruGiU8RTK3zV6XwrVJTmwiDOyYK6J9g==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz", + "integrity": "sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -3852,9 +3848,9 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz", - "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz", + "integrity": "sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -3867,12 +3863,12 @@ } }, "node_modules/@babel/plugin-transform-private-methods": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz", - "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz", + "integrity": "sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==", "dev": true, "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -3883,13 +3879,13 @@ } }, "node_modules/@babel/plugin-transform-private-property-in-object": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz", - "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz", + "integrity": "sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-create-class-features-plugin": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-private-property-in-object": "^7.14.5" }, @@ -3913,9 +3909,9 @@ } }, "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz", - "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz", + "integrity": "sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -3928,9 +3924,9 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz", - "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz", + "integrity": "sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -3944,9 +3940,9 @@ } }, "node_modules/@babel/plugin-transform-reserved-words": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz", - "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz", + "integrity": "sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -3988,9 +3984,9 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz", - "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz", + "integrity": "sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -4003,9 +3999,9 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz", - "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz", + "integrity": "sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", @@ -4019,9 +4015,9 @@ } }, "node_modules/@babel/plugin-transform-sticky-regex": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz", - "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz", + "integrity": "sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -4034,9 +4030,9 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz", - "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz", + "integrity": "sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -4049,9 +4045,9 @@ } }, "node_modules/@babel/plugin-transform-typeof-symbol": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz", - "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz", + "integrity": "sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -4094,9 +4090,9 @@ } }, "node_modules/@babel/plugin-transform-unicode-escapes": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz", - "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz", + "integrity": "sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" @@ -4109,12 +4105,12 @@ } }, "node_modules/@babel/plugin-transform-unicode-property-regex": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz", - "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz", + "integrity": "sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-create-regexp-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -4125,12 +4121,12 @@ } }, "node_modules/@babel/plugin-transform-unicode-regex": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz", - "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz", + "integrity": "sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-create-regexp-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -4141,12 +4137,12 @@ } }, "node_modules/@babel/plugin-transform-unicode-sets-regex": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz", - "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==", + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz", + "integrity": "sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-create-regexp-features-plugin": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -4476,18 +4472,18 @@ } }, "node_modules/@babel/traverse": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.10.tgz", - "integrity": "sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.5.tgz", + "integrity": "sha512-czx7Xy5a6sapWWRx61m1Ke1Ra4vczu1mCTtJam5zRTBOonfdJ+S/B6HYmGYu3fJtr8GGET3si6IhgWVBhJ/m8w==", "dependencies": { - "@babel/code-frame": "^7.22.10", - "@babel/generator": "^7.22.10", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.10", - "@babel/types": "^7.22.10", + "@babel/parser": "^7.23.5", + "@babel/types": "^7.23.5", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -4496,11 +4492,11 @@ } }, "node_modules/@babel/traverse/node_modules/@babel/generator": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz", - "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.5.tgz", + "integrity": "sha512-BPssCHrBD+0YrxviOa3QzpqwhNIXKEtOa2jQrm4FlmkC2apYgRnQcmPWiGZDlGxiNtltnUFolMe8497Esry+jA==", "dependencies": { - "@babel/types": "^7.22.10", + "@babel/types": "^7.23.5", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -4534,12 +4530,12 @@ } }, "node_modules/@babel/types": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.10.tgz", - "integrity": "sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.5.tgz", + "integrity": "sha512-ON5kSOJwVO6xXVRTvOI0eOnWe7VdUcIpsovGo9U/Br4Ie4UVFQTboO2cYnDhAGU6Fp+UxSiT+pMft0SMHfuq6w==", "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, "engines": { @@ -4659,47 +4655,54 @@ } }, "node_modules/@compodoc/compodoc": { - "version": "1.1.21", - "resolved": "https://registry.npmjs.org/@compodoc/compodoc/-/compodoc-1.1.21.tgz", - "integrity": "sha512-/FDlwRgKzmkGuorDnURuCzoGY6rZ0KY7Mj5/PwnEjMs0y1CRRPHBJC9I0yVIjn8j8gxVy8PPc6dna0lY1MWwhg==", + "version": "1.1.23", + "resolved": "https://registry.npmjs.org/@compodoc/compodoc/-/compodoc-1.1.23.tgz", + "integrity": "sha512-5Zfx+CHKTxLD+TxCGt1U8krnEBCWPVxCLt3jCJEN55AzhTluo8xlMenaXlJsuVqL4Lmo/OTTzEXrm9zoQKh/3w==", "dev": true, "hasInstallScript": true, "dependencies": { - "@angular-devkit/schematics": "^16.0.1", - "@babel/core": "^7.21.8", - "@babel/preset-env": "^7.21.5", + "@angular-devkit/schematics": "14.2.12", + "@babel/core": "^7.23.3", + "@babel/plugin-proposal-private-methods": "^7.18.6", + "@babel/preset-env": "^7.23.3", "@compodoc/live-server": "^1.2.3", "@compodoc/ngd-transformer": "^2.1.3", + "bootstrap.native": "^5.0.10", "chalk": "4.1.2", "cheerio": "^1.0.0-rc.12", "chokidar": "^3.5.3", "colors": "1.4.0", - "commander": "^10.0.1", - "cosmiconfig": "^8.1.3", - "decache": "^4.6.1", + "commander": "^11.1.0", + "cosmiconfig": "^8.3.6", + "decache": "^4.6.2", + "es6-shim": "^0.35.8", "fancy-log": "^2.0.0", - "fast-glob": "^3.2.12", + "fast-glob": "^3.3.2", "fs-extra": "^11.1.1", - "glob": "^10.2.4", - "handlebars": "^4.7.7", - "html-entities": "^2.3.3", - "i18next": "^22.4.15", - "inside": "^1.0.0", + "glob": "^10.3.10", + "handlebars": "^4.7.8", + "html-entities": "^2.4.0", + "i18next": "^23.7.6", "json5": "^2.2.3", "lodash": "^4.17.21", "loglevel": "^1.8.1", "loglevel-plugin-prefix": "^0.8.4", "lunr": "^2.3.9", - "marked": "4.3.0", + "marked": "7.0.3", "minimist": "^1.2.8", "opencollective-postinstall": "^2.0.3", "os-name": "4.0.1", "pdfjs-dist": "2.12.313", - "pdfmake": "^0.2.7", - "semver": "^7.5.1", + "pdfmake": "^0.2.8", + "prismjs": "^1.29.0", + "semver": "^7.5.4", + "svg-pan-zoom": "^3.6.1", + "tablesort": "^5.3.0", "traverse": "^0.6.7", - "ts-morph": "^18.0.0", - "uuid": "^9.0.0" + "ts-morph": "^20.0.0", + "uuid": "^9.0.1", + "vis": "^4.21.0-EOL", + "zepto": "^1.2.0" }, "bin": { "compodoc": "bin/index-cli.js" @@ -4709,19 +4712,19 @@ } }, "node_modules/@compodoc/compodoc/node_modules/@angular-devkit/core": { - "version": "16.0.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-16.0.4.tgz", - "integrity": "sha512-RK8+W+BVQcD2RHyQcy4iKSIFO1BexVUU2htu3+A9SY7VN/szoMgHIP/sx7Pj+LIJfDrvyve57aIOv0KPWk3WOg==", + "version": "14.2.12", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-14.2.12.tgz", + "integrity": "sha512-tg1+deEZdm3fgk2BQ6y7tujciL6qhtN5Ums266lX//kAZeZ4nNNXTBT+oY5xgfjvmLbW+xKg0XZrAS0oIRKY5g==", "dev": true, "dependencies": { - "ajv": "8.12.0", + "ajv": "8.11.0", "ajv-formats": "2.1.1", - "jsonc-parser": "3.2.0", - "rxjs": "7.8.1", + "jsonc-parser": "3.1.0", + "rxjs": "6.6.7", "source-map": "0.7.4" }, "engines": { - "node": "^16.14.0 || >=18.10.0", + "node": "^14.15.0 || >=16.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" }, @@ -4735,69 +4738,89 @@ } }, "node_modules/@compodoc/compodoc/node_modules/@angular-devkit/schematics": { - "version": "16.0.4", - "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-16.0.4.tgz", - "integrity": "sha512-ASr9bGRuTTAAgHsr/ltBBl4CTyZETmuzS/boVMNDVLvjDDFr0aY/F/FW/QRFbJsxgxM2VAJn7NpY64Rl9fQz/g==", + "version": "14.2.12", + "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-14.2.12.tgz", + "integrity": "sha512-MN5yGR+SSSPPBBVMf4cifDJn9u0IYvxiHst+HWokH2AkBYy+vB1x8jYES2l1wkiISD7nvjTixfqX+Y95oMBoLg==", "dev": true, "dependencies": { - "@angular-devkit/core": "16.0.4", - "jsonc-parser": "3.2.0", - "magic-string": "0.30.0", + "@angular-devkit/core": "14.2.12", + "jsonc-parser": "3.1.0", + "magic-string": "0.26.2", "ora": "5.4.1", - "rxjs": "7.8.1" + "rxjs": "6.6.7" }, "engines": { - "node": "^16.14.0 || >=18.10.0", + "node": "^14.15.0 || >=16.10.0", "npm": "^6.11.0 || ^7.5.6 || >=8.0.0", "yarn": ">= 1.13.0" } }, "node_modules/@compodoc/compodoc/node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz", - "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==", + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.3.tgz", + "integrity": "sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==", "dev": true, "dependencies": { - "@babel/helper-compilation-targets": "^7.17.7", - "@babel/helper-plugin-utils": "^7.16.7", + "@babel/helper-compilation-targets": "^7.22.6", + "@babel/helper-plugin-utils": "^7.22.5", "debug": "^4.1.1", "lodash.debounce": "^4.0.8", - "resolve": "^1.14.2", - "semver": "^6.1.2" + "resolve": "^1.14.2" }, "peerDependencies": { - "@babel/core": "^7.4.0-0" + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, - "node_modules/@compodoc/compodoc/node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "node_modules/@compodoc/compodoc/node_modules/@babel/plugin-proposal-private-property-in-object": { + "version": "7.21.0-placeholder-for-preset-env.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", + "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", "dev": true, - "bin": { - "semver": "bin/semver.js" + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@compodoc/compodoc/node_modules/@babel/plugin-transform-async-to-generator": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz", + "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==", + "dev": true, + "dependencies": { + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.20" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" } }, "node_modules/@compodoc/compodoc/node_modules/@babel/preset-env": { - "version": "7.22.4", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.4.tgz", - "integrity": "sha512-c3lHOjbwBv0TkhYCr+XCR6wKcSZ1QbQTVdSkZUaVpLv8CVWotBMArWUi5UAJrcrQaEnleVkkvaV8F/pmc/STZQ==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.5.tgz", + "integrity": "sha512-0d/uxVD6tFGWXGDSfyMD1p2otoaKmu6+GD+NfAx0tMaH+dxORnp7T9TaVQ6mKyya7iBtCIVxHjWT7MuzzM9z+A==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.22.3", - "@babel/helper-compilation-targets": "^7.22.1", - "@babel/helper-plugin-utils": "^7.21.5", - "@babel/helper-validator-option": "^7.21.0", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.3", - "@babel/plugin-proposal-private-property-in-object": "^7.21.0", + "@babel/compat-data": "^7.23.5", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-validator-option": "^7.23.5", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3", + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.3", + "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.20.0", - "@babel/plugin-syntax-import-attributes": "^7.22.3", + "@babel/plugin-syntax-import-assertions": "^7.23.3", + "@babel/plugin-syntax-import-attributes": "^7.23.3", "@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", @@ -4809,61 +4832,60 @@ "@babel/plugin-syntax-private-property-in-object": "^7.14.5", "@babel/plugin-syntax-top-level-await": "^7.14.5", "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", - "@babel/plugin-transform-arrow-functions": "^7.21.5", - "@babel/plugin-transform-async-generator-functions": "^7.22.3", - "@babel/plugin-transform-async-to-generator": "^7.20.7", - "@babel/plugin-transform-block-scoped-functions": "^7.18.6", - "@babel/plugin-transform-block-scoping": "^7.21.0", - "@babel/plugin-transform-class-properties": "^7.22.3", - "@babel/plugin-transform-class-static-block": "^7.22.3", - "@babel/plugin-transform-classes": "^7.21.0", - "@babel/plugin-transform-computed-properties": "^7.21.5", - "@babel/plugin-transform-destructuring": "^7.21.3", - "@babel/plugin-transform-dotall-regex": "^7.18.6", - "@babel/plugin-transform-duplicate-keys": "^7.18.9", - "@babel/plugin-transform-dynamic-import": "^7.22.1", - "@babel/plugin-transform-exponentiation-operator": "^7.18.6", - "@babel/plugin-transform-export-namespace-from": "^7.22.3", - "@babel/plugin-transform-for-of": "^7.21.5", - "@babel/plugin-transform-function-name": "^7.18.9", - "@babel/plugin-transform-json-strings": "^7.22.3", - "@babel/plugin-transform-literals": "^7.18.9", - "@babel/plugin-transform-logical-assignment-operators": "^7.22.3", - "@babel/plugin-transform-member-expression-literals": "^7.18.6", - "@babel/plugin-transform-modules-amd": "^7.20.11", - "@babel/plugin-transform-modules-commonjs": "^7.21.5", - "@babel/plugin-transform-modules-systemjs": "^7.22.3", - "@babel/plugin-transform-modules-umd": "^7.18.6", - "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.3", - "@babel/plugin-transform-new-target": "^7.22.3", - "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.3", - "@babel/plugin-transform-numeric-separator": "^7.22.3", - "@babel/plugin-transform-object-rest-spread": "^7.22.3", - "@babel/plugin-transform-object-super": "^7.18.6", - "@babel/plugin-transform-optional-catch-binding": "^7.22.3", - "@babel/plugin-transform-optional-chaining": "^7.22.3", - "@babel/plugin-transform-parameters": "^7.22.3", - "@babel/plugin-transform-private-methods": "^7.22.3", - "@babel/plugin-transform-private-property-in-object": "^7.22.3", - "@babel/plugin-transform-property-literals": "^7.18.6", - "@babel/plugin-transform-regenerator": "^7.21.5", - "@babel/plugin-transform-reserved-words": "^7.18.6", - "@babel/plugin-transform-shorthand-properties": "^7.18.6", - "@babel/plugin-transform-spread": "^7.20.7", - "@babel/plugin-transform-sticky-regex": "^7.18.6", - "@babel/plugin-transform-template-literals": "^7.18.9", - "@babel/plugin-transform-typeof-symbol": "^7.18.9", - "@babel/plugin-transform-unicode-escapes": "^7.21.5", - "@babel/plugin-transform-unicode-property-regex": "^7.22.3", - "@babel/plugin-transform-unicode-regex": "^7.18.6", - "@babel/plugin-transform-unicode-sets-regex": "^7.22.3", - "@babel/preset-modules": "^0.1.5", - "@babel/types": "^7.22.4", - "babel-plugin-polyfill-corejs2": "^0.4.3", - "babel-plugin-polyfill-corejs3": "^0.8.1", - "babel-plugin-polyfill-regenerator": "^0.5.0", - "core-js-compat": "^3.30.2", - "semver": "^6.3.0" + "@babel/plugin-transform-arrow-functions": "^7.23.3", + "@babel/plugin-transform-async-generator-functions": "^7.23.4", + "@babel/plugin-transform-async-to-generator": "^7.23.3", + "@babel/plugin-transform-block-scoped-functions": "^7.23.3", + "@babel/plugin-transform-block-scoping": "^7.23.4", + "@babel/plugin-transform-class-properties": "^7.23.3", + "@babel/plugin-transform-class-static-block": "^7.23.4", + "@babel/plugin-transform-classes": "^7.23.5", + "@babel/plugin-transform-computed-properties": "^7.23.3", + "@babel/plugin-transform-destructuring": "^7.23.3", + "@babel/plugin-transform-dotall-regex": "^7.23.3", + "@babel/plugin-transform-duplicate-keys": "^7.23.3", + "@babel/plugin-transform-dynamic-import": "^7.23.4", + "@babel/plugin-transform-exponentiation-operator": "^7.23.3", + "@babel/plugin-transform-export-namespace-from": "^7.23.4", + "@babel/plugin-transform-for-of": "^7.23.3", + "@babel/plugin-transform-function-name": "^7.23.3", + "@babel/plugin-transform-json-strings": "^7.23.4", + "@babel/plugin-transform-literals": "^7.23.3", + "@babel/plugin-transform-logical-assignment-operators": "^7.23.4", + "@babel/plugin-transform-member-expression-literals": "^7.23.3", + "@babel/plugin-transform-modules-amd": "^7.23.3", + "@babel/plugin-transform-modules-commonjs": "^7.23.3", + "@babel/plugin-transform-modules-systemjs": "^7.23.3", + "@babel/plugin-transform-modules-umd": "^7.23.3", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5", + "@babel/plugin-transform-new-target": "^7.23.3", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4", + "@babel/plugin-transform-numeric-separator": "^7.23.4", + "@babel/plugin-transform-object-rest-spread": "^7.23.4", + "@babel/plugin-transform-object-super": "^7.23.3", + "@babel/plugin-transform-optional-catch-binding": "^7.23.4", + "@babel/plugin-transform-optional-chaining": "^7.23.4", + "@babel/plugin-transform-parameters": "^7.23.3", + "@babel/plugin-transform-private-methods": "^7.23.3", + "@babel/plugin-transform-private-property-in-object": "^7.23.4", + "@babel/plugin-transform-property-literals": "^7.23.3", + "@babel/plugin-transform-regenerator": "^7.23.3", + "@babel/plugin-transform-reserved-words": "^7.23.3", + "@babel/plugin-transform-shorthand-properties": "^7.23.3", + "@babel/plugin-transform-spread": "^7.23.3", + "@babel/plugin-transform-sticky-regex": "^7.23.3", + "@babel/plugin-transform-template-literals": "^7.23.3", + "@babel/plugin-transform-typeof-symbol": "^7.23.3", + "@babel/plugin-transform-unicode-escapes": "^7.23.3", + "@babel/plugin-transform-unicode-property-regex": "^7.23.3", + "@babel/plugin-transform-unicode-regex": "^7.23.3", + "@babel/plugin-transform-unicode-sets-regex": "^7.23.3", + "@babel/preset-modules": "0.1.6-no-external-plugins", + "babel-plugin-polyfill-corejs2": "^0.4.6", + "babel-plugin-polyfill-corejs3": "^0.8.5", + "babel-plugin-polyfill-regenerator": "^0.5.3", + "core-js-compat": "^3.31.0", + "semver": "^6.3.1" }, "engines": { "node": ">=6.9.0" @@ -4873,14 +4895,44 @@ } }, "node_modules/@compodoc/compodoc/node_modules/@babel/preset-env/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, + "node_modules/@compodoc/compodoc/node_modules/@babel/preset-modules": { + "version": "0.1.6-no-external-plugins", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz", + "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/types": "^7.4.4", + "esutils": "^2.0.2" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0" + } + }, + "node_modules/@compodoc/compodoc/node_modules/ajv": { + "version": "8.11.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", + "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", + "dev": true, + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, "node_modules/@compodoc/compodoc/node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -4888,51 +4940,51 @@ "dev": true }, "node_modules/@compodoc/compodoc/node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz", - "integrity": "sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==", + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz", + "integrity": "sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.17.7", - "@babel/helper-define-polyfill-provider": "^0.4.0", - "semver": "^6.1.1" + "@babel/compat-data": "^7.22.6", + "@babel/helper-define-polyfill-provider": "^0.4.3", + "semver": "^6.3.1" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/@compodoc/compodoc/node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "bin": { "semver": "bin/semver.js" } }, "node_modules/@compodoc/compodoc/node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz", - "integrity": "sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==", + "version": "0.8.6", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.6.tgz", + "integrity": "sha512-leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ==", "dev": true, "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.4.0", - "core-js-compat": "^3.30.1" + "@babel/helper-define-polyfill-provider": "^0.4.3", + "core-js-compat": "^3.33.1" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/@compodoc/compodoc/node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz", - "integrity": "sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.3.tgz", + "integrity": "sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==", "dev": true, "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.4.0" + "@babel/helper-define-polyfill-provider": "^0.4.3" }, "peerDependencies": { - "@babel/core": "^7.0.0-0" + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, "node_modules/@compodoc/compodoc/node_modules/brace-expansion": { @@ -4945,23 +4997,23 @@ } }, "node_modules/@compodoc/compodoc/node_modules/commander": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", - "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", + "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", "dev": true, "engines": { - "node": ">=14" + "node": ">=16" } }, "node_modules/@compodoc/compodoc/node_modules/cosmiconfig": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz", - "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==", + "version": "8.3.6", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", + "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", "dev": true, "dependencies": { - "import-fresh": "^3.2.1", + "import-fresh": "^3.3.0", "js-yaml": "^4.1.0", - "parse-json": "^5.0.0", + "parse-json": "^5.2.0", "path-type": "^4.0.0" }, "engines": { @@ -4969,12 +5021,20 @@ }, "funding": { "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, "node_modules/@compodoc/compodoc/node_modules/fs-extra": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz", - "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", "dev": true, "dependencies": { "graceful-fs": "^4.2.0", @@ -4986,19 +5046,19 @@ } }, "node_modules/@compodoc/compodoc/node_modules/glob": { - "version": "10.2.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.2.6.tgz", - "integrity": "sha512-U/rnDpXJGF414QQQZv5uVsabTVxMSwzS5CH0p3DRCIV6ownl4f7PzGnkGmvlum2wB+9RlJWJZ6ACU1INnBqiPA==", + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", "dev": true, "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.0.3", + "jackspeak": "^2.3.5", "minimatch": "^9.0.1", - "minipass": "^5.0.0 || ^6.0.2", - "path-scurry": "^1.7.0" + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" }, "bin": { - "glob": "dist/cjs/src/bin.js" + "glob": "dist/esm/bin.mjs" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -5019,22 +5079,28 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/@compodoc/compodoc/node_modules/jsonc-parser": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.1.0.tgz", + "integrity": "sha512-DRf0QjnNeCUds3xTjKlQQ3DpJD51GvDjJfnxUVWg6PZTo2otSm+slzNAxU/35hF8/oJIKoG9slq30JYOsF2azg==", + "dev": true + }, "node_modules/@compodoc/compodoc/node_modules/magic-string": { - "version": "0.30.0", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz", - "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==", + "version": "0.26.2", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.26.2.tgz", + "integrity": "sha512-NzzlXpclt5zAbmo6h6jNc8zl2gNRGHvmsZW4IvZhTC4W7k4OlLP+S5YLussa/r3ixNT66KOQfNORlXHSOy/X4A==", "dev": true, "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.13" + "sourcemap-codec": "^1.4.8" }, "engines": { "node": ">=12" } }, "node_modules/@compodoc/compodoc/node_modules/minimatch": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz", - "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" @@ -5047,33 +5113,41 @@ } }, "node_modules/@compodoc/compodoc/node_modules/minipass": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-6.0.2.tgz", - "integrity": "sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "dev": true, "engines": { "node": ">=16 || 14 >=14.17" } }, - "node_modules/@compodoc/compodoc/node_modules/pdfjs-dist": { - "version": "2.12.313", - "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.12.313.tgz", - "integrity": "sha512-1x6iXO4Qnv6Eb+YFdN5JdUzt4pAkxSp3aLAYPX93eQCyg/m7QFzXVWJHJVtoW48CI8HCXju4dSkhQZwoheL5mA==", + "node_modules/@compodoc/compodoc/node_modules/rxjs": { + "version": "6.6.7", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", + "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", "dev": true, - "peerDependencies": { - "worker-loader": "^3.0.8" + "dependencies": { + "tslib": "^1.9.0" }, - "peerDependenciesMeta": { - "worker-loader": { - "optional": true - } + "engines": { + "npm": ">=2.0.0" } }, + "node_modules/@compodoc/compodoc/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/@compodoc/compodoc/node_modules/uuid": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", - "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", "dev": true, + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], "bin": { "uuid": "dist/bin/uuid" } @@ -5328,9 +5402,9 @@ } }, "node_modules/@electron/rebuild": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.3.1.tgz", - "integrity": "sha512-bQDWw9rkEGYW+gzPNFCD+ugJ8LIFSu0pORJl5fmrT+H8qETOIPAe99Klzg0wGaZRu9JN+5qLzKG+PehRGOlzmQ==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.4.1.tgz", + "integrity": "sha512-iMKb6KJgKcdURbejs0j2GLEmrY8uY4rg1ESThXx9sFTgdWb8UOfJuTqW6LIEtcoY8FrbFqDmJrkWc4tBpdStXw==", "dev": true, "dependencies": { "@malept/cross-spawn-promise": "^2.0.0", @@ -5343,6 +5417,7 @@ "node-api-version": "^0.1.4", "node-gyp": "^9.0.0", "ora": "^5.1.0", + "read-binary-file-arch": "^1.0.6", "semver": "^7.3.5", "tar": "^6.0.5", "yargs": "^17.0.1" @@ -5817,9 +5892,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", - "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", "dev": true, "dependencies": { "ajv": "^6.12.4", @@ -5907,9 +5982,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.47.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz", - "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz", + "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -6000,17 +6075,20 @@ } }, "node_modules/@foliojs-fork/fontkit/node_modules/deep-equal": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", - "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz", + "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==", "dev": true, "dependencies": { - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.1", - "is-regex": "^1.0.4", - "object-is": "^1.0.1", + "is-arguments": "^1.1.1", + "is-date-object": "^1.0.5", + "is-regex": "^1.1.4", + "object-is": "^1.1.5", "object-keys": "^1.1.1", - "regexp.prototype.flags": "^1.2.0" + "regexp.prototype.flags": "^1.5.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6034,14 +6112,14 @@ "dev": true }, "node_modules/@foliojs-fork/pdfkit": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@foliojs-fork/pdfkit/-/pdfkit-0.13.0.tgz", - "integrity": "sha512-YXeG1fml9k97YNC9K8e292Pj2JzGt9uOIiBFuQFxHsdQ45BlxW+JU3RQK6JAvXU7kjhjP8rCcYvpk36JLD33sQ==", + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/@foliojs-fork/pdfkit/-/pdfkit-0.14.0.tgz", + "integrity": "sha512-nMOiQAv6id89MT3tVTCgc7HxD5ZMANwio2o5yvs5sexQkC0KI3BLaLakpsrHmFfeGFAhqPmZATZGbJGXTUebpg==", "dev": true, "dependencies": { "@foliojs-fork/fontkit": "^1.9.1", "@foliojs-fork/linebreak": "^1.1.1", - "crypto-js": "^4.0.0", + "crypto-js": "^4.2.0", "png-js": "^1.0.0" } }, @@ -6073,12 +6151,12 @@ } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz", - "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==", + "version": "0.11.13", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", + "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", "dev": true, "dependencies": { - "@humanwhocodes/object-schema": "^1.2.1", + "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", "minimatch": "^3.0.5" }, @@ -6100,9 +6178,9 @@ } }, "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", + "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", "dev": true }, "node_modules/@isaacs/cliui": { @@ -6860,9 +6938,9 @@ } }, "node_modules/@microsoft/signalr": { - "version": "6.0.21", - "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-6.0.21.tgz", - "integrity": "sha512-3MWhSUE7AxkQs3QBuJ/spJJpg1mAHo0/6yRGhs5+Hew3Z+iqYrHVfo0yTElC7W2bVA9t3fW3jliQ9rBN0OvJLA==", + "version": "6.0.25", + "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-6.0.25.tgz", + "integrity": "sha512-8AzrpxS+E0yn1tXSlv7+UlURLmSxTQDgbvOT0pGKXjZT7MkhnDP+/GLuk7veRtUjczou/x32d9PHhYlr2NBy6Q==", "dependencies": { "abort-controller": "^3.0.0", "eventsource": "^1.0.7", @@ -6872,11 +6950,11 @@ } }, "node_modules/@microsoft/signalr-protocol-msgpack": { - "version": "6.0.21", - "resolved": "https://registry.npmjs.org/@microsoft/signalr-protocol-msgpack/-/signalr-protocol-msgpack-6.0.21.tgz", - "integrity": "sha512-Z62G5Sq0HSkS2iJEEugqXHU2nNVgPZLI5vSoqUo0IghCc6AJRCZzPcxgCeLsaQcpUYqWxo29YWkyzylrw5snsw==", + "version": "6.0.25", + "resolved": "https://registry.npmjs.org/@microsoft/signalr-protocol-msgpack/-/signalr-protocol-msgpack-6.0.25.tgz", + "integrity": "sha512-3XVLisQMTLs3cAW9jmuyQQWnxidWcB8MOebncoH09HR98oIx3cboQxg5aOSuTOhoeWHvDHd/+bYJntKNyOsTyQ==", "dependencies": { - "@microsoft/signalr": ">=6.0.21", + "@microsoft/signalr": ">=6.0.25", "@msgpack/msgpack": "^2.7.0" } }, @@ -6917,9 +6995,9 @@ } }, "node_modules/@ngtools/webpack": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.2.9.tgz", - "integrity": "sha512-nOXUGqKkAEMlCcrhkDwWDzcVdKNH7MNRUXfNzsFc9zdeR/5p3qt6SVMN7OOE3NREyI7P6nzARc3S+6QDBjf3Jg==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.2.10.tgz", + "integrity": "sha512-ZExB4rKh/Saad31O/Ofd2XvRuILuCNTYs0+qJL697Be2pzeewvzBhE4Xe1Mm7Jg13aWSPeuIdzSGOqCdwxxxFQ==", "dev": true, "engines": { "node": "^14.20.0 || ^16.13.0 || >=18.10.0", @@ -7842,13 +7920,13 @@ } }, "node_modules/@schematics/angular": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-15.2.9.tgz", - "integrity": "sha512-0Lit6TLNUwcAYiEkXgZp3vY9xAO1cnZCBXuUcp+6v+Ddnrt2w/YOiGe74p21cYe0StkTpTljsqsKBTiX7TMjQg==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-15.2.10.tgz", + "integrity": "sha512-eLdyP+T1TueNQ8FCP7sP+tt8z+YQ1BINsJsyAyoJT/XZjcCV7LUxgDIU94/kuvIotmJ2xTuFWHFPfAY+CN3duQ==", "dev": true, "dependencies": { - "@angular-devkit/core": "15.2.9", - "@angular-devkit/schematics": "15.2.9", + "@angular-devkit/core": "15.2.10", + "@angular-devkit/schematics": "15.2.10", "jsonc-parser": "3.2.0" }, "engines": { @@ -7858,9 +7936,9 @@ } }, "node_modules/@schematics/angular/node_modules/@angular-devkit/core": { - "version": "15.2.9", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.9.tgz", - "integrity": "sha512-6u44YJ9tEG2hiWITL1rwA9yP6ot4a3cyN/UOMRkYSa/XO2Gz5/dM3U74E2kwg+P1NcxLXffBWl0rz8/Y/lSZyQ==", + "version": "15.2.10", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-15.2.10.tgz", + "integrity": "sha512-bFPm7wjvfBds9km2rCJxUhzkqe4h3h/199yJtzC1bNvwRr2LMHvtyoQAzftda+gs7Ulqac5wzUEZX/cVV3WrsA==", "dev": true, "dependencies": { "ajv": "8.12.0", @@ -8736,9 +8814,9 @@ } }, "node_modules/@storybook/addon-designs": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/@storybook/addon-designs/-/addon-designs-7.0.4.tgz", - "integrity": "sha512-u2Nxa69C6/VuuVI/Uc0vB2Hk+TOt2L/bAatowRBLcVtv7HiDpNuuc7OyW9QJMIzXZ6aVLjI59k53llz7BfExbA==", + "version": "7.0.7", + "resolved": "https://registry.npmjs.org/@storybook/addon-designs/-/addon-designs-7.0.7.tgz", + "integrity": "sha512-4Ec85kgv/r55Zh5xOHSIq7b9h7PyYhavMpwLmjpzeOkEdFwiNM9KCTK8SE58yCXzbkrw1JIGb3+FAWfR5JfK5g==", "dev": true, "dependencies": { "@figspec/react": "^1.0.0" @@ -11537,6 +11615,21 @@ "node": ">=14.14" } }, + "node_modules/@storybook/cli/node_modules/prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/@storybook/cli/node_modules/simple-update-notifier": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", @@ -11838,6 +11931,21 @@ "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" } }, + "node_modules/@storybook/codemod/node_modules/prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/@storybook/codemod/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -13475,18 +13583,39 @@ "node": ">=10" } }, + "node_modules/@thednp/event-listener": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@thednp/event-listener/-/event-listener-2.0.4.tgz", + "integrity": "sha512-sc4B7AzYAIvnGnivirq0XyR7LfzEDhGiiB70Q0qdNn8wSJ2pL1buVAsEZxrlc47qRJiBV4YIP+BFkyMm2r3NLg==", + "dev": true, + "engines": { + "node": ">=16", + "pnpm": ">=8.6.0" + } + }, + "node_modules/@thednp/shorty": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@thednp/shorty/-/shorty-2.0.0.tgz", + "integrity": "sha512-kwtLivCxYIoFfGIVU4NlZtfdA/zxZ6X8UcWaJrb7XqU3WQ4Q1p5IaZlLBfOVAO06WH5oWE87QUdK/dS56Wnfjg==", + "dev": true, + "engines": { + "node": ">=16", + "pnpm": ">=8.6.0" + } + }, "node_modules/@tootallnate/once": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "dev": true, "engines": { "node": ">= 10" } }, "node_modules/@ts-morph/common": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.19.0.tgz", - "integrity": "sha512-Unz/WHmd4pGax91rdIKWi51wnVUW11QttMEPpBiBgIewnc9UQIX7UDLxr5vRlqeByXCwhkF6VabSsI0raWcyAQ==", + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/@ts-morph/common/-/common-0.21.0.tgz", + "integrity": "sha512-ES110Mmne5Vi4ypUKrtVQfXFDtCsDXiUiGxF6ILVlE90dDD4fdpC1LSjydl/ml7xJWKSDZwUYD2zkOePMSrPBA==", "dev": true, "dependencies": { "fast-glob": "^3.2.12", @@ -13947,9 +14076,9 @@ } }, "node_modules/@types/jest": { - "version": "29.5.3", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.3.tgz", - "integrity": "sha512-1Nq7YrO/vJE/FYnqYyw0FS8LdrjExSgIiHyKg7xPpn+yi8Q4huZryKnkJatN1ZRH89Kw2v33/8ZMB7DuZeSLlA==", + "version": "29.5.11", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.11.tgz", + "integrity": "sha512-S2mHmYIVe13vrm6q4kN6fLYYAka15ALQki/vgDC3mIukEOx8WJlv0kQPM+d4w8Gp6u0uSdKND04IlTXBv0rwnQ==", "dev": true, "dependencies": { "expect": "^29.0.0", @@ -13957,18 +14086,18 @@ } }, "node_modules/@types/jquery": { - "version": "3.5.16", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.16.tgz", - "integrity": "sha512-bsI7y4ZgeMkmpG9OM710RRzDFp+w4P1RGiIt30C1mSBT+ExCleeh4HObwgArnDFELmRrOpXgSYN9VF1hj+f1lw==", + "version": "3.5.29", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.29.tgz", + "integrity": "sha512-oXQQC9X9MOPRrMhPHHOsXqeQDnWeCDT3PelUIg/Oy8FAbzSZtFHRjc7IpbfFVmpLtJ+UOoywpRsuO5Jxjybyeg==", "dev": true, "dependencies": { "@types/sizzle": "*" } }, "node_modules/@types/jsdom": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-21.1.1.tgz", - "integrity": "sha512-cZFuoVLtzKP3gmq9eNosUL1R50U+USkbLtUQ1bYVgl/lKp0FZM7Cq4aIHAL8oIvQ17uSHi7jXPtfDOdjPwBE7A==", + "version": "21.1.6", + "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-21.1.6.tgz", + "integrity": "sha512-/7kkMsC+/kMs7gAYmmBR9P0vGTnOoLhQhyhQJSlXGI5bzTHp6xdo0TtKWQAsz6pmSAeVqKSbqeyP6hytqr9FDw==", "dev": true, "dependencies": { "@types/node": "*", @@ -14125,10 +14254,13 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.17.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.5.tgz", - "integrity": "sha512-xNbS75FxH6P4UXTPUJp/zNPq6/xsfdJKussCWNOnz4aULWIRwMgP1LgaB5RiBnMX1DPCYenuqGZfnIAx5mbFLA==", - "dev": true + "version": "18.19.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.2.tgz", + "integrity": "sha512-6wzfBdbWpe8QykUkXBjtmO3zITA0A3FIjoy+in0Y2K4KrCiRhNYJIdwAPDffZ3G6GnaKaSLSEa9ZuORLfEoiwg==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/node-fetch": { "version": "2.6.4", @@ -14155,9 +14287,9 @@ } }, "node_modules/@types/node-forge": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.4.tgz", - "integrity": "sha512-08scBQriFsBbm/CuBWOXRMD1RG7ydFW01EDR6vGX27nxcj6E/jGSCOLdICNd8ETwQlLFXVBVA854RX6Y7vPSrQ==", + "version": "1.3.10", + "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.10.tgz", + "integrity": "sha512-y6PJDYN4xYBxwd22l+OVH35N+1fCYWiuC3aiP2SlXVE6Lo7SS+rSx9r89hLxrP4pn6n1lBGhHJ12pj3F3Mpttw==", "dev": true, "dependencies": { "@types/node": "*" @@ -14376,9 +14508,9 @@ "optional": true }, "node_modules/@types/vinyl": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.7.tgz", - "integrity": "sha512-4UqPv+2567NhMQuMLdKAyK4yzrfCqwaTt6bLhHEs8PFcxbHILsrxaY63n4wgE/BRLDWDQeI+WcTmkXKExh9hQg==", + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.11.tgz", + "integrity": "sha512-vPXzCLmRp74e9LsP8oltnWKTH+jBwt86WgRUb4Pc9Lf3pkMVGyvIo2gm9bODeGfCay2DBB/hAWDuvf07JcK4rw==", "dev": true, "dependencies": { "@types/expect": "^1.20.4", @@ -14426,38 +14558,39 @@ } }, "node_modules/@types/zxcvbn": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/@types/zxcvbn/-/zxcvbn-4.4.1.tgz", - "integrity": "sha512-3NoqvZC2W5gAC5DZbTpCeJ251vGQmgcWIHQJGq2J240HY6ErQ9aWKkwfoKJlHLx+A83WPNTZ9+3cd2ILxbvr1w==", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/@types/zxcvbn/-/zxcvbn-4.4.4.tgz", + "integrity": "sha512-Tuk4q7q0DnpzyJDI4aMeghGuFu2iS1QAdKpabn8JfbtfGmVDUgvZv1I7mEjP61Bvnp3ljKCC8BE6YYSTNxmvRQ==", "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", - "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.13.2.tgz", + "integrity": "sha512-3+9OGAWHhk4O1LlcwLBONbdXsAhLjyCFogJY/cWy2lxdVJ2JrcTF2pTGMaLl2AE7U1l31n8Py4a8bx5DLf/0dQ==", "dev": true, "dependencies": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/type-utils": "5.62.0", - "@typescript-eslint/utils": "5.62.0", + "@eslint-community/regexpp": "^4.5.1", + "@typescript-eslint/scope-manager": "6.13.2", + "@typescript-eslint/type-utils": "6.13.2", + "@typescript-eslint/utils": "6.13.2", + "@typescript-eslint/visitor-keys": "6.13.2", "debug": "^4.3.4", "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "ignore": "^5.2.4", + "natural-compare": "^1.4.0", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -14466,16 +14599,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz", + "integrity": "sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" + "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/visitor-keys": "6.13.2" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -14483,25 +14616,25 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", - "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.13.2.tgz", + "integrity": "sha512-Qr6ssS1GFongzH2qfnWKkAQmMUyZSyOr0W54nZNU1MDfo+U4Mv3XveeLZzadc/yq8iYhQZHYT+eoXJqnACM1tw==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.62.0", - "@typescript-eslint/utils": "5.62.0", + "@typescript-eslint/typescript-estree": "6.13.2", + "@typescript-eslint/utils": "6.13.2", "debug": "^4.3.4", - "tsutils": "^3.21.0" + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "*" + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -14510,12 +14643,12 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.2.tgz", + "integrity": "sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==", "dev": true, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -14523,21 +14656,21 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz", + "integrity": "sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", + "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/visitor-keys": "6.13.2", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -14550,70 +14683,47 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.13.2.tgz", + "integrity": "sha512-b9Ptq4eAZUym4idijCRzl61oPCwwREcfDI8xGk751Vhzig5fFZR9CyzDz4Sp/nxSLBYxUPyh4QdIDqWykFhNmQ==", "dev": true, "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.13.2", + "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/typescript-estree": "6.13.2", + "semver": "^7.5.4" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "eslint": "^7.0.0 || ^8.0.0" } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz", + "integrity": "sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "eslint-visitor-keys": "^3.3.0" + "@typescript-eslint/types": "6.13.2", + "eslint-visitor-keys": "^3.4.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, "node_modules/@typescript-eslint/experimental-utils": { "version": "5.59.7", "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.59.7.tgz", @@ -14682,25 +14792,26 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", - "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.13.2.tgz", + "integrity": "sha512-MUkcC+7Wt/QOGeVlM8aGGJZy1XV5YKjTpq9jK6r6/iLsGXhBVaGP5N0UYvFsu9BFlSpwY9kMretzdBH01rkRXg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", + "@typescript-eslint/scope-manager": "6.13.2", + "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/typescript-estree": "6.13.2", + "@typescript-eslint/visitor-keys": "6.13.2", "debug": "^4.3.4" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -14709,16 +14820,16 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.13.2.tgz", + "integrity": "sha512-CXQA0xo7z6x13FeDYCgBkjWzNqzBn8RXaE3QVQVIUm74fWJLkJkaHmHdKStrxQllGh6Q4eUGyNpMe0b1hMkXFA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" + "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/visitor-keys": "6.13.2" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -14726,12 +14837,12 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.13.2.tgz", + "integrity": "sha512-7sxbQ+EMRubQc3wTfTsycgYpSujyVbI1xw+3UMRUcrhSy+pN09y/lWzeKDbvhoqcRbHdc+APLs/PWYi/cisLPg==", "dev": true, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -14739,21 +14850,21 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.13.2.tgz", + "integrity": "sha512-SuD8YLQv6WHnOEtKv8D6HZUzOub855cfPnPMKvdM/Bh1plv1f7Q/0iFUDLKKlxHcEstQnaUU4QZskgQq74t+3w==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", + "@typescript-eslint/types": "6.13.2", + "@typescript-eslint/visitor-keys": "6.13.2", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -14766,16 +14877,16 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.13.2.tgz", + "integrity": "sha512-OGznFs0eAQXJsp+xSd6k/O1UbFi/K/L7WjqeRoFE7vadjAF9y0uppXhYNQNEqygjou782maGClOoZwPqF0Drlw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "eslint-visitor-keys": "^3.3.0" + "@typescript-eslint/types": "6.13.2", + "eslint-visitor-keys": "^3.4.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -15062,6 +15173,12 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, "node_modules/@webassemblyjs/ast": { "version": "1.11.6", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", @@ -15337,7 +15454,8 @@ "node_modules/abab": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", - "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==" + "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", + "dev": true }, "node_modules/abbrev": { "version": "1.1.1", @@ -15946,12 +16064,15 @@ } }, "node_modules/array-differ": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz", - "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-4.0.0.tgz", + "integrity": "sha512-Q6VPTLMsmXZ47ENG3V+wQyZS1ZxXMxFyYzA+Z/GMrJ6yIutAIEf9wTyroTzmGjNfox9/h3GdGBCVh43GVFx4Uw==", "dev": true, "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/array-each": { @@ -15976,15 +16097,15 @@ "dev": true }, "node_modules/array-includes": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", - "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", + "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", "is-string": "^1.0.7" }, "engines": { @@ -16088,16 +16209,16 @@ } }, "node_modules/array.prototype.findlastindex": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz", - "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", + "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.1.3" + "get-intrinsic": "^1.2.1" }, "engines": { "node": ">= 0.4" @@ -16107,14 +16228,14 @@ } }, "node_modules/array.prototype.flat": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", - "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", + "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -16125,14 +16246,14 @@ } }, "node_modules/array.prototype.flatmap": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", - "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -16142,13 +16263,25 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/arrify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", - "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz", + "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==", "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", + "is-array-buffer": "^3.0.2", + "is-shared-array-buffer": "^1.0.2" + }, "engines": { - "node": ">=8" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/asar": { @@ -16371,9 +16504,9 @@ } }, "node_modules/autoprefixer": { - "version": "10.4.15", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.15.tgz", - "integrity": "sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==", + "version": "10.4.16", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz", + "integrity": "sha512-7vd3UC6xKp0HLfua5IjZlcXvGAGy7cBAXTg2lyQ/8WpNhd6SiZ8Be+xm3FyBSYJx5GKcpRCzBh7RH4/0dnY+uQ==", "dev": true, "funding": [ { @@ -16391,8 +16524,8 @@ ], "dependencies": { "browserslist": "^4.21.10", - "caniuse-lite": "^1.0.30001520", - "fraction.js": "^4.2.0", + "caniuse-lite": "^1.0.30001538", + "fraction.js": "^4.3.6", "normalize-range": "^0.1.2", "picocolors": "^1.0.0", "postcss-value-parser": "^4.2.0" @@ -16408,9 +16541,9 @@ } }, "node_modules/autoprefixer/node_modules/browserslist": { - "version": "4.21.10", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", - "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", + "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", "dev": true, "funding": [ { @@ -16427,10 +16560,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001517", - "electron-to-chromium": "^1.4.477", + "caniuse-lite": "^1.0.30001541", + "electron-to-chromium": "^1.4.535", "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.11" + "update-browserslist-db": "^1.0.13" }, "bin": { "browserslist": "cli.js" @@ -17036,6 +17169,20 @@ "popper.js": "^1.16.1" } }, + "node_modules/bootstrap.native": { + "version": "5.0.11", + "resolved": "https://registry.npmjs.org/bootstrap.native/-/bootstrap.native-5.0.11.tgz", + "integrity": "sha512-bk2i4sQcQk2KuCTs1yygTa+JGjZOpKzIZ/It6TZZOO/Q+PmVGuKuIbrznXF64BUFxXaPNy7gO9LnE7vjGdauSQ==", + "dev": true, + "dependencies": { + "@thednp/event-listener": "^2.0.4", + "@thednp/shorty": "^2.0.0" + }, + "engines": { + "node": ">=16", + "pnpm": ">=8.6.0" + } + }, "node_modules/bplist-parser": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz", @@ -17305,9 +17452,9 @@ "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" }, "node_modules/bufferutil": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.7.tgz", - "integrity": "sha512-kukuqc39WOHtdxtw4UScxF/WVnMFVSQVKhtx3AjZJzhd0RGZZldcrfSEbVsWWe6KNH253574cq5F+wpv0G9pJw==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.8.tgz", + "integrity": "sha512-4T53u4PdgsXqKaIctwF8ifXlRTTmEPJ8iEPWFdGZvcf7sbwYo6FKFEX9eNNAnzFZ7EzJAQ3CJeOtCRA4rDp7Pw==", "hasInstallScript": true, "dependencies": { "node-gyp-build": "^4.3.0" @@ -17574,9 +17721,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001520", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001520.tgz", - "integrity": "sha512-tahF5O9EiiTzwTUqAeFjIZbn4Dnqxzz7ktrgGlMYNLH43Ul26IgTMH/zvL3DG0lZxBYnlT04axvInszUsZULdA==", + "version": "1.0.30001565", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001565.tgz", + "integrity": "sha512-xrE//a3O7TP0vaJ8ikzkD2c2NgcVUvsEe2IvFTntV4Yd1Z9FVzh+gW+enX96L0psrbaFMcVcH2l90xNuGDWc8w==", "funding": [ { "type": "opencollective", @@ -17739,9 +17886,9 @@ } }, "node_modules/chromatic": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/chromatic/-/chromatic-6.22.0.tgz", - "integrity": "sha512-PBZAhTzjQvx+B4nXmEgvySmR9+a8hgt7zuTT3NhC0BT1Wf08T6gjnl4bZR5Dg5V4PfCeQvP5uROPS7QFdzZeyA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/chromatic/-/chromatic-10.0.0.tgz", + "integrity": "sha512-RLU/Y0FdYVnPJIhm/gG3CSJO1hKg2O/nvfutyWT88Tg2o4aIGqSrQKCBiAUAHKrQKpfF+9Dvn/oHRTPtRcinHA==", "dev": true, "bin": { "chroma": "dist/bin.js", @@ -18599,7 +18746,8 @@ "node_modules/convert-source-map": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true }, "node_modules/cookie": { "version": "0.5.0", @@ -18742,12 +18890,12 @@ } }, "node_modules/core-js-compat": { - "version": "3.32.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.0.tgz", - "integrity": "sha512-7a9a3D1k4UCVKnLhrgALyFcP7YCsLOQIxPd0dKjf/6GuPcgyiGP70ewWdCGrSK7evyhymi0qO4EqCmSJofDeYw==", + "version": "3.33.3", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.33.3.tgz", + "integrity": "sha512-cNzGqFsh3Ot+529GIXacjTJ7kegdt5fPXxCBVS1G0iaZpuo/tBz399ymceLJveQhFFZ8qThHiP3fzuoQjKN2ow==", "dev": true, "dependencies": { - "browserslist": "^4.21.9" + "browserslist": "^4.22.1" }, "funding": { "type": "opencollective", @@ -18755,9 +18903,9 @@ } }, "node_modules/core-js-compat/node_modules/browserslist": { - "version": "4.21.10", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", - "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.1.tgz", + "integrity": "sha512-FEVc202+2iuClEhZhrWy6ZiAcRLvNMyYcxZ8raemul1DYVOVdFsbqckWLdsixQZCpJlwe77Z3UTalE7jsjnKfQ==", "dev": true, "funding": [ { @@ -18774,10 +18922,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001517", - "electron-to-chromium": "^1.4.477", + "caniuse-lite": "^1.0.30001541", + "electron-to-chromium": "^1.4.535", "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.11" + "update-browserslist-db": "^1.0.13" }, "bin": { "browserslist": "cli.js" @@ -18989,9 +19137,9 @@ } }, "node_modules/crypto-js": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz", - "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz", + "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==" }, "node_modules/crypto-random-string": { "version": "2.0.0", @@ -19108,16 +19256,23 @@ "dev": true }, "node_modules/data-urls": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz", - "integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz", + "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==", "dependencies": { - "abab": "^2.0.6", - "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^12.0.0" + "whatwg-mimetype": "^4.0.0", + "whatwg-url": "^14.0.0" }, "engines": { - "node": ">=14" + "node": ">=18" + } + }, + "node_modules/data-urls/node_modules/whatwg-mimetype": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", + "engines": { + "node": ">=18" } }, "node_modules/date-fns": { @@ -19180,9 +19335,9 @@ } }, "node_modules/decache": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/decache/-/decache-4.6.1.tgz", - "integrity": "sha512-ohApBM8u9ygepJCjgBrEZSSxPjc0T/PJkD+uNyxXPkqudyUpdXpwJYp0VISm2WrPVzASU6DZyIi6BWdyw7uJ2Q==", + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/decache/-/decache-4.6.2.tgz", + "integrity": "sha512-2LPqkLeu8XWHU8qNCS3kcF6sCcb5zIzvWaAHYSvPfwhdd7mHuah29NssMzrTYyHN4F5oFy2ko9OBYxegtU0FEw==", "dev": true, "dependencies": { "callsite": "^1.0.0" @@ -19859,6 +20014,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz", "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==", + "dev": true, "dependencies": { "webidl-conversions": "^7.0.0" }, @@ -20016,6 +20172,18 @@ "node": ">=6.0.0" } }, + "node_modules/easy-transform-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/easy-transform-stream/-/easy-transform-stream-1.0.1.tgz", + "integrity": "sha512-ktkaa6XR7COAR3oj02CF3IOgz2m1hCaY3SfzvKT4Svt2MhHw9XCt+ncJNWfe2TGz31iqzNGZ8spdKQflj+Rlog==", + "dev": true, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/editorconfig": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz", @@ -20088,9 +20256,9 @@ } }, "node_modules/electron": { - "version": "25.9.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.1.tgz", - "integrity": "sha512-Uo/Fh7igjoUXA/f90iTATZJesQEArVL1uLA672JefNWTLymdKSZkJKiCciu/Xnd0TS6qvdIOUGuJFSTQnKskXQ==", + "version": "27.1.3", + "resolved": "https://registry.npmjs.org/electron/-/electron-27.1.3.tgz", + "integrity": "sha512-7eD8VMhhlL5J531OOawn00eMthUkX1e3qN5Nqd7eMK8bg5HxQBrn8bdPlvUEnCano9KhrVwaDnGeuzWoDOGpjQ==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -20228,9 +20396,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.490", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.490.tgz", - "integrity": "sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A==" + "version": "1.4.600", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.600.tgz", + "integrity": "sha512-KD6CWjf1BnQG+NsXuyiTDDT1eV13sKuYsOUioXkQweYTQIbgHkXPry9K7M+7cKtYHnSUPitVaLrXYB1jTkkYrw==" }, "node_modules/electron-updater": { "version": "6.1.7", @@ -20279,6 +20447,15 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/emitter-component": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/emitter-component/-/emitter-component-1.1.2.tgz", + "integrity": "sha512-QdXO3nXOzZB4pAjM0n6ZE+R9/+kPpECA/XSELIcc54NeYVnBqIk+4DFiBgK+8QbV3mdvTG6nedl7dTYgO+5wDw==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/emittery": { "version": "0.13.1", "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz", @@ -20333,9 +20510,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.14.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.14.1.tgz", - "integrity": "sha512-Vklwq2vDKtl0y/vtwjSesgJ5MYS7Etuk5txS8VdKL4AOS1aUlD96zqIfsOSLQsdv3xgMRbtkWM8eG9XDfKUPow==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -20406,25 +20583,26 @@ } }, "node_modules/es-abstract": { - "version": "1.21.2", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz", - "integrity": "sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==", + "version": "1.22.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz", + "integrity": "sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==", "dev": true, "dependencies": { "array-buffer-byte-length": "^1.0.0", + "arraybuffer.prototype.slice": "^1.0.2", "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.5", "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.2.0", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.2", "get-symbol-description": "^1.0.0", "globalthis": "^1.0.3", "gopd": "^1.0.1", - "has": "^1.0.3", "has-property-descriptors": "^1.0.0", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", + "hasown": "^2.0.0", "internal-slot": "^1.0.5", "is-array-buffer": "^3.0.2", "is-callable": "^1.2.7", @@ -20432,19 +20610,23 @@ "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", + "is-typed-array": "^1.1.12", "is-weakref": "^1.0.2", - "object-inspect": "^1.12.3", + "object-inspect": "^1.13.1", "object-keys": "^1.1.1", "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.4.3", + "regexp.prototype.flags": "^1.5.1", + "safe-array-concat": "^1.0.1", "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.7", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", + "string.prototype.trim": "^1.2.8", + "string.prototype.trimend": "^1.0.7", + "string.prototype.trimstart": "^1.0.7", + "typed-array-buffer": "^1.0.0", + "typed-array-byte-length": "^1.0.0", + "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.9" + "which-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -20480,14 +20662,14 @@ "dev": true }, "node_modules/es-set-tostringtag": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", - "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", + "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==", "dev": true, "dependencies": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "has-tostringtag": "^1.0.0" + "get-intrinsic": "^1.2.2", + "has-tostringtag": "^1.0.0", + "hasown": "^2.0.0" }, "engines": { "node": ">= 0.4" @@ -20595,6 +20777,12 @@ "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==", "dev": true }, + "node_modules/es6-shim": { + "version": "0.35.8", + "resolved": "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.8.tgz", + "integrity": "sha512-Twf7I2v4/1tLoIXMT8HlqaBSS5H2wQTs2wx3MNYCI8K1R1/clXyCazrcVCPm/FuO9cyV8+leEaZOWD5C253NDg==", + "dev": true + }, "node_modules/es6-symbol": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", @@ -20775,18 +20963,19 @@ } }, "node_modules/eslint": { - "version": "8.47.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.47.0.tgz", - "integrity": "sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==", + "version": "8.55.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz", + "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "^8.47.0", - "@humanwhocodes/config-array": "^0.11.10", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.55.0", + "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", @@ -20829,9 +21018,9 @@ } }, "node_modules/eslint-config-prettier": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz", - "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz", + "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==", "dev": true, "bin": { "eslint-config-prettier": "bin/cli.js" @@ -20856,14 +21045,14 @@ } }, "node_modules/eslint-import-resolver-node": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz", - "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==", + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", "dev": true, "dependencies": { "debug": "^3.2.7", - "is-core-module": "^2.11.0", - "resolve": "^1.22.1" + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" } }, "node_modules/eslint-import-resolver-node/node_modules/debug": { @@ -20875,10 +21064,27 @@ "ms": "^2.1.1" } }, + "node_modules/eslint-import-resolver-node/node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "dev": true, + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/eslint-import-resolver-typescript": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.0.tgz", - "integrity": "sha512-QTHR9ddNnn35RTxlaEnx2gCxqFlF2SEN0SE2d17SqwyM7YOSI2GHWRYp5BiRkObTUNYPupC/3Fq2a0PpT+EKpg==", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz", + "integrity": "sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==", "dev": true, "dependencies": { "debug": "^4.3.4", @@ -20900,22 +21106,6 @@ "eslint-plugin-import": "*" } }, - "node_modules/eslint-import-resolver-typescript/node_modules/fast-glob": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", - "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, "node_modules/eslint-module-utils": { "version": "2.8.0", "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", @@ -20943,27 +21133,26 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.28.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz", - "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==", + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz", + "integrity": "sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==", "dev": true, "dependencies": { - "array-includes": "^3.1.6", - "array.prototype.findlastindex": "^1.2.2", - "array.prototype.flat": "^1.3.1", - "array.prototype.flatmap": "^1.3.1", + "array-includes": "^3.1.7", + "array.prototype.findlastindex": "^1.2.3", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", "debug": "^3.2.7", "doctrine": "^2.1.0", - "eslint-import-resolver-node": "^0.3.7", + "eslint-import-resolver-node": "^0.3.9", "eslint-module-utils": "^2.8.0", - "has": "^1.0.3", - "is-core-module": "^2.12.1", + "hasown": "^2.0.0", + "is-core-module": "^2.13.1", "is-glob": "^4.0.3", "minimatch": "^3.1.2", - "object.fromentries": "^2.0.6", - "object.groupby": "^1.0.0", - "object.values": "^1.1.6", - "resolve": "^1.22.3", + "object.fromentries": "^2.0.7", + "object.groupby": "^1.0.1", + "object.values": "^1.1.7", "semver": "^6.3.1", "tsconfig-paths": "^3.14.2" }, @@ -20995,23 +21184,6 @@ "node": ">=0.10.0" } }, - "node_modules/eslint-plugin-import/node_modules/resolve": { - "version": "1.22.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", - "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", - "dev": true, - "dependencies": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/eslint-plugin-import/node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -21060,9 +21232,9 @@ } }, "node_modules/eslint-plugin-storybook": { - "version": "0.6.13", - "resolved": "https://registry.npmjs.org/eslint-plugin-storybook/-/eslint-plugin-storybook-0.6.13.tgz", - "integrity": "sha512-smd+CS0WH1jBqUEJ3znGS7DU4ayBE9z6lkQAK2yrSUv1+rq8BT/tiI5C/rKE7rmiqiAfojtNYZRhzo5HrulccQ==", + "version": "0.6.15", + "resolved": "https://registry.npmjs.org/eslint-plugin-storybook/-/eslint-plugin-storybook-0.6.15.tgz", + "integrity": "sha512-lAGqVAJGob47Griu29KXYowI4G7KwMoJDOkEip8ujikuDLxU+oWJ1l0WL6F2oDO4QiyUFXvtDkEkISMOPzo+7w==", "dev": true, "dependencies": { "@storybook/csf": "^0.0.1", @@ -21103,9 +21275,9 @@ } }, "node_modules/eslint-scope": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz", - "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", @@ -21179,22 +21351,6 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, - "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/eslint/node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -21208,9 +21364,9 @@ } }, "node_modules/eslint/node_modules/globals": { - "version": "13.20.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", - "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", + "version": "13.23.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", + "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -21919,10 +22075,16 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, + "node_modules/fast-fifo": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", + "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", + "dev": true + }, "node_modules/fast-glob": { - "version": "3.2.12", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz", - "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", "dev": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -22741,16 +22903,16 @@ } }, "node_modules/fraction.js": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", - "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz", + "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==", "dev": true, "engines": { "node": "*" }, "funding": { "type": "patreon", - "url": "https://www.patreon.com/infusion" + "url": "https://github.com/sponsors/rawify" } }, "node_modules/fragment-cache": { @@ -22895,15 +23057,15 @@ } }, "node_modules/function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" }, "engines": { "node": ">= 0.4" @@ -22963,15 +23125,27 @@ "node": "6.* || 8.* || >= 10.*" } }, + "node_modules/get-east-asian-width": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.2.0.tgz", + "integrity": "sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==", + "dev": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz", + "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -23983,18 +24157,19 @@ } }, "node_modules/gulp-filter": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-7.0.0.tgz", - "integrity": "sha512-ZGWtJo0j1mHfP77tVuhyqem4MRA5NfNRjoVe6VAkLGeQQ/QGo2VsFwp7zfPTGDsd1rwzBmoDHhxpE6f5B3Zuaw==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-9.0.1.tgz", + "integrity": "sha512-knVYL8h9bfYIeft3VokVTkuaWJkQJMrFCS3yVjZQC6BGg+1dZFoeUY++B9D2X4eFpeNTx9StWK0qnDby3NO3PA==", "dev": true, "dependencies": { - "multimatch": "^5.0.0", - "plugin-error": "^1.0.1", + "multimatch": "^7.0.0", + "plugin-error": "^2.0.1", + "slash": "^5.1.0", "streamfilter": "^3.0.0", - "to-absolute-glob": "^2.0.2" + "to-absolute-glob": "^3.0.0" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -24008,6 +24183,31 @@ } } }, + "node_modules/gulp-filter/node_modules/slash": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", + "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", + "dev": true, + "engines": { + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/gulp-filter/node_modules/to-absolute-glob": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-3.0.0.tgz", + "integrity": "sha512-loO/XEWTRqpfcpI7+Jr2RR2Umaaozx1t6OSVWtMi0oy5F/Fxg3IC+D/TToDnxyAGs7uZBGT/6XmyDUxgsObJXA==", + "dev": true, + "dependencies": { + "is-absolute": "^1.0.0", + "is-negated-glob": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/gulp-if": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-3.0.0.tgz", @@ -24032,30 +24232,6 @@ "through2": "^4.0.2" } }, - "node_modules/gulp-json-editor/node_modules/ansi-colors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", - "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", - "dev": true, - "dependencies": { - "ansi-wrap": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/gulp-json-editor/node_modules/plugin-error": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-2.0.1.tgz", - "integrity": "sha512-zMakqvIDyY40xHOvzXka0kUvf40nYIuwRE8dWhti2WtjQZ31xAgBZBhxsK7vK3QbRXS1Xms/LO7B5cuAsfB2Gg==", - "dev": true, - "dependencies": { - "ansi-colors": "^1.0.1" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/gulp-json-editor/node_modules/readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", @@ -24088,6 +24264,35 @@ "minimatch": "^3.0.3" } }, + "node_modules/gulp-plugin-extras": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/gulp-plugin-extras/-/gulp-plugin-extras-0.3.0.tgz", + "integrity": "sha512-I/kOBSpo61QsGQZcqozZYEnDseKvpudUafVVWDLYgBFAUJ37kW5R8Sjw9cMYzpGyPUfEYOeoY4p+dkfLqgyJUQ==", + "dev": true, + "dependencies": { + "@types/vinyl": "^2.0.9", + "chalk": "^5.3.0", + "easy-transform-stream": "^1.0.1" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/gulp-plugin-extras/node_modules/chalk": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "dev": true, + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, "node_modules/gulp-replace": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.4.tgz", @@ -24105,19 +24310,21 @@ } }, "node_modules/gulp-zip": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-5.1.0.tgz", - "integrity": "sha512-XZr/y91IliK/SpR74g3TkZejGkGEmK7CSDjSghT1jXshgO+dFvpLIz9w9fpuwkew6i7k4F+G24TubNgq1ISzEw==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-6.0.0.tgz", + "integrity": "sha512-fPGvNve2dBoZxGKcviTU7mOa77eQibyhwgGLTxnF+ZCKX8RFaTZKkPbdPnmw0r4TNPRjPCkQB/0VuP+MzgkEYg==", "dev": true, "dependencies": { - "get-stream": "^5.2.0", - "plugin-error": "^1.0.1", - "through2": "^3.0.1", - "vinyl": "^2.1.0", + "get-stream": "^8.0.1", + "gulp-plugin-extras": "^0.3.0", + "vinyl": "^3.0.0", "yazl": "^2.5.1" }, "engines": { - "node": ">=8" + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" }, "peerDependencies": { "gulp": ">=4" @@ -24128,21 +24335,52 @@ } } }, - "node_modules/gulp-zip/node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "node_modules/gulp-zip/node_modules/clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", "dev": true, - "dependencies": { - "pump": "^3.0.0" - }, "engines": { - "node": ">=8" + "node": ">=0.8" + } + }, + "node_modules/gulp-zip/node_modules/get-stream": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", + "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", + "dev": true, + "engines": { + "node": ">=16" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/gulp-zip/node_modules/replace-ext": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", + "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==", + "dev": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/gulp-zip/node_modules/vinyl": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz", + "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==", + "dev": true, + "dependencies": { + "clone": "^2.1.2", + "clone-stats": "^1.0.0", + "remove-trailing-separator": "^1.1.0", + "replace-ext": "^2.0.0", + "teex": "^1.0.1" + }, + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/gulplog": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", @@ -24182,6 +24420,15 @@ "xtend": "~4.0.1" } }, + "node_modules/hammerjs": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz", + "integrity": "sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ==", + "dev": true, + "engines": { + "node": ">=0.8.0" + } + }, "node_modules/handle-thing": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", @@ -24189,13 +24436,13 @@ "dev": true }, "node_modules/handlebars": { - "version": "4.7.7", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", - "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", + "version": "4.7.8", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", + "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", "dev": true, "dependencies": { "minimist": "^1.2.5", - "neo-async": "^2.6.0", + "neo-async": "^2.6.2", "source-map": "^0.6.1", "wordwrap": "^1.0.0" }, @@ -24222,6 +24469,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, "dependencies": { "function-bind": "^1.1.1" }, @@ -24367,6 +24615,17 @@ "node": ">=0.10.0" } }, + "node_modules/hasown": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", + "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/hdr-histogram-js": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz", @@ -24457,6 +24716,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz", "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==", + "dev": true, "dependencies": { "whatwg-encoding": "^2.0.0" }, @@ -24465,10 +24725,20 @@ } }, "node_modules/html-entities": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz", - "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==", - "dev": true + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz", + "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/mdevils" + }, + { + "type": "patreon", + "url": "https://patreon.com/mdevils" + } + ] }, "node_modules/html-escaper": { "version": "2.0.2", @@ -24534,9 +24804,9 @@ "dev": true }, "node_modules/html-webpack-plugin": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz", - "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.4.tgz", + "integrity": "sha512-3wNSaVVxdxcu0jd4FpQFoICdqgxs4zIQQvj+2yQKFfBOnLETQ6X5CDWdeasuGlSsooFlMkEioWDTqBv1wvw5Iw==", "dev": true, "dependencies": { "@types/html-minifier-terser": "^6.0.0", @@ -24713,6 +24983,7 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "dev": true, "dependencies": { "@tootallnate/once": "2", "agent-base": "6", @@ -24817,9 +25088,9 @@ } }, "node_modules/i18next": { - "version": "22.5.0", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-22.5.0.tgz", - "integrity": "sha512-sqWuJFj+wJAKQP2qBQ+b7STzxZNUmnSxrehBCCj9vDOW9RDYPfqCaK1Hbh2frNYQuPziz6O2CGoJPwtzY3vAYA==", + "version": "23.7.7", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-23.7.7.tgz", + "integrity": "sha512-peTvdT+Lma+o0LfLFD7IC2M37N9DJ04dH0IJYOyOHRhDfLo6nK36v7LkrQH35C2l8NHiiXZqGirhKESlEb/5PA==", "dev": true, "funding": [ { @@ -24836,9 +25107,27 @@ } ], "dependencies": { - "@babel/runtime": "^7.20.6" + "@babel/runtime": "^7.23.2" } }, + "node_modules/i18next/node_modules/@babel/runtime": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.5.tgz", + "integrity": "sha512-NdUTHcPe4C99WxPub+K9l9tK5/lV4UXIoaHSYgzco9BCyjKAAwzdBI+wWtYqHt7LJdbo74ZjRPJgzVweq1sz0w==", + "dev": true, + "dependencies": { + "regenerator-runtime": "^0.14.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/i18next/node_modules/regenerator-runtime": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", + "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==", + "dev": true + }, "node_modules/iconv-corefoundation": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz", @@ -25186,12 +25475,6 @@ "node": ">=8" } }, - "node_modules/inside": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/inside/-/inside-1.0.0.tgz", - "integrity": "sha512-tvFwvS4g7q6iDot/4FjtWFHwwpv6TVvEumbTdLQilk1F07ojakbXPQcvf3kMAlyNDpzKRzn+d33O3RuXODuxZQ==", - "dev": true - }, "node_modules/internal-slot": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", @@ -25431,12 +25714,12 @@ } }, "node_modules/is-core-module": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", - "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dev": true, "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -25864,16 +26147,12 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.10.tgz", - "integrity": "sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", + "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", "dev": true, "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", - "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "which-typed-array": "^1.1.11" }, "engines": { "node": ">= 0.4" @@ -26777,9 +27056,9 @@ } }, "node_modules/jest-preset-angular": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-13.1.1.tgz", - "integrity": "sha512-X8i7icKt9U5uhj7YKqdEZm7ZZPvNFRxfBnU+9SALdIkHYJhwtlJ5/MUk9wo4f3lX2smOkIl9LPJUu1APO+11Jg==", + "version": "13.1.4", + "resolved": "https://registry.npmjs.org/jest-preset-angular/-/jest-preset-angular-13.1.4.tgz", + "integrity": "sha512-XKeWa8Qt7p37SzlJ85qEXgig06SgkfrzV057X2GSMqfz/HLJmTUjMFkHJKe65ZaQumNQWCcXpxXREr6EfZ9bow==", "dev": true, "dependencies": { "bs-logger": "^0.2.6", @@ -26796,10 +27075,10 @@ "esbuild": ">=0.13.8" }, "peerDependencies": { - "@angular-devkit/build-angular": ">=13.0.0 <17.0.0", - "@angular/compiler-cli": ">=13.0.0 <17.0.0", - "@angular/core": ">=13.0.0 <17.0.0", - "@angular/platform-browser-dynamic": ">=13.0.0 <17.0.0", + "@angular-devkit/build-angular": ">=13.0.0 <18.0.0", + "@angular/compiler-cli": ">=13.0.0 <18.0.0", + "@angular/core": ">=13.0.0 <18.0.0", + "@angular/platform-browser-dynamic": ">=13.0.0 <18.0.0", "jest": "^29.0.0", "typescript": ">=4.4" } @@ -27091,9 +27370,9 @@ } }, "node_modules/jiti": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz", - "integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==", + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz", + "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==", "dev": true, "bin": { "jiti": "bin/jiti.js" @@ -27113,9 +27392,9 @@ } }, "node_modules/jquery": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz", - "integrity": "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==" + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" }, "node_modules/js-beautify": { "version": "1.14.9", @@ -27272,39 +27551,37 @@ } }, "node_modules/jsdom": { - "version": "22.1.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz", - "integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==", + "version": "23.0.1", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-23.0.1.tgz", + "integrity": "sha512-2i27vgvlUsGEBO9+/kJQRbtqtm+191b5zAZrU/UezVmnC2dlDAFLgDYJvAEi94T4kjsRKkezEtLQTgsNEsW2lQ==", "dependencies": { - "abab": "^2.0.6", "cssstyle": "^3.0.0", - "data-urls": "^4.0.0", + "data-urls": "^5.0.0", "decimal.js": "^10.4.3", - "domexception": "^4.0.0", "form-data": "^4.0.0", - "html-encoding-sniffer": "^3.0.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.1", + "html-encoding-sniffer": "^4.0.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.2", "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.4", + "nwsapi": "^2.2.7", "parse5": "^7.1.2", "rrweb-cssom": "^0.6.0", "saxes": "^6.0.0", "symbol-tree": "^3.2.4", - "tough-cookie": "^4.1.2", - "w3c-xmlserializer": "^4.0.0", + "tough-cookie": "^4.1.3", + "w3c-xmlserializer": "^5.0.0", "webidl-conversions": "^7.0.0", - "whatwg-encoding": "^2.0.0", - "whatwg-mimetype": "^3.0.0", - "whatwg-url": "^12.0.1", - "ws": "^8.13.0", - "xml-name-validator": "^4.0.0" + "whatwg-encoding": "^3.1.1", + "whatwg-mimetype": "^4.0.0", + "whatwg-url": "^14.0.0", + "ws": "^8.14.2", + "xml-name-validator": "^5.0.0" }, "engines": { - "node": ">=16" + "node": ">=18" }, "peerDependencies": { - "canvas": "^2.5.0" + "canvas": "^2.11.2" }, "peerDependenciesMeta": { "canvas": { @@ -27312,10 +27589,86 @@ } } }, + "node_modules/jsdom/node_modules/agent-base": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", + "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", + "dependencies": { + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/jsdom/node_modules/html-encoding-sniffer": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", + "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==", + "dependencies": { + "whatwg-encoding": "^3.1.1" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/jsdom/node_modules/http-proxy-agent": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz", + "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==", + "dependencies": { + "agent-base": "^7.1.0", + "debug": "^4.3.4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/jsdom/node_modules/https-proxy-agent": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz", + "integrity": "sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==", + "dependencies": { + "agent-base": "^7.0.2", + "debug": "4" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/jsdom/node_modules/w3c-xmlserializer": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", + "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==", + "dependencies": { + "xml-name-validator": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/jsdom/node_modules/whatwg-encoding": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", + "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", + "dependencies": { + "iconv-lite": "0.6.3" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/jsdom/node_modules/whatwg-mimetype": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", + "engines": { + "node": ">=18" + } + }, "node_modules/jsdom/node_modules/ws": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", - "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz", + "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==", "engines": { "node": ">=10.0.0" }, @@ -27332,6 +27685,14 @@ } } }, + "node_modules/jsdom/node_modules/xml-name-validator": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", + "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==", + "engines": { + "node": ">=18" + } + }, "node_modules/jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -27476,6 +27837,12 @@ "source-map-support": "^0.5.5" } }, + "node_modules/keycharm": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/keycharm/-/keycharm-0.2.0.tgz", + "integrity": "sha512-i/XBRTiLqRConPKioy2oq45vbv04e8x59b0mnsIRQM+7Ec/8BC7UcL5pnC4FMeGb8KwG7q4wOMw7CtNZf5tiIg==", + "dev": true + }, "node_modules/keygrip": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz", @@ -27892,27 +28259,27 @@ "dev": true }, "node_modules/lint-staged": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-13.3.0.tgz", - "integrity": "sha512-mPRtrYnipYYv1FEE134ufbWpeggNTo+O/UPzngoaKzbzHAthvR55am+8GfHTnqNRQVRRrYQLGW9ZyUoD7DsBHQ==", + "version": "15.2.0", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.0.tgz", + "integrity": "sha512-TFZzUEV00f+2YLaVPWBWGAMq7So6yQx+GG8YRMDeOEIf95Zn5RyiLMsEiX4KTNl9vq/w+NqRJkLA1kPIo15ufQ==", "dev": true, "dependencies": { "chalk": "5.3.0", - "commander": "11.0.0", + "commander": "11.1.0", "debug": "4.3.4", - "execa": "7.2.0", - "lilconfig": "2.1.0", - "listr2": "6.6.1", + "execa": "8.0.1", + "lilconfig": "3.0.0", + "listr2": "8.0.0", "micromatch": "4.0.5", "pidtree": "0.6.0", "string-argv": "0.3.2", - "yaml": "2.3.1" + "yaml": "2.3.4" }, "bin": { "lint-staged": "bin/lint-staged.js" }, "engines": { - "node": "^16.14.0 || >=18.0.0" + "node": ">=18.12.0" }, "funding": { "url": "https://opencollective.com/lint-staged" @@ -27931,44 +28298,56 @@ } }, "node_modules/lint-staged/node_modules/commander": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-11.0.0.tgz", - "integrity": "sha512-9HMlXtt/BNoYr8ooyjjNRdIilOTkVJXB+GhxMTtOKwk0R4j4lS4NpjuqmRxroBfnfTSHQIHQB7wryHhXarNjmQ==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", + "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", "dev": true, "engines": { "node": ">=16" } }, "node_modules/lint-staged/node_modules/execa": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz", - "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", + "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", "dev": true, "dependencies": { "cross-spawn": "^7.0.3", - "get-stream": "^6.0.1", - "human-signals": "^4.3.0", + "get-stream": "^8.0.1", + "human-signals": "^5.0.0", "is-stream": "^3.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^5.1.0", "onetime": "^6.0.0", - "signal-exit": "^3.0.7", + "signal-exit": "^4.1.0", "strip-final-newline": "^3.0.0" }, "engines": { - "node": "^14.18.0 || ^16.14.0 || >=18.0.0" + "node": ">=16.17" }, "funding": { "url": "https://github.com/sindresorhus/execa?sponsor=1" } }, - "node_modules/lint-staged/node_modules/human-signals": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz", - "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==", + "node_modules/lint-staged/node_modules/get-stream": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", + "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", "dev": true, "engines": { - "node": ">=14.18.0" + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lint-staged/node_modules/human-signals": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", + "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", + "dev": true, + "engines": { + "node": ">=16.17.0" } }, "node_modules/lint-staged/node_modules/is-stream": { @@ -27983,6 +28362,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/lint-staged/node_modules/lilconfig": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz", + "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==", + "dev": true, + "engines": { + "node": ">=14" + } + }, "node_modules/lint-staged/node_modules/mimic-fn": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", @@ -28037,6 +28425,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/lint-staged/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "dev": true, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/lint-staged/node_modules/strip-final-newline": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", @@ -28050,37 +28450,29 @@ } }, "node_modules/lint-staged/node_modules/yaml": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz", - "integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz", + "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==", "dev": true, "engines": { "node": ">= 14" } }, "node_modules/listr2": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-6.6.1.tgz", - "integrity": "sha512-+rAXGHh0fkEWdXBmX+L6mmfmXmXvDGEKzkjxO+8mP3+nI/r/CWznVBvsibXdxda9Zz0OW2e2ikphN3OwCT/jSg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.0.0.tgz", + "integrity": "sha512-u8cusxAcyqAiQ2RhYvV7kRKNLgUvtObIbhOX2NCXqvp1UU32xIg5CT22ykS2TPKJXZWJwtK3IKLiqAGlGNE+Zg==", "dev": true, "dependencies": { - "cli-truncate": "^3.1.0", + "cli-truncate": "^4.0.0", "colorette": "^2.0.20", "eventemitter3": "^5.0.1", - "log-update": "^5.0.1", + "log-update": "^6.0.0", "rfdc": "^1.3.0", - "wrap-ansi": "^8.1.0" + "wrap-ansi": "^9.0.0" }, "engines": { - "node": ">=16.0.0" - }, - "peerDependencies": { - "enquirer": ">= 2.3.0 < 3" - }, - "peerDependenciesMeta": { - "enquirer": { - "optional": true - } + "node": ">=18.0.0" } }, "node_modules/listr2/node_modules/ansi-regex": { @@ -28108,25 +28500,25 @@ } }, "node_modules/listr2/node_modules/cli-truncate": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz", - "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz", + "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==", "dev": true, "dependencies": { "slice-ansi": "^5.0.0", - "string-width": "^5.0.0" + "string-width": "^7.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/listr2/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", + "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", "dev": true }, "node_modules/listr2/node_modules/eventemitter3": { @@ -28164,17 +28556,17 @@ } }, "node_modules/listr2/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.0.0.tgz", + "integrity": "sha512-GPQHj7row82Hjo9hKZieKcHIhaAIKOJvFSIZXuCU9OASVZrMNUaZuz++SPVrBjnLsnk4k+z9f2EIypgxf2vNFw==", "dev": true, "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -28196,17 +28588,17 @@ } }, "node_modules/listr2/node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", + "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", "dev": true, "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/chalk/wrap-ansi?sponsor=1" @@ -28376,34 +28768,34 @@ } }, "node_modules/log-update": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-5.0.1.tgz", - "integrity": "sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.0.0.tgz", + "integrity": "sha512-niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw==", "dev": true, "dependencies": { - "ansi-escapes": "^5.0.0", + "ansi-escapes": "^6.2.0", "cli-cursor": "^4.0.0", - "slice-ansi": "^5.0.0", - "strip-ansi": "^7.0.1", - "wrap-ansi": "^8.0.1" + "slice-ansi": "^7.0.0", + "strip-ansi": "^7.1.0", + "wrap-ansi": "^9.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/log-update/node_modules/ansi-escapes": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-5.0.0.tgz", - "integrity": "sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.0.tgz", + "integrity": "sha512-kzRaCqXnpzWs+3z5ABPQiVke+iq0KXkHo8xiWV4RPTi5Yli0l97BEQuhXV1s7+aSU/fu1kUuxgS4MsQ0fRuygw==", "dev": true, "dependencies": { - "type-fest": "^1.0.2" + "type-fest": "^3.0.0" }, "engines": { - "node": ">=12" + "node": ">=14.16" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -28449,18 +28841,21 @@ } }, "node_modules/log-update/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", + "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", "dev": true }, "node_modules/log-update/node_modules/is-fullwidth-code-point": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", - "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz", + "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==", "dev": true, + "dependencies": { + "get-east-asian-width": "^1.0.0" + }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -28483,33 +28878,33 @@ } }, "node_modules/log-update/node_modules/slice-ansi": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", - "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz", + "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==", "dev": true, "dependencies": { - "ansi-styles": "^6.0.0", - "is-fullwidth-code-point": "^4.0.0" + "ansi-styles": "^6.2.1", + "is-fullwidth-code-point": "^5.0.0" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/chalk/slice-ansi?sponsor=1" } }, "node_modules/log-update/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.0.0.tgz", + "integrity": "sha512-GPQHj7row82Hjo9hKZieKcHIhaAIKOJvFSIZXuCU9OASVZrMNUaZuz++SPVrBjnLsnk4k+z9f2EIypgxf2vNFw==", "dev": true, "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -28531,29 +28926,29 @@ } }, "node_modules/log-update/node_modules/type-fest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-3.13.1.tgz", + "integrity": "sha512-tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==", "dev": true, "engines": { - "node": ">=10" + "node": ">=14.16" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/log-update/node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz", + "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==", "dev": true, "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" }, "engines": { - "node": ">=12" + "node": ">=18" }, "funding": { "url": "https://github.com/chalk/wrap-ansi?sponsor=1" @@ -28963,15 +29358,15 @@ } }, "node_modules/marked": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz", - "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/marked/-/marked-7.0.3.tgz", + "integrity": "sha512-ev2uM40p0zQ/GbvqotfKcSWEa59fJwluGZj5dcaUOwDRrB1F3dncdXy8NWUApk4fi8atU3kTBOwjyjZ0ud0dxw==", "dev": true, "bin": { "marked": "bin/marked.js" }, "engines": { - "node": ">= 12" + "node": ">= 16" } }, "node_modules/matchdep": { @@ -30390,6 +30785,15 @@ "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", "dev": true }, + "node_modules/moment": { + "version": "2.29.4", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", + "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==", + "dev": true, + "engines": { + "node": "*" + } + }, "node_modules/morgan": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", @@ -30489,29 +30893,57 @@ } }, "node_modules/multimatch": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz", - "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-7.0.0.tgz", + "integrity": "sha512-SYU3HBAdF4psHEL/+jXDKHO95/m5P2RvboHT2Y0WtTttvJLP4H/2WS9WlQPFvF6C8d6SpLw8vjCnQOnVIVOSJQ==", "dev": true, "dependencies": { - "@types/minimatch": "^3.0.3", - "array-differ": "^3.0.0", - "array-union": "^2.1.0", - "arrify": "^2.0.1", - "minimatch": "^3.0.4" + "array-differ": "^4.0.0", + "array-union": "^3.0.1", + "minimatch": "^9.0.3" }, "engines": { - "node": ">=10" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/multimatch/node_modules/@types/minimatch": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", - "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", - "dev": true + "node_modules/multimatch/node_modules/array-union": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz", + "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/multimatch/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/multimatch/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } }, "node_modules/multistream": { "version": "4.1.0", @@ -30644,12 +31076,6 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "node_modules/natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, "node_modules/needle": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/needle/-/needle-3.2.0.tgz", @@ -31338,9 +31764,9 @@ } }, "node_modules/nwsapi": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.4.tgz", - "integrity": "sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g==" + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", + "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==" }, "node_modules/object-assign": { "version": "4.1.1", @@ -31451,9 +31877,9 @@ } }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -31528,14 +31954,14 @@ } }, "node_modules/object.fromentries": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz", - "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", + "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -31545,14 +31971,14 @@ } }, "node_modules/object.groupby": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz", - "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", + "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", - "es-abstract": "^1.21.2", + "es-abstract": "^1.22.1", "get-intrinsic": "^1.2.1" } }, @@ -31595,14 +32021,14 @@ } }, "node_modules/object.values": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", - "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", + "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -31618,11 +32044,11 @@ "dev": true }, "node_modules/oidc-client-ts": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/oidc-client-ts/-/oidc-client-ts-2.3.0.tgz", - "integrity": "sha512-7RUKU+TJFQo+4X9R50IGJAIDF18uRBaFXyZn4VVCfwmwbSUhKcdDnw4zgeut3uEXkiD3NqURq+d88sDPxjf1FA==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/oidc-client-ts/-/oidc-client-ts-2.4.0.tgz", + "integrity": "sha512-WijhkTrlXK2VvgGoakWJiBdfIsVGz6CFzgjNNqZU1hPKV2kyeEaJgLs7RwuiSp2WhLfWBQuLvr2SxVlZnk3N1w==", "dependencies": { - "crypto-js": "^4.1.1", + "crypto-js": "^4.2.0", "jwt-decode": "^3.1.2" }, "engines": { @@ -32322,14 +32748,28 @@ "through": "~2.3" } }, + "node_modules/pdfjs-dist": { + "version": "2.12.313", + "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.12.313.tgz", + "integrity": "sha512-1x6iXO4Qnv6Eb+YFdN5JdUzt4pAkxSp3aLAYPX93eQCyg/m7QFzXVWJHJVtoW48CI8HCXju4dSkhQZwoheL5mA==", + "dev": true, + "peerDependencies": { + "worker-loader": "^3.0.8" + }, + "peerDependenciesMeta": { + "worker-loader": { + "optional": true + } + } + }, "node_modules/pdfmake": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/pdfmake/-/pdfmake-0.2.7.tgz", - "integrity": "sha512-ClLpgx30H5G3EDvRW1MrA1Xih6YxEaSgIVFrOyBMgAAt62V+hxsyWAi6JNP7u1Fc5JKYAbpb4RRVw8Rhvmz5cQ==", + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/pdfmake/-/pdfmake-0.2.8.tgz", + "integrity": "sha512-lI+amfIaUL8CrPhndxFdhIgMj9JB49Sj4DARltKC1gLm/5NsPohZqfB+D+II8HymtPB6eugUFD5oBxmzO57qHA==", "dev": true, "dependencies": { "@foliojs-fork/linebreak": "^1.1.1", - "@foliojs-fork/pdfkit": "^0.13.0", + "@foliojs-fork/pdfkit": "^0.14.0", "iconv-lite": "^0.6.3", "xmldoc": "^1.1.2" }, @@ -32729,18 +33169,15 @@ } }, "node_modules/plugin-error": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", - "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-2.0.1.tgz", + "integrity": "sha512-zMakqvIDyY40xHOvzXka0kUvf40nYIuwRE8dWhti2WtjQZ31xAgBZBhxsK7vK3QbRXS1Xms/LO7B5cuAsfB2Gg==", "dev": true, "dependencies": { - "ansi-colors": "^1.0.1", - "arr-diff": "^4.0.0", - "arr-union": "^3.1.0", - "extend-shallow": "^3.0.2" + "ansi-colors": "^1.0.1" }, "engines": { - "node": ">= 0.10" + "node": ">=10.13.0" } }, "node_modules/plugin-error/node_modules/ansi-colors": { @@ -33085,27 +33522,27 @@ } }, "node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz", + "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==", "dev": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" } }, "node_modules/prettier-plugin-tailwindcss": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.4.1.tgz", - "integrity": "sha512-hwn2EiJmv8M+AW4YDkbjJ6HlZCTzLyz1QlySn9sMuKV/Px0fjwldlB7tol8GzdgqtkdPtzT3iJ4UzdnYXP25Ag==", + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.5.7.tgz", + "integrity": "sha512-4v6uESAgwCni6YF6DwJlRaDjg9Z+al5zM4JfngcazMy4WEf/XkPS5TEQjbD+DZ5iNuG6RrKQLa/HuX2SYzC3kQ==", "dev": true, "engines": { - "node": ">=12.17.0" + "node": ">=14.21.3" }, "peerDependencies": { "@ianvs/prettier-plugin-sort-imports": "*", @@ -33113,17 +33550,15 @@ "@shopify/prettier-plugin-liquid": "*", "@shufo/prettier-plugin-blade": "*", "@trivago/prettier-plugin-sort-imports": "*", - "prettier": "^2.2 || ^3.0", + "prettier": "^3.0", "prettier-plugin-astro": "*", "prettier-plugin-css-order": "*", "prettier-plugin-import-sort": "*", "prettier-plugin-jsdoc": "*", - "prettier-plugin-marko": "*", "prettier-plugin-organize-attributes": "*", "prettier-plugin-organize-imports": "*", "prettier-plugin-style-order": "*", - "prettier-plugin-svelte": "*", - "prettier-plugin-twig-melody": "*" + "prettier-plugin-svelte": "*" }, "peerDependenciesMeta": { "@ianvs/prettier-plugin-sort-imports": { @@ -33230,6 +33665,15 @@ "node": ">= 0.8" } }, + "node_modules/prismjs": { + "version": "1.29.0", + "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz", + "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/proc-log": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz", @@ -33316,6 +33760,15 @@ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", "dev": true }, + "node_modules/propagating-hammerjs": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/propagating-hammerjs/-/propagating-hammerjs-1.5.0.tgz", + "integrity": "sha512-3PUXWmomwutoZfydC+lJwK1bKCh6sK6jZGB31RUX6+4EXzsbkDZrK4/sVR7gBrvJaEIwpTVyxQUAd29FKkmVdw==", + "dev": true, + "dependencies": { + "hammerjs": "^2.0.8" + } + }, "node_modules/proper-lockfile": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-4.1.2.tgz", @@ -33404,9 +33857,9 @@ } }, "node_modules/punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "engines": { "node": ">=6" } @@ -33598,6 +34051,12 @@ } ] }, + "node_modules/queue-tick": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", + "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==", + "dev": true + }, "node_modules/quick-lru": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", @@ -33882,6 +34341,18 @@ } } }, + "node_modules/read-binary-file-arch": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz", + "integrity": "sha512-BNg9EN3DD3GsDXX7Aa8O4p92sryjkmzYYgmgTAc6CA4uGLEDzFfxOxugu21akOxpcXHiEgsYkC6nPsQvLLLmEg==", + "dev": true, + "dependencies": { + "debug": "^4.3.4" + }, + "bin": { + "read-binary-file-arch": "cli.js" + } + }, "node_modules/read-cache": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", @@ -34364,14 +34835,14 @@ "dev": true }, "node_modules/regexp.prototype.flags": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", - "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", + "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", - "functions-have-names": "^1.2.3" + "set-function-name": "^2.0.0" }, "engines": { "node": ">= 0.4" @@ -35115,6 +35586,24 @@ "node": ">=6" } }, + "node_modules/safe-array-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz", + "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -35589,6 +36078,20 @@ "node": ">= 0.4" } }, + "node_modules/set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "dev": true, + "dependencies": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/set-value": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", @@ -36878,6 +37381,16 @@ "node": ">=10.0.0" } }, + "node_modules/streamx": { + "version": "2.15.5", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.15.5.tgz", + "integrity": "sha512-9thPGMkKC2GctCzyCUjME3yR03x2xNo0GPKGkRw2UMYN+gqWa9uqpyNWhmsNCutU5zHmkUum0LsCRQTXUgUCAg==", + "dev": true, + "dependencies": { + "fast-fifo": "^1.1.0", + "queue-tick": "^1.0.1" + } + }, "node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -36938,14 +37451,14 @@ } }, "node_modules/string.prototype.trim": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", - "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", + "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -36955,28 +37468,28 @@ } }, "node_modules/string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", + "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", + "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -37163,6 +37676,12 @@ "es6-symbol": "^3.1.1" } }, + "node_modules/svg-pan-zoom": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/svg-pan-zoom/-/svg-pan-zoom-3.6.1.tgz", + "integrity": "sha512-JaKkGHHfGvRrcMPdJWkssLBeWqM+Isg/a09H7kgNNajT1cX5AztDTNs+C8UzpCxjCTRrG34WbquwaovZbmSk9g==", + "dev": true + }, "node_modules/swc-loader": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/swc-loader/-/swc-loader-0.2.3.tgz", @@ -37198,10 +37717,16 @@ "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.2.0.tgz", "integrity": "sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==" }, + "node_modules/tablesort": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/tablesort/-/tablesort-5.3.0.tgz", + "integrity": "sha512-WkfcZBHsp47gVH9CBHG0ZXopriG01IA87arGrchvIe868d4RiXVvoYPS1zMq9IdW05kBs5iGsqxTABqLyWonbg==", + "dev": true + }, "node_modules/tailwindcss": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz", - "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==", + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.5.tgz", + "integrity": "sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA==", "dev": true, "dependencies": { "@alloc/quick-lru": "^5.2.0", @@ -37209,10 +37734,10 @@ "chokidar": "^3.5.3", "didyoumean": "^1.2.2", "dlv": "^1.1.3", - "fast-glob": "^3.2.12", + "fast-glob": "^3.3.0", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", - "jiti": "^1.18.2", + "jiti": "^1.19.1", "lilconfig": "^2.1.0", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", @@ -37248,9 +37773,9 @@ } }, "node_modules/tailwindcss/node_modules/resolve": { - "version": "1.22.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", - "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", "dev": true, "dependencies": { "is-core-module": "^2.13.0", @@ -37372,6 +37897,15 @@ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, + "node_modules/teex": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz", + "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==", + "dev": true, + "dependencies": { + "streamx": "^2.12.5" + } + }, "node_modules/telejson": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/telejson/-/telejson-7.1.0.tgz", @@ -37815,20 +38349,20 @@ "dev": true }, "node_modules/tldts": { - "version": "6.0.22", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.0.22.tgz", - "integrity": "sha512-dBxlzF/sbr8DBCI6To3gMUzTgoz7P8qrnZsfF+nYGkjEfcPaOUkwtJMjLzde4dN7xyjDLMIS5+uxChhYaFzRKw==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.0.tgz", + "integrity": "sha512-9eh9oPefds2M+Trcgpa4gLaHtckcmfgHsNwQKE4kfiy6ApJrt4Thko2CXQ9s3K1o0rQtJOLmV0UfFLhC9CAN3w==", "dependencies": { - "tldts-core": "^6.0.22" + "tldts-core": "^6.1.0" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "6.0.22", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.0.22.tgz", - "integrity": "sha512-5m5+f69JzLj+QP+5DVgBv0fKjAE0zJaU8kBWx6dN+Tm9cm+OHNDIVNf2dmy3WL+ujECROIPJZHNAr+74hm8ujA==" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.0.tgz", + "integrity": "sha512-kWIs6ECYvpsHXmVezsbU2ZmaPZld6bArFUM2HS/Pz1o1pRCu/y8w6n02IfiefUA5NarwJ7sCjwsrKGtpztXYZQ==" }, "node_modules/tmp": { "version": "0.0.33", @@ -38017,9 +38551,9 @@ } }, "node_modules/tough-cookie": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz", - "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dependencies": { "psl": "^1.1.33", "punycode": "^2.1.1", @@ -38039,14 +38573,14 @@ } }, "node_modules/tr46": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", - "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz", + "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==", "dependencies": { - "punycode": "^2.3.0" + "punycode": "^2.3.1" }, "engines": { - "node": ">=14" + "node": ">=18" } }, "node_modules/traverse": { @@ -38086,6 +38620,18 @@ "utf8-byte-length": "^1.0.1" } }, + "node_modules/ts-api-utils": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz", + "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==", + "dev": true, + "engines": { + "node": ">=16.13.0" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } + }, "node_modules/ts-dedent": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz", @@ -38154,15 +38700,16 @@ } }, "node_modules/ts-loader": { - "version": "9.4.4", - "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.4.4.tgz", - "integrity": "sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==", + "version": "9.5.1", + "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-9.5.1.tgz", + "integrity": "sha512-rNH3sK9kGZcH9dYzC7CewQm4NtxJTjSEVRJ2DyBZR7f8/wcta+iV44UPCXc5+nzDzivKtlzV6c9P4e+oFhDLYg==", "dev": true, "dependencies": { "chalk": "^4.1.0", "enhanced-resolve": "^5.0.0", "micromatch": "^4.0.0", - "semver": "^7.3.4" + "semver": "^7.3.4", + "source-map": "^0.7.4" }, "engines": { "node": ">=12.0.0" @@ -38173,12 +38720,12 @@ } }, "node_modules/ts-morph": { - "version": "18.0.0", - "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-18.0.0.tgz", - "integrity": "sha512-Kg5u0mk19PIIe4islUI/HWRvm9bC1lHejK4S0oh1zaZ77TMZAEmQC0sHQYiu2RgCQFZKXz1fMVi/7nOOeirznA==", + "version": "20.0.0", + "resolved": "https://registry.npmjs.org/ts-morph/-/ts-morph-20.0.0.tgz", + "integrity": "sha512-JVmEJy2Wow5n/84I3igthL9sudQ8qzjh/6i4tmYCm6IqYyKFlNbJZi7oBdjyqcWSWYRu3CtL0xbT6fS03ESZIg==", "dev": true, "dependencies": { - "@ts-morph/common": "~0.19.0", + "@ts-morph/common": "~0.21.0", "code-block-writer": "^12.0.0" } }, @@ -38442,6 +38989,57 @@ "node": ">= 0.6" } }, + "node_modules/typed-array-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", + "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", + "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", + "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/typed-array-length": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", @@ -38553,6 +39151,12 @@ "integrity": "sha512-Ia0sQNrMPXXkqVFt6w6M1n1oKo3NfKs+mvaV811Jwir7vAk9a6PVV9VPYf6X3BU97QiLEmuW3uXH9u87zDFfdw==", "dev": true }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", @@ -38889,9 +39493,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", - "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "funding": [ { "type": "opencollective", @@ -39024,9 +39628,9 @@ } }, "node_modules/utf-8-validate": { - "version": "5.0.10", - "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.10.tgz", - "integrity": "sha512-Z6czzLq4u8fPOyx7TU6X3dvUZVvoJmxSQ+IcrlmagKhilxlhZgxPK6C5Jqbkw1IDUmFTM+cz9QDnnLTwDz/2gQ==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-6.0.3.tgz", + "integrity": "sha512-uIuGf9TWQ/y+0Lp+KGZCMuJWc3N9BHA+l/UmHd/oUHwJJDeysyTRxNQVkbzsIWfGFbRe3OcgML/i0mvVRPOyDA==", "hasInstallScript": true, "dependencies": { "node-gyp-build": "^4.3.0" @@ -39331,10 +39935,25 @@ "node": ">=0.8" } }, + "node_modules/vis": { + "version": "4.21.0-EOL", + "resolved": "https://registry.npmjs.org/vis/-/vis-4.21.0-EOL.tgz", + "integrity": "sha512-JVS1mywKg5S88XbkDJPfCb3n+vlg5fMA8Ae2hzs3KHAwD4ryM5qwlbFZ6ReDfY8te7I4NLCpuCoywJQEehvJlQ==", + "deprecated": "Please consider using https://github.com/visjs", + "dev": true, + "dependencies": { + "emitter-component": "^1.1.1", + "hammerjs": "^2.0.8", + "keycharm": "^0.2.0", + "moment": "^2.18.1", + "propagating-hammerjs": "^1.4.6" + } + }, "node_modules/w3c-xmlserializer": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz", "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==", + "dev": true, "dependencies": { "xml-name-validator": "^4.0.0" }, @@ -39409,9 +40028,9 @@ } }, "node_modules/webpack": { - "version": "5.88.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz", - "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==", + "version": "5.89.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz", + "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==", "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.3", @@ -39803,19 +40422,6 @@ "ajv": "^6.9.1" } }, - "node_modules/webpack/node_modules/enhanced-resolve": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", - "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/webpack/node_modules/eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -39889,6 +40495,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", + "dev": true, "dependencies": { "iconv-lite": "0.6.3" }, @@ -39900,20 +40507,21 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz", "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==", + "dev": true, "engines": { "node": ">=12" } }, "node_modules/whatwg-url": { - "version": "12.0.1", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz", - "integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz", + "integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==", "dependencies": { - "tr46": "^4.1.1", + "tr46": "^5.0.0", "webidl-conversions": "^7.0.0" }, "engines": { - "node": ">=14" + "node": ">=18" } }, "node_modules/which": { @@ -39968,17 +40576,16 @@ "dev": true }, "node_modules/which-typed-array": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.9.tgz", - "integrity": "sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz", + "integrity": "sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==", "dev": true, "dependencies": { "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.4", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0", - "is-typed-array": "^1.1.10" + "has-tostringtag": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -40161,6 +40768,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz", "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==", + "dev": true, "engines": { "node": ">=12" } @@ -40285,6 +40893,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/zepto": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/zepto/-/zepto-1.2.0.tgz", + "integrity": "sha512-C1x6lfvBICFTQIMgbt3JqMOno3VOtkWat/xEakLTOurskYIHPmzJrzd1e8BnmtdDVJlGuk5D+FxyCA8MPmkIyA==", + "dev": true + }, "node_modules/zone.js": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.12.0.tgz", diff --git a/package.json b/package.json index 38c4f12a839..8cbedf05c80 100644 --- a/package.json +++ b/package.json @@ -34,20 +34,20 @@ "libs/*" ], "devDependencies": { - "@angular-devkit/build-angular": "15.2.9", + "@angular-devkit/build-angular": "15.2.10", "@angular-eslint/eslint-plugin": "15.2.1", "@angular-eslint/eslint-plugin-template": "15.2.1", "@angular-eslint/template-parser": "15.2.1", - "@angular/cli": "15.2.9", - "@angular/compiler-cli": "15.2.9", - "@angular/elements": "15.2.9", - "@compodoc/compodoc": "1.1.21", + "@angular/cli": "15.2.10", + "@angular/compiler-cli": "15.2.10", + "@angular/elements": "15.2.10", + "@compodoc/compodoc": "1.1.23", "@electron/notarize": "2.2.0", - "@electron/rebuild": "3.3.1", - "@ngtools/webpack": "15.2.9", + "@electron/rebuild": "3.4.1", + "@ngtools/webpack": "15.2.10", "@storybook/addon-a11y": "7.3.0", "@storybook/addon-actions": "7.3.0", - "@storybook/addon-designs": "7.0.4", + "@storybook/addon-designs": "7.0.7", "@storybook/addon-essentials": "7.3.0", "@storybook/addon-links": "7.3.0", "@storybook/angular": "7.3.0", @@ -56,9 +56,9 @@ "@types/duo_web_sdk": "2.7.1", "@types/firefox-webext-browser": "111.0.1", "@types/inquirer": "8.2.6", - "@types/jest": "29.5.3", - "@types/jquery": "3.5.16", - "@types/jsdom": "21.1.1", + "@types/jest": "29.5.11", + "@types/jquery": "3.5.29", + "@types/jsdom": "21.1.6", "@types/koa": "2.13.8", "@types/koa__multer": "2.0.4", "@types/koa__router": "12.0.0", @@ -66,63 +66,62 @@ "@types/koa-json": "2.0.20", "@types/lowdb": "1.0.11", "@types/lunr": "2.3.4", - "@types/node": "18.17.5", + "@types/node": "18.19.2", "@types/node-fetch": "2.6.4", - "@types/node-forge": "1.3.4", + "@types/node-forge": "1.3.10", "@types/node-ipc": "9.2.0", "@types/papaparse": "5.3.14", "@types/proper-lockfile": "4.1.2", "@types/react": "16.14.45", "@types/retry": "0.12.2", - "@types/zxcvbn": "4.4.1", - "@typescript-eslint/eslint-plugin": "5.62.0", - "@typescript-eslint/parser": "5.62.0", + "@types/zxcvbn": "4.4.4", + "@typescript-eslint/eslint-plugin": "6.13.2", + "@typescript-eslint/parser": "6.13.2", "@webcomponents/custom-elements": "1.6.0", - "autoprefixer": "10.4.15", + "autoprefixer": "10.4.16", "base64-loader": "1.0.0", "buffer": "6.0.3", - "chromatic": "6.22.0", + "chromatic": "10.0.0", "clean-webpack-plugin": "4.0.0", "concurrently": "8.2.2", "copy-webpack-plugin": "11.0.0", "cross-env": "7.0.3", "css-loader": "6.8.1", - "del": "6.1.1", - "electron": "25.9.1", + "electron": "27.1.3", "electron-builder": "23.6.0", "electron-log": "5.0.1", "electron-reload": "2.0.0-alpha.1", "electron-store": "8.1.0", "electron-updater": "6.1.7", - "eslint": "8.47.0", - "eslint-config-prettier": "8.10.0", - "eslint-import-resolver-typescript": "3.6.0", - "eslint-plugin-import": "2.28.0", + "eslint": "8.55.0", + "eslint-config-prettier": "9.1.0", + "eslint-import-resolver-typescript": "3.6.1", + "eslint-plugin-import": "2.29.0", "eslint-plugin-rxjs": "5.0.3", "eslint-plugin-rxjs-angular": "2.0.1", - "eslint-plugin-storybook": "0.6.13", + "eslint-plugin-storybook": "0.6.15", "eslint-plugin-tailwindcss": "3.13.0", "gulp": "4.0.2", - "gulp-filter": "7.0.0", + "gulp-filter": "9.0.1", "gulp-if": "3.0.0", "gulp-json-editor": "2.5.7", "gulp-replace": "1.1.4", - "gulp-zip": "5.1.0", + "gulp-zip": "6.0.0", "html-loader": "4.2.0", "html-webpack-injector": "1.1.4", - "html-webpack-plugin": "5.5.3", + "html-webpack-plugin": "5.5.4", "husky": "8.0.3", "jest-junit": "16.0.0", "jest-mock-extended": "3.0.5", - "jest-preset-angular": "13.1.1", - "lint-staged": "13.3.0", + "jest-preset-angular": "13.1.4", + "lint-staged": "15.2.0", "mini-css-extract-plugin": "2.7.6", "node-ipc": "9.2.1", "pkg": "5.8.1", "postcss": "8.4.31", "postcss-loader": "7.3.3", - "prettier": "2.8.8", - "prettier-plugin-tailwindcss": "0.4.1", + "prettier": "3.1.1", + "prettier-plugin-tailwindcss": "0.5.7", "process": "0.11.10", "react": "18.2.0", "react-dom": "18.2.0", @@ -133,41 +132,41 @@ "sass-loader": "13.3.2", "storybook": "7.3.0", "style-loader": "3.3.3", - "tailwindcss": "3.3.3", + "tailwindcss": "3.3.5", "ts-jest": "29.1.1", - "ts-loader": "9.4.4", + "ts-loader": "9.5.1", "tsconfig-paths-webpack-plugin": "4.1.0", "type-fest": "2.19.0", "typescript": "4.9.5", "url": "0.11.1", "util": "0.12.5", "wait-on": "7.2.0", - "webpack": "5.88.2", + "webpack": "5.89.0", "webpack-cli": "5.1.4", "webpack-dev-server": "4.15.1", "webpack-node-externals": "3.0.0" }, "dependencies": { - "@angular/animations": "15.2.9", + "@angular/animations": "15.2.10", "@angular/cdk": "15.2.9", - "@angular/common": "15.2.9", - "@angular/compiler": "15.2.9", - "@angular/core": "15.2.9", - "@angular/forms": "15.2.9", - "@angular/platform-browser": "15.2.9", - "@angular/platform-browser-dynamic": "15.2.9", - "@angular/router": "15.2.9", + "@angular/common": "15.2.10", + "@angular/compiler": "15.2.10", + "@angular/core": "15.2.10", + "@angular/forms": "15.2.10", + "@angular/platform-browser": "15.2.10", + "@angular/platform-browser-dynamic": "15.2.10", + "@angular/router": "15.2.10", "@koa/multer": "3.0.2", "@koa/router": "12.0.0", - "@microsoft/signalr": "6.0.21", - "@microsoft/signalr-protocol-msgpack": "6.0.21", + "@microsoft/signalr": "6.0.25", + "@microsoft/signalr-protocol-msgpack": "6.0.25", "@ng-select/ng-select": "10.0.4", "argon2": "0.31.0", "argon2-browser": "1.18.0", "big-integer": "1.6.51", "bootstrap": "4.6.0", "braintree-web-drop-in": "1.40.0", - "bufferutil": "4.0.7", + "bufferutil": "4.0.8", "chalk": "4.1.2", "commander": "7.2.0", "core-js": "3.32.0", @@ -175,8 +174,8 @@ "form-data": "4.0.0", "https-proxy-agent": "5.0.1", "inquirer": "8.2.6", - "jquery": "3.7.0", - "jsdom": "22.1.0", + "jquery": "3.7.1", + "jsdom": "23.0.1", "jszip": "3.10.1", "koa": "2.14.2", "koa-bodyparser": "4.4.1", @@ -189,7 +188,7 @@ "node-fetch": "2.6.12", "node-forge": "1.3.1", "nord": "0.2.1", - "oidc-client-ts": "2.3.0", + "oidc-client-ts": "2.4.0", "open": "8.4.2", "papaparse": "5.4.1", "patch-package": "8.0.0", @@ -198,8 +197,8 @@ "qrious": "4.0.2", "rxjs": "7.8.1", "tabbable": "6.2.0", - "tldts": "6.0.22", - "utf-8-validate": "5.0.10", + "tldts": "6.1.0", + "utf-8-validate": "6.0.3", "zone.js": "0.12.0", "zxcvbn": "4.4.2" }, diff --git a/scripts/test-types.js b/scripts/test-types.js index 0fc27f3646d..af5ffd1c4bc 100644 --- a/scripts/test-types.js +++ b/scripts/test-types.js @@ -25,5 +25,5 @@ concurrently( files.map((file) => ({ name: path.basename(path.dirname(file)), command: `npx tsc --noEmit --project ${file}`, - })) + })), );
    {{ e.date | date : "medium" }}{{ e.date | date: "medium" }} {{ e.appName }}
    {{ serviceAccount.accessToSecrets }} {{ serviceAccount.revisionDate | date : "medium" }}{{ serviceAccount.revisionDate | date: "medium" }} - - - diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/dialogs/access-removal-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/dialogs/access-removal-dialog.component.ts deleted file mode 100644 index ef460f278d3..00000000000 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/dialogs/access-removal-dialog.component.ts +++ /dev/null @@ -1,69 +0,0 @@ -import { DialogRef, DIALOG_DATA } from "@angular/cdk/dialog"; -import { Component, Inject, OnInit } from "@angular/core"; -import { Router } from "@angular/router"; - -import { AccessPolicyService } from "../access-policy.service"; -import { AccessSelectorComponent, AccessSelectorRowView } from "../access-selector.component"; - -export interface AccessRemovalDetails { - title: string; - message: string; - operation: "update" | "delete"; - type: "project" | "service-account"; - returnRoute: string[]; - policy: AccessSelectorRowView; -} - -@Component({ - templateUrl: "./access-removal-dialog.component.html", -}) -export class AccessRemovalDialogComponent implements OnInit { - constructor( - public dialogRef: DialogRef, - private router: Router, - private accessPolicyService: AccessPolicyService, - @Inject(DIALOG_DATA) public data: AccessRemovalDetails - ) {} - - ngOnInit(): void { - // TODO remove null checks once strictNullChecks in TypeScript is turned on. - if ( - !this.data.message || - !this.data.title || - !this.data.operation || - !this.data.returnRoute || - !this.data.policy - ) { - this.dialogRef.close(); - throw new Error( - "The access removal dialog was not called with the appropriate operation values." - ); - } - } - - removeAccess = async () => { - await this.router.navigate(this.data.returnRoute); - if (this.data.operation === "delete") { - await this.accessPolicyService.deleteAccessPolicy(this.data.policy.accessPolicyId); - } else if (this.data.operation == "update") { - await this.accessPolicyService.updateAccessPolicy( - AccessSelectorComponent.getBaseAccessPolicyView(this.data.policy) - ); - this.refreshPolicyChanges(); - } - this.dialogRef.close(); - }; - - cancel = () => { - this.refreshPolicyChanges(); - this.dialogRef.close(); - }; - - private refreshPolicyChanges() { - if (this.data.type == "project") { - this.accessPolicyService.refreshProjectAccessPolicyChanges(); - } else if (this.data.type == "service-account") { - this.accessPolicyService.refreshServiceAccountAccessPolicyChanges(); - } - } -} diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/access-policy.response.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/access-policy.response.ts index 9aaa57a722a..ef076f9b592 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/access-policy.response.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/access-policy.response.ts @@ -39,6 +39,7 @@ export class UserServiceAccountAccessPolicyResponse extends BaseAccessPolicyResp organizationUserName: string; grantedServiceAccountId: string; userId: string; + currentUser: boolean; constructor(response: any) { super(response); @@ -46,6 +47,7 @@ export class UserServiceAccountAccessPolicyResponse extends BaseAccessPolicyResp this.organizationUserName = this.getResponseProperty("OrganizationUserName"); this.grantedServiceAccountId = this.getResponseProperty("GrantedServiceAccountId"); this.userId = this.getResponseProperty("UserId"); + this.currentUser = this.getResponseProperty("CurrentUser"); } } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/project-access-policies.response.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/project-access-policies.response.ts index f041796e592..66d76c14933 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/project-access-policies.response.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/project-access-policies.response.ts @@ -15,15 +15,15 @@ export class ProjectAccessPoliciesResponse extends BaseResponse { super(response); const userAccessPolicies = this.getResponseProperty("UserAccessPolicies"); this.userAccessPolicies = userAccessPolicies.map( - (k: any) => new UserProjectAccessPolicyResponse(k) + (k: any) => new UserProjectAccessPolicyResponse(k), ); const groupAccessPolicies = this.getResponseProperty("GroupAccessPolicies"); this.groupAccessPolicies = groupAccessPolicies.map( - (k: any) => new GroupProjectAccessPolicyResponse(k) + (k: any) => new GroupProjectAccessPolicyResponse(k), ); const serviceAccountAccessPolicies = this.getResponseProperty("ServiceAccountAccessPolicies"); this.serviceAccountAccessPolicies = serviceAccountAccessPolicies.map( - (k: any) => new ServiceAccountProjectAccessPolicyResponse(k) + (k: any) => new ServiceAccountProjectAccessPolicyResponse(k), ); } } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/project-people-access-policies.response.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/project-people-access-policies.response.ts index fb5ac17d061..3fa0fa652e0 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/project-people-access-policies.response.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/project-people-access-policies.response.ts @@ -13,11 +13,11 @@ export class ProjectPeopleAccessPoliciesResponse extends BaseResponse { super(response); const userAccessPolicies = this.getResponseProperty("UserAccessPolicies"); this.userAccessPolicies = userAccessPolicies.map( - (k: any) => new UserProjectAccessPolicyResponse(k) + (k: any) => new UserProjectAccessPolicyResponse(k), ); const groupAccessPolicies = this.getResponseProperty("GroupAccessPolicies"); this.groupAccessPolicies = groupAccessPolicies.map( - (k: any) => new GroupProjectAccessPolicyResponse(k) + (k: any) => new GroupProjectAccessPolicyResponse(k), ); } } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/service-accounts-access-policies.response.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/service-account-people-access-policies.response.ts similarity index 83% rename from bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/service-accounts-access-policies.response.ts rename to bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/service-account-people-access-policies.response.ts index d2fc245bb86..ca134d9012a 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/service-accounts-access-policies.response.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/access-policies/models/responses/service-account-people-access-policies.response.ts @@ -5,7 +5,7 @@ import { UserServiceAccountAccessPolicyResponse, } from "./access-policy.response"; -export class ServiceAccountAccessPoliciesResponse extends BaseResponse { +export class ServiceAccountPeopleAccessPoliciesResponse extends BaseResponse { userAccessPolicies: UserServiceAccountAccessPolicyResponse[]; groupAccessPolicies: GroupServiceAccountAccessPolicyResponse[]; @@ -13,11 +13,11 @@ export class ServiceAccountAccessPoliciesResponse extends BaseResponse { super(response); const userAccessPolicies = this.getResponseProperty("UserAccessPolicies"); this.userAccessPolicies = userAccessPolicies.map( - (k: any) => new UserServiceAccountAccessPolicyResponse(k) + (k: any) => new UserServiceAccountAccessPolicyResponse(k), ); const groupAccessPolicies = this.getResponseProperty("GroupAccessPolicies"); this.groupAccessPolicies = groupAccessPolicies.map( - (k: any) => new GroupServiceAccountAccessPolicyResponse(k) + (k: any) => new GroupServiceAccountAccessPolicyResponse(k), ); } } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-confirmation-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-confirmation-dialog.component.ts index f42351c2b1e..24d4d29e890 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-confirmation-dialog.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-confirmation-dialog.component.ts @@ -26,7 +26,7 @@ export enum BulkConfirmationResult { export class BulkConfirmationDialogComponent implements OnInit { constructor( public dialogRef: DialogRef, - @Inject(DIALOG_DATA) public data: BulkConfirmationDetails + @Inject(DIALOG_DATA) public data: BulkConfirmationDetails, ) {} protected bulkConfirmationResult = BulkConfirmationResult; @@ -41,7 +41,7 @@ export class BulkConfirmationDialogComponent implements OnInit { ) { this.dialogRef.close(); throw new Error( - "The bulk confirmation dialog was not called with the appropriate operation values." + "The bulk confirmation dialog was not called with the appropriate operation values.", ); } } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-status-dialog.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-status-dialog.component.ts index 4a9c85280bb..8472ddb7b89 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-status-dialog.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/dialogs/bulk-status-dialog.component.ts @@ -19,7 +19,10 @@ export class BulkOperationStatus { templateUrl: "./bulk-status-dialog.component.html", }) export class BulkStatusDialogComponent implements OnInit { - constructor(public dialogRef: DialogRef, @Inject(DIALOG_DATA) public data: BulkStatusDetails) {} + constructor( + public dialogRef: DialogRef, + @Inject(DIALOG_DATA) public data: BulkStatusDetails, + ) {} ngOnInit(): void { // TODO remove null checks once strictNullChecks in TypeScript is turned on. @@ -32,7 +35,7 @@ export class BulkStatusDialogComponent implements OnInit { ) { this.dialogRef.close(); throw new Error( - "The bulk status dialog was not called with the appropriate operation values." + "The bulk status dialog was not called with the appropriate operation values.", ); } } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts index 67a93e8ad87..6cb5722be04 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/new-menu.component.ts @@ -30,7 +30,7 @@ export class NewMenuComponent implements OnInit, OnDestroy { constructor( private route: ActivatedRoute, private dialogService: DialogService, - private organizationService: OrganizationService + private organizationService: OrganizationService, ) {} ngOnInit() { diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.html index 8de68f65988..512ccbf5bb8 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.html @@ -1,6 +1,6 @@ - + - + {{ "organizationIsDisabled" | i18n }} {{ "secretsAccessSuspended" | i18n }} diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts index 73f89c0826d..ee94a78bb83 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/org-suspended.component.ts @@ -9,10 +9,13 @@ import { Icon, Icons } from "@bitwarden/components"; templateUrl: "./org-suspended.component.html", }) export class OrgSuspendedComponent { - constructor(private organizationService: OrganizationService, private route: ActivatedRoute) {} + constructor( + private organizationService: OrganizationService, + private route: ActivatedRoute, + ) {} protected NoAccess: Icon = Icons.NoAccess; protected organizationName$ = this.route.params.pipe( - map((params) => this.organizationService.get(params.organizationId)?.name) + map((params) => this.organizationService.get(params.organizationId)?.name), ); } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.html index fe639343de2..7fe1d219ab7 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.html +++ b/bitwarden_license/bit-web/src/app/secrets-manager/shared/projects-list.component.html @@ -66,7 +66,7 @@ }} {{ project.revisionDate | date : "medium" }}{{ project.revisionDate | date: "medium" }} {{ secret.revisionDate | date : "medium" }}{{ secret.revisionDate | date: "medium" }} @@ -82,3 +83,43 @@ export const Danger: Story = { bannerType: "danger", }, }; + +export const HideClose: Story = { + ...Premium, + args: { + showClose: false, + }, +}; + +export const Stacked: Story = { + args: {}, + render: (args: BannerComponent) => ({ + props: args, + template: ` + + Bruce + + + Bruce + + + Bruce + + + Bruce + + + Bruce + + + Bruce + + + Bruce + + + Bruce + + `, + }), +}; diff --git a/libs/components/src/breadcrumbs/breadcrumbs.stories.ts b/libs/components/src/breadcrumbs/breadcrumbs.stories.ts index 673b7027278..300369f2454 100644 --- a/libs/components/src/breadcrumbs/breadcrumbs.stories.ts +++ b/libs/components/src/breadcrumbs/breadcrumbs.stories.ts @@ -31,7 +31,7 @@ export default { applicationConfig({ providers: [ importProvidersFrom( - RouterModule.forRoot([{ path: "**", component: EmptyComponent }], { useHash: true }) + RouterModule.forRoot([{ path: "**", component: EmptyComponent }], { useHash: true }), ), ], }), diff --git a/libs/components/src/button/button.component.spec.ts b/libs/components/src/button/button.component.spec.ts index e531fc0a6a4..bf958da54ec 100644 --- a/libs/components/src/button/button.component.spec.ts +++ b/libs/components/src/button/button.component.spec.ts @@ -45,13 +45,13 @@ describe("Button", () => { fixture.detectChanges(); expect( Array.from(buttonDebugElement.nativeElement.classList).some((klass: string) => - klass.startsWith("tw-bg") - ) + klass.startsWith("tw-bg"), + ), ).toBe(false); expect( Array.from(linkDebugElement.nativeElement.classList).some((klass: string) => - klass.startsWith("tw-bg") - ) + klass.startsWith("tw-bg"), + ), ).toBe(false); testAppComponent.buttonType = null; diff --git a/libs/components/src/checkbox/checkbox.component.ts b/libs/components/src/checkbox/checkbox.component.ts index 82113b68c5a..bbc288659c6 100644 --- a/libs/components/src/checkbox/checkbox.component.ts +++ b/libs/components/src/checkbox/checkbox.component.ts @@ -77,10 +77,12 @@ export class CheckboxComponent implements BitFormControlAbstraction { constructor(@Optional() @Self() private ngControl?: NgControl) {} @HostBinding("style.--mask-image") - protected maskImage = `url('data:image/svg+xml,%3Csvg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="8" height="8" viewBox="0 0 10 10"%3E%3Cpath d="M0.5 6.2L2.9 8.6L9.5 1.4" fill="none" stroke="white" stroke-width="2"%3E%3C/path%3E%3C/svg%3E')`; + protected maskImage = + `url('data:image/svg+xml,%3Csvg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="8" height="8" viewBox="0 0 10 10"%3E%3Cpath d="M0.5 6.2L2.9 8.6L9.5 1.4" fill="none" stroke="white" stroke-width="2"%3E%3C/path%3E%3C/svg%3E')`; @HostBinding("style.--indeterminate-mask-image") - protected indeterminateImage = `url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="none" viewBox="0 0 13 13"%3E%3Cpath stroke="%23fff" stroke-width="2" d="M2.5 6.5h8"/%3E%3C/svg%3E%0A')`; + protected indeterminateImage = + `url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="none" viewBox="0 0 13 13"%3E%3Cpath stroke="%23fff" stroke-width="2" d="M2.5 6.5h8"/%3E%3C/svg%3E%0A')`; @HostBinding() @Input() diff --git a/libs/components/src/dialog/dialog.service.stories.ts b/libs/components/src/dialog/dialog.service.stories.ts index 021e36c6c7e..9ebe292eda1 100644 --- a/libs/components/src/dialog/dialog.service.stories.ts +++ b/libs/components/src/dialog/dialog.service.stories.ts @@ -50,7 +50,10 @@ class StoryDialogComponent { `, }) class StoryDialogContentComponent { - constructor(public dialogRef: DialogRef, @Inject(DIALOG_DATA) private data: Animal) {} + constructor( + public dialogRef: DialogRef, + @Inject(DIALOG_DATA) private data: Animal, + ) {} get animal() { return this.data?.animal; diff --git a/libs/components/src/dialog/dialog.service.ts b/libs/components/src/dialog/dialog.service.ts index 27930189bfc..4ebd65ad55c 100644 --- a/libs/components/src/dialog/dialog.service.ts +++ b/libs/components/src/dialog/dialog.service.ts @@ -44,7 +44,7 @@ export class DialogService extends Dialog implements OnDestroy { @Optional() router: Router, @Optional() authService: AuthService, - protected i18nService: I18nService + protected i18nService: I18nService, ) { super(_overlay, _injector, _defaultOptions, _parentDialog, _overlayContainer, scrollStrategy); @@ -55,7 +55,7 @@ export class DialogService extends Dialog implements OnDestroy { filter((event) => event instanceof NavigationEnd), switchMap(() => authService.getAuthStatus()), filter((v) => v !== AuthenticationStatus.Unlocked), - takeUntil(this._destroy$) + takeUntil(this._destroy$), ) .subscribe(() => this.closeAll()); } @@ -69,7 +69,7 @@ export class DialogService extends Dialog implements OnDestroy { override open( componentOrTemplateRef: ComponentType | TemplateRef, - config?: DialogConfig> + config?: DialogConfig>, ): DialogRef { config = { backdropClass: this.backDropClasses, diff --git a/libs/components/src/dialog/dialog/dialog.component.ts b/libs/components/src/dialog/dialog/dialog.component.ts index 45fe6c1e857..1d6eb331702 100644 --- a/libs/components/src/dialog/dialog/dialog.component.ts +++ b/libs/components/src/dialog/dialog/dialog.component.ts @@ -32,7 +32,7 @@ export class DialogComponent { @HostBinding("class") get classes() { return ["tw-flex", "tw-flex-col", "tw-max-h-screen", "tw-w-screen", "tw-p-4"].concat( - this.width + this.width, ); } diff --git a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component.ts b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component.ts index f9acdbe8c6e..e93498ec48b 100644 --- a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component.ts +++ b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.component.ts @@ -44,7 +44,7 @@ export class SimpleConfigurableDialogComponent { constructor( public dialogRef: DialogRef, private i18nService: I18nService, - @Inject(DIALOG_DATA) public simpleDialogOpts?: SimpleDialogOptions + @Inject(DIALOG_DATA) public simpleDialogOpts?: SimpleDialogOptions, ) { this.localizeText(); } @@ -66,7 +66,7 @@ export class SimpleConfigurableDialogComponent { // If accept text is overridden, use cancel, otherwise no this.cancelButtonText = this.translate( this.simpleDialogOpts.cancelButtonText, - this.simpleDialogOpts.acceptButtonText !== undefined ? "cancel" : "no" + this.simpleDialogOpts.acceptButtonText !== undefined ? "cancel" : "no", ); } } diff --git a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts index 81400537be5..6c2a25c67ca 100644 --- a/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts +++ b/libs/components/src/dialog/simple-dialog/simple-configurable-dialog/simple-configurable-dialog.service.stories.ts @@ -122,7 +122,10 @@ class StoryDialogComponent { calloutType = "info"; dialogCloseResult: boolean; - constructor(public dialogService: DialogService, private i18nService: I18nService) {} + constructor( + public dialogService: DialogService, + private i18nService: I18nService, + ) {} async openSimpleConfigurableDialog(opts: SimpleDialogOptions) { this.dialogCloseResult = await this.dialogService.openSimpleDialog(opts); diff --git a/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts b/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts index b6615184ecb..08ca6f7dee8 100644 --- a/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts +++ b/libs/components/src/dialog/simple-dialog/simple-dialog.service.stories.ts @@ -50,7 +50,10 @@ class StoryDialogComponent { `, }) class StoryDialogContentComponent { - constructor(public dialogRef: DialogRef, @Inject(DIALOG_DATA) private data: Animal) {} + constructor( + public dialogRef: DialogRef, + @Inject(DIALOG_DATA) private data: Animal, + ) {} get animal() { return this.data?.animal; diff --git a/libs/components/src/form-control/form-control.component.ts b/libs/components/src/form-control/form-control.component.ts index b61dee709c5..5a808e606d5 100644 --- a/libs/components/src/form-control/form-control.component.ts +++ b/libs/components/src/form-control/form-control.component.ts @@ -50,7 +50,7 @@ export class FormControlComponent { protected get labelContentClasses() { return ["tw-inline-flex", "tw-flex-col", "tw-font-semibold"].concat( - this.formControl.disabled ? "tw-text-muted" : "tw-text-main" + this.formControl.disabled ? "tw-text-muted" : "tw-text-main", ); } diff --git a/libs/components/src/form-field/error-summary.component.ts b/libs/components/src/form-field/error-summary.component.ts index 14118aa2725..55a3ae1553f 100644 --- a/libs/components/src/form-field/error-summary.component.ts +++ b/libs/components/src/form-field/error-summary.component.ts @@ -4,7 +4,7 @@ import { AbstractControl, UntypedFormGroup } from "@angular/forms"; @Component({ selector: "bit-error-summary", template: ` - {{ "fieldsNeedAttention" | i18n : errorString }} + {{ "fieldsNeedAttention" | i18n: errorString }} `, host: { class: "tw-block tw-text-danger tw-mt-2", diff --git a/libs/components/src/form-field/password-input-toggle.directive.ts b/libs/components/src/form-field/password-input-toggle.directive.ts index bd029effcb8..9c5047351fd 100644 --- a/libs/components/src/form-field/password-input-toggle.directive.ts +++ b/libs/components/src/form-field/password-input-toggle.directive.ts @@ -44,7 +44,7 @@ export class BitPasswordInputToggleDirective implements AfterContentInit, OnChan constructor( @Host() private button: BitIconButtonComponent, private formField: BitFormFieldComponent, - private i18nService: I18nService + private i18nService: I18nService, ) {} get icon() { diff --git a/libs/components/src/index.html b/libs/components/src/index.html index 777f720cd43..3b5da1979d7 100644 --- a/libs/components/src/index.html +++ b/libs/components/src/index.html @@ -1,4 +1,4 @@ - + diff --git a/libs/components/src/input/input.directive.ts b/libs/components/src/input/input.directive.ts index b9f71ff8d59..9bd110704e6 100644 --- a/libs/components/src/input/input.directive.ts +++ b/libs/components/src/input/input.directive.ts @@ -104,7 +104,7 @@ export class BitInputDirective implements BitFormFieldControl { constructor( @Optional() @Self() private ngControl: NgControl, private ngZone: NgZone, - private elementRef: ElementRef + private elementRef: ElementRef, ) {} focus() { diff --git a/libs/components/src/layout/layout.component.html b/libs/components/src/layout/layout.component.html index addbede7b44..584b53ba923 100644 --- a/libs/components/src/layout/layout.component.html +++ b/libs/components/src/layout/layout.component.html @@ -1,5 +1,13 @@