From 56ededa94739edff8db9035a5afd3feb2b207fe3 Mon Sep 17 00:00:00 2001 From: Alex Morask <144709477+amorask-bitwarden@users.noreply.github.com> Date: Fri, 6 Sep 2024 10:19:12 -0400 Subject: [PATCH 01/36] Update organization-plans.component to use new payment-v2.component when FF is on (#10906) --- .../organization-plans.component.html | 5 +- .../organization-plans.component.ts | 62 ++++++++++++++----- 2 files changed, 52 insertions(+), 15 deletions(-) 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 5f34ef6cb95..498374aa14b 100644 --- a/apps/web/src/app/billing/organizations/organization-plans.component.html +++ b/apps/web/src/app/billing/organizations/organization-plans.component.html @@ -428,9 +428,12 @@ {{ paymentDesc }}

+
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 20839d5d2b9..3d02fa027ef 100644 --- a/apps/web/src/app/billing/organizations/organization-plans.component.ts +++ b/apps/web/src/app/billing/organizations/organization-plans.component.ts @@ -28,6 +28,8 @@ import { PaymentRequest } from "@bitwarden/common/billing/models/request/payment import { BillingResponse } from "@bitwarden/common/billing/models/response/billing.response"; import { OrganizationSubscriptionResponse } from "@bitwarden/common/billing/models/response/organization-subscription.response"; import { PlanResponse } from "@bitwarden/common/billing/models/response/plan.response"; +import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; +import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; @@ -41,6 +43,7 @@ import { ToastService } from "@bitwarden/components"; import { OrganizationCreateModule } from "../../admin-console/organizations/create/organization-create.module"; import { BillingSharedModule, secretsManagerSubscribeFormFactory } from "../shared"; +import { PaymentV2Component } from "../shared/payment/payment-v2.component"; import { PaymentComponent } from "../shared/payment/payment.component"; import { TaxInfoComponent } from "../shared/tax-info.component"; @@ -63,6 +66,7 @@ const Allowed2020PlansForLegacyProviders = [ }) export class OrganizationPlansComponent implements OnInit, OnDestroy { @ViewChild(PaymentComponent) paymentComponent: PaymentComponent; + @ViewChild(PaymentV2Component) paymentV2Component: PaymentV2Component; @ViewChild(TaxInfoComponent) taxComponent: TaxInfoComponent; @Input() organizationId: string; @@ -108,6 +112,7 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { singleOrgPolicyAppliesToActiveUser = false; isInTrialFlow = false; discount = 0; + deprecateStripeSourcesAPI: boolean; secretsManagerSubscription = secretsManagerSubscribeFormFactory(this.formBuilder); @@ -152,11 +157,16 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { private organizationApiService: OrganizationApiServiceAbstraction, private providerApiService: ProviderApiServiceAbstraction, private toastService: ToastService, + private configService: ConfigService, ) { this.selfHosted = platformUtilsService.isSelfHost(); } async ngOnInit() { + this.deprecateStripeSourcesAPI = await this.configService.getFeatureFlag( + FeatureFlag.AC2476_DeprecateStripeSourcesAPI, + ); + if (this.organizationId) { this.organization = await this.organizationService.get(this.organizationId); this.billing = await this.organizationApiService.getBilling(this.organizationId); @@ -535,14 +545,23 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { } changedCountry() { - this.paymentComponent.hideBank = this.taxComponent.taxFormGroup?.value.country !== "US"; - // Bank Account payments are only available for US customers - if ( - this.paymentComponent.hideBank && - this.paymentComponent.method === PaymentMethodType.BankAccount - ) { - this.paymentComponent.method = PaymentMethodType.Card; - this.paymentComponent.changeMethod(); + if (this.deprecateStripeSourcesAPI) { + this.paymentV2Component.showBankAccount = this.taxComponent.country === "US"; + if ( + !this.paymentV2Component.showBankAccount && + this.paymentV2Component.selected === PaymentMethodType.BankAccount + ) { + this.paymentV2Component.select(PaymentMethodType.Card); + } + } else { + this.paymentComponent.hideBank = this.taxComponent.taxFormGroup?.value.country !== "US"; + if ( + this.paymentComponent.hideBank && + this.paymentComponent.method === PaymentMethodType.BankAccount + ) { + this.paymentComponent.method = PaymentMethodType.Card; + this.paymentComponent.changeMethod(); + } } } @@ -639,10 +658,18 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { this.buildSecretsManagerRequest(request); if (this.upgradeRequiresPaymentMethod) { - const tokenResult = await this.paymentComponent.createPaymentToken(); + let type: PaymentMethodType; + let token: string; + + if (this.deprecateStripeSourcesAPI) { + ({ type, token } = await this.paymentV2Component.tokenize()); + } else { + [token, type] = await this.paymentComponent.createPaymentToken(); + } + const paymentRequest = new PaymentRequest(); - paymentRequest.paymentToken = tokenResult[0]; - paymentRequest.paymentMethodType = tokenResult[1]; + paymentRequest.paymentToken = token; + paymentRequest.paymentMethodType = type; paymentRequest.country = this.taxComponent.taxFormGroup?.value.country; paymentRequest.postalCode = this.taxComponent.taxFormGroup?.value.postalCode; await this.organizationApiService.updatePayment(this.organizationId, paymentRequest); @@ -679,10 +706,17 @@ export class OrganizationPlansComponent implements OnInit, OnDestroy { if (this.selectedPlan.type === PlanType.Free) { request.planType = PlanType.Free; } else { - const tokenResult = await this.paymentComponent.createPaymentToken(); + let type: PaymentMethodType; + let token: string; - request.paymentToken = tokenResult[0]; - request.paymentMethodType = tokenResult[1]; + if (this.deprecateStripeSourcesAPI) { + ({ type, token } = await this.paymentV2Component.tokenize()); + } else { + [token, type] = await this.paymentComponent.createPaymentToken(); + } + + request.paymentToken = token; + request.paymentMethodType = type; request.additionalSeats = this.formGroup.controls.additionalSeats.value; request.additionalStorageGb = this.formGroup.controls.additionalStorage.value; request.premiumAccessAddon = From 9881c7842be55718678b43fb4a047b0986091774 Mon Sep 17 00:00:00 2001 From: Jonathan Prusik Date: Fri, 6 Sep 2024 11:24:04 -0400 Subject: [PATCH 02/36] [PM-10418] Bugfix - Expiration date on cards does not always autofill the correct format (#10705) * add branching logic for alternative card expiration autofill strategy * simplify logic and fix some pattern-matching bugs * add EnableNewCardCombinedExpiryAutofill feature flag * update default format for card expiry date and update tests * review reccs --- .../autofill/services/autofill-constants.ts | 56 +++ .../services/autofill.service.spec.ts | 214 ++++++-- .../src/autofill/services/autofill.service.ts | 456 ++++++++++++------ libs/common/src/enums/feature-flag.enum.ts | 2 + 4 files changed, 544 insertions(+), 184 deletions(-) diff --git a/apps/browser/src/autofill/services/autofill-constants.ts b/apps/browser/src/autofill/services/autofill-constants.ts index 1bab7210672..9cf2b6848c6 100644 --- a/apps/browser/src/autofill/services/autofill-constants.ts +++ b/apps/browser/src/autofill/services/autofill-constants.ts @@ -90,6 +90,7 @@ export class CreditCardAutoFillConstants { "data-stripe", "htmlName", "htmlID", + "title", "label-tag", "placeholder", "label-left", @@ -299,6 +300,54 @@ export class CreditCardAutoFillConstants { "cb-type", ]; + static readonly CardExpiryDateDelimiters: string[] = ["/", "-", ".", " "]; + + // Note, these are expressions of user-guidance for the expected expiry date format to be used + static readonly CardExpiryDateFormats: CardExpiryDateFormat[] = [ + // English + { + Month: "mm", + MonthShort: "m", + Year: "yyyy", + YearShort: "yy", + }, + // Danish + { + Month: "mm", + MonthShort: "m", + Year: "åååå", + YearShort: "åå", + }, + // German/Dutch + { + Month: "mm", + MonthShort: "m", + Year: "jjjj", + YearShort: "jj", + }, + // French/Spanish/Italian + { + Month: "mm", + MonthShort: "m", + Year: "aa", + YearShort: "aa", + }, + // Russian + { + Month: "мм", + MonthShort: "м", + Year: "гггг", + YearShort: "гг", + }, + // Portuguese + { + Month: "mm", + MonthShort: "m", + Year: "rrrr", + YearShort: "rr", + }, + ]; + // Each index represents a language. These three arrays should all be the same length. // 0: English, 1: Danish, 2: German/Dutch, 3: French/Spanish/Italian, 4: Russian, 5: Portuguese static readonly MonthAbbr = ["mm", "mm", "mm", "mm", "мм", "mm"]; @@ -306,6 +355,13 @@ export class CreditCardAutoFillConstants { static readonly YearAbbrLong = ["yyyy", "åååå", "jjjj", "aa", "гггг", "rrrr"]; } +export type CardExpiryDateFormat = { + Month: string; + MonthShort: string; + Year: string; + YearShort: string; +}; + export class IdentityAutoFillConstants { static readonly IdentityAttributes: string[] = [ "autoCompleteType", diff --git a/apps/browser/src/autofill/services/autofill.service.spec.ts b/apps/browser/src/autofill/services/autofill.service.spec.ts index b1c372655c2..455c171e59a 100644 --- a/apps/browser/src/autofill/services/autofill.service.spec.ts +++ b/apps/browser/src/autofill/services/autofill.service.spec.ts @@ -2475,10 +2475,10 @@ describe("AutofillService", () => { options.cipher.card = mock(); }); - it("returns null if the passed options contains a cipher with no card view", () => { + it("returns null if the passed options contains a cipher with no card view", async () => { options.cipher.card = undefined; - const value = autofillService["generateCardFillScript"]( + const value = await autofillService["generateCardFillScript"]( fillScript, pageDetails, filledFields, @@ -2499,7 +2499,7 @@ describe("AutofillService", () => { untrustedIframe: false, }; - it("returns an unmodified fill script when the field is a `span` field", () => { + it("returns an unmodified fill script when the field is a `span` field", async () => { const spanField = createAutofillFieldMock({ opid: "span-field", form: "validFormId", @@ -2510,7 +2510,7 @@ describe("AutofillService", () => { pageDetails.fields = [spanField]; jest.spyOn(AutofillService, "isExcludedFieldType"); - const value = autofillService["generateCardFillScript"]( + const value = await autofillService["generateCardFillScript"]( fillScript, pageDetails, filledFields, @@ -2522,7 +2522,7 @@ describe("AutofillService", () => { }); AutoFillConstants.ExcludedAutofillTypes.forEach((excludedType) => { - it(`returns an unmodified fill script when the field has a '${excludedType}' type`, () => { + it(`returns an unmodified fill script when the field has a '${excludedType}' type`, async () => { const invalidField = createAutofillFieldMock({ opid: `${excludedType}-field`, form: "validFormId", @@ -2533,7 +2533,7 @@ describe("AutofillService", () => { pageDetails.fields = [invalidField]; jest.spyOn(AutofillService, "isExcludedFieldType"); - const value = autofillService["generateCardFillScript"]( + const value = await autofillService["generateCardFillScript"]( fillScript, pageDetails, filledFields, @@ -2548,7 +2548,7 @@ describe("AutofillService", () => { }); }); - it("returns an unmodified fill script when the field is not viewable", () => { + it("returns an unmodified fill script when the field is not viewable", async () => { const notViewableField = createAutofillFieldMock({ opid: "invalid-field", form: "validFormId", @@ -2561,7 +2561,7 @@ describe("AutofillService", () => { jest.spyOn(AutofillService, "forCustomFieldsOnly"); jest.spyOn(AutofillService, "isExcludedFieldType"); - const value = autofillService["generateCardFillScript"]( + const value = await autofillService["generateCardFillScript"]( fillScript, pageDetails, filledFields, @@ -2663,8 +2663,8 @@ describe("AutofillService", () => { jest.spyOn(autofillService as any, "makeScriptActionWithValue"); }); - it("returns a fill script containing all of the passed card fields", () => { - const value = autofillService["generateCardFillScript"]( + it("returns a fill script containing all of the passed card fields", async () => { + const value = await autofillService["generateCardFillScript"]( fillScript, pageDetails, filledFields, @@ -2745,11 +2745,11 @@ describe("AutofillService", () => { options.cipher.card.expMonth = "05"; }); - it("returns an expiration month parsed from found select options within the field", () => { + it("returns an expiration month parsed from found select options within the field", async () => { const testValue = "sometestvalue"; expMonthField.selectInfo.options[4] = ["May", testValue]; - const value = autofillService["generateCardFillScript"]( + const value = await autofillService["generateCardFillScript"]( fillScript, pageDetails, filledFields, @@ -2759,12 +2759,12 @@ describe("AutofillService", () => { expect(value.script[2]).toStrictEqual(["fill_by_opid", expMonthField.opid, testValue]); }); - it("returns an expiration month parsed from found select options within the field when the select field has an empty option at the end of the list of options", () => { + it("returns an expiration month parsed from found select options within the field when the select field has an empty option at the end of the list of options", async () => { const testValue = "sometestvalue"; expMonthField.selectInfo.options[4] = ["May", testValue]; expMonthField.selectInfo.options.push(["", ""]); - const value = autofillService["generateCardFillScript"]( + const value = await autofillService["generateCardFillScript"]( fillScript, pageDetails, filledFields, @@ -2774,12 +2774,12 @@ describe("AutofillService", () => { expect(value.script[2]).toStrictEqual(["fill_by_opid", expMonthField.opid, testValue]); }); - it("returns an expiration month parsed from found select options within the field when the select field has an empty option at the start of the list of options", () => { + it("returns an expiration month parsed from found select options within the field when the select field has an empty option at the start of the list of options", async () => { const testValue = "sometestvalue"; expMonthField.selectInfo.options[4] = ["May", testValue]; expMonthField.selectInfo.options.unshift(["", ""]); - const value = autofillService["generateCardFillScript"]( + const value = await autofillService["generateCardFillScript"]( fillScript, pageDetails, filledFields, @@ -2789,13 +2789,13 @@ describe("AutofillService", () => { expect(value.script[2]).toStrictEqual(["fill_by_opid", expMonthField.opid, testValue]); }); - it("returns an expiration month with a zero attached if the field requires two characters, and the vault item has only one character", () => { + it("returns an expiration month with a zero attached if the field requires two characters, and the vault item has only one character", async () => { options.cipher.card.expMonth = "5"; expMonthField.selectInfo = null; expMonthField.placeholder = "mm"; expMonthField.maxLength = 2; - const value = autofillService["generateCardFillScript"]( + const value = await autofillService["generateCardFillScript"]( fillScript, pageDetails, filledFields, @@ -2830,12 +2830,12 @@ describe("AutofillService", () => { options.cipher.card.expYear = "2024"; }); - it("returns an expiration year parsed from the select options if an exact match is found for either the select option text or value", () => { + it("returns an expiration year parsed from the select options if an exact match is found for either the select option text or value", async () => { const someTestValue = "sometestvalue"; expYearField.selectInfo.options[1] = ["2024", someTestValue]; options.cipher.card.expYear = someTestValue; - let value = autofillService["generateCardFillScript"]( + let value = await autofillService["generateCardFillScript"]( fillScript, pageDetails, filledFields, @@ -2846,7 +2846,7 @@ describe("AutofillService", () => { expYearField.selectInfo.options[1] = [someTestValue, "2024"]; - value = autofillService["generateCardFillScript"]( + value = await autofillService["generateCardFillScript"]( fillScript, pageDetails, filledFields, @@ -2856,12 +2856,12 @@ describe("AutofillService", () => { expect(value.script[2]).toStrictEqual(["fill_by_opid", expYearField.opid, someTestValue]); }); - it("returns an expiration year parsed from the select options if the value of an option contains only two characters and the vault item value contains four characters", () => { + it("returns an expiration year parsed from the select options if the value of an option contains only two characters and the vault item value contains four characters", async () => { const yearValue = "26"; expYearField.selectInfo.options.push(["The year 2026", yearValue]); options.cipher.card.expYear = "2026"; - const value = autofillService["generateCardFillScript"]( + const value = await autofillService["generateCardFillScript"]( fillScript, pageDetails, filledFields, @@ -2871,13 +2871,13 @@ describe("AutofillService", () => { expect(value.script[2]).toStrictEqual(["fill_by_opid", expYearField.opid, yearValue]); }); - it("returns an expiration year parsed from the select options if the vault of an option is separated by a colon", () => { + it("returns an expiration year parsed from the select options if the vault of an option is separated by a colon", async () => { const yearValue = "26"; const colonSeparatedYearValue = `2:0${yearValue}`; expYearField.selectInfo.options.push(["The year 2026", colonSeparatedYearValue]); options.cipher.card.expYear = yearValue; - const value = autofillService["generateCardFillScript"]( + const value = await autofillService["generateCardFillScript"]( fillScript, pageDetails, filledFields, @@ -2891,14 +2891,14 @@ describe("AutofillService", () => { ]); }); - it("returns an expiration year with `20` prepended to the vault item value if the field to be filled expects a `yyyy` format but the vault item only has two characters", () => { + it("returns an expiration year with `20` prepended to the vault item value if the field to be filled expects a `yyyy` format but the vault item only has two characters", async () => { const yearValue = "26"; expYearField.selectInfo = null; expYearField.placeholder = "yyyy"; expYearField.maxLength = 4; options.cipher.card.expYear = yearValue; - const value = autofillService["generateCardFillScript"]( + const value = await autofillService["generateCardFillScript"]( fillScript, pageDetails, filledFields, @@ -2912,14 +2912,14 @@ describe("AutofillService", () => { ]); }); - it("returns an expiration year with only the last two values if the field to be filled expects a `yy` format but the vault item contains four characters", () => { + it("returns an expiration year with only the last two values if the field to be filled expects a `yy` format but the vault item contains four characters", async () => { const yearValue = "26"; expYearField.selectInfo = null; expYearField.placeholder = "yy"; expYearField.maxLength = 2; options.cipher.card.expYear = `20${yearValue}`; - const value = autofillService["generateCardFillScript"]( + const value = await autofillService["generateCardFillScript"]( fillScript, pageDetails, filledFields, @@ -2930,11 +2930,26 @@ describe("AutofillService", () => { }); }); + const expectedDateFormats = [ + ["mm/yyyy", "05/2024"], + ["mm/yy", "05/24"], + ["yyyy/mm", "2024/05"], + ["yy/mm", "24/05"], + ["mm-yyyy", "05-2024"], + ["mm-yy", "05-24"], + ["yyyy-mm", "2024-05"], + ["yy-mm", "24-05"], + ["yyyymm", "202405"], + ["yymm", "2405"], + ["mmyyyy", "052024"], + ["mmyy", "0524"], + ]; describe("given a generic expiration date field", () => { let expirationDateField: AutofillField; let expirationDateFieldView: FieldView; beforeEach(() => { + configService.getFeatureFlag.mockResolvedValue(false); expirationDateField = createAutofillFieldMock({ opid: "expirationDate", form: "validFormId", @@ -2949,23 +2964,11 @@ describe("AutofillService", () => { options.cipher.card.expYear = "2024"; }); - const expectedDateFormats = [ - ["mm/yyyy", "05/2024"], - ["mm/yy", "05/24"], - ["yyyy/mm", "2024/05"], - ["yy/mm", "24/05"], - ["mm-yyyy", "05-2024"], - ["mm-yy", "05-24"], - ["yyyy-mm", "2024-05"], - ["yy-mm", "24-05"], - ["yyyymm", "202405"], - ["yymm", "2405"], - ["mmyyyy", "052024"], - ["mmyy", "0524"], - ]; expectedDateFormats.forEach((dateFormat, index) => { - it(`returns an expiration date format matching '${dateFormat[0]}'`, () => { + it(`returns an expiration date format matching '${dateFormat[0]}'`, async () => { expirationDateField.placeholder = dateFormat[0]; + + // test alternate stored cipher value formats if (index === 0) { options.cipher.card.expYear = "24"; } @@ -2973,7 +2976,13 @@ describe("AutofillService", () => { options.cipher.card.expMonth = "5"; } - const value = autofillService["generateCardFillScript"]( + const enableNewCardCombinedExpiryAutofill = await configService.getFeatureFlag( + FeatureFlag.EnableNewCardCombinedExpiryAutofill, + ); + + expect(enableNewCardCombinedExpiryAutofill).toEqual(false); + + const value = await autofillService["generateCardFillScript"]( fillScript, pageDetails, filledFields, @@ -2984,17 +2993,128 @@ describe("AutofillService", () => { }); }); - it("returns an expiration date format matching `yyyy-mm` if no valid format can be identified", () => { - const value = autofillService["generateCardFillScript"]( + it("returns an expiration date format matching `yyyy-mm` if no valid format can be identified", async () => { + const value = await autofillService["generateCardFillScript"]( fillScript, pageDetails, filledFields, options, ); + const enableNewCardCombinedExpiryAutofill = await configService.getFeatureFlag( + FeatureFlag.EnableNewCardCombinedExpiryAutofill, + ); + + expect(enableNewCardCombinedExpiryAutofill).toEqual(false); + expect(value.script[2]).toStrictEqual(["fill_by_opid", "expirationDate", "2024-05"]); }); }); + + const extraExpectedDateFormats = [ + ...expectedDateFormats, + ["m yy", "5 24"], + ["m yyyy", "5 2024"], + ["m-yy", "5-24"], + ["m-yyyy", "5-2024"], + ["m.yy", "5.24"], + ["m.yyyy", "5.2024"], + ["m/yy", "5/24"], + ["m/yyyy", "5/2024"], + ["mm åååå", "05 2024"], + ["mm yy", "05 24"], + ["mm yyyy", "05 2024"], + ["mm.yy", "05.24"], + ["mm.yyyy", "05.2024"], + ["myy", "524"], + ["myyyy", "52024"], + ["yy m", "24 5"], + ["yy mm", "24 05"], + ["yy mm", "24 05"], + ["yy-m", "24-5"], + ["yy.m", "24.5"], + ["yy.mm", "24.05"], + ["yy/m", "24/5"], + ["yym", "245"], + ["yyyy m", "2024 5"], + ["yyyy mm", "2024 05"], + ["yyyy-m", "2024-5"], + ["yyyy.m", "2024.5"], + ["yyyy.mm", "2024.05"], + ["yyyy/m", "2024/5"], + ["yyyym", "20245"], + ["мм гг", "05 24"], + ]; + describe("given a generic expiration date field with the `enable-new-card-combined-expiry-autofill` feature-flag enabled", () => { + let expirationDateField: AutofillField; + let expirationDateFieldView: FieldView; + + beforeEach(() => { + configService.getFeatureFlag.mockResolvedValue(true); + expirationDateField = createAutofillFieldMock({ + opid: "expirationDate", + form: "validFormId", + elementNumber: 3, + htmlName: "expiration-date", + }); + filledFields["exp-field"] = expirationDateField; + expirationDateFieldView = mock({ name: "exp" }); + pageDetails.fields = [expirationDateField]; + options.cipher.fields = [expirationDateFieldView]; + options.cipher.card.expMonth = "05"; + options.cipher.card.expYear = "2024"; + }); + + afterEach(() => { + configService.getFeatureFlag.mockResolvedValue(false); + }); + + extraExpectedDateFormats.forEach((dateFormat, index) => { + it(`feature-flagged logic returns an expiration date format matching '${dateFormat[0]}'`, async () => { + expirationDateField.placeholder = dateFormat[0]; + + // test alternate stored cipher value formats + if (index === 0) { + options.cipher.card.expYear = "24"; + } + if (index === 1) { + options.cipher.card.expMonth = "05"; + } + + const enableNewCardCombinedExpiryAutofill = await configService.getFeatureFlag( + FeatureFlag.EnableNewCardCombinedExpiryAutofill, + ); + + expect(enableNewCardCombinedExpiryAutofill).toEqual(true); + + const value = await autofillService["generateCardFillScript"]( + fillScript, + pageDetails, + filledFields, + options, + ); + + expect(value.script[2]).toStrictEqual(["fill_by_opid", "expirationDate", dateFormat[1]]); + }); + }); + + it("feature-flagged logic returns an expiration date format matching `mm/yy` if no valid format can be identified", async () => { + const value = await autofillService["generateCardFillScript"]( + fillScript, + pageDetails, + filledFields, + options, + ); + + const enableNewCardCombinedExpiryAutofill = await configService.getFeatureFlag( + FeatureFlag.EnableNewCardCombinedExpiryAutofill, + ); + + expect(enableNewCardCombinedExpiryAutofill).toEqual(true); + + expect(value.script[2]).toStrictEqual(["fill_by_opid", "expirationDate", "05/24"]); + }); + }); }); describe("inUntrustedIframe", () => { diff --git a/apps/browser/src/autofill/services/autofill.service.ts b/apps/browser/src/autofill/services/autofill.service.ts index 1002ca99225..49d00624f34 100644 --- a/apps/browser/src/autofill/services/autofill.service.ts +++ b/apps/browser/src/autofill/services/autofill.service.ts @@ -26,6 +26,7 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi import { TotpService } from "@bitwarden/common/vault/abstractions/totp.service"; import { FieldType, CipherType } from "@bitwarden/common/vault/enums"; import { CipherRepromptType } from "@bitwarden/common/vault/enums/cipher-reprompt-type"; +import { CardView } from "@bitwarden/common/vault/models/view/card.view"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { FieldView } from "@bitwarden/common/vault/models/view/field.view"; import { IdentityView } from "@bitwarden/common/vault/models/view/identity.view"; @@ -50,6 +51,7 @@ import { } from "./abstractions/autofill.service"; import { AutoFillConstants, + CardExpiryDateFormat, CreditCardAutoFillConstants, IdentityAutoFillConstants, } from "./autofill-constants"; @@ -721,7 +723,12 @@ export default class AutofillService implements AutofillServiceInterface { ); break; case CipherType.Card: - fillScript = this.generateCardFillScript(fillScript, pageDetails, filledFields, options); + fillScript = await this.generateCardFillScript( + fillScript, + pageDetails, + filledFields, + options, + ); break; case CipherType.Identity: fillScript = await this.generateIdentityFillScript( @@ -937,12 +944,12 @@ export default class AutofillService implements AutofillServiceInterface { * @returns {AutofillScript|null} * @private */ - private generateCardFillScript( + private async generateCardFillScript( fillScript: AutofillScript, pageDetails: AutofillPageDetails, filledFields: { [id: string]: AutofillField }, options: GenerateFillScriptOptions, - ): AutofillScript | null { + ): Promise { if (!options.cipher.card) { return null; } @@ -1027,6 +1034,7 @@ export default class AutofillService implements AutofillServiceInterface { this.makeScriptAction(fillScript, card, fillFields, filledFields, "code"); this.makeScriptAction(fillScript, card, fillFields, filledFields, "brand"); + // There is an expiration month field and the cipher has an expiration month value if (fillFields.expMonth && AutofillService.hasValue(card.expMonth)) { let expMonth: string = card.expMonth; @@ -1065,6 +1073,7 @@ export default class AutofillService implements AutofillServiceInterface { AutofillService.fillByOpid(fillScript, fillFields.expMonth, expMonth); } + // There is an expiration year field and the cipher has an expiration year value if (fillFields.expYear && AutofillService.hasValue(card.expYear)) { let expYear: string = card.expYear; if (fillFields.expYear.selectInfo && fillFields.expYear.selectInfo.options) { @@ -1111,142 +1120,174 @@ export default class AutofillService implements AutofillServiceInterface { AutofillService.fillByOpid(fillScript, fillFields.expYear, expYear); } + // There is a single expiry date field (combined values) and the cipher has both expiration month and year if ( fillFields.exp && AutofillService.hasValue(card.expMonth) && AutofillService.hasValue(card.expYear) ) { - const fullMonth = ("0" + card.expMonth).slice(-2); + let combinedExpiryFillValue = null; - let fullYear: string = card.expYear; - let partYear: string = null; - if (fullYear.length === 2) { - partYear = fullYear; - fullYear = normalizeExpiryYearFormat(fullYear); - } else if (fullYear.length === 4) { - partYear = fullYear.substr(2, 2); - } + const enableNewCardCombinedExpiryAutofill = await this.configService.getFeatureFlag( + FeatureFlag.EnableNewCardCombinedExpiryAutofill, + ); - let exp: string = null; - for (let i = 0; i < CreditCardAutoFillConstants.MonthAbbr.length; i++) { - if ( - this.fieldAttrsContain( - fillFields.exp, - CreditCardAutoFillConstants.MonthAbbr[i] + - "/" + - CreditCardAutoFillConstants.YearAbbrLong[i], - ) - ) { - exp = fullMonth + "/" + fullYear; - } else if ( - this.fieldAttrsContain( - fillFields.exp, - CreditCardAutoFillConstants.MonthAbbr[i] + - "/" + - CreditCardAutoFillConstants.YearAbbrShort[i], - ) && - partYear != null - ) { - exp = fullMonth + "/" + partYear; - } else if ( - this.fieldAttrsContain( - fillFields.exp, - CreditCardAutoFillConstants.YearAbbrLong[i] + - "/" + - CreditCardAutoFillConstants.MonthAbbr[i], - ) - ) { - exp = fullYear + "/" + fullMonth; - } else if ( - this.fieldAttrsContain( - fillFields.exp, - CreditCardAutoFillConstants.YearAbbrShort[i] + - "/" + - CreditCardAutoFillConstants.MonthAbbr[i], - ) && - partYear != null - ) { - exp = partYear + "/" + fullMonth; - } else if ( - this.fieldAttrsContain( - fillFields.exp, - CreditCardAutoFillConstants.MonthAbbr[i] + - "-" + - CreditCardAutoFillConstants.YearAbbrLong[i], - ) - ) { - exp = fullMonth + "-" + fullYear; - } else if ( - this.fieldAttrsContain( - fillFields.exp, - CreditCardAutoFillConstants.MonthAbbr[i] + - "-" + - CreditCardAutoFillConstants.YearAbbrShort[i], - ) && - partYear != null - ) { - exp = fullMonth + "-" + partYear; - } else if ( - this.fieldAttrsContain( - fillFields.exp, - CreditCardAutoFillConstants.YearAbbrLong[i] + - "-" + - CreditCardAutoFillConstants.MonthAbbr[i], - ) - ) { - exp = fullYear + "-" + fullMonth; - } else if ( - this.fieldAttrsContain( - fillFields.exp, - CreditCardAutoFillConstants.YearAbbrShort[i] + - "-" + - CreditCardAutoFillConstants.MonthAbbr[i], - ) && - partYear != null - ) { - exp = partYear + "-" + fullMonth; - } else if ( - this.fieldAttrsContain( - fillFields.exp, - CreditCardAutoFillConstants.YearAbbrLong[i] + CreditCardAutoFillConstants.MonthAbbr[i], - ) - ) { - exp = fullYear + fullMonth; - } else if ( - this.fieldAttrsContain( - fillFields.exp, - CreditCardAutoFillConstants.YearAbbrShort[i] + CreditCardAutoFillConstants.MonthAbbr[i], - ) && - partYear != null - ) { - exp = partYear + fullMonth; - } else if ( - this.fieldAttrsContain( - fillFields.exp, - CreditCardAutoFillConstants.MonthAbbr[i] + CreditCardAutoFillConstants.YearAbbrLong[i], - ) - ) { - exp = fullMonth + fullYear; - } else if ( - this.fieldAttrsContain( - fillFields.exp, - CreditCardAutoFillConstants.MonthAbbr[i] + CreditCardAutoFillConstants.YearAbbrShort[i], - ) && - partYear != null - ) { - exp = fullMonth + partYear; + if (enableNewCardCombinedExpiryAutofill) { + combinedExpiryFillValue = this.generateCombinedExpiryValue(card, fillFields.exp); + } else { + const fullMonth = ("0" + card.expMonth).slice(-2); + + let fullYear: string = card.expYear; + let partYear: string = null; + if (fullYear.length === 2) { + partYear = fullYear; + fullYear = normalizeExpiryYearFormat(fullYear); + } else if (fullYear.length === 4) { + partYear = fullYear.substr(2, 2); } - if (exp != null) { - break; + for (let i = 0; i < CreditCardAutoFillConstants.MonthAbbr.length; i++) { + if ( + // mm/yyyy + this.fieldAttrsContain( + fillFields.exp, + CreditCardAutoFillConstants.MonthAbbr[i] + + "/" + + CreditCardAutoFillConstants.YearAbbrLong[i], + ) + ) { + combinedExpiryFillValue = fullMonth + "/" + fullYear; + } else if ( + // mm/yy + this.fieldAttrsContain( + fillFields.exp, + CreditCardAutoFillConstants.MonthAbbr[i] + + "/" + + CreditCardAutoFillConstants.YearAbbrShort[i], + ) && + partYear != null + ) { + combinedExpiryFillValue = fullMonth + "/" + partYear; + } else if ( + // yyyy/mm + this.fieldAttrsContain( + fillFields.exp, + CreditCardAutoFillConstants.YearAbbrLong[i] + + "/" + + CreditCardAutoFillConstants.MonthAbbr[i], + ) + ) { + combinedExpiryFillValue = fullYear + "/" + fullMonth; + } else if ( + // yy/mm + this.fieldAttrsContain( + fillFields.exp, + CreditCardAutoFillConstants.YearAbbrShort[i] + + "/" + + CreditCardAutoFillConstants.MonthAbbr[i], + ) && + partYear != null + ) { + combinedExpiryFillValue = partYear + "/" + fullMonth; + } else if ( + // mm-yyyy + this.fieldAttrsContain( + fillFields.exp, + CreditCardAutoFillConstants.MonthAbbr[i] + + "-" + + CreditCardAutoFillConstants.YearAbbrLong[i], + ) + ) { + combinedExpiryFillValue = fullMonth + "-" + fullYear; + } else if ( + // mm-yy + this.fieldAttrsContain( + fillFields.exp, + CreditCardAutoFillConstants.MonthAbbr[i] + + "-" + + CreditCardAutoFillConstants.YearAbbrShort[i], + ) && + partYear != null + ) { + combinedExpiryFillValue = fullMonth + "-" + partYear; + } else if ( + // yyyy-mm + this.fieldAttrsContain( + fillFields.exp, + CreditCardAutoFillConstants.YearAbbrLong[i] + + "-" + + CreditCardAutoFillConstants.MonthAbbr[i], + ) + ) { + combinedExpiryFillValue = fullYear + "-" + fullMonth; + } else if ( + // yy-mm + this.fieldAttrsContain( + fillFields.exp, + CreditCardAutoFillConstants.YearAbbrShort[i] + + "-" + + CreditCardAutoFillConstants.MonthAbbr[i], + ) && + partYear != null + ) { + combinedExpiryFillValue = partYear + "-" + fullMonth; + } else if ( + // yyyymm + this.fieldAttrsContain( + fillFields.exp, + CreditCardAutoFillConstants.YearAbbrLong[i] + + CreditCardAutoFillConstants.MonthAbbr[i], + ) + ) { + combinedExpiryFillValue = fullYear + fullMonth; + } else if ( + // yymm + this.fieldAttrsContain( + fillFields.exp, + CreditCardAutoFillConstants.YearAbbrShort[i] + + CreditCardAutoFillConstants.MonthAbbr[i], + ) && + partYear != null + ) { + combinedExpiryFillValue = partYear + fullMonth; + } else if ( + // mmyyyy + this.fieldAttrsContain( + fillFields.exp, + CreditCardAutoFillConstants.MonthAbbr[i] + + CreditCardAutoFillConstants.YearAbbrLong[i], + ) + ) { + combinedExpiryFillValue = fullMonth + fullYear; + } else if ( + // mmyy + this.fieldAttrsContain( + fillFields.exp, + CreditCardAutoFillConstants.MonthAbbr[i] + + CreditCardAutoFillConstants.YearAbbrShort[i], + ) && + partYear != null + ) { + combinedExpiryFillValue = fullMonth + partYear; + } + + if (combinedExpiryFillValue != null) { + break; + } + } + + // If none of the previous cases applied, set as default + if (combinedExpiryFillValue == null) { + combinedExpiryFillValue = fullYear + "-" + fullMonth; } } - if (exp == null) { - exp = fullYear + "-" + fullMonth; - } - - this.makeScriptActionWithValue(fillScript, exp, fillFields.exp, filledFields); + this.makeScriptActionWithValue( + fillScript, + combinedExpiryFillValue, + fillFields.exp, + filledFields, + ); } return fillScript; @@ -1287,28 +1328,169 @@ export default class AutofillService implements AutofillServiceInterface { * Used when handling autofill on credit card fields. Determines whether * the field has an attribute that matches the given value. * @param {AutofillField} field - * @param {string} containsVal + * @param {string} containsValue * @returns {boolean} * @private */ - private fieldAttrsContain(field: AutofillField, containsVal: string): boolean { + private fieldAttrsContain(field: AutofillField, containsValue: string): boolean { if (!field) { return false; } - let doesContain = false; - CreditCardAutoFillConstants.CardAttributesExtended.forEach((attr) => { - // eslint-disable-next-line - if (doesContain || !field.hasOwnProperty(attr) || !field[attr]) { + let doesContainValue = false; + CreditCardAutoFillConstants.CardAttributesExtended.forEach((attributeName) => { + // eslint-disable-next-line no-prototype-builtins + if (doesContainValue || !field[attributeName]) { return; } - let val = field[attr]; - val = val.replace(/ /g, "").toLowerCase(); - doesContain = val.indexOf(containsVal) > -1; + let fieldValue = field[attributeName]; + fieldValue = fieldValue.replace(/ /g, "").toLowerCase(); + doesContainValue = fieldValue.indexOf(containsValue) > -1; }); - return doesContain; + return doesContainValue; + } + + /** + * Returns a string value representation of the combined card expiration month and year values + * in a format matching discovered guidance within the field attributes (typically provided for users). + * + * @param {CardView} cardCipher + * @param {AutofillField} field + */ + private generateCombinedExpiryValue(cardCipher: CardView, field: AutofillField): string { + /* + Some expectations of the passed stored card cipher view: + + - At the time of writing, the stored card expiry year value (`expYear`) + can be any arbitrary string (no format validation). We may attempt some format + normalization here, but expect the user to have entered a string of integers + with a length of 2 or 4 + + - the `expiration` property cannot be used for autofill as it is an opinionated + format + + - `expMonth` a stringified integer stored with no zero-padding and is not + zero-indexed (e.g. January is "1", not "01" or 0) + */ + + // Expiry format options + let useMonthPadding = true; + let useYearFull = false; + let delimiter = "/"; + let orderByYear = false; + + // Because users are allowed to store truncated years, we need to make assumptions + // about the full year format when called for + const currentCentury = `${new Date().getFullYear()}`.slice(0, 2); + + // Note, we construct the output rather than doing string replacement against the + // format guidance pattern to avoid edge cases that would output invalid values + const [ + // The guidance parsed from the field properties regarding expiry format + expectedExpiryDateFormat, + // The (localized) date pattern set that was used to parse the expiry format guidance + expiryDateFormatPatterns, + ] = this.getExpectedExpiryDateFormat(field); + + if (expectedExpiryDateFormat) { + const { Month, MonthShort, Year } = expiryDateFormatPatterns; + + const expiryDateDelimitersPattern = + "\\" + CreditCardAutoFillConstants.CardExpiryDateDelimiters.join("\\"); + + // assign the delimiter from the expected format string + delimiter = + expectedExpiryDateFormat.match(new RegExp(`[${expiryDateDelimitersPattern}]`, "g"))?.[0] || + ""; + + // check if the expected format starts with a month form + // order matters here; check long form first, since short form will match against long + if (expectedExpiryDateFormat.indexOf(Month + delimiter) === 0) { + useMonthPadding = true; + orderByYear = false; + } else if (expectedExpiryDateFormat.indexOf(MonthShort + delimiter) === 0) { + useMonthPadding = false; + orderByYear = false; + } else { + orderByYear = true; + + // short form can match against long form, but long won't match against short + const containsLongMonthPattern = new RegExp(`${Month}`, "i"); + useMonthPadding = containsLongMonthPattern.test(expectedExpiryDateFormat); + } + + const containsLongYearPattern = new RegExp(`${Year}`, "i"); + + useYearFull = containsLongYearPattern.test(expectedExpiryDateFormat); + } + + const month = useMonthPadding + ? // Ensure zero-padding + ("0" + cardCipher.expMonth).slice(-2) + : // Handle zero-padded stored month values, even though they are not _expected_ to be as such + cardCipher.expMonth.replaceAll("0", ""); + // Note: assumes the user entered an `expYear` value with a length of either 2 or 4 + const year = (currentCentury + cardCipher.expYear).slice(useYearFull ? -4 : -2); + + const combinedExpiryFillValue = (orderByYear ? [year, month] : [month, year]).join(delimiter); + + return combinedExpiryFillValue; + } + + /** + * Returns a string value representation of discovered guidance for a combined month and year expiration value from the field attributes + * + * @param {AutofillField} field + */ + private getExpectedExpiryDateFormat( + field: AutofillField, + ): [string | null, CardExpiryDateFormat | null] { + let expectedDateFormat = null; + let dateFormatPatterns = null; + + const expiryDateDelimitersPattern = + "\\" + CreditCardAutoFillConstants.CardExpiryDateDelimiters.join("\\"); + + CreditCardAutoFillConstants.CardExpiryDateFormats.find((dateFormat) => { + dateFormatPatterns = dateFormat; + + const { Month, MonthShort, YearShort, Year } = dateFormat; + + // Non-exhaustive coverage of field guidances. Some uncovered edge cases: ". " delimiter, space-delimited delimiters ("mm / yyyy"). + // We should consider if added whitespace is for improved readability of user-guidance or actually desired in the filled value. + // e.g. "/((mm|m)[\/\-\.\ ]{0,1}(yyyy|yy))|((yyyy|yy)[\/\-\.\ ]{0,1}(mm|m))/gi" + const dateFormatPattern = new RegExp( + `((${Month}|${MonthShort})[${expiryDateDelimitersPattern}]{0,1}(${Year}|${YearShort}))|((${Year}|${YearShort})[${expiryDateDelimitersPattern}]{0,1}(${Month}|${MonthShort}))`, + "gi", + ); + + return CreditCardAutoFillConstants.CardAttributesExtended.find((attributeName) => { + const fieldAttributeValue = field[attributeName]; + + const fieldAttributeMatch = fieldAttributeValue?.match(dateFormatPattern); + // break find as soon as a match is found + + if (fieldAttributeMatch?.length) { + expectedDateFormat = fieldAttributeMatch[0]; + + // remove any irrelevant characters + const irrelevantExpiryCharactersPattern = new RegExp( + // "or digits" to ensure numbers are removed from guidance pattern, which aren't covered by ^\w + `[^\\w${expiryDateDelimitersPattern}]|[\\d]`, + "gi", + ); + expectedDateFormat.replaceAll(irrelevantExpiryCharactersPattern, ""); + + return true; + } + + return false; + }); + }); + + return [expectedDateFormat, dateFormatPatterns]; } /** diff --git a/libs/common/src/enums/feature-flag.enum.ts b/libs/common/src/enums/feature-flag.enum.ts index a2423dc1a90..53baea14c5c 100644 --- a/libs/common/src/enums/feature-flag.enum.ts +++ b/libs/common/src/enums/feature-flag.enum.ts @@ -30,6 +30,7 @@ export enum FeatureFlag { UnauthenticatedExtensionUIRefresh = "unauth-ui-refresh", EnableUpgradePasswordManagerSub = "AC-2708-upgrade-password-manager-sub", GenerateIdentityFillScriptRefactor = "generate-identity-fill-script-refactor", + EnableNewCardCombinedExpiryAutofill = "enable-new-card-combined-expiry-autofill", DelayFido2PageScriptInitWithinMv2 = "delay-fido2-page-script-init-within-mv2", AccountDeprovisioning = "pm-10308-account-deprovisioning", NotificationBarAddLoginImprovements = "notification-bar-add-login-improvements", @@ -76,6 +77,7 @@ export const DefaultFeatureFlagValue = { [FeatureFlag.UnauthenticatedExtensionUIRefresh]: FALSE, [FeatureFlag.EnableUpgradePasswordManagerSub]: FALSE, [FeatureFlag.GenerateIdentityFillScriptRefactor]: FALSE, + [FeatureFlag.EnableNewCardCombinedExpiryAutofill]: FALSE, [FeatureFlag.DelayFido2PageScriptInitWithinMv2]: FALSE, [FeatureFlag.StorageReseedRefactor]: FALSE, [FeatureFlag.AccountDeprovisioning]: FALSE, From 40cb4b5353ce64b0ded69f29f3f84ccb8386fdbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Fri, 6 Sep 2024 17:48:51 +0200 Subject: [PATCH 03/36] Fix TestFlight errors caused by desktop_proxy (#10928) * Add info.plist and enable app-sandbox * Log available identities * Fix cert selection * Remove comment --- apps/desktop/desktop_native/Cargo.lock | 7 ++++ apps/desktop/desktop_native/proxy/Cargo.toml | 3 ++ apps/desktop/desktop_native/proxy/src/main.rs | 3 ++ .../entitlements.desktop_proxy.plist | 2 ++ .../resources/info.desktop_proxy.plist | 10 ++++++ apps/desktop/scripts/after-pack.js | 36 ++++++++++++++----- 6 files changed, 52 insertions(+), 9 deletions(-) create mode 100644 apps/desktop/resources/info.desktop_proxy.plist diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock index 8b498f2c65e..d96e0642fad 100644 --- a/apps/desktop/desktop_native/Cargo.lock +++ b/apps/desktop/desktop_native/Cargo.lock @@ -555,6 +555,7 @@ version = "0.0.0" dependencies = [ "anyhow", "desktop_core", + "embed_plist", "futures", "log", "simplelog", @@ -614,6 +615,12 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "embed_plist" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + [[package]] name = "endi" version = "1.1.0" diff --git a/apps/desktop/desktop_native/proxy/Cargo.toml b/apps/desktop/desktop_native/proxy/Cargo.toml index b15b07a78d3..681c34c8eab 100644 --- a/apps/desktop/desktop_native/proxy/Cargo.toml +++ b/apps/desktop/desktop_native/proxy/Cargo.toml @@ -14,3 +14,6 @@ log = "0.4.21" simplelog = "0.12.2" tokio = { version = "1.38.0", features = ["io-std", "io-util", "macros", "rt"] } tokio-util = { version = "0.7.11", features = ["codec"] } + +[target.'cfg(target_os = "macos")'.dependencies] +embed_plist = "1.2.2" diff --git a/apps/desktop/desktop_native/proxy/src/main.rs b/apps/desktop/desktop_native/proxy/src/main.rs index d4467c3f1cc..776b363598a 100644 --- a/apps/desktop/desktop_native/proxy/src/main.rs +++ b/apps/desktop/desktop_native/proxy/src/main.rs @@ -5,6 +5,9 @@ use futures::{SinkExt, StreamExt}; use log::*; use tokio_util::codec::LengthDelimitedCodec; +#[cfg(target_os = "macos")] +embed_plist::embed_info_plist!("../../../resources/info.desktop_proxy.plist"); + fn init_logging(log_path: &Path, level: log::LevelFilter) { use simplelog::{ColorChoice, CombinedLogger, Config, SharedLogger, TermLogger, TerminalMode}; diff --git a/apps/desktop/resources/entitlements.desktop_proxy.plist b/apps/desktop/resources/entitlements.desktop_proxy.plist index 774e274cf73..0bf3cc2c2f4 100644 --- a/apps/desktop/resources/entitlements.desktop_proxy.plist +++ b/apps/desktop/resources/entitlements.desktop_proxy.plist @@ -6,6 +6,8 @@ LTZ2PFU5D6.com.bitwarden.desktop com.apple.developer.team-identifier LTZ2PFU5D6 + com.apple.security.app-sandbox + com.apple.security.application-groups LTZ2PFU5D6.com.bitwarden.desktop diff --git a/apps/desktop/resources/info.desktop_proxy.plist b/apps/desktop/resources/info.desktop_proxy.plist new file mode 100644 index 00000000000..d0825217f15 --- /dev/null +++ b/apps/desktop/resources/info.desktop_proxy.plist @@ -0,0 +1,10 @@ + + + + + CFBundleIdentifier + com.bitwarden.desktop + LSMinimumSystemVersion + 10.15 + + diff --git a/apps/desktop/scripts/after-pack.js b/apps/desktop/scripts/after-pack.js index 7d588988155..08cff76e858 100644 --- a/apps/desktop/scripts/after-pack.js +++ b/apps/desktop/scripts/after-pack.js @@ -33,13 +33,32 @@ async function run(context) { } if (["darwin", "mas"].includes(context.electronPlatformName)) { - const identities = getIdentities(process.env.CSC_NAME ?? ""); - if (identities.length === 0) { - throw new Error("No valid identities found"); - } - const id = identities[0].id; + const is_mas = context.electronPlatformName === "mas"; + const is_mas_dev = context.targets.some((e) => e.name === "mas-dev"); - console.log("Signing proxy binary before the main bundle, using identity", id); + let id; + + // Only use the Bitwarden Identities on CI + if (process.env.GITHUB_ACTIONS === "true") { + if (is_mas) { + id = is_mas_dev + ? "E7C9978F6FBCE0553429185C405E61F5380BE8EB" + : "3rd Party Mac Developer Application: Bitwarden Inc"; + } else { + id = "Developer ID Application: 8bit Solutions LLC"; + } + // Locally, use the first valid code signing identity, unless CSC_NAME is set + } else if (process.env.CSC_NAME) { + id = process.env.CSC_NAME; + } else { + const identities = getIdentities(); + if (identities.length === 0) { + throw new Error("No valid identities found"); + } + id = identities[0].id; + } + + console.log(`Signing proxy binary before the main bundle, using identity '${id}'`); const appName = context.packager.appInfo.productFilename; const appPath = `${context.appOutDir}/${appName}.app`; @@ -49,7 +68,7 @@ async function run(context) { const entitlementsName = "entitlements.desktop_proxy.plist"; const entitlementsPath = path.join(__dirname, "..", "resources", entitlementsName); child_process.execSync( - `codesign -s ${id} -i ${packageId} -f --timestamp --options runtime --entitlements ${entitlementsPath} ${proxyPath}`, + `codesign -s '${id}' -i ${packageId} -f --timestamp --options runtime --entitlements ${entitlementsPath} ${proxyPath}`, ); } } @@ -66,7 +85,7 @@ const appleCertificatePrefixes = [ "Apple Development:", ]; -function getIdentities(csc_name) { +function getIdentities() { const ids = child_process .execSync("/usr/bin/security find-identity -v -p codesigning") .toString(); @@ -81,7 +100,6 @@ function getIdentities(csc_name) { } return false; }) - .filter((line) => line.includes(csc_name)) .map((line) => { const split = line.trim().split(" "); const id = split[1]; From a48773ae4f34bbeb617393119aa2f63ec04e0ab7 Mon Sep 17 00:00:00 2001 From: SmithThe4th Date: Fri, 6 Sep 2024 12:55:26 -0400 Subject: [PATCH 04/36] [PM-11692] [PM-11693] [PM-11694] Fixed defects with browser refresh trash component (#10911) * Added animation when viewing item in trash * Fixed A11y to announce delete forever * Route to vault page after restore or delete action is performed --- apps/browser/src/popup/app-routing.animations.ts | 3 +++ .../components/vault-v2/view-v2/view-v2.component.html | 2 +- .../trash-list-items-container.component.ts | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apps/browser/src/popup/app-routing.animations.ts b/apps/browser/src/popup/app-routing.animations.ts index 3da6fdef196..90990ea832d 100644 --- a/apps/browser/src/popup/app-routing.animations.ts +++ b/apps/browser/src/popup/app-routing.animations.ts @@ -202,6 +202,9 @@ export const routerTransition = trigger("routerTransition", [ transition("vault-settings => trash", inSlideLeft), transition("trash => vault-settings", outSlideRight), + transition("trash => view-cipher", inSlideLeft), + transition("view-cipher => trash", outSlideRight), + // Appearance settings transition("tabs => appearance", inSlideLeft), transition("appearance => tabs", outSlideRight), diff --git a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.html b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.html index 2595a6459c4..a778d6aaea9 100644 --- a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.html +++ b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.html @@ -33,7 +33,7 @@ type="button" buttonType="danger" bitIconButton="bwi-trash" - [appA11yTitle]="'delete' | i18n" + [appA11yTitle]="(cipher.isDeleted ? 'deleteForever' : 'delete') | i18n" > diff --git a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts index c5fea3c2b8c..6d3bfc24838 100644 --- a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts +++ b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.ts @@ -57,6 +57,8 @@ export class TrashListItemsContainerComponent { async restore(cipher: CipherView) { try { await this.cipherService.restoreWithServer(cipher.id); + + await this.router.navigate(["/vault"]); this.toastService.showToast({ variant: "success", title: null, @@ -86,10 +88,12 @@ export class TrashListItemsContainerComponent { try { await this.cipherService.deleteWithServer(cipher.id); + + await this.router.navigate(["/vault"]); this.toastService.showToast({ variant: "success", title: null, - message: this.i18nService.t("deletedItem"), + message: this.i18nService.t("permanentlyDeletedItem"), }); } catch (e) { this.logService.error(e); From 45806ed8d82f07b421467ab99f65a550d641434c Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Fri, 6 Sep 2024 19:00:50 +0200 Subject: [PATCH 05/36] Add fallbackbulkencryptservice to main.background.ts (#10696) --- apps/browser/src/background/main.background.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index e451b55c9e8..df1e479656e 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -782,6 +782,8 @@ export default class MainBackground { this.authService, ); + this.bulkEncryptService = new FallbackBulkEncryptService(this.encryptService); + this.cipherService = new CipherService( this.cryptoService, this.domainSettingsService, From 4dbb036df11f004c424429f61b448758eb35c1c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Fri, 6 Sep 2024 20:06:01 +0200 Subject: [PATCH 06/36] Remove unnecessary plist keys in desktop_proxy (#10933) --- apps/desktop/resources/entitlements.desktop_proxy.plist | 4 ---- apps/desktop/resources/info.desktop_proxy.plist | 2 -- 2 files changed, 6 deletions(-) diff --git a/apps/desktop/resources/entitlements.desktop_proxy.plist b/apps/desktop/resources/entitlements.desktop_proxy.plist index 0bf3cc2c2f4..d5c7b8a2cc8 100644 --- a/apps/desktop/resources/entitlements.desktop_proxy.plist +++ b/apps/desktop/resources/entitlements.desktop_proxy.plist @@ -2,10 +2,6 @@ - com.apple.application-identifier - LTZ2PFU5D6.com.bitwarden.desktop - com.apple.developer.team-identifier - LTZ2PFU5D6 com.apple.security.app-sandbox com.apple.security.application-groups diff --git a/apps/desktop/resources/info.desktop_proxy.plist b/apps/desktop/resources/info.desktop_proxy.plist index d0825217f15..d3c30e3e0eb 100644 --- a/apps/desktop/resources/info.desktop_proxy.plist +++ b/apps/desktop/resources/info.desktop_proxy.plist @@ -4,7 +4,5 @@ CFBundleIdentifier com.bitwarden.desktop - LSMinimumSystemVersion - 10.15 From 12b5ce548d05166bc6fe0bb58ac850af0aa83018 Mon Sep 17 00:00:00 2001 From: Cesar Gonzalez Date: Fri, 6 Sep 2024 15:57:12 -0500 Subject: [PATCH 07/36] [PM-11689] Incorporate refined submit button capture logic within auto-submit login content script (#10909) * [PM-11689] Incorporate refined submit button capture logic within auto-submit login content script * [PM-11689] Refactoring implementation to better unify logic * [PM-11689] Adjusting regex value in order to avoid iterating over element unnecessarily * [PM-11689] Adjusting regex value in order to avoid iterating over element unnecessarily * [PM-11689] Adjusting regex value in order to avoid iterating over element unnecessarily --- .../src/autofill/content/auto-submit-login.ts | 75 +++++++++---------- ...inline-menu-field-qualification.service.ts | 31 +------- apps/browser/src/autofill/utils/index.ts | 40 ++++++++++ 3 files changed, 79 insertions(+), 67 deletions(-) diff --git a/apps/browser/src/autofill/content/auto-submit-login.ts b/apps/browser/src/autofill/content/auto-submit-login.ts index 19ffac61bcf..ab7f09f804d 100644 --- a/apps/browser/src/autofill/content/auto-submit-login.ts +++ b/apps/browser/src/autofill/content/auto-submit-login.ts @@ -2,11 +2,17 @@ import { EVENTS } from "@bitwarden/common/autofill/constants"; import AutofillPageDetails from "../models/autofill-page-details"; import AutofillScript from "../models/autofill-script"; +import { SubmitLoginButtonNames } from "../services/autofill-constants"; import { CollectAutofillContentService } from "../services/collect-autofill-content.service"; import DomElementVisibilityService from "../services/dom-element-visibility.service"; import { DomQueryService } from "../services/dom-query.service"; import InsertAutofillContentService from "../services/insert-autofill-content.service"; -import { elementIsInputElement, nodeIsFormElement, sendExtensionMessage } from "../utils"; +import { + elementIsInputElement, + getSubmitButtonKeywordsSet, + nodeIsFormElement, + sendExtensionMessage, +} from "../utils"; (function (globalContext) { const domQueryService = new DomQueryService(); @@ -19,17 +25,6 @@ import { elementIsInputElement, nodeIsFormElement, sendExtensionMessage } from " domElementVisibilityService, collectAutofillContentService, ); - const loginKeywords = [ - "login", - "log in", - "log-in", - "signin", - "sign in", - "sign-in", - "submit", - "continue", - "next", - ]; let autoSubmitLoginTimeout: number | NodeJS.Timeout; init(); @@ -194,26 +189,41 @@ import { elementIsInputElement, nodeIsFormElement, sendExtensionMessage } from " element: HTMLElement, lastFieldIsPasswordInput = false, ): boolean { - const genericSubmitElement = domQueryService.deepQueryElements( - element, - "[type='submit']", - ); - if (genericSubmitElement[0]) { - clickSubmitElement(genericSubmitElement[0], lastFieldIsPasswordInput); + const genericSubmitElement = querySubmitButtonElement(element, "[type='submit']"); + if (genericSubmitElement) { + clickSubmitElement(genericSubmitElement, lastFieldIsPasswordInput); return true; } - const buttons = domQueryService.deepQueryElements(element, "button"); - for (let i = 0; i < buttons.length; i++) { - if (isLoginButton(buttons[i])) { - clickSubmitElement(buttons[i], lastFieldIsPasswordInput); - return true; - } + const buttonElement = querySubmitButtonElement(element, "button, [type='button']"); + if (buttonElement) { + clickSubmitElement(buttonElement, lastFieldIsPasswordInput); + return true; } return false; } + /** + * Queries the element for a submit button element. If an element is found and has keywords + * that indicate a login action, the element is returned. + * + * @param element - The element to query for submit buttons + * @param selector - The selector to query for submit buttons + */ + function querySubmitButtonElement(element: HTMLElement, selector: string) { + const submitButtonElements = domQueryService.deepQueryElements( + element, + selector, + ); + for (let index = 0; index < submitButtonElements.length; index++) { + const submitElement = submitButtonElements[index]; + if (isLoginButton(submitElement)) { + return submitElement; + } + } + } + /** * Handles clicking the submit element and optionally triggering * a completion action for multistep login forms. @@ -236,21 +246,10 @@ import { elementIsInputElement, nodeIsFormElement, sendExtensionMessage } from " * @param element - The element to check */ function isLoginButton(element: HTMLElement) { - const keywordValues = [ - element.textContent, - element.getAttribute("value"), - element.getAttribute("aria-label"), - element.getAttribute("aria-labelledby"), - element.getAttribute("aria-describedby"), - element.getAttribute("title"), - element.getAttribute("id"), - element.getAttribute("name"), - element.getAttribute("class"), - ] - .join(",") - .toLowerCase(); + const keywordsSet = getSubmitButtonKeywordsSet(element); + const keywordValues = Array.from(keywordsSet).join(","); - return loginKeywords.some((keyword) => keywordValues.includes(keyword)); + return SubmitLoginButtonNames.some((keyword) => keywordValues.indexOf(keyword) > -1); } /** diff --git a/apps/browser/src/autofill/services/inline-menu-field-qualification.service.ts b/apps/browser/src/autofill/services/inline-menu-field-qualification.service.ts index 089c48cd230..67bf94e5cbd 100644 --- a/apps/browser/src/autofill/services/inline-menu-field-qualification.service.ts +++ b/apps/browser/src/autofill/services/inline-menu-field-qualification.service.ts @@ -1,6 +1,6 @@ import AutofillField from "../models/autofill-field"; import AutofillPageDetails from "../models/autofill-page-details"; -import { sendExtensionMessage } from "../utils"; +import { getSubmitButtonKeywordsSet, sendExtensionMessage } from "../utils"; import { AutofillKeywordsMap, @@ -1014,34 +1014,7 @@ export class InlineMenuFieldQualificationService */ private getSubmitButtonKeywords(element: HTMLElement): string { if (!this.submitButtonKeywordsMap.has(element)) { - const keywords = [ - element.textContent, - element.getAttribute("value"), - element.getAttribute("aria-label"), - element.getAttribute("aria-labelledby"), - element.getAttribute("aria-describedby"), - element.getAttribute("title"), - element.getAttribute("id"), - element.getAttribute("name"), - element.getAttribute("class"), - ]; - - const keywordsSet = new Set(); - for (let i = 0; i < keywords.length; i++) { - if (typeof keywords[i] === "string") { - keywords[i] - .toLowerCase() - .replace(/[-\s]/g, "") - .replace(/[^a-zA-Z0-9]+/g, "|") - .split("|") - .forEach((keyword) => { - if (keyword) { - keywordsSet.add(keyword); - } - }); - } - } - + const keywordsSet = getSubmitButtonKeywordsSet(element); this.submitButtonKeywordsMap.set(element, Array.from(keywordsSet).join(",")); } diff --git a/apps/browser/src/autofill/utils/index.ts b/apps/browser/src/autofill/utils/index.ts index 98e58a022e4..7c18e7fd127 100644 --- a/apps/browser/src/autofill/utils/index.ts +++ b/apps/browser/src/autofill/utils/index.ts @@ -360,3 +360,43 @@ export function throttle(callback: (_args: any) => any, limit: number) { } }; } + +/** + * Gathers and normalizes keywords from a potential submit button element. Used + * to verify if the element submits a login or change password form. + * + * @param element - The element to gather keywords from. + */ +export function getSubmitButtonKeywordsSet(element: HTMLElement): Set { + const keywords = [ + element.textContent, + element.getAttribute("type"), + element.getAttribute("value"), + element.getAttribute("aria-label"), + element.getAttribute("aria-labelledby"), + element.getAttribute("aria-describedby"), + element.getAttribute("title"), + element.getAttribute("id"), + element.getAttribute("name"), + element.getAttribute("class"), + ]; + + const keywordsSet = new Set(); + for (let i = 0; i < keywords.length; i++) { + if (typeof keywords[i] === "string") { + // Iterate over all keywords metadata and split them by non-letter characters. + // This ensures we check against individual words and not the entire string. + keywords[i] + .toLowerCase() + .replace(/[-\s]/g, "") + .split(/[^\p{L}]+/gu) + .forEach((keyword) => { + if (keyword) { + keywordsSet.add(keyword); + } + }); + } + } + + return keywordsSet; +} From 4e1912e24eeb4aca0d17264a843238b742d1ca27 Mon Sep 17 00:00:00 2001 From: Cesar Gonzalez Date: Fri, 6 Sep 2024 16:00:47 -0500 Subject: [PATCH 08/36] [PM-11481] Incorporate TOTP field qualification to ensure inline menu appears correctly for login forms (#10900) * [PM-11481] Incorporate TOTP field qualification to ensure inline menu appears correctly for login forms * [PM-11481] Incorporate TOTP field qualification to ensure inline menu appears correctly for login forms --- ...nline-menu-field-qualifications.service.ts | 1 + .../autofill-overlay-content.service.ts | 17 ++++++++---- ...e-menu-field-qualification.service.spec.ts | 19 +++++++++++++ ...inline-menu-field-qualification.service.ts | 27 +++++++++++++++++-- 4 files changed, 57 insertions(+), 7 deletions(-) diff --git a/apps/browser/src/autofill/services/abstractions/inline-menu-field-qualifications.service.ts b/apps/browser/src/autofill/services/abstractions/inline-menu-field-qualifications.service.ts index 58cfc253163..ecf8b924b1e 100644 --- a/apps/browser/src/autofill/services/abstractions/inline-menu-field-qualifications.service.ts +++ b/apps/browser/src/autofill/services/abstractions/inline-menu-field-qualifications.service.ts @@ -13,6 +13,7 @@ export type SubmitButtonKeywordsMap = WeakMap; export interface InlineMenuFieldQualificationService { isUsernameField(field: AutofillField): boolean; + isCurrentPasswordField(field: AutofillField): boolean; isNewPasswordField(field: AutofillField): boolean; isEmailField(field: AutofillField): boolean; isFieldForLoginForm(field: AutofillField, pageDetails: AutofillPageDetails): boolean; 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 a78e9e0a6ef..23a4fc27000 100644 --- a/apps/browser/src/autofill/services/autofill-overlay-content.service.ts +++ b/apps/browser/src/autofill/services/autofill-overlay-content.service.ts @@ -87,6 +87,11 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ destroyAutofillInlineMenuListeners: () => this.destroy(), getFormFieldDataForNotification: () => this.handleGetFormFieldDataForNotificationMessage(), }; + private readonly loginFieldQualifiers: Record = { + [AutofillFieldQualifier.username]: this.inlineMenuFieldQualificationService.isUsernameField, + [AutofillFieldQualifier.password]: + this.inlineMenuFieldQualificationService.isCurrentPasswordField, + }; private readonly cardFieldQualifiers: Record = { [AutofillFieldQualifier.cardholderName]: this.inlineMenuFieldQualificationService.isFieldForCardholderName, @@ -781,12 +786,14 @@ export class AutofillOverlayContentService implements AutofillOverlayContentServ * @param autofillFieldData - Autofill field data captured from the form field element. */ private qualifyUserFilledLoginField(autofillFieldData: AutofillField) { - if (autofillFieldData.type === "password") { - autofillFieldData.fieldQualifier = AutofillFieldQualifier.password; - return; + for (const [fieldQualifier, fieldQualifierFunction] of Object.entries( + this.loginFieldQualifiers, + )) { + if (fieldQualifierFunction(autofillFieldData)) { + autofillFieldData.fieldQualifier = fieldQualifier as AutofillFieldQualifierType; + return; + } } - - autofillFieldData.fieldQualifier = AutofillFieldQualifier.username; } /** diff --git a/apps/browser/src/autofill/services/inline-menu-field-qualification.service.spec.ts b/apps/browser/src/autofill/services/inline-menu-field-qualification.service.spec.ts index 21bdcba3365..f38994e9852 100644 --- a/apps/browser/src/autofill/services/inline-menu-field-qualification.service.spec.ts +++ b/apps/browser/src/autofill/services/inline-menu-field-qualification.service.spec.ts @@ -21,12 +21,29 @@ describe("InlineMenuFieldQualificationService", () => { }); describe("isFieldForLoginForm", () => { + it("disqualifies totp fields", () => { + const field = mock({ + type: "text", + autoCompleteType: "one-time-code", + htmlName: "totp", + htmlID: "totp", + placeholder: "totp", + }); + + expect(inlineMenuFieldQualificationService.isFieldForLoginForm(field, pageDetails)).toBe( + false, + ); + }); + describe("qualifying a password field for a login form", () => { describe("an invalid password field", () => { it("has a `new-password` autoCompleteType", () => { const field = mock({ type: "password", autoCompleteType: "new-password", + htmlName: "input-password", + htmlID: "input-password", + placeholder: "input-password", }); expect(inlineMenuFieldQualificationService.isFieldForLoginForm(field, pageDetails)).toBe( @@ -39,6 +56,8 @@ describe("InlineMenuFieldQualificationService", () => { type: "password", placeholder: "create account password", autoCompleteType: "", + htmlName: "input-password", + htmlID: "input-password", }); expect(inlineMenuFieldQualificationService.isFieldForLoginForm(field, pageDetails)).toBe( diff --git a/apps/browser/src/autofill/services/inline-menu-field-qualification.service.ts b/apps/browser/src/autofill/services/inline-menu-field-qualification.service.ts index 67bf94e5cbd..0b04b83ce4e 100644 --- a/apps/browser/src/autofill/services/inline-menu-field-qualification.service.ts +++ b/apps/browser/src/autofill/services/inline-menu-field-qualification.service.ts @@ -125,6 +125,7 @@ export class InlineMenuFieldQualificationService this.identityCompanyAutocompleteValue, this.identityPostalCodeAutocompleteValue, ]); + private totpFieldAutocompleteValue = "one-time-code"; private inlineMenuFieldQualificationFlagSet = false; constructor() { @@ -145,6 +146,11 @@ export class InlineMenuFieldQualificationService return this.isFieldForLoginFormFallback(field); } + const isTotpField = this.isTotpField(field); + if (isTotpField) { + return false; + } + const isCurrentPasswordField = this.isCurrentPasswordField(field); if (isCurrentPasswordField) { return this.isPasswordFieldForLoginForm(field, pageDetails); @@ -838,7 +844,7 @@ export class InlineMenuFieldQualificationService * * @param field - The field to validate */ - private isCurrentPasswordField = (field: AutofillField): boolean => { + isCurrentPasswordField = (field: AutofillField): boolean => { if ( this.fieldContainsAutocompleteValues(field, this.newPasswordAutoCompleteValue) || this.keywordsFoundInFieldData(field, this.accountCreationFieldKeywords) @@ -875,7 +881,8 @@ export class InlineMenuFieldQualificationService if ( (!isInputPasswordType && this.isExcludedFieldType(field, this.excludedAutofillFieldTypesSet)) || - this.fieldHasDisqualifyingAttributeValue(field) + this.fieldHasDisqualifyingAttributeValue(field) || + this.isTotpField(field) ) { return false; } @@ -923,6 +930,22 @@ export class InlineMenuFieldQualificationService return !(this.passwordFieldExcludeListString.indexOf(cleanedValue) > -1); } + /** + * Validates whether the provided field is a TOTP field. + * + * @param field - The field to validate + */ + private isTotpField = (field: AutofillField): boolean => { + if (this.fieldContainsAutocompleteValues(field, this.totpFieldAutocompleteValue)) { + return true; + } + + return ( + !this.isExcludedFieldType(field, this.excludedAutofillFieldTypesSet) && + this.keywordsFoundInFieldData(field, AutoFillConstants.TotpFieldNames) + ); + }; + /** * Validates the provided field to indicate if the field has a * disqualifying attribute that would impede autofill entirely. From e3fc4547ae55ccf24f36acb09c216f4c83358bac Mon Sep 17 00:00:00 2001 From: md-5 Date: Sat, 7 Sep 2024 07:22:43 +1000 Subject: [PATCH 09/36] Handle detached table cells in autofill service (#10880) Fixes errors and high CPU usage / browser lockup on offending webpages. HTMLTableCellElement.cellIndex will be -1 if the cell is not part of any row, which will cause getTextContentFromElement to fail since it will not receive a valid sibling cell. --- .../src/autofill/services/collect-autofill-content.service.ts | 4 ++++ 1 file changed, 4 insertions(+) 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 2cdcbd67023..efacafbe88e 100644 --- a/apps/browser/src/autofill/services/collect-autofill-content.service.ts +++ b/apps/browser/src/autofill/services/collect-autofill-content.service.ts @@ -644,6 +644,10 @@ export class CollectAutofillContentService implements CollectAutofillContentServ } const tableDataElementIndex = tableDataElement.cellIndex; + if (tableDataElementIndex < 0) { + return null; + } + const parentSiblingTableRowElement = tableDataElement.closest("tr") ?.previousElementSibling as HTMLTableRowElement; From ee738ac36ac5178e88ecad274e62d9a073cdd4bc Mon Sep 17 00:00:00 2001 From: Alec Rippberger <127791530+alec-livefront@users.noreply.github.com> Date: Sat, 7 Sep 2024 21:20:39 -0500 Subject: [PATCH 10/36] Update "linked" to use "cfTypeLinked" message. (#10841) Co-authored-by: Shane Melton --- .../cipher-view/custom-fields/custom-fields-v2.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html b/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html index 96cb63fe39b..69aa4e9d699 100644 --- a/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html +++ b/libs/vault/src/cipher-view/custom-fields/custom-fields-v2.component.html @@ -46,7 +46,7 @@ {{ field.name }} - {{ "linked" | i18n }}: {{ field.name }} + {{ "cfTypeLinked" | i18n }}: {{ field.name }} Date: Mon, 9 Sep 2024 13:25:14 +0100 Subject: [PATCH 11/36] Fix the adjusting issue on the plans selection (#10953) --- .../billing/organizations/change-plan-dialog.component.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html index 96bf6c43a31..d643c41e0ff 100644 --- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html +++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html @@ -52,10 +52,7 @@ tabindex="0" >
-
+

{{ selectableProduct.nameLocalizationKey | i18n From 2827d338ee459baac33526f4aa120ffec8ac6dfe Mon Sep 17 00:00:00 2001 From: Cesar Gonzalez Date: Mon, 9 Sep 2024 07:44:08 -0500 Subject: [PATCH 12/36] [PM-11419] Fix issues encountered with inline menu passkeys (#10892) * [PM-11419] Login items do not display after adding passkey * [PM-11419] Login items do not display after adding passkey * [PM-11419] Incorporating fixes for deleting a cipher from the inline menu as well as authenticating using passkeys * [PM-11419] Fixing an issue where master password reprompt is ignored for a set passkey cipher * [PM-11419] Fixing an issue where saving a passkey does not trigger a clearing of cached cipher values * [PM-11419] Refactoring implementation * [PM-11419] Ensuring that passkeys must be enabled in order for ciphers to appear * [PM-11419] Adding an abort event from the active request manager * [PM-11419] Adding an abort event from the active request manager * [PM-11419] Working through jest tests within implementation * [PM-11419] Fixing jest tests within Fido2ClientService and Fido2AuthenticatorService * [PM-11419] Adding jest tests for added logic within OverlayBackground * [PM-11419] Adding jest tests for added logic within OverlayBackground * [PM-11419] Reworking how we handle assuming user presence when master password reprompt is required * [PM-11419] Reworking how we handle assuming user presence when master password reprompt is required * [PM-11419] Reworking how we handle assuming user presence when master password reprompt is required * [PM-11419] Refactoring implementation * [PM-11419] Incorporating suggestion for reporting failed passkey authentication from the inline menu * [PM-11419] Reworking positioning of the abort controller that informs the background script of an error * [PM-11419] Scoping down the behavior surrounding master password reprompt a bit more tightly * [PM-11419] Reworking how we handle reacting to active fido2 requests to avoid ambiguity * [PM-11419] Reworking how we handle reacting to active fido2 requests to avoid ambiguity * [PM-11419] Adjusting implementation to ensure we clear any active requests when the passkeys setting is modified --- .../abstractions/overlay.background.ts | 1 + .../background/overlay.background.spec.ts | 129 ++++++++++++++++-- .../autofill/background/overlay.background.ts | 76 +++++++++-- .../fido2/background/fido2.background.spec.ts | 4 + .../fido2/background/fido2.background.ts | 3 + .../fido2/content/fido2-content-script.ts | 4 + .../fido2/content/fido2-page-script.ts | 7 + .../browser-fido2-user-interface.service.ts | 3 +- .../browser/src/background/main.background.ts | 10 +- ...ido2-active-request-manager.abstraction.ts | 18 ++- .../fido2/fido2-client.service.abstraction.ts | 8 -- ...ido2-user-interface.service.abstraction.ts | 5 + .../fido2/fido2-active-request-manager.ts | 19 ++- .../fido2/fido2-authenticator.service.spec.ts | 3 + .../fido2/fido2-authenticator.service.ts | 13 +- .../fido2/fido2-client.service.spec.ts | 35 ++--- .../services/fido2/fido2-client.service.ts | 34 ++--- 17 files changed, 288 insertions(+), 84 deletions(-) diff --git a/apps/browser/src/autofill/background/abstractions/overlay.background.ts b/apps/browser/src/autofill/background/abstractions/overlay.background.ts index 5d2d2a38981..e91a58a84cf 100644 --- a/apps/browser/src/autofill/background/abstractions/overlay.background.ts +++ b/apps/browser/src/autofill/background/abstractions/overlay.background.ts @@ -217,6 +217,7 @@ export type OverlayBackgroundExtensionMessageHandlers = { addEditCipherSubmitted: () => void; editedCipher: () => void; deletedCipher: () => void; + fido2AbortRequest: ({ message, sender }: BackgroundOnMessageHandlerParams) => void; }; export type PortMessageParam = { diff --git a/apps/browser/src/autofill/background/overlay.background.spec.ts b/apps/browser/src/autofill/background/overlay.background.spec.ts index 5ac94582ce3..30f19e7260a 100644 --- a/apps/browser/src/autofill/background/overlay.background.spec.ts +++ b/apps/browser/src/autofill/background/overlay.background.spec.ts @@ -18,12 +18,12 @@ import { EnvironmentService, Region, } from "@bitwarden/common/platform/abstractions/environment.service"; -import { Fido2ClientService } from "@bitwarden/common/platform/abstractions/fido2/fido2-client.service.abstraction"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { ThemeType } from "@bitwarden/common/platform/enums"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { CloudEnvironment } from "@bitwarden/common/platform/services/default-environment.service"; +import { Fido2ActiveRequestManager } from "@bitwarden/common/platform/services/fido2/fido2-active-request-manager"; import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service"; import { FakeAccountService, @@ -32,6 +32,7 @@ import { } from "@bitwarden/common/spec"; import { UserId } from "@bitwarden/common/types/guid"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { VaultSettingsService } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service"; import { CipherRepromptType, CipherType } from "@bitwarden/common/vault/enums"; import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view"; import { Fido2CredentialView } from "@bitwarden/common/vault/models/view/fido2-credential.view"; @@ -89,8 +90,9 @@ describe("OverlayBackground", () => { let autofillSettingsService: MockProxy; let i18nService: MockProxy; let platformUtilsService: MockProxy; - let availableAutofillCredentialsMock$: BehaviorSubject; - let fido2ClientService: MockProxy; + let enablePasskeysMock$: BehaviorSubject; + let vaultSettingsServiceMock: MockProxy; + let fido2ActiveRequestManager: Fido2ActiveRequestManager; let selectedThemeMock$: BehaviorSubject; let themeStateService: MockProxy; let overlayBackground: OverlayBackground; @@ -159,10 +161,10 @@ describe("OverlayBackground", () => { autofillSettingsService.inlineMenuVisibility$ = inlineMenuVisibilityMock$; i18nService = mock(); platformUtilsService = mock(); - availableAutofillCredentialsMock$ = new BehaviorSubject([]); - fido2ClientService = mock({ - availableAutofillCredentials$: (_tabId) => availableAutofillCredentialsMock$, - }); + enablePasskeysMock$ = new BehaviorSubject(true); + vaultSettingsServiceMock = mock(); + vaultSettingsServiceMock.enablePasskeys$ = enablePasskeysMock$; + fido2ActiveRequestManager = new Fido2ActiveRequestManager(); selectedThemeMock$ = new BehaviorSubject(ThemeType.Light); themeStateService = mock(); themeStateService.selectedTheme$ = selectedThemeMock$; @@ -176,7 +178,8 @@ describe("OverlayBackground", () => { autofillSettingsService, i18nService, platformUtilsService, - fido2ClientService, + vaultSettingsServiceMock, + fido2ActiveRequestManager, themeStateService, ); portKeyForTabSpy = overlayBackground["portKeyForTab"]; @@ -779,6 +782,15 @@ describe("OverlayBackground", () => { expect(cipherService.getAllDecryptedForUrl).not.toHaveBeenCalled(); }); + it("skips updating the inline menu ciphers if the current tab url has non-http protocol", async () => { + const nonHttpTab = createChromeTabMock({ url: "chrome-extension://id/route" }); + getTabFromCurrentWindowIdSpy.mockResolvedValueOnce(nonHttpTab); + + await overlayBackground.updateOverlayCiphers(); + + expect(cipherService.getAllDecryptedForUrl).not.toHaveBeenCalled(); + }); + it("closes the inline menu on the focused field's tab if the user's auth status is not unlocked", async () => { activeAccountStatusMock$.next(AuthenticationStatus.Locked); const previousTab = mock({ id: 1 }); @@ -1113,7 +1125,11 @@ describe("OverlayBackground", () => { }); it("adds available passkey ciphers to the inline menu", async () => { - availableAutofillCredentialsMock$.next(passkeyCipher.login.fido2Credentials); + void fido2ActiveRequestManager.newActiveRequest( + tab.id, + passkeyCipher.login.fido2Credentials, + new AbortController(), + ); overlayBackground["focusedFieldData"] = createFocusedFieldDataMock({ tabId: tab.id, filledByCipherType: CipherType.Login, @@ -1192,10 +1208,15 @@ describe("OverlayBackground", () => { }); it("does not add a passkey to the inline menu when its rpId is part of the neverDomains exclusion list", async () => { - availableAutofillCredentialsMock$.next(passkeyCipher.login.fido2Credentials); + void fido2ActiveRequestManager.newActiveRequest( + tab.id, + passkeyCipher.login.fido2Credentials, + new AbortController(), + ); overlayBackground["focusedFieldData"] = createFocusedFieldDataMock({ tabId: tab.id, filledByCipherType: CipherType.Login, + showPasskeys: true, }); cipherService.getAllDecryptedForUrl.mockResolvedValue([loginCipher1, passkeyCipher]); cipherService.sortCiphersByLastUsedThenName.mockReturnValue(-1); @@ -1248,6 +1269,69 @@ describe("OverlayBackground", () => { showPasskeysLabels: false, }); }); + + it("does not add passkeys to the inline menu if the passkey setting is disabled", async () => { + enablePasskeysMock$.next(false); + void fido2ActiveRequestManager.newActiveRequest( + tab.id, + passkeyCipher.login.fido2Credentials, + new AbortController(), + ); + overlayBackground["focusedFieldData"] = createFocusedFieldDataMock({ + tabId: tab.id, + filledByCipherType: CipherType.Login, + showPasskeys: true, + }); + cipherService.getAllDecryptedForUrl.mockResolvedValue([loginCipher1, passkeyCipher]); + cipherService.sortCiphersByLastUsedThenName.mockReturnValue(-1); + getTabFromCurrentWindowIdSpy.mockResolvedValueOnce(tab); + + await overlayBackground.updateOverlayCiphers(); + + expect(listPortSpy.postMessage).toHaveBeenCalledWith({ + command: "updateAutofillInlineMenuListCiphers", + ciphers: [ + { + id: "inline-menu-cipher-0", + name: passkeyCipher.name, + type: CipherType.Login, + reprompt: passkeyCipher.reprompt, + favorite: passkeyCipher.favorite, + icon: { + fallbackImage: "images/bwi-globe.png", + icon: "bwi-globe", + image: "https://icons.bitwarden.com//jest-testing-website.com/icon.png", + imageEnabled: true, + }, + accountCreationFieldType: undefined, + login: { + username: passkeyCipher.login.username, + passkey: null, + }, + }, + { + id: "inline-menu-cipher-1", + name: loginCipher1.name, + type: CipherType.Login, + reprompt: loginCipher1.reprompt, + favorite: loginCipher1.favorite, + icon: { + fallbackImage: "images/bwi-globe.png", + icon: "bwi-globe", + image: "https://icons.bitwarden.com//jest-testing-website.com/icon.png", + imageEnabled: true, + }, + accountCreationFieldType: undefined, + login: { + username: loginCipher1.login.username, + passkey: null, + }, + }, + ], + showInlineMenuAccountCreation: false, + showPasskeysLabels: false, + }); + }); }); describe("extension message handlers", () => { @@ -2537,6 +2621,25 @@ describe("OverlayBackground", () => { }); }); }); + + describe("fido2AbortRequest", () => { + const sender = mock({ tab: { id: 1 } }); + it("removes an active request associated with the sender tab", () => { + const removeActiveRequestSpy = jest.spyOn(fido2ActiveRequestManager, "removeActiveRequest"); + + sendMockExtensionMessage({ command: "fido2AbortRequest" }, sender); + + expect(removeActiveRequestSpy).toHaveBeenCalledWith(sender.tab.id); + }); + + it("updates the overlay ciphers after removing the active request", () => { + const updateOverlayCiphersSpy = jest.spyOn(overlayBackground, "updateOverlayCiphers"); + + sendMockExtensionMessage({ command: "fido2AbortRequest" }, sender); + + expect(updateOverlayCiphersSpy).toHaveBeenCalledWith(false); + }); + }); }); describe("handle extension onMessage", () => { @@ -2920,6 +3023,7 @@ describe("OverlayBackground", () => { [sender.frameId, pageDetailsForTab], ]); autofillService.isPasswordRepromptRequired.mockResolvedValue(false); + jest.spyOn(fido2ActiveRequestManager, "getActiveRequest"); sendPortMessage(listMessageConnectorSpy, { command: "fillAutofillInlineMenuCipher", @@ -2929,10 +3033,7 @@ describe("OverlayBackground", () => { }); await flushPromises(); - expect(fido2ClientService.autofillCredential).toHaveBeenCalledWith( - sender.tab.id, - fido2Credential.credentialId, - ); + expect(fido2ActiveRequestManager.getActiveRequest).toHaveBeenCalledWith(sender.tab.id); }); }); diff --git a/apps/browser/src/autofill/background/overlay.background.ts b/apps/browser/src/autofill/background/overlay.background.ts index 0c626c68794..0047d1de28e 100644 --- a/apps/browser/src/autofill/background/overlay.background.ts +++ b/apps/browser/src/autofill/background/overlay.background.ts @@ -6,6 +6,8 @@ import { throttleTime, switchMap, debounceTime, + Observable, + map, } from "rxjs"; import { parse } from "tldts"; @@ -20,13 +22,17 @@ import { DomainSettingsService } from "@bitwarden/common/autofill/services/domai import { InlineMenuVisibilitySetting } from "@bitwarden/common/autofill/types"; import { NeverDomains } from "@bitwarden/common/models/domain/domain-service"; import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service"; -import { Fido2ClientService } from "@bitwarden/common/platform/abstractions/fido2/fido2-client.service.abstraction"; +import { + Fido2ActiveRequestEvents, + Fido2ActiveRequestManager, +} from "@bitwarden/common/platform/abstractions/fido2/fido2-active-request-manager.abstraction"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { ThemeStateService } from "@bitwarden/common/platform/theming/theme-state.service"; import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service"; +import { VaultSettingsService } from "@bitwarden/common/vault/abstractions/vault-settings/vault-settings.service"; import { CipherType } from "@bitwarden/common/vault/enums"; import { buildCipherIcon } from "@bitwarden/common/vault/icon/build-cipher-icon"; import { CardView } from "@bitwarden/common/vault/models/view/card.view"; @@ -144,6 +150,7 @@ export class OverlayBackground implements OverlayBackgroundInterface { addEditCipherSubmitted: () => this.updateOverlayCiphers(), editedCipher: () => this.updateOverlayCiphers(), deletedCipher: () => this.updateOverlayCiphers(), + fido2AbortRequest: ({ sender }) => this.abortFido2ActiveRequest(sender), }; private readonly inlineMenuButtonPortMessageHandlers: InlineMenuButtonPortMessageHandlers = { triggerDelayedAutofillInlineMenuClosure: () => this.triggerDelayedInlineMenuClosure(), @@ -175,7 +182,8 @@ export class OverlayBackground implements OverlayBackgroundInterface { private autofillSettingsService: AutofillSettingsServiceAbstraction, private i18nService: I18nService, private platformUtilsService: PlatformUtilsService, - private fido2ClientService: Fido2ClientService, + private vaultSettingsService: VaultSettingsService, + private fido2ActiveRequestManager: Fido2ActiveRequestManager, private themeStateService: ThemeStateService, ) { this.initOverlayEventObservables(); @@ -196,7 +204,7 @@ export class OverlayBackground implements OverlayBackgroundInterface { */ private initOverlayEventObservables() { this.storeInlineMenuFido2CredentialsSubject - .pipe(switchMap((tabId) => this.fido2ClientService.availableAutofillCredentials$(tabId))) + .pipe(switchMap((tabId) => this.availablePasskeyAuthCredentials$(tabId))) .subscribe((credentials) => this.storeInlineMenuFido2Credentials(credentials)); this.repositionInlineMenuSubject .pipe( @@ -279,6 +287,11 @@ export class OverlayBackground implements OverlayBackgroundInterface { return; } + const request = this.fido2ActiveRequestManager.getActiveRequest(currentTab.id); + if (request) { + request.subject.next({ type: Fido2ActiveRequestEvents.Refresh }); + } + this.inlineMenuFido2Credentials.clear(); this.storeInlineMenuFido2CredentialsSubject.next(currentTab.id); @@ -452,6 +465,7 @@ export class OverlayBackground implements OverlayBackgroundInterface { if (domainExclusions) { domainExclusionsSet = new Set(Object.keys(await this.getExcludedDomains())); } + const passkeysEnabled = await firstValueFrom(this.vaultSettingsService.enablePasskeys$); for (let cipherIndex = 0; cipherIndex < inlineMenuCiphersArray.length; cipherIndex++) { const [inlineMenuCipherId, cipher] = inlineMenuCiphersArray[cipherIndex]; @@ -459,7 +473,7 @@ export class OverlayBackground implements OverlayBackgroundInterface { continue; } - if (!this.showCipherAsPasskey(cipher, domainExclusionsSet)) { + if (!passkeysEnabled || !(await this.showCipherAsPasskey(cipher, domainExclusionsSet))) { inlineMenuCipherData.push( this.buildCipherData({ inlineMenuCipherId, cipher, showFavicons }), ); @@ -497,7 +511,10 @@ export class OverlayBackground implements OverlayBackgroundInterface { * @param cipher - The cipher to check * @param domainExclusions - The domain exclusions to check against */ - private showCipherAsPasskey(cipher: CipherView, domainExclusions: Set | null): boolean { + private async showCipherAsPasskey( + cipher: CipherView, + domainExclusions: Set | null, + ): Promise { if (cipher.type !== CipherType.Login || !this.focusedFieldData?.showPasskeys) { return false; } @@ -514,10 +531,7 @@ export class OverlayBackground implements OverlayBackgroundInterface { return false; } - return ( - this.inlineMenuFido2Credentials.size === 0 || - this.inlineMenuFido2Credentials.has(credentialId) - ); + return this.inlineMenuFido2Credentials.has(credentialId); } /** @@ -635,12 +649,35 @@ export class OverlayBackground implements OverlayBackgroundInterface { * @param credentials - The FIDO2 credentials to store */ private storeInlineMenuFido2Credentials(credentials: Fido2CredentialView[]) { + this.inlineMenuFido2Credentials.clear(); + credentials.forEach( (credential) => credential?.credentialId && this.inlineMenuFido2Credentials.add(credential.credentialId), ); } + /** + * Gets the passkey credentials available from an active FIDO2 request for a given tab. + * + * @param tabId - The tab id to get the active request for. + */ + private availablePasskeyAuthCredentials$(tabId: number): Observable { + return this.fido2ActiveRequestManager + .getActiveRequest$(tabId) + .pipe(map((request) => request?.credentials ?? [])); + } + + /** + * Aborts an active FIDO2 request for a given tab and updates the inline menu ciphers. + * + * @param sender - The sender of the message + */ + private async abortFido2ActiveRequest(sender: chrome.runtime.MessageSender) { + this.fido2ActiveRequestManager.removeActiveRequest(sender.tab.id); + await this.updateOverlayCiphers(false); + } + /** * Gets the neverDomains setting from the domain settings service. */ @@ -900,11 +937,12 @@ export class OverlayBackground implements OverlayBackgroundInterface { const cipher = this.inlineMenuCiphers.get(inlineMenuCipherId); if (usePasskey && cipher.login?.hasFido2Credentials) { - await this.fido2ClientService.autofillCredential( + await this.authenticatePasskeyCredential( sender.tab.id, cipher.login.fido2Credentials[0].credentialId, ); this.updateLastUsedInlineMenuCipher(inlineMenuCipherId, cipher); + this.closeInlineMenu(sender, { forceCloseInlineMenu: true }); return; } @@ -927,6 +965,24 @@ export class OverlayBackground implements OverlayBackgroundInterface { this.updateLastUsedInlineMenuCipher(inlineMenuCipherId, cipher); } + /** + * Triggers a FIDO2 authentication from the inline menu using the passed credential ID. + * + * @param tabId - The tab ID to trigger the authentication for + * @param credentialId - The credential ID to authenticate + */ + async authenticatePasskeyCredential(tabId: number, credentialId: string) { + const request = this.fido2ActiveRequestManager.getActiveRequest(tabId); + if (!request) { + this.logService.error( + "Could not complete passkey autofill due to missing active Fido2 request", + ); + return; + } + + request.subject.next({ type: Fido2ActiveRequestEvents.Continue, credentialId }); + } + /** * Sets the most recently used cipher at the top of the list of ciphers. * diff --git a/apps/browser/src/autofill/fido2/background/fido2.background.spec.ts b/apps/browser/src/autofill/fido2/background/fido2.background.spec.ts index 2a22a226e38..23d0292e188 100644 --- a/apps/browser/src/autofill/fido2/background/fido2.background.spec.ts +++ b/apps/browser/src/autofill/fido2/background/fido2.background.spec.ts @@ -2,6 +2,7 @@ import { mock, MockProxy } from "jest-mock-extended"; import { BehaviorSubject } from "rxjs"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; +import { Fido2ActiveRequestManager } from "@bitwarden/common/platform/abstractions/fido2/fido2-active-request-manager.abstraction"; import { AssertCredentialParams, CreateCredentialParams, @@ -52,6 +53,7 @@ describe("Fido2Background", () => { let tabMock!: MockProxy; let senderMock!: MockProxy; let logService!: MockProxy; + let fido2ActiveRequestManager: MockProxy; let fido2ClientService!: MockProxy; let vaultSettingsService!: MockProxy; let scriptInjectorServiceMock!: MockProxy; @@ -77,9 +79,11 @@ describe("Fido2Background", () => { enablePasskeysMock$ = new BehaviorSubject(true); vaultSettingsService.enablePasskeys$ = enablePasskeysMock$; + fido2ActiveRequestManager = mock(); fido2ClientService.isFido2FeatureEnabled.mockResolvedValue(true); fido2Background = new Fido2Background( logService, + fido2ActiveRequestManager, fido2ClientService, vaultSettingsService, scriptInjectorServiceMock, diff --git a/apps/browser/src/autofill/fido2/background/fido2.background.ts b/apps/browser/src/autofill/fido2/background/fido2.background.ts index 800c7d4e0de..a9d1b314770 100644 --- a/apps/browser/src/autofill/fido2/background/fido2.background.ts +++ b/apps/browser/src/autofill/fido2/background/fido2.background.ts @@ -3,6 +3,7 @@ import { pairwise } from "rxjs/operators"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service"; +import { Fido2ActiveRequestManager } from "@bitwarden/common/platform/abstractions/fido2/fido2-active-request-manager.abstraction"; import { AssertCredentialParams, AssertCredentialResult, @@ -49,6 +50,7 @@ export class Fido2Background implements Fido2BackgroundInterface { constructor( private logService: LogService, + private fido2ActiveRequestManager: Fido2ActiveRequestManager, private fido2ClientService: Fido2ClientService, private vaultSettingsService: VaultSettingsService, private scriptInjectorService: ScriptInjectorService, @@ -96,6 +98,7 @@ export class Fido2Background implements Fido2BackgroundInterface { previousEnablePasskeysSetting: boolean, enablePasskeys: boolean, ) { + this.fido2ActiveRequestManager.removeAllActiveRequests(); await this.updateContentScriptRegistration(); if (previousEnablePasskeysSetting === undefined) { diff --git a/apps/browser/src/autofill/fido2/content/fido2-content-script.ts b/apps/browser/src/autofill/fido2/content/fido2-content-script.ts index 171aa7cd834..737f8e77ca3 100644 --- a/apps/browser/src/autofill/fido2/content/fido2-content-script.ts +++ b/apps/browser/src/autofill/fido2/content/fido2-content-script.ts @@ -60,6 +60,10 @@ import { MessageWithMetadata, Messenger } from "./messaging/messenger"; message.data as InsecureAssertCredentialParams, ); } + + if (message.type === MessageType.AbortRequest) { + return sendExtensionMessage("fido2AbortRequest", { abortedRequestId: requestId }); + } } finally { abortController.signal.removeEventListener("abort", abortHandler); } diff --git a/apps/browser/src/autofill/fido2/content/fido2-page-script.ts b/apps/browser/src/autofill/fido2/content/fido2-page-script.ts index 4631b78ddb1..c44c263dd23 100644 --- a/apps/browser/src/autofill/fido2/content/fido2-page-script.ts +++ b/apps/browser/src/autofill/fido2/content/fido2-page-script.ts @@ -131,6 +131,12 @@ import { Messenger } from "./messaging/messenger"; const internalAbortControllers = [new AbortController(), new AbortController()]; const bitwardenResponse = async (internalAbortController: AbortController) => { try { + const abortListener = () => + messenger.request({ + type: MessageType.AbortRequest, + abortedRequestId: abortSignal.toString(), + }); + internalAbortController.signal.addEventListener("abort", abortListener); const response = await messenger.request( { type: MessageType.CredentialGetRequest, @@ -138,6 +144,7 @@ import { Messenger } from "./messaging/messenger"; }, internalAbortController.signal, ); + internalAbortController.signal.removeEventListener("abort", abortListener); if (response.type !== MessageType.CredentialGetResponse) { throw new Error("Something went wrong."); } diff --git a/apps/browser/src/autofill/fido2/services/browser-fido2-user-interface.service.ts b/apps/browser/src/autofill/fido2/services/browser-fido2-user-interface.service.ts index 1e5e880c675..3ab9edf60f9 100644 --- a/apps/browser/src/autofill/fido2/services/browser-fido2-user-interface.service.ts +++ b/apps/browser/src/autofill/fido2/services/browser-fido2-user-interface.service.ts @@ -242,12 +242,13 @@ export class BrowserFido2UserInterfaceSession implements Fido2UserInterfaceSessi cipherIds, userVerification, assumeUserPresence, + masterPasswordRepromptRequired, }: PickCredentialParams): Promise<{ cipherId: string; userVerified: boolean }> { // NOTE: For now, we are defaulting to a userVerified status of `true` when the request // is for a conditionally mediated authentication. This will allow for mediated conditional // authentication to function without requiring user interaction. This is a product // decision, rather than a decision based on the expected technical specifications. - if (assumeUserPresence && cipherIds.length === 1) { + if (assumeUserPresence && cipherIds.length === 1 && !masterPasswordRepromptRequired) { return { cipherId: cipherIds[0], userVerified: userVerification }; } diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts index df1e479656e..1cb615fe067 100644 --- a/apps/browser/src/background/main.background.ts +++ b/apps/browser/src/background/main.background.ts @@ -79,6 +79,7 @@ import { ConfigService } from "@bitwarden/common/platform/abstractions/config/co import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto-function.service"; import { CryptoService as CryptoServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto.service"; import { EncryptService } from "@bitwarden/common/platform/abstractions/encrypt.service"; +import { Fido2ActiveRequestManager as Fido2ActiveRequestManagerAbstraction } from "@bitwarden/common/platform/abstractions/fido2/fido2-active-request-manager.abstraction"; import { Fido2AuthenticatorService as Fido2AuthenticatorServiceAbstraction } from "@bitwarden/common/platform/abstractions/fido2/fido2-authenticator.service.abstraction"; import { Fido2ClientService as Fido2ClientServiceAbstraction } from "@bitwarden/common/platform/abstractions/fido2/fido2-client.service.abstraction"; import { Fido2UserInterfaceService as Fido2UserInterfaceServiceAbstraction } from "@bitwarden/common/platform/abstractions/fido2/fido2-user-interface.service.abstraction"; @@ -324,6 +325,7 @@ export default class MainBackground { userVerificationApiService: UserVerificationApiServiceAbstraction; fido2UserInterfaceService: Fido2UserInterfaceServiceAbstraction; fido2AuthenticatorService: Fido2AuthenticatorServiceAbstraction; + fido2ActiveRequestManager: Fido2ActiveRequestManagerAbstraction; fido2ClientService: Fido2ClientServiceAbstraction; avatarService: AvatarServiceAbstraction; mainContextMenuHandler: MainContextMenuHandler; @@ -1021,7 +1023,7 @@ export default class MainBackground { this.accountService, this.logService, ); - const fido2ActiveRequestManager = new Fido2ActiveRequestManager(); + this.fido2ActiveRequestManager = new Fido2ActiveRequestManager(); this.fido2ClientService = new Fido2ClientService( this.fido2AuthenticatorService, this.configService, @@ -1029,7 +1031,7 @@ export default class MainBackground { this.vaultSettingsService, this.domainSettingsService, this.taskSchedulerService, - fido2ActiveRequestManager, + this.fido2ActiveRequestManager, this.logService, ); @@ -1057,6 +1059,7 @@ export default class MainBackground { if (!this.popupOnlyContext) { this.fido2Background = new Fido2Background( this.logService, + this.fido2ActiveRequestManager, this.fido2ClientService, this.vaultSettingsService, this.scriptInjectorService, @@ -1605,7 +1608,8 @@ export default class MainBackground { this.autofillSettingsService, this.i18nService, this.platformUtilsService, - this.fido2ClientService, + this.vaultSettingsService, + this.fido2ActiveRequestManager, this.themeStateService, ); } diff --git a/libs/common/src/platform/abstractions/fido2/fido2-active-request-manager.abstraction.ts b/libs/common/src/platform/abstractions/fido2/fido2-active-request-manager.abstraction.ts index 4e164c4577c..797133edd22 100644 --- a/libs/common/src/platform/abstractions/fido2/fido2-active-request-manager.abstraction.ts +++ b/libs/common/src/platform/abstractions/fido2/fido2-active-request-manager.abstraction.ts @@ -2,9 +2,22 @@ import { Observable, Subject } from "rxjs"; import { Fido2CredentialView } from "../../../vault/models/view/fido2-credential.view"; +export const Fido2ActiveRequestEvents = { + Refresh: "refresh-fido2-active-request", + Abort: "abort-fido2-active-request", + Continue: "continue-fido2-active-request", +} as const; + +type Fido2ActiveRequestEvent = typeof Fido2ActiveRequestEvents; + +export type RequestResult = + | { type: Fido2ActiveRequestEvent["Refresh"] } + | { type: Fido2ActiveRequestEvent["Abort"] } + | { type: Fido2ActiveRequestEvent["Continue"]; credentialId: string }; + export interface ActiveRequest { credentials: Fido2CredentialView[]; - subject: Subject; + subject: Subject; } export type RequestCollection = Readonly<{ [tabId: number]: ActiveRequest }>; @@ -16,6 +29,7 @@ export abstract class Fido2ActiveRequestManager { tabId: number, credentials: Fido2CredentialView[], abortController: AbortController, - ) => Promise; + ) => Promise; removeActiveRequest: (tabId: number) => void; + removeAllActiveRequests: () => void; } diff --git a/libs/common/src/platform/abstractions/fido2/fido2-client.service.abstraction.ts b/libs/common/src/platform/abstractions/fido2/fido2-client.service.abstraction.ts index 2ba67a48be2..6467af5fc1c 100644 --- a/libs/common/src/platform/abstractions/fido2/fido2-client.service.abstraction.ts +++ b/libs/common/src/platform/abstractions/fido2/fido2-client.service.abstraction.ts @@ -1,7 +1,3 @@ -import { Observable } from "rxjs"; - -import { Fido2CredentialView } from "../../../vault/models/view/fido2-credential.view"; - export const UserRequestedFallbackAbortReason = "UserRequestedFallback"; export type UserVerification = "discouraged" | "preferred" | "required"; @@ -20,10 +16,6 @@ export type UserVerification = "discouraged" | "preferred" | "required"; export abstract class Fido2ClientService { isFido2FeatureEnabled: (hostname: string, origin: string) => Promise; - availableAutofillCredentials$: (tabId: number) => Observable; - - autofillCredential: (tabId: number, credentialId: string) => Promise; - /** * Allows WebAuthn Relying Party scripts to request the creation of a new public key credential source. * For more information please see: https://www.w3.org/TR/webauthn-3/#sctn-createCredential diff --git a/libs/common/src/platform/abstractions/fido2/fido2-user-interface.service.abstraction.ts b/libs/common/src/platform/abstractions/fido2/fido2-user-interface.service.abstraction.ts index 55232162d47..70fe0b092be 100644 --- a/libs/common/src/platform/abstractions/fido2/fido2-user-interface.service.abstraction.ts +++ b/libs/common/src/platform/abstractions/fido2/fido2-user-interface.service.abstraction.ts @@ -45,6 +45,11 @@ export interface PickCredentialParams { * Bypass the UI and assume that the user has already interacted with the authenticator. */ assumeUserPresence?: boolean; + + /** + * Identifies whether a cipher requires a master password reprompt when getting a credential. + */ + masterPasswordRepromptRequired?: boolean; } /** diff --git a/libs/common/src/platform/services/fido2/fido2-active-request-manager.ts b/libs/common/src/platform/services/fido2/fido2-active-request-manager.ts index 0f82d8a09ce..d24941ee4ec 100644 --- a/libs/common/src/platform/services/fido2/fido2-active-request-manager.ts +++ b/libs/common/src/platform/services/fido2/fido2-active-request-manager.ts @@ -14,6 +14,8 @@ import { ActiveRequest, RequestCollection, Fido2ActiveRequestManager as Fido2ActiveRequestManagerAbstraction, + Fido2ActiveRequestEvents, + RequestResult, } from "../../abstractions/fido2/fido2-active-request-manager.abstraction"; export class Fido2ActiveRequestManager implements Fido2ActiveRequestManagerAbstraction { @@ -53,7 +55,7 @@ export class Fido2ActiveRequestManager implements Fido2ActiveRequestManagerAbstr tabId: number, credentials: Fido2CredentialView[], abortController: AbortController, - ): Promise { + ): Promise { const newRequest: ActiveRequest = { credentials, subject: new Subject(), @@ -65,10 +67,10 @@ export class Fido2ActiveRequestManager implements Fido2ActiveRequestManagerAbstr const abortListener = () => this.abortActiveRequest(tabId); abortController.signal.addEventListener("abort", abortListener); - const credentialId = firstValueFrom(newRequest.subject); + const requestResult = firstValueFrom(newRequest.subject); abortController.signal.removeEventListener("abort", abortListener); - return credentialId; + return requestResult; } /** @@ -85,12 +87,23 @@ export class Fido2ActiveRequestManager implements Fido2ActiveRequestManagerAbstr }); } + /** + * Removes and aborts all active requests. + */ + removeAllActiveRequests() { + Object.keys(this.activeRequests$.value).forEach((tabId) => { + this.abortActiveRequest(Number(tabId)); + }); + this.updateRequests(() => ({})); + } + /** * Aborts the active request associated with a given tab id. * * @param tabId - The tab id to abort the active request for. */ private abortActiveRequest(tabId: number): void { + this.activeRequests$.value[tabId]?.subject.next({ type: Fido2ActiveRequestEvents.Abort }); this.activeRequests$.value[tabId]?.subject.error( new DOMException("The operation either timed out or was not allowed.", "AbortError"), ); diff --git a/libs/common/src/platform/services/fido2/fido2-authenticator.service.spec.ts b/libs/common/src/platform/services/fido2/fido2-authenticator.service.spec.ts index adb1adcce48..289e94e6eff 100644 --- a/libs/common/src/platform/services/fido2/fido2-authenticator.service.spec.ts +++ b/libs/common/src/platform/services/fido2/fido2-authenticator.service.spec.ts @@ -576,6 +576,7 @@ describe("FidoAuthenticatorService", () => { expect(userInterfaceSession.pickCredential).toHaveBeenCalledWith({ cipherIds: ciphers.map((c) => c.id), userVerification: false, + masterPasswordRepromptRequired: false, }); }); @@ -592,6 +593,7 @@ describe("FidoAuthenticatorService", () => { expect(userInterfaceSession.pickCredential).toHaveBeenCalledWith({ cipherIds: [discoverableCiphers[0].id], userVerification: false, + masterPasswordRepromptRequired: false, }); }); @@ -609,6 +611,7 @@ describe("FidoAuthenticatorService", () => { expect(userInterfaceSession.pickCredential).toHaveBeenCalledWith({ cipherIds: ciphers.map((c) => c.id), userVerification, + masterPasswordRepromptRequired: false, }); }); } diff --git a/libs/common/src/platform/services/fido2/fido2-authenticator.service.ts b/libs/common/src/platform/services/fido2/fido2-authenticator.service.ts index ef09a3d1604..ddcc079eb95 100644 --- a/libs/common/src/platform/services/fido2/fido2-authenticator.service.ts +++ b/libs/common/src/platform/services/fido2/fido2-authenticator.service.ts @@ -160,6 +160,7 @@ export class Fido2AuthenticatorService implements Fido2AuthenticatorServiceAbstr } const reencrypted = await this.cipherService.encrypt(cipher, activeUserId); await this.cipherService.updateWithServer(reencrypted); + await this.cipherService.clearCache(activeUserId); credentialId = fido2Credential.credentialId; } catch (error) { this.logService?.error( @@ -243,12 +244,18 @@ export class Fido2AuthenticatorService implements Fido2AuthenticatorServiceAbstr } let response = { cipherId: cipherOptions[0].id, userVerified: false }; + const masterPasswordRepromptRequired = cipherOptions.some( + (cipher) => cipher.reprompt !== CipherRepromptType.None, + ); - if (this.requiresUserVerificationPrompt(params, cipherOptions)) { + if ( + this.requiresUserVerificationPrompt(params, cipherOptions, masterPasswordRepromptRequired) + ) { response = await userInterfaceSession.pickCredential({ cipherIds: cipherOptions.map((cipher) => cipher.id), userVerification: params.requireUserVerification, assumeUserPresence: params.assumeUserPresence, + masterPasswordRepromptRequired, }); } @@ -292,6 +299,7 @@ export class Fido2AuthenticatorService implements Fido2AuthenticatorServiceAbstr ); const encrypted = await this.cipherService.encrypt(selectedCipher, activeUserId); await this.cipherService.updateWithServer(encrypted); + await this.cipherService.clearCache(activeUserId); } const authenticatorData = await generateAuthData({ @@ -330,13 +338,14 @@ export class Fido2AuthenticatorService implements Fido2AuthenticatorServiceAbstr private requiresUserVerificationPrompt( params: Fido2AuthenticatorGetAssertionParams, cipherOptions: CipherView[], + masterPasswordRepromptRequired: boolean, ): boolean { return ( params.requireUserVerification || !params.assumeUserPresence || cipherOptions.length > 1 || cipherOptions.length === 0 || - cipherOptions.some((cipher) => cipher.reprompt !== CipherRepromptType.None) + masterPasswordRepromptRequired ); } diff --git a/libs/common/src/platform/services/fido2/fido2-client.service.spec.ts b/libs/common/src/platform/services/fido2/fido2-client.service.spec.ts index c0ae2cabfba..582849ebc12 100644 --- a/libs/common/src/platform/services/fido2/fido2-client.service.spec.ts +++ b/libs/common/src/platform/services/fido2/fido2-client.service.spec.ts @@ -6,11 +6,12 @@ import { AuthenticationStatus } from "../../../auth/enums/authentication-status" import { DomainSettingsService } from "../../../autofill/services/domain-settings.service"; import { Utils } from "../../../platform/misc/utils"; import { VaultSettingsService } from "../../../vault/abstractions/vault-settings/vault-settings.service"; -import { Fido2CredentialView } from "../../../vault/models/view/fido2-credential.view"; import { ConfigService } from "../../abstractions/config/config.service"; import { ActiveRequest, + Fido2ActiveRequestEvents, Fido2ActiveRequestManager, + RequestResult, } from "../../abstractions/fido2/fido2-active-request-manager.abstraction"; import { Fido2AuthenticatorError, @@ -56,7 +57,10 @@ describe("FidoAuthenticatorService", () => { domainSettingsService = mock(); taskSchedulerService = mock(); activeRequest = mock({ - subject: new BehaviorSubject(""), + subject: new BehaviorSubject({ + type: Fido2ActiveRequestEvents.Continue, + credentialId: "", + }), }); requestManager = mock({ getActiveRequest$: (tabId: number) => new BehaviorSubject(activeRequest), @@ -615,7 +619,10 @@ describe("FidoAuthenticatorService", () => { }); beforeEach(() => { - requestManager.newActiveRequest.mockResolvedValue(crypto.randomUUID()); + requestManager.newActiveRequest.mockResolvedValue({ + type: Fido2ActiveRequestEvents.Continue, + credentialId: crypto.randomUUID(), + }); authenticator.getAssertion.mockResolvedValue(createAuthenticatorAssertResult()); }); @@ -676,28 +683,6 @@ describe("FidoAuthenticatorService", () => { }; } }); - - describe("autofill of credentials through the active request manager", () => { - it("returns an observable that updates with an array of the credentials for active Fido2 requests", async () => { - const activeRequestCredentials = mock(); - activeRequest.credentials = [activeRequestCredentials]; - - const observable = client.availableAutofillCredentials$(tab.id); - observable.subscribe((credentials) => { - expect(credentials).toEqual([activeRequestCredentials]); - }); - }); - - it("triggers the logic of the next behavior subject of an active request", async () => { - const activeRequestCredentials = mock(); - activeRequest.credentials = [activeRequestCredentials]; - jest.spyOn(activeRequest.subject, "next"); - - await client.autofillCredential(tab.id, activeRequestCredentials.credentialId); - - expect(activeRequest.subject.next).toHaveBeenCalled(); - }); - }); }); /** This is a fake function that always returns the same byte sequence */ diff --git a/libs/common/src/platform/services/fido2/fido2-client.service.ts b/libs/common/src/platform/services/fido2/fido2-client.service.ts index 972d6889122..849e0c72565 100644 --- a/libs/common/src/platform/services/fido2/fido2-client.service.ts +++ b/libs/common/src/platform/services/fido2/fido2-client.service.ts @@ -1,13 +1,15 @@ -import { firstValueFrom, map, Observable, Subscription } from "rxjs"; +import { firstValueFrom, Subscription } from "rxjs"; import { parse } from "tldts"; import { AuthService } from "../../../auth/abstractions/auth.service"; import { AuthenticationStatus } from "../../../auth/enums/authentication-status"; import { DomainSettingsService } from "../../../autofill/services/domain-settings.service"; import { VaultSettingsService } from "../../../vault/abstractions/vault-settings/vault-settings.service"; -import { Fido2CredentialView } from "../../../vault/models/view/fido2-credential.view"; import { ConfigService } from "../../abstractions/config/config.service"; -import { Fido2ActiveRequestManager } from "../../abstractions/fido2/fido2-active-request-manager.abstraction"; +import { + Fido2ActiveRequestEvents, + Fido2ActiveRequestManager, +} from "../../abstractions/fido2/fido2-active-request-manager.abstraction"; import { Fido2AuthenticatorError, Fido2AuthenticatorErrorCode, @@ -73,17 +75,6 @@ export class Fido2ClientService implements Fido2ClientServiceAbstraction { ); } - availableAutofillCredentials$(tabId: number): Observable { - return this.requestManager - .getActiveRequest$(tabId) - .pipe(map((request) => request?.credentials ?? [])); - } - - async autofillCredential(tabId: number, credentialId: string) { - const request = this.requestManager.getActiveRequest(tabId); - request.subject.next(credentialId); - } - async isFido2FeatureEnabled(hostname: string, origin: string): Promise { const isUserLoggedIn = (await this.authService.getAuthStatus()) !== AuthenticationStatus.LoggedOut; @@ -385,12 +376,23 @@ export class Fido2ClientService implements Fido2ClientServiceAbstraction { this.logService?.info( `[Fido2Client] started mediated request, available credentials: ${availableCredentials.length}`, ); - const credentialId = await this.requestManager.newActiveRequest( + const requestResult = await this.requestManager.newActiveRequest( tab.id, availableCredentials, abortController, ); - params.allowedCredentialIds = [Fido2Utils.bufferToString(guidToRawFormat(credentialId))]; + + if (requestResult.type === Fido2ActiveRequestEvents.Refresh) { + continue; + } + + if (requestResult.type === Fido2ActiveRequestEvents.Abort) { + break; + } + + params.allowedCredentialIds = [ + Fido2Utils.bufferToString(guidToRawFormat(requestResult.credentialId)), + ]; assumeUserPresence = true; const clientDataHash = await crypto.subtle.digest({ name: "SHA-256" }, clientDataJSONBytes); From ed4d481e4d26d3349506407ea113da2238a4ab16 Mon Sep 17 00:00:00 2001 From: Todd Martin <106564991+trmartin4@users.noreply.github.com> Date: Mon, 9 Sep 2024 09:09:17 -0400 Subject: [PATCH 13/36] [PM-7646][PM-5506] Revert IPC changes (#10946) * Revert "Remove unnecessary plist keys in desktop_proxy (#10933)" This reverts commit 4dbb036df11f004c424429f61b448758eb35c1c8. * Revert "Fix TestFlight errors caused by desktop_proxy (#10928)" This reverts commit 40cb4b5353ce64b0ded69f29f3f84ccb8386fdbc. * Revert "[PM-5506] Enable electron fuses (#10073)" This reverts commit 78c5e9c7061fff7f550ebeb28711a47143f3c0f5. * Revert "[PM-7846] Implement a rust based native messaging proxy and IPC system (#9894)" This reverts commit 55874b72bfb59acc3fd31facfac0d676ff0807b2. --- .github/workflows/build-desktop.yml | 45 ++-- apps/desktop/desktop_native/.gitignore | 1 - apps/desktop/desktop_native/Cargo.lock | 254 +----------------- apps/desktop/desktop_native/Cargo.toml | 2 +- apps/desktop/desktop_native/build.js | 68 ----- apps/desktop/desktop_native/core/Cargo.toml | 37 +-- .../desktop_native/core/src/ipc/client.rs | 102 ------- .../desktop_native/core/src/ipc/mod.rs | 64 ----- .../desktop_native/core/src/ipc/server.rs | 232 ---------------- apps/desktop/desktop_native/core/src/lib.rs | 6 - apps/desktop/desktop_native/napi/Cargo.toml | 6 +- apps/desktop/desktop_native/napi/build.js | 24 ++ apps/desktop/desktop_native/napi/index.d.ts | 30 --- apps/desktop/desktop_native/napi/index.js | 8 +- apps/desktop/desktop_native/napi/package.json | 4 +- apps/desktop/desktop_native/napi/src/lib.rs | 100 ------- apps/desktop/desktop_native/proxy/Cargo.toml | 19 -- apps/desktop/desktop_native/proxy/src/main.rs | 140 ---------- apps/desktop/electron-builder.json | 21 +- apps/desktop/package.json | 2 +- .../entitlements.desktop_proxy.plist | 12 - apps/desktop/resources/entitlements.mas.plist | 4 - .../resources/info.desktop_proxy.plist | 8 - apps/desktop/resources/native-messaging.bat | 7 + apps/desktop/scripts/after-pack.js | 138 +--------- apps/desktop/src/entry.ts | 42 ++- apps/desktop/src/main.ts | 15 +- .../desktop/src/main/native-messaging.main.ts | 97 +++---- apps/desktop/src/proxy/ipc.ts | 78 ++++++ .../src/proxy/native-messaging-proxy.ts | 23 ++ apps/desktop/src/proxy/nativemessage.ts | 95 +++++++ package-lock.json | 28 -- package.json | 1 - 33 files changed, 348 insertions(+), 1365 deletions(-) delete mode 100644 apps/desktop/desktop_native/build.js delete mode 100644 apps/desktop/desktop_native/core/src/ipc/client.rs delete mode 100644 apps/desktop/desktop_native/core/src/ipc/mod.rs delete mode 100644 apps/desktop/desktop_native/core/src/ipc/server.rs create mode 100644 apps/desktop/desktop_native/napi/build.js delete mode 100644 apps/desktop/desktop_native/proxy/Cargo.toml delete mode 100644 apps/desktop/desktop_native/proxy/src/main.rs delete mode 100644 apps/desktop/resources/entitlements.desktop_proxy.plist delete mode 100644 apps/desktop/resources/info.desktop_proxy.plist create mode 100644 apps/desktop/resources/native-messaging.bat create mode 100644 apps/desktop/src/proxy/ipc.ts create mode 100644 apps/desktop/src/proxy/native-messaging-proxy.ts create mode 100644 apps/desktop/src/proxy/nativemessage.ts diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index e82b490f813..8ac65d257c6 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -174,21 +174,20 @@ jobs: with: path: | apps/desktop/desktop_native/napi/*.node - apps/desktop/desktop_native/dist/* ${{ env.RUNNER_TEMP }}/.cargo/registry ${{ env.RUNNER_TEMP }}/.cargo/git key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }} - name: Build Native Module if: steps.cache.outputs.cache-hit != 'true' - working-directory: apps/desktop/desktop_native + working-directory: apps/desktop/desktop_native/napi env: PKG_CONFIG_ALLOW_CROSS: true PKG_CONFIG_ALL_STATIC: true TARGET: musl run: | rustup target add x86_64-unknown-linux-musl - node build.js cross-platform + npm run build:cross-platform - name: Build application run: npm run dist:lin @@ -302,15 +301,13 @@ jobs: uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 id: cache with: - path: | - apps/desktop/desktop_native/napi/*.node - apps/desktop/desktop_native/dist/* + path: apps/desktop/desktop_native/napi/*.node key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }} - name: Build Native Module if: steps.cache.outputs.cache-hit != 'true' - working-directory: apps/desktop/desktop_native - run: node build.js cross-platform + working-directory: apps/desktop/desktop_native/napi + run: npm run build:cross-platform - name: Build & Sign (dev) env: @@ -587,15 +584,13 @@ jobs: uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 id: cache with: - path: | - apps/desktop/desktop_native/napi/*.node - apps/desktop/desktop_native/dist/* + path: apps/desktop/desktop_native/napi/*.node key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }} - name: Build Native Module if: steps.cache.outputs.cache-hit != 'true' - working-directory: apps/desktop/desktop_native - run: node build.js cross-platform + working-directory: apps/desktop/desktop_native/napi + run: npm run build:cross-platform - name: Build application (dev) run: npm run build @@ -753,15 +748,13 @@ jobs: uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 id: cache with: - path: | - apps/desktop/desktop_native/napi/*.node - apps/desktop/desktop_native/dist/* + path: apps/desktop/desktop_native/napi/*.node key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }} - name: Build Native Module if: steps.cache.outputs.cache-hit != 'true' - working-directory: apps/desktop/desktop_native - run: node build.js cross-platform + working-directory: apps/desktop/desktop_native/napi + run: npm run build:cross-platform - name: Build if: steps.build-cache.outputs.cache-hit != 'true' @@ -972,15 +965,13 @@ jobs: uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 id: cache with: - path: | - apps/desktop/desktop_native/napi/*.node - apps/desktop/desktop_native/dist/* + path: apps/desktop/desktop_native/napi/*.node key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }} - name: Build Native Module if: steps.cache.outputs.cache-hit != 'true' - working-directory: apps/desktop/desktop_native - run: node build.js cross-platform + working-directory: apps/desktop/desktop_native/napi + run: npm run build:cross-platform - name: Build if: steps.build-cache.outputs.cache-hit != 'true' @@ -1177,15 +1168,13 @@ jobs: uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 id: cache with: - path: | - apps/desktop/desktop_native/napi/*.node - apps/desktop/desktop_native/dist/* + path: apps/desktop/desktop_native/napi/*.node key: rust-${{ runner.os }}-${{ hashFiles('apps/desktop/desktop_native/**/*') }} - name: Build Native Module if: steps.cache.outputs.cache-hit != 'true' - working-directory: apps/desktop/desktop_native - run: node build.js cross-platform + working-directory: apps/desktop/desktop_native/napi + run: npm run build:cross-platform - name: Build if: steps.build-cache.outputs.cache-hit != 'true' diff --git a/apps/desktop/desktop_native/.gitignore b/apps/desktop/desktop_native/.gitignore index 1cfa7dafc20..96e7a71e1b0 100644 --- a/apps/desktop/desktop_native/.gitignore +++ b/apps/desktop/desktop_native/.gitignore @@ -4,4 +4,3 @@ index.node **/.DS_Store npm-debug.log* *.node -dist diff --git a/apps/desktop/desktop_native/Cargo.lock b/apps/desktop/desktop_native/Cargo.lock index d96e0642fad..6c73c3622b4 100644 --- a/apps/desktop/desktop_native/Cargo.lock +++ b/apps/desktop/desktop_native/Cargo.lock @@ -482,15 +482,6 @@ dependencies = [ "syn", ] -[[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - [[package]] name = "derive-new" version = "0.6.0" @@ -512,14 +503,10 @@ dependencies = [ "base64", "cbc", "core-foundation", - "dirs", - "futures", "gio", - "interprocess", "keytar", "libc", "libsecret", - "log", "rand", "retry", "scopeguard", @@ -528,7 +515,6 @@ dependencies = [ "sha2", "thiserror", "tokio", - "tokio-util", "typenum", "widestring", "windows", @@ -545,22 +531,6 @@ dependencies = [ "napi", "napi-build", "napi-derive", - "tokio", - "tokio-util", -] - -[[package]] -name = "desktop_proxy" -version = "0.0.0" -dependencies = [ - "anyhow", - "desktop_core", - "embed_plist", - "futures", - "log", - "simplelog", - "tokio", - "tokio-util", ] [[package]] @@ -573,27 +543,6 @@ dependencies = [ "crypto-common", ] -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - [[package]] name = "dlib" version = "0.5.2" @@ -603,24 +552,12 @@ dependencies = [ "libloading", ] -[[package]] -name = "doctest-file" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562" - [[package]] name = "downcast-rs" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" -[[package]] -name = "embed_plist" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" - [[package]] name = "endi" version = "1.1.0" @@ -709,21 +646,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "futures" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - [[package]] name = "futures-channel" version = "0.3.30" @@ -731,7 +653,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", - "futures-sink", ] [[package]] @@ -799,7 +720,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ - "futures-channel", "futures-core", "futures-io", "futures-macro", @@ -994,27 +914,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "interprocess" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f4e4a06d42fab3e85ab1b419ad32b09eab58b901d40c57935ff92db3287a13" -dependencies = [ - "doctest-file", - "futures-core", - "libc", - "recvmsg", - "tokio", - "widestring", - "windows-sys 0.52.0", -] - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - [[package]] name = "keytar" version = "0.1.6" @@ -1052,16 +951,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "libredox" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" -dependencies = [ - "bitflags", - "libc", -] - [[package]] name = "libsecret" version = "0.5.0" @@ -1149,22 +1038,11 @@ dependencies = [ "adler", ] -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.48.0", -] - [[package]] name = "napi" -version = "2.16.7" +version = "2.16.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633e41b2b983cf7983134f0c50986ca524d0caf38a2c6fc893ea3fa2e26abb0c" +checksum = "dfc300228808a0e6aea5a58115c82889240bcf8dab16fc25ad675b33e454b368" dependencies = [ "bitflags", "ctor", @@ -1182,9 +1060,9 @@ checksum = "e1c0f5d67ee408a4685b61f5ab7e58605c8ae3f2b4189f0127d804ff13d5560a" [[package]] name = "napi-derive" -version = "2.16.6" +version = "2.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a8a778fd367b13c64232e58632514b795514ece491ce136d96e976d34a3eb8" +checksum = "e0e034ddf6155192cf83f267ede763fe6c164dfa9971585436b16173718d94c4" dependencies = [ "cfg-if", "convert_case", @@ -1253,12 +1131,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - [[package]] name = "num_cpus" version = "1.16.0" @@ -1269,15 +1141,6 @@ dependencies = [ "libc", ] -[[package]] -name = "num_threads" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" -dependencies = [ - "libc", -] - [[package]] name = "objc-sys" version = "0.3.5" @@ -1392,12 +1255,6 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - [[package]] name = "ordered-stream" version = "0.2.0" @@ -1501,12 +1358,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - [[package]] name = "ppv-lite86" version = "0.2.20" @@ -1582,12 +1433,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "recvmsg" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175" - [[package]] name = "redox_syscall" version = "0.5.3" @@ -1597,17 +1442,6 @@ dependencies = [ "bitflags", ] -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - [[package]] name = "regex" version = "1.10.6" @@ -1789,17 +1623,6 @@ dependencies = [ "libc", ] -[[package]] -name = "simplelog" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0" -dependencies = [ - "log", - "termcolor", - "time", -] - [[package]] name = "slab" version = "0.4.9" @@ -1815,16 +1638,6 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -1903,39 +1716,6 @@ dependencies = [ "syn", ] -[[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "itoa", - "libc", - "num-conv", - "num_threads", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" -dependencies = [ - "num-conv", - "time-core", -] - [[package]] name = "tokio" version = "1.38.0" @@ -1944,13 +1724,9 @@ checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", - "libc", - "mio", "num_cpus", "pin-project-lite", - "socket2", "tokio-macros", - "windows-sys 0.48.0", ] [[package]] @@ -1964,19 +1740,6 @@ dependencies = [ "syn", ] -[[package]] -name = "tokio-util" -version = "0.7.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - [[package]] name = "toml" version = "0.8.19" @@ -2272,15 +2035,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows-sys" version = "0.52.0" diff --git a/apps/desktop/desktop_native/Cargo.toml b/apps/desktop/desktop_native/Cargo.toml index 6525b38162d..c6b77473b2a 100644 --- a/apps/desktop/desktop_native/Cargo.toml +++ b/apps/desktop/desktop_native/Cargo.toml @@ -1,3 +1,3 @@ [workspace] resolver = "2" -members = ["napi", "core", "proxy"] +members = ["napi", "core"] diff --git a/apps/desktop/desktop_native/build.js b/apps/desktop/desktop_native/build.js deleted file mode 100644 index f2f012bf088..00000000000 --- a/apps/desktop/desktop_native/build.js +++ /dev/null @@ -1,68 +0,0 @@ -/* eslint-disable @typescript-eslint/no-var-requires */ -const child_process = require("child_process"); -const fs = require("fs"); -const path = require("path"); -const process = require("process"); - -let crossPlatform = process.argv.length > 2 && process.argv[2] === "cross-platform"; - -function buildNapiModule(target, release = true) { - const targetArg = target ? `--target ${target}` : ""; - const releaseArg = release ? "--release" : ""; - return child_process.execSync(`npm run build -- ${releaseArg} ${targetArg}`, { stdio: 'inherit', cwd: path.join(__dirname, "napi") }); -} - -function buildProxyBin(target, release = true) { - const targetArg = target ? `--target ${target}` : ""; - const releaseArg = release ? "--release" : ""; - return child_process.execSync(`cargo build --bin desktop_proxy ${releaseArg} ${targetArg}`, {stdio: 'inherit', cwd: path.join(__dirname, "proxy")}); -} - -if (!crossPlatform) { - console.log("Building native modules in debug mode for the native architecture"); - buildNapiModule(false, false); - buildProxyBin(false, false); - return; -} - -// Note that targets contains pairs of [rust target, node arch] -// We do this to move the output binaries to a location that can -// be easily accessed from electron-builder using ${os} and ${arch} -let targets = []; -switch (process.platform) { - case "win32": - targets = [ - ["i686-pc-windows-msvc", 'ia32'], - ["x86_64-pc-windows-msvc", 'x64'], - ["aarch64-pc-windows-msvc", 'arm64'] - ]; - break; - - case "darwin": - targets = [ - ["x86_64-apple-darwin", 'x64'], - ["aarch64-apple-darwin", 'arm64'] - ]; - break; - - default: - targets = [ - ['x86_64-unknown-linux-musl', 'x64'] - ]; - - process.env["PKG_CONFIG_ALLOW_CROSS"] = "1"; - process.env["PKG_CONFIG_ALL_STATIC"] = "1"; - break; -} - -console.log("Cross building native modules for the targets: ", targets.map(([target, _]) => target).join(", ")); - -fs.mkdirSync(path.join(__dirname, "dist"), { recursive: true }); - -targets.forEach(([target, nodeArch]) => { - buildNapiModule(target); - buildProxyBin(target); - - const ext = process.platform === "win32" ? ".exe" : ""; - fs.copyFileSync(path.join(__dirname, "target", target, "release", `desktop_proxy${ext}`), path.join(__dirname, "dist", `desktop_proxy.${process.platform}-${nodeArch}${ext}`)); -}); diff --git a/apps/desktop/desktop_native/core/Cargo.toml b/apps/desktop/desktop_native/core/Cargo.toml index 46b22a5b74e..d8859208837 100644 --- a/apps/desktop/desktop_native/core/Cargo.toml +++ b/apps/desktop/desktop_native/core/Cargo.toml @@ -6,21 +6,9 @@ version = "0.0.0" publish = false [features] -default = ["sys"] +default = [] manual_test = [] -sys = [ - "dep:widestring", - "dep:windows", - "dep:core-foundation", - "dep:security-framework", - "dep:security-framework-sys", - "dep:gio", - "dep:libsecret", - "dep:zbus", - "dep:zbus_polkit", -] - [dependencies] aes = "=0.8.4" anyhow = "=1.0.86" @@ -29,22 +17,17 @@ arboard = { version = "=3.4.0", default-features = false, features = [ ] } base64 = "=0.22.1" cbc = { version = "=0.1.2", features = ["alloc"] } -dirs = "=5.0.1" -futures = "=0.3.30" -interprocess = { version = "=2.2.1", features = ["tokio"] } libc = "=0.2.155" -log = "=0.4.22" rand = "=0.8.5" retry = "=2.0.0" scopeguard = "=1.2.0" sha2 = "=0.10.8" thiserror = "=1.0.61" tokio = { version = "=1.38.0", features = ["io-util", "sync", "macros"] } -tokio-util = "=0.7.11" typenum = "=1.17.0" [target.'cfg(windows)'.dependencies] -widestring = { version = "=1.1.0", optional = true } +widestring = "=1.1.0" windows = { version = "=0.57.0", features = [ "Foundation", "Security_Credentials_UI", @@ -55,18 +38,18 @@ windows = { version = "=0.57.0", features = [ "Win32_System_WinRT", "Win32_UI_Input_KeyboardAndMouse", "Win32_UI_WindowsAndMessaging", -], optional = true } +] } [target.'cfg(windows)'.dev-dependencies] keytar = "=0.1.6" [target.'cfg(target_os = "macos")'.dependencies] -core-foundation = { version = "=0.9.4", optional = true } -security-framework = { version = "=2.11.0", optional = true } -security-framework-sys = { version = "=2.11.0", optional = true } +core-foundation = "=0.9.4" +security-framework = "=2.11.0" +security-framework-sys = "=2.11.0" [target.'cfg(target_os = "linux")'.dependencies] -gio = { version = "=0.19.5", optional = true } -libsecret = { version = "=0.5.0", optional = true } -zbus = { version = "=4.3.1", optional = true } -zbus_polkit = { version = "=4.0.0", optional = true } +gio = "=0.19.5" +libsecret = "=0.5.0" +zbus = "=4.3.1" +zbus_polkit = "=4.0.0" diff --git a/apps/desktop/desktop_native/core/src/ipc/client.rs b/apps/desktop/desktop_native/core/src/ipc/client.rs deleted file mode 100644 index 6e24a74629c..00000000000 --- a/apps/desktop/desktop_native/core/src/ipc/client.rs +++ /dev/null @@ -1,102 +0,0 @@ -use std::{ - path::{Path, PathBuf}, - time::Duration, -}; - -use interprocess::local_socket::{ - tokio::{prelude::*, Stream}, - GenericFilePath, ToFsName, -}; -use log::{error, info}; -use tokio::{ - io::{AsyncReadExt, AsyncWriteExt}, - time::sleep, -}; - -use crate::ipc::NATIVE_MESSAGING_BUFFER_SIZE; - -pub async fn connect( - path: PathBuf, - send: tokio::sync::mpsc::Sender, - mut recv: tokio::sync::mpsc::Receiver, -) { - // Keep track of connection failures to make sure we don't leave the process as a zombie - let mut connection_failures = 0; - - loop { - match connect_inner(&path, &send, &mut recv).await { - Ok(()) => return, - Err(e) => { - connection_failures += 1; - if connection_failures >= 20 { - error!("Failed to connect to IPC server after 20 attempts: {e}"); - return; - } - - error!("Failed to connect to IPC server: {e}"); - } - } - - sleep(Duration::from_secs(5)).await; - } -} - -async fn connect_inner( - path: &Path, - send: &tokio::sync::mpsc::Sender, - recv: &mut tokio::sync::mpsc::Receiver, -) -> Result<(), Box> { - info!("Attempting to connect to {}", path.display()); - - let name = path.as_os_str().to_fs_name::()?; - let mut conn = Stream::connect(name).await?; - - info!("Connected to {}", path.display()); - - // This `connected` and the latter `disconnected` messages are the only ones that - // are sent from the Rust IPC code and not just forwarded from the desktop app. - // As it's only two, we hardcode the JSON values to avoid pulling in a JSON library. - send.send("{\"command\":\"connected\"}".to_owned()).await?; - - let mut buffer = vec![0; NATIVE_MESSAGING_BUFFER_SIZE]; - - // Listen to IPC messages - loop { - tokio::select! { - // Forward messages to the IPC server - msg = recv.recv() => { - match msg { - Some(msg) => { - conn.write_all(msg.as_bytes()).await?; - } - None => { - info!("Client channel closed"); - break; - }, - } - }, - - // Forward messages from the IPC server - res = conn.read(&mut buffer[..]) => { - match res { - Err(e) => { - error!("Error reading from IPC server: {e}"); - break; - } - Ok(0) => { - info!("Connection closed"); - break; - } - Ok(n) => { - let message = String::from_utf8_lossy(&buffer[..n]).to_string(); - send.send(message).await?; - } - } - } - } - } - - let _ = send.send("{\"command\":\"disconnected\"}".to_owned()).await; - - Ok(()) -} diff --git a/apps/desktop/desktop_native/core/src/ipc/mod.rs b/apps/desktop/desktop_native/core/src/ipc/mod.rs deleted file mode 100644 index 6117dab38cf..00000000000 --- a/apps/desktop/desktop_native/core/src/ipc/mod.rs +++ /dev/null @@ -1,64 +0,0 @@ -pub mod client; -pub mod server; - -/// The maximum size of a message that can be sent over IPC. -/// According to the documentation, the maximum size sent to the browser is 1MB. -/// While the maximum size sent from the browser to the native messaging host is 4GB. -/// -/// Currently we are setting the maximum both ways to be 1MB. -/// -/// https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Native_messaging#app_side -/// https://developer.chrome.com/docs/extensions/develop/concepts/native-messaging#native-messaging-host-protocol -pub const NATIVE_MESSAGING_BUFFER_SIZE: usize = 1024 * 1024; - -/// The maximum number of messages that can be buffered in a channel. -/// This number is more or less arbitrary and can be adjusted as needed, -/// but ideally the messages should be processed as quickly as possible. -pub const MESSAGE_CHANNEL_BUFFER: usize = 32; - -/// Resolve the path to the IPC socket. -pub fn path(name: &str) -> std::path::PathBuf { - #[cfg(target_os = "windows")] - { - // Use a unique IPC pipe //./pipe/xxxxxxxxxxxxxxxxx.app.bitwarden per user. - // Hashing prevents problems with reserved characters and file length limitations. - use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine}; - use sha2::Digest; - let home = dirs::home_dir().unwrap(); - let hash = sha2::Sha256::digest(home.as_os_str().as_encoded_bytes()); - let hash_b64 = URL_SAFE_NO_PAD.encode(hash.as_slice()); - - format!(r"\\.\pipe\{hash_b64}.app.{name}").into() - } - - #[cfg(target_os = "macos")] - { - let mut home = dirs::home_dir().unwrap(); - - // When running in an unsandboxed environment, path is: /Users// - // While running sandboxed, it's different: /Users//Library/Containers/com.bitwarden.desktop/Data - // - // We want to use App Groups in /Users//Library/Group Containers/LTZ2PFU5D6.com.bitwarden.desktop, - // so we need to remove all the components after the user. - // Note that we subtract 3 because the root directory is counted as a component (/, Users, ). - let num_components = home.components().count(); - for _ in 0..num_components - 3 { - home.pop(); - } - - home.join(format!( - "Library/Group Containers/LTZ2PFU5D6.com.bitwarden.desktop/tmp/app.{name}" - )) - } - - #[cfg(target_os = "linux")] - { - // On Linux, we use the user's cache directory. - let home = dirs::cache_dir().unwrap(); - let path_dir = home.join("com.bitwarden.desktop"); - - // The chache directory might not exist, so create it - let _ = std::fs::create_dir_all(&path_dir); - path_dir.join(format!("app.{name}")) - } -} diff --git a/apps/desktop/desktop_native/core/src/ipc/server.rs b/apps/desktop/desktop_native/core/src/ipc/server.rs deleted file mode 100644 index 053b4322203..00000000000 --- a/apps/desktop/desktop_native/core/src/ipc/server.rs +++ /dev/null @@ -1,232 +0,0 @@ -use std::{error::Error, path::Path, vec}; - -use futures::TryFutureExt; - -use anyhow::Result; -use interprocess::local_socket::{tokio::prelude::*, GenericFilePath, ListenerOptions}; -use log::{error, info}; -use tokio::{ - io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt}, - sync::{broadcast, mpsc}, -}; -use tokio_util::sync::CancellationToken; - -use super::{MESSAGE_CHANNEL_BUFFER, NATIVE_MESSAGING_BUFFER_SIZE}; - -#[derive(Debug)] -pub struct Message { - pub client_id: u32, - pub kind: MessageType, - // This value should be Some for MessageType::Message and None for the rest - pub message: Option, -} - -#[derive(Debug)] -pub enum MessageType { - Connected, - Disconnected, - Message, -} - -pub struct Server { - cancel_token: CancellationToken, - server_to_clients_send: broadcast::Sender, -} - -impl Server { - /// Create and start the IPC server without blocking. - /// - /// # Parameters - /// - /// - `name`: The endpoint name to listen on. This name uniquely identifies the IPC connection and must be the same for both the server and client. - /// - `client_to_server_send`: This [`mpsc::Sender`] will receive all the [`Message`]'s that the clients send to this server. - pub fn start( - path: &Path, - client_to_server_send: mpsc::Sender, - ) -> Result> { - // If the unix socket file already exists, we get an error when trying to bind to it. So we remove it first. - // Any processes that were using the old socket should remain connected to it but any new connections will use the new socket. - if !cfg!(windows) { - let _ = std::fs::remove_file(path); - } - - let name = path.as_os_str().to_fs_name::()?; - let opts = ListenerOptions::new().name(name); - let listener = opts.create_tokio()?; - - // This broadcast channel is used for sending messages to all connected clients, and so the sender - // will be stored in the server while the receiver will be cloned and passed to each client handler. - let (server_to_clients_send, server_to_clients_recv) = - broadcast::channel::(MESSAGE_CHANNEL_BUFFER); - - // This cancellation token allows us to cleanly stop the server and all the spawned - // tasks without having to wait on all the pending tasks finalizing first - let cancel_token = CancellationToken::new(); - - // Create the server and start listening for incoming connections - // in a separate task to avoid blocking the current task - let server = Server { - cancel_token: cancel_token.clone(), - server_to_clients_send, - }; - tokio::spawn(listen_incoming( - listener, - client_to_server_send, - server_to_clients_recv, - cancel_token, - )); - - Ok(server) - } - - /// Send a message over the IPC server to all the connected clients - /// - /// # Returns - /// - /// The number of clients that the message was sent to. Note that the number of messages - /// sent may be less than the number of connected clients if some clients disconnect while - /// the message is being sent. - pub fn send(&self, message: String) -> Result { - let sent = self.server_to_clients_send.send(message)?; - Ok(sent) - } - - /// Stop the IPC server. - pub fn stop(&self) { - self.cancel_token.cancel(); - } -} - -impl Drop for Server { - fn drop(&mut self) { - self.stop(); - } -} - -async fn listen_incoming( - listener: LocalSocketListener, - client_to_server_send: mpsc::Sender, - server_to_clients_recv: broadcast::Receiver, - cancel_token: CancellationToken, -) { - // We use a simple incrementing ID for each client - let mut next_client_id = 1_u32; - - loop { - tokio::select! { - _ = cancel_token.cancelled() => { - info!("IPC server cancelled."); - break; - }, - - // A new client connection has been established - msg = listener.accept() => { - match msg { - Ok(client_stream) => { - let client_id = next_client_id; - next_client_id += 1; - - let future = handle_connection( - client_stream, - client_to_server_send.clone(), - // We resubscribe to the receiver here so this task can have it's own copy - // Note that this copy will only receive messages sent after this point, - // but that is okay, realistically we don't want any messages before we get a chance - // to send the connected message to the client, which is done inside [`handle_connection`] - server_to_clients_recv.resubscribe(), - cancel_token.clone(), - client_id - ); - tokio::spawn(future.map_err(|e| { - error!("Error handling connection: {}", e) - })); - }, - Err(e) => { - error!("Error accepting connection: {}", e); - break; - }, - } - } - } - } -} - -async fn handle_connection( - mut client_stream: impl AsyncRead + AsyncWrite + Unpin, - client_to_server_send: mpsc::Sender, - mut server_to_clients_recv: broadcast::Receiver, - cancel_token: CancellationToken, - client_id: u32, -) -> Result<(), Box> { - client_to_server_send - .send(Message { - client_id, - kind: MessageType::Connected, - message: None, - }) - .await?; - - let mut buf = vec![0u8; NATIVE_MESSAGING_BUFFER_SIZE]; - - loop { - tokio::select! { - _ = cancel_token.cancelled() => { - info!("Client {client_id} cancelled."); - break; - }, - - // Forward messages to the IPC clients - msg = server_to_clients_recv.recv() => { - match msg { - Ok(msg) => { - client_stream.write_all(msg.as_bytes()).await?; - }, - Err(e) => { - info!("Error reading message: {}", e); - break; - } - } - }, - - // Forwards messages from the IPC clients to the server - // Note that we also send connect and disconnect events so that - // the server can keep track of multiple clients - result = client_stream.read(&mut buf) => { - match result { - Err(e) => { - info!("Error reading from client {client_id}: {e}"); - - client_to_server_send.send(Message { - client_id, - kind: MessageType::Disconnected, - message: None, - }).await?; - break; - }, - Ok(0) => { - info!("Client {client_id} disconnected."); - - client_to_server_send.send(Message { - client_id, - kind: MessageType::Disconnected, - message: None, - }).await?; - break; - }, - Ok(size) => { - let msg = std::str::from_utf8(&buf[..size])?; - - client_to_server_send.send(Message { - client_id, - kind: MessageType::Message, - message: Some(msg.to_string()), - }).await?; - }, - - } - } - } - } - - Ok(()) -} diff --git a/apps/desktop/desktop_native/core/src/lib.rs b/apps/desktop/desktop_native/core/src/lib.rs index 3132c56f7f8..d23a285b4ac 100644 --- a/apps/desktop/desktop_native/core/src/lib.rs +++ b/apps/desktop/desktop_native/core/src/lib.rs @@ -1,13 +1,7 @@ -#[cfg(feature = "sys")] pub mod biometric; -#[cfg(feature = "sys")] pub mod clipboard; pub mod crypto; pub mod error; -pub mod ipc; -#[cfg(feature = "sys")] pub mod password; -#[cfg(feature = "sys")] pub mod process_isolation; -#[cfg(feature = "sys")] pub mod powermonitor; diff --git a/apps/desktop/desktop_native/napi/Cargo.toml b/apps/desktop/desktop_native/napi/Cargo.toml index 6fb710b0671..942ccdba212 100644 --- a/apps/desktop/desktop_native/napi/Cargo.toml +++ b/apps/desktop/desktop_native/napi/Cargo.toml @@ -16,10 +16,8 @@ manual_test = [] [dependencies] anyhow = "=1.0.86" desktop_core = { path = "../core" } -napi = { version = "=2.16.7", features = ["async"] } -napi-derive = "=2.16.6" -tokio = { version = "1.38.0" } -tokio-util = "0.7.11" +napi = { version = "=2.16.6", features = ["async"] } +napi-derive = "=2.16.5" [build-dependencies] napi-build = "=2.1.3" diff --git a/apps/desktop/desktop_native/napi/build.js b/apps/desktop/desktop_native/napi/build.js new file mode 100644 index 00000000000..6c92dbad1b6 --- /dev/null +++ b/apps/desktop/desktop_native/napi/build.js @@ -0,0 +1,24 @@ +/* eslint-disable @typescript-eslint/no-var-requires */ +const child_process = require("child_process"); +const process = require("process"); + +let targets = []; +switch (process.platform) { + case "win32": + targets = ["i686-pc-windows-msvc", "x86_64-pc-windows-msvc", "aarch64-pc-windows-msvc"]; + break; + + case "darwin": + targets = ["x86_64-apple-darwin", "aarch64-apple-darwin"]; + break; + + default: + targets = ['x86_64-unknown-linux-musl']; + process.env["PKG_CONFIG_ALLOW_CROSS"] = "1"; + process.env["PKG_CONFIG_ALL_STATIC"] = "1"; + break; +} + +targets.forEach(target => { + child_process.execSync(`npm run build -- --target ${target}`, {stdio: 'inherit'}); +}); diff --git a/apps/desktop/desktop_native/napi/index.d.ts b/apps/desktop/desktop_native/napi/index.d.ts index fe4ab59fd8e..deaf6b8e57f 100644 --- a/apps/desktop/desktop_native/napi/index.d.ts +++ b/apps/desktop/desktop_native/napi/index.d.ts @@ -51,33 +51,3 @@ export namespace powermonitors { export function onLock(callback: (err: Error | null, ) => any): Promise export function isLockMonitorAvailable(): Promise } -export namespace ipc { - export interface IpcMessage { - clientId: number - kind: IpcMessageType - message?: string - } - export const enum IpcMessageType { - Connected = 0, - Disconnected = 1, - Message = 2 - } - export class IpcServer { - /** - * Create and start the IPC server without blocking. - * - * @param name The endpoint name to listen on. This name uniquely identifies the IPC connection and must be the same for both the server and client. - * @param callback This function will be called whenever a message is received from a client. - */ - static listen(name: string, callback: (error: null | Error, message: IpcMessage) => void): Promise - /** Stop the IPC server. */ - stop(): void - /** - * Send a message over the IPC server to all the connected clients - * - * @return The number of clients that the message was sent to. Note that the number of messages - * actually received may be less, as some clients could disconnect before receiving the message. - */ - send(message: string): number - } -} diff --git a/apps/desktop/desktop_native/napi/index.js b/apps/desktop/desktop_native/napi/index.js index a0cfee8e1a0..680f1302b9a 100644 --- a/apps/desktop/desktop_native/napi/index.js +++ b/apps/desktop/desktop_native/napi/index.js @@ -206,4 +206,10 @@ if (!nativeBinding) { throw new Error(`Failed to load native binding`) } -module.exports = nativeBinding +const { passwords, biometrics, clipboards, processisolations, powermonitors } = nativeBinding + +module.exports.passwords = passwords +module.exports.biometrics = biometrics +module.exports.clipboards = clipboards +module.exports.processisolations = processisolations +module.exports.powermonitors = powermonitors diff --git a/apps/desktop/desktop_native/napi/package.json b/apps/desktop/desktop_native/napi/package.json index 9f098c4965d..70e472b3952 100644 --- a/apps/desktop/desktop_native/napi/package.json +++ b/apps/desktop/desktop_native/napi/package.json @@ -3,7 +3,9 @@ "version": "0.1.0", "description": "", "scripts": { - "build": "napi build --platform --js false", + "build": "napi build --release --platform --js false", + "build:debug": "napi build --platform --js false", + "build:cross-platform": "node build.js", "test": "cargo test" }, "author": "", diff --git a/apps/desktop/desktop_native/napi/src/lib.rs b/apps/desktop/desktop_native/napi/src/lib.rs index 838eb651244..dfdc316d259 100644 --- a/apps/desktop/desktop_native/napi/src/lib.rs +++ b/apps/desktop/desktop_native/napi/src/lib.rs @@ -189,103 +189,3 @@ pub mod powermonitors { } } - -#[napi] -pub mod ipc { - use desktop_core::ipc::server::{Message, MessageType}; - use napi::threadsafe_function::{ - ErrorStrategy, ThreadsafeFunction, ThreadsafeFunctionCallMode, - }; - - #[napi(object)] - pub struct IpcMessage { - pub client_id: u32, - pub kind: IpcMessageType, - pub message: Option, - } - - impl From for IpcMessage { - fn from(message: Message) -> Self { - IpcMessage { - client_id: message.client_id, - kind: message.kind.into(), - message: message.message, - } - } - } - - #[napi] - pub enum IpcMessageType { - Connected, - Disconnected, - Message, - } - - impl From for IpcMessageType { - fn from(message_type: MessageType) -> Self { - match message_type { - MessageType::Connected => IpcMessageType::Connected, - MessageType::Disconnected => IpcMessageType::Disconnected, - MessageType::Message => IpcMessageType::Message, - } - } - } - - #[napi] - pub struct IpcServer { - server: desktop_core::ipc::server::Server, - } - - #[napi] - impl IpcServer { - /// Create and start the IPC server without blocking. - /// - /// @param name The endpoint name to listen on. This name uniquely identifies the IPC connection and must be the same for both the server and client. - /// @param callback This function will be called whenever a message is received from a client. - #[napi(factory)] - pub async fn listen( - name: String, - #[napi(ts_arg_type = "(error: null | Error, message: IpcMessage) => void")] - callback: ThreadsafeFunction, - ) -> napi::Result { - let (send, mut recv) = tokio::sync::mpsc::channel::(32); - tokio::spawn(async move { - while let Some(message) = recv.recv().await { - callback.call(Ok(message.into()), ThreadsafeFunctionCallMode::NonBlocking); - } - }); - - let path = desktop_core::ipc::path(&name); - - let server = desktop_core::ipc::server::Server::start(&path, send).map_err(|e| { - napi::Error::from_reason(format!( - "Error listening to server - Path: {path:?} - Error: {e} - {e:?}" - )) - })?; - - Ok(IpcServer { server }) - } - - /// Stop the IPC server. - #[napi] - pub fn stop(&self) -> napi::Result<()> { - self.server.stop(); - Ok(()) - } - - /// Send a message over the IPC server to all the connected clients - /// - /// @return The number of clients that the message was sent to. Note that the number of messages - /// actually received may be less, as some clients could disconnect before receiving the message. - #[napi] - pub fn send(&self, message: String) -> napi::Result { - self.server - .send(message) - .map_err(|e| { - napi::Error::from_reason(format!("Error sending message - Error: {e} - {e:?}")) - }) - // NAPI doesn't support u64 or usize, so we need to convert to u32 - .map(|u| u32::try_from(u).unwrap_or_default()) - } - } -} diff --git a/apps/desktop/desktop_native/proxy/Cargo.toml b/apps/desktop/desktop_native/proxy/Cargo.toml deleted file mode 100644 index 681c34c8eab..00000000000 --- a/apps/desktop/desktop_native/proxy/Cargo.toml +++ /dev/null @@ -1,19 +0,0 @@ -[package] -edition = "2021" -exclude = ["index.node"] -license = "GPL-3.0" -name = "desktop_proxy" -version = "0.0.0" -publish = false - -[dependencies] -anyhow = "=1.0.86" -desktop_core = { path = "../core", default-features = false } -futures = "0.3.30" -log = "0.4.21" -simplelog = "0.12.2" -tokio = { version = "1.38.0", features = ["io-std", "io-util", "macros", "rt"] } -tokio-util = { version = "0.7.11", features = ["codec"] } - -[target.'cfg(target_os = "macos")'.dependencies] -embed_plist = "1.2.2" diff --git a/apps/desktop/desktop_native/proxy/src/main.rs b/apps/desktop/desktop_native/proxy/src/main.rs deleted file mode 100644 index 776b363598a..00000000000 --- a/apps/desktop/desktop_native/proxy/src/main.rs +++ /dev/null @@ -1,140 +0,0 @@ -use std::path::Path; - -use desktop_core::ipc::{MESSAGE_CHANNEL_BUFFER, NATIVE_MESSAGING_BUFFER_SIZE}; -use futures::{SinkExt, StreamExt}; -use log::*; -use tokio_util::codec::LengthDelimitedCodec; - -#[cfg(target_os = "macos")] -embed_plist::embed_info_plist!("../../../resources/info.desktop_proxy.plist"); - -fn init_logging(log_path: &Path, level: log::LevelFilter) { - use simplelog::{ColorChoice, CombinedLogger, Config, SharedLogger, TermLogger, TerminalMode}; - - let config = Config::default(); - - let mut loggers: Vec> = Vec::new(); - loggers.push(TermLogger::new( - level, - config.clone(), - TerminalMode::Stderr, - ColorChoice::Auto, - )); - - match std::fs::File::create(log_path) { - Ok(file) => { - loggers.push(simplelog::WriteLogger::new(level, config, file)); - } - Err(e) => { - eprintln!("Can't create file: {}", e); - } - } - - if let Err(e) = CombinedLogger::init(loggers) { - eprintln!("Failed to initialize logger: {}", e); - } -} - -/// Bitwarden IPC Proxy. -/// -/// This proxy allows browser extensions to communicate with a desktop application using Native -/// Messaging. This method allows an extension to send and receive messages through the use of -/// stdin/stdout streams. -/// -/// However, this also requires the browser to start the process in order for the communication to -/// occur. To overcome this limitation, we implement Inter-Process Communication (IPC) to establish -/// a stable communication channel between the proxy and the running desktop application. -/// -/// Browser extension <-[native messaging]-> proxy <-[ipc]-> desktop -/// -#[tokio::main(flavor = "current_thread")] -async fn main() { - let sock_path = desktop_core::ipc::path("bitwarden"); - - let log_path = { - let mut path = sock_path.clone(); - path.set_extension("bitwarden.log"); - path - }; - - init_logging(&log_path, LevelFilter::Info); - - info!("Starting Bitwarden IPC Proxy."); - - // Different browsers send different arguments when the app starts: - // - // Firefox: - // - The complete path to the app manifest. (in the form `/Users//Library/.../Mozilla/NativeMessagingHosts/com.8bit.bitwarden.json`) - // - (in Firefox 55+) the ID (as given in the manifest.json) of the add-on that started it (in the form `{[UUID]}`). - // - // Chrome on Windows: - // - Origin of the extension that started it (in the form `chrome-extension://[ID]`). - // - Handle to the Chrome native window that started the app. - // - // Chrome on Linux and Mac: - // - Origin of the extension that started it (in the form `chrome-extension://[ID]`). - - let args: Vec<_> = std::env::args().skip(1).collect(); - info!("Process args: {:?}", args); - - // Setup two channels, one for sending messages to the desktop application (`out`) and one for receiving messages from the desktop application (`in`) - let (in_send, in_recv) = tokio::sync::mpsc::channel(MESSAGE_CHANNEL_BUFFER); - let (out_send, mut out_recv) = tokio::sync::mpsc::channel(MESSAGE_CHANNEL_BUFFER); - - let mut handle = tokio::spawn(desktop_core::ipc::client::connect( - sock_path, out_send, in_recv, - )); - - // Create a new codec for reading and writing messages from stdin/stdout. - let mut stdin = LengthDelimitedCodec::builder() - .max_frame_length(NATIVE_MESSAGING_BUFFER_SIZE) - .native_endian() - .new_read(tokio::io::stdin()); - let mut stdout = LengthDelimitedCodec::builder() - .max_frame_length(NATIVE_MESSAGING_BUFFER_SIZE) - .native_endian() - .new_write(tokio::io::stdout()); - - loop { - tokio::select! { - // IPC client has finished, so we should exit as well. - _ = &mut handle => { - break; - } - - // Receive messages from IPC and print to STDOUT. - msg = out_recv.recv() => { - match msg { - Some(msg) => { - debug!("OUT: {}", msg); - stdout.send(msg.into()).await.unwrap(); - } - None => { - info!("Channel closed, exiting."); - break; - } - } - }, - - // Listen to stdin and send messages to ipc processor. - msg = stdin.next() => { - match msg { - Some(Ok(msg)) => { - let m = String::from_utf8(msg.to_vec()).unwrap(); - debug!("IN: {}", m); - in_send.send(m).await.unwrap(); - } - Some(Err(e)) => { - error!("Error parsing input: {}", e); - break; - } - None => { - info!("Received EOF, exiting."); - break; - } - } - } - - } - } -} diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json index 02bb2377767..b6572587faa 100644 --- a/apps/desktop/electron-builder.json +++ b/apps/desktop/electron-builder.json @@ -73,13 +73,6 @@ "CFBundleDevelopmentRegion": "en" }, "singleArchFiles": "node_modules/@bitwarden/desktop-napi/desktop_napi.darwin-*.node", - "extraFiles": [ - { - "from": "desktop_native/dist/desktop_proxy.${platform}-${arch}", - "to": "MacOS/desktop_proxy" - } - ], - "signIgnore": ["MacOS/desktop_proxy"], "target": ["dmg", "zip"] }, "win": { @@ -91,24 +84,16 @@ "from": "../../node_modules/regedit/vbs", "to": "regedit/vbs", "filter": ["**/*"] - } - ], - "extraFiles": [ + }, { - "from": "desktop_native/dist/desktop_proxy.${platform}-${arch}.exe", - "to": "desktop_proxy.exe" + "from": "resources/native-messaging.bat", + "to": "native-messaging.bat" } ] }, "linux": { "category": "Utility", "synopsis": "A secure and free password manager for all of your devices.", - "extraFiles": [ - { - "from": "desktop_native/dist/desktop_proxy.${platform}-${arch}", - "to": "desktop_proxy" - } - ], "target": ["deb", "freebsd", "rpm", "AppImage", "snap"], "desktop": { "Name": "Bitwarden", diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 70a0d9cb8c2..4562653978b 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -18,7 +18,7 @@ "scripts": { "postinstall": "electron-rebuild", "start": "cross-env ELECTRON_IS_DEV=0 ELECTRON_NO_UPDATER=1 electron ./build", - "build-native": "cd desktop_native && node build.js", + "build-native": "cd desktop_native/napi && npm run build", "build": "concurrently -n Main,Rend,Prel -c yellow,cyan \"npm run build:main\" \"npm run build:renderer\" \"npm run build:preload\"", "build:dev": "concurrently -n Main,Rend -c yellow,cyan \"npm run build:main:dev\" \"npm run build:renderer:dev\"", "build:preload": "cross-env NODE_ENV=production webpack --config webpack.preload.js", diff --git a/apps/desktop/resources/entitlements.desktop_proxy.plist b/apps/desktop/resources/entitlements.desktop_proxy.plist deleted file mode 100644 index d5c7b8a2cc8..00000000000 --- a/apps/desktop/resources/entitlements.desktop_proxy.plist +++ /dev/null @@ -1,12 +0,0 @@ - - - - - com.apple.security.app-sandbox - - com.apple.security.application-groups - - LTZ2PFU5D6.com.bitwarden.desktop - - - diff --git a/apps/desktop/resources/entitlements.mas.plist b/apps/desktop/resources/entitlements.mas.plist index d42ade962c3..5bfeba83a61 100644 --- a/apps/desktop/resources/entitlements.mas.plist +++ b/apps/desktop/resources/entitlements.mas.plist @@ -8,10 +8,6 @@ LTZ2PFU5D6 com.apple.security.app-sandbox - com.apple.security.application-groups - - LTZ2PFU5D6.com.bitwarden.desktop - com.apple.security.network.client com.apple.security.files.user-selected.read-write diff --git a/apps/desktop/resources/info.desktop_proxy.plist b/apps/desktop/resources/info.desktop_proxy.plist deleted file mode 100644 index d3c30e3e0eb..00000000000 --- a/apps/desktop/resources/info.desktop_proxy.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - CFBundleIdentifier - com.bitwarden.desktop - - diff --git a/apps/desktop/resources/native-messaging.bat b/apps/desktop/resources/native-messaging.bat new file mode 100644 index 00000000000..45519250dd6 --- /dev/null +++ b/apps/desktop/resources/native-messaging.bat @@ -0,0 +1,7 @@ +@echo off +:: Helper script for starting the Native Messaging Proxy on Windows. + +cd ../ +set ELECTRON_RUN_AS_NODE=1 +set ELECTRON_NO_ATTACH_CONSOLE=1 +Bitwarden.exe resources/app.asar %* diff --git a/apps/desktop/scripts/after-pack.js b/apps/desktop/scripts/after-pack.js index 08cff76e858..e128397e615 100644 --- a/apps/desktop/scripts/after-pack.js +++ b/apps/desktop/scripts/after-pack.js @@ -1,22 +1,14 @@ /* eslint-disable @typescript-eslint/no-var-requires, no-console */ require("dotenv").config(); -const child_process = require("child_process"); const path = require("path"); -const { flipFuses, FuseVersion, FuseV1Options } = require("@electron/fuses"); -const builder = require("electron-builder"); const fse = require("fs-extra"); exports.default = run; async function run(context) { console.log("## After pack"); - // console.log(context); - - if (context.packager.platform.nodeName !== "darwin" || context.arch === builder.Arch.universal) { - await addElectronFuses(context); - } - + console.log(context); if (context.electronPlatformName === "linux") { console.log("Creating memory-protection wrapper script"); const appOutDir = context.appOutDir; @@ -31,132 +23,4 @@ async function run(context) { fse.chmodSync(wrapperBin, "755"); console.log("Copied memory-protection wrapper script"); } - - if (["darwin", "mas"].includes(context.electronPlatformName)) { - const is_mas = context.electronPlatformName === "mas"; - const is_mas_dev = context.targets.some((e) => e.name === "mas-dev"); - - let id; - - // Only use the Bitwarden Identities on CI - if (process.env.GITHUB_ACTIONS === "true") { - if (is_mas) { - id = is_mas_dev - ? "E7C9978F6FBCE0553429185C405E61F5380BE8EB" - : "3rd Party Mac Developer Application: Bitwarden Inc"; - } else { - id = "Developer ID Application: 8bit Solutions LLC"; - } - // Locally, use the first valid code signing identity, unless CSC_NAME is set - } else if (process.env.CSC_NAME) { - id = process.env.CSC_NAME; - } else { - const identities = getIdentities(); - if (identities.length === 0) { - throw new Error("No valid identities found"); - } - id = identities[0].id; - } - - console.log(`Signing proxy binary before the main bundle, using identity '${id}'`); - - const appName = context.packager.appInfo.productFilename; - const appPath = `${context.appOutDir}/${appName}.app`; - const proxyPath = path.join(appPath, "Contents", "MacOS", "desktop_proxy"); - - const packageId = "com.bitwarden.desktop"; - const entitlementsName = "entitlements.desktop_proxy.plist"; - const entitlementsPath = path.join(__dirname, "..", "resources", entitlementsName); - child_process.execSync( - `codesign -s '${id}' -i ${packageId} -f --timestamp --options runtime --entitlements ${entitlementsPath} ${proxyPath}`, - ); - } -} - -// Partially based on electron-builder code: -// https://github.com/electron-userland/electron-builder/blob/master/packages/app-builder-lib/src/macPackager.ts -// https://github.com/electron-userland/electron-builder/blob/master/packages/app-builder-lib/src/codeSign/macCodeSign.ts - -const appleCertificatePrefixes = [ - "Developer ID Application:", - // "Developer ID Installer:", - // "3rd Party Mac Developer Application:", - // "3rd Party Mac Developer Installer:", - "Apple Development:", -]; - -function getIdentities() { - const ids = child_process - .execSync("/usr/bin/security find-identity -v -p codesigning") - .toString(); - - return ids - .split("\n") - .filter((line) => { - for (const prefix of appleCertificatePrefixes) { - if (line.includes(prefix)) { - return true; - } - } - return false; - }) - .map((line) => { - const split = line.trim().split(" "); - const id = split[1]; - const name = split.slice(2).join(" ").replace(/"/g, ""); - return { id, name }; - }); -} - -/** - * @param {import("electron-builder").AfterPackContext} context - */ -async function addElectronFuses(context) { - const platform = context.packager.platform.nodeName; - - const ext = { - darwin: ".app", - win32: ".exe", - linux: "", - }[platform]; - - const IS_LINUX = platform === "linux"; - const executableName = IS_LINUX - ? context.packager.appInfo.productFilename.toLowerCase().replace("-dev", "").replace(" ", "-") - : context.packager.appInfo.productFilename; // .toLowerCase() to accomodate Linux file named `name` but productFileName is `Name` -- Replaces '-dev' because on Linux the executable name is `name` even for the DEV builds - - const electronBinaryPath = path.join(context.appOutDir, `${executableName}${ext}`); - - console.log("## Adding fuses to the electron binary", electronBinaryPath); - - await flipFuses(electronBinaryPath, { - version: FuseVersion.V1, - strictlyRequireAllFuses: true, - resetAdHocDarwinSignature: platform === "darwin" && context.arch === builder.Arch.universal, - - // List of fuses and their default values is available at: - // https://www.electronjs.org/docs/latest/tutorial/fuses - - [FuseV1Options.RunAsNode]: false, - [FuseV1Options.EnableCookieEncryption]: true, - [FuseV1Options.EnableNodeOptionsEnvironmentVariable]: false, - [FuseV1Options.EnableNodeCliInspectArguments]: false, - - // Currently, asar integrity is only implemented for macOS and Windows - // https://www.electronjs.org/docs/latest/tutorial/asar-integrity - // On macOS, it works by default, but on Windows it requires the - // asarIntegrity feature of electron-builder v25, currently in alpha - // https://github.com/electron-userland/electron-builder/releases/tag/v25.0.0-alpha.10 - [FuseV1Options.EnableEmbeddedAsarIntegrityValidation]: platform === "darwin", - - [FuseV1Options.OnlyLoadAppFromAsar]: true, - - // App refuses to open when enabled - [FuseV1Options.LoadBrowserProcessSpecificV8Snapshot]: false, - - // To disable this, we should stop using the file:// protocol to load the app bundle - // This can be done by defining a custom app:// protocol and loading the bundle from there, - // but then any requests to the server will be blocked by CORS policy - [FuseV1Options.GrantFileProtocolExtraPrivileges]: true, - }); } diff --git a/apps/desktop/src/entry.ts b/apps/desktop/src/entry.ts index 3bb84461363..78fe51e8b9e 100644 --- a/apps/desktop/src/entry.ts +++ b/apps/desktop/src/entry.ts @@ -1,33 +1,31 @@ -import { spawn } from "child_process"; -import * as path from "path"; +import { NativeMessagingProxy } from "./proxy/native-messaging-proxy"; -import { app } from "electron"; +// We need to import the other dependencies using `require` since `import` will +// generate `Error: Cannot find module 'electron'`. The cause of this error is +// due to native messaging setting the ELECTRON_RUN_AS_NODE env flag on windows +// which removes the electron module. This flag is needed for stdin/out to work +// properly on Windows. if ( - process.platform === "darwin" && process.argv.some((arg) => arg.indexOf("chrome-extension://") !== -1 || arg.indexOf("{") !== -1) ) { - // If we're on MacOS, we need to support DuckDuckGo's IPC communication, - // which for the moment is launching the Bitwarden process. - // Ideally the browser would instead startup the desktop_proxy process - // when available, but for now we'll just launch it here. + if (process.platform === "darwin") { + // eslint-disable-next-line + const app = require("electron").app; - app.on("ready", () => { - app.dock.hide(); + app.on("ready", () => { + app.dock.hide(); + }); + } + + process.stdout.on("error", (e) => { + if (e.code === "EPIPE") { + process.exit(0); + } }); - const proc = spawn(path.join(process.execPath, "..", "desktop_proxy"), process.argv.slice(1), { - cwd: process.cwd(), - stdio: "inherit", - shell: false, - }); - - proc.on("exit", () => { - process.exit(0); - }); - proc.on("error", () => { - process.exit(1); - }); + const proxy = new NativeMessagingProxy(); + proxy.run(); } else { // eslint-disable-next-line const Main = require("./main").Main; diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts index 212e5b50ee1..86d07440a73 100644 --- a/apps/desktop/src/main.ts +++ b/apps/desktop/src/main.ts @@ -220,7 +220,6 @@ export class Main { this.windowMain, app.getPath("userData"), app.getPath("exe"), - app.getAppPath(), ); this.desktopAutofillSettingsService = new DesktopAutofillSettingsService(stateProvider); @@ -266,21 +265,13 @@ export class Main { if (browserIntegrationEnabled || ddgIntegrationEnabled) { // Re-register the native messaging host integrations on startup, in case they are not present if (browserIntegrationEnabled) { - this.nativeMessagingMain - .generateManifests() - .catch((err) => this.logService.error("Error while generating manifests", err)); + this.nativeMessagingMain.generateManifests().catch(this.logService.error); } if (ddgIntegrationEnabled) { - this.nativeMessagingMain - .generateDdgManifests() - .catch((err) => this.logService.error("Error while generating DDG manifests", err)); + this.nativeMessagingMain.generateDdgManifests().catch(this.logService.error); } - this.nativeMessagingMain - .listen() - .catch((err) => - this.logService.error("Error while starting native message listener", err), - ); + this.nativeMessagingMain.listen(); } app.removeAsDefaultProtocolClient("bitwarden"); diff --git a/apps/desktop/src/main/native-messaging.main.ts b/apps/desktop/src/main/native-messaging.main.ts index 036f35e61c8..8c8404578b6 100644 --- a/apps/desktop/src/main/native-messaging.main.ts +++ b/apps/desktop/src/main/native-messaging.main.ts @@ -1,34 +1,34 @@ import { existsSync, promises as fs } from "fs"; +import { Socket } from "net"; import { homedir, userInfo } from "os"; import * as path from "path"; import * as util from "util"; import { ipcMain } from "electron"; +import * as ipc from "node-ipc"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; -import { ipc } from "@bitwarden/desktop-napi"; -import { isDev } from "../utils"; +import { getIpcSocketRoot } from "../proxy/ipc"; import { WindowMain } from "./window.main"; export class NativeMessagingMain { - private ipcServer: ipc.IpcServer | null; - private connected: number[] = []; + private connected: Socket[] = []; + private socket: any; constructor( private logService: LogService, private windowMain: WindowMain, private userPath: string, private exePath: string, - private appPath: string, ) { ipcMain.handle( "nativeMessaging.manifests", async (_event: any, options: { create: boolean }) => { if (options.create) { + this.listen(); try { - await this.listen(); await this.generateManifests(); } catch (e) { this.logService.error("Error generating manifests: " + e); @@ -51,8 +51,8 @@ export class NativeMessagingMain { "nativeMessaging.ddgManifests", async (_event: any, options: { create: boolean }) => { if (options.create) { + this.listen(); try { - await this.listen(); await this.generateDdgManifests(); } catch (e) { this.logService.error("Error generating duckduckgo manifests: " + e); @@ -72,46 +72,56 @@ export class NativeMessagingMain { ); } - async listen() { - if (this.ipcServer) { - this.ipcServer.stop(); + listen() { + ipc.config.id = "bitwarden"; + ipc.config.retry = 1500; + const ipcSocketRoot = getIpcSocketRoot(); + if (ipcSocketRoot != null) { + ipc.config.socketRoot = ipcSocketRoot; } - this.ipcServer = await ipc.IpcServer.listen("bitwarden", (error, msg) => { - switch (msg.kind) { - case ipc.IpcMessageType.Connected: { - this.connected.push(msg.clientId); - this.logService.info("Native messaging client " + msg.clientId + " has connected"); - break; - } - case ipc.IpcMessageType.Disconnected: { - const index = this.connected.indexOf(msg.clientId); - if (index > -1) { - this.connected.splice(index, 1); - } + ipc.serve(() => { + ipc.server.on("message", (data: any, socket: any) => { + this.socket = socket; + this.windowMain.win.webContents.send("nativeMessaging", data); + }); - this.logService.info("Native messaging client " + msg.clientId + " has disconnected"); - break; + ipcMain.on("nativeMessagingReply", (event, msg) => { + if (this.socket != null && msg != null) { + this.send(msg, this.socket); } - case ipc.IpcMessageType.Message: - this.windowMain.win.webContents.send("nativeMessaging", JSON.parse(msg.message)); - break; - } + }); + + ipc.server.on("connect", (socket: Socket) => { + this.connected.push(socket); + }); + + ipc.server.on("socket.disconnected", (socket, destroyedSocketID) => { + const index = this.connected.indexOf(socket); + if (index > -1) { + this.connected.splice(index, 1); + } + + this.socket = null; + ipc.log("client " + destroyedSocketID + " has disconnected!"); + }); }); - ipcMain.on("nativeMessagingReply", (event, msg) => { - if (msg != null) { - this.send(msg); - } - }); + ipc.server.start(); } stop() { - this.ipcServer?.stop(); + ipc.server.stop(); + // Kill all existing connections + this.connected.forEach((socket) => { + if (!socket.destroyed) { + socket.destroy(); + } + }); } - send(message: object) { - this.ipcServer?.send(JSON.stringify(message)); + send(message: object, socket: any) { + ipc.server.emit(socket, "message", message); } async generateManifests() { @@ -321,20 +331,11 @@ export class NativeMessagingMain { } private binaryPath() { - const ext = process.platform === "win32" ? ".exe" : ""; - - if (isDev()) { - return path.join( - this.appPath, - "..", - "desktop_native", - "target", - "debug", - `desktop_proxy${ext}`, - ); + if (process.platform === "win32") { + return path.join(path.dirname(this.exePath), "resources", "native-messaging.bat"); } - return path.join(path.dirname(this.exePath), `desktop_proxy${ext}`); + return this.exePath; } private getRegeditInstance() { diff --git a/apps/desktop/src/proxy/ipc.ts b/apps/desktop/src/proxy/ipc.ts new file mode 100644 index 00000000000..0160d6bf294 --- /dev/null +++ b/apps/desktop/src/proxy/ipc.ts @@ -0,0 +1,78 @@ +/* eslint-disable no-console */ +import { createHash } from "crypto"; +import { existsSync, mkdirSync } from "fs"; +import { homedir } from "os"; +import { join as path_join } from "path"; + +import * as ipc from "node-ipc"; + +export function getIpcSocketRoot(): string | null { + let socketRoot = null; + + switch (process.platform) { + case "darwin": { + const ipcSocketRootDir = path_join(homedir(), "tmp"); + if (!existsSync(ipcSocketRootDir)) { + mkdirSync(ipcSocketRootDir); + } + socketRoot = ipcSocketRootDir + "/"; + break; + } + case "win32": { + // Let node-ipc use a unique IPC pipe //./pipe/xxxxxxxxxxxxxxxxx.app.bitwarden per user. + // Hashing prevents problems with reserved characters and file length limitations. + socketRoot = createHash("sha1").update(homedir()).digest("hex") + "."; + } + } + return socketRoot; +} + +ipc.config.id = "proxy"; +ipc.config.retry = 1500; +ipc.config.logger = console.warn; // Stdout is used for native messaging +const ipcSocketRoot = getIpcSocketRoot(); +if (ipcSocketRoot != null) { + ipc.config.socketRoot = ipcSocketRoot; +} + +export default class IPC { + onMessage: (message: object) => void; + + private connected = false; + + connect() { + ipc.connectTo("bitwarden", () => { + ipc.of.bitwarden.on("connect", () => { + this.connected = true; + console.error("## connected to bitwarden desktop ##"); + + // Notify browser extension, connection is established to desktop application. + this.onMessage({ command: "connected" }); + }); + + ipc.of.bitwarden.on("disconnect", () => { + this.connected = false; + console.error("disconnected from world"); + + // Notify browser extension, no connection to desktop application. + this.onMessage({ command: "disconnected" }); + }); + + ipc.of.bitwarden.on("message", (message: any) => { + this.onMessage(message); + }); + + ipc.of.bitwarden.on("error", (err: any) => { + console.error("error", err); + }); + }); + } + + isConnected(): boolean { + return this.connected; + } + + send(json: object) { + ipc.of.bitwarden.emit("message", json); + } +} diff --git a/apps/desktop/src/proxy/native-messaging-proxy.ts b/apps/desktop/src/proxy/native-messaging-proxy.ts new file mode 100644 index 00000000000..f1b54a82014 --- /dev/null +++ b/apps/desktop/src/proxy/native-messaging-proxy.ts @@ -0,0 +1,23 @@ +import IPC from "./ipc"; +import NativeMessage from "./nativemessage"; + +// Proxy is a lightweight application which provides bi-directional communication +// between the browser extension and a running desktop application. +// +// Browser extension <-[native messaging]-> proxy <-[ipc]-> desktop +export class NativeMessagingProxy { + private ipc: IPC; + private nativeMessage: NativeMessage; + + constructor() { + this.ipc = new IPC(); + this.nativeMessage = new NativeMessage(this.ipc); + } + + run() { + this.ipc.connect(); + this.nativeMessage.listen(); + + this.ipc.onMessage = this.nativeMessage.send; + } +} diff --git a/apps/desktop/src/proxy/nativemessage.ts b/apps/desktop/src/proxy/nativemessage.ts new file mode 100644 index 00000000000..f7a32296f84 --- /dev/null +++ b/apps/desktop/src/proxy/nativemessage.ts @@ -0,0 +1,95 @@ +/* eslint-disable no-console */ +import IPC from "./ipc"; + +// Mostly based on the example from MDN, +// https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Native_messaging +export default class NativeMessage { + ipc: IPC; + + constructor(ipc: IPC) { + this.ipc = ipc; + } + + send(message: object) { + const messageBuffer = Buffer.from(JSON.stringify(message)); + + const headerBuffer = Buffer.alloc(4); + headerBuffer.writeUInt32LE(messageBuffer.length, 0); + + process.stdout.write(Buffer.concat([headerBuffer, messageBuffer])); + } + + listen() { + let payloadSize: number = null; + + // A queue to store the chunks as we read them from stdin. + // This queue can be flushed when `payloadSize` data has been read + const chunks: any = []; + + // Only read the size once for each payload + const sizeHasBeenRead = () => Boolean(payloadSize); + + // All the data has been read, reset everything for the next message + const flushChunksQueue = () => { + payloadSize = null; + chunks.splice(0); + }; + + const processData = () => { + // Create one big buffer with all all the chunks + const stringData = Buffer.concat(chunks); + console.error(stringData); + + // The browser will emit the size as a header of the payload, + // if it hasn't been read yet, do it. + // The next time we'll need to read the payload size is when all of the data + // of the current payload has been read (ie. data.length >= payloadSize + 4) + if (!sizeHasBeenRead()) { + try { + payloadSize = stringData.readUInt32LE(0); + } catch (e) { + console.error(e); + return; + } + } + + // If the data we have read so far is >= to the size advertised in the header, + // it means we have all of the data sent. + // We add 4 here because that's the size of the bytes that old the payloadSize + if (stringData.length >= payloadSize + 4) { + // Remove the header + const contentWithoutSize = stringData.slice(4, payloadSize + 4).toString(); + + // Reset the read size and the queued chunks + flushChunksQueue(); + + const json = JSON.parse(contentWithoutSize); + + // Forward to desktop application + this.ipc.send(json); + } + }; + + process.stdin.on("readable", () => { + // A temporary variable holding the nodejs.Buffer of each + // chunk of data read off stdin + let chunk = null; + + // Read all of the available data + // tslint:disable-next-line:no-conditional-assignment + while ((chunk = process.stdin.read()) !== null) { + chunks.push(chunk); + } + + try { + processData(); + } catch (e) { + console.error(e); + } + }); + + process.stdin.on("end", () => { + process.exit(0); + }); + } +} diff --git a/package-lock.json b/package-lock.json index 49346dbe885..15138a66967 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,6 @@ "@angular/platform-browser": "16.2.12", "@angular/platform-browser-dynamic": "16.2.12", "@angular/router": "16.2.12", - "@electron/fuses": "1.8.0", "@koa/multer": "3.0.2", "@koa/router": "12.0.1", "@microsoft/signalr": "8.0.7", @@ -5101,33 +5100,6 @@ "node": "*" } }, - "node_modules/@electron/fuses": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@electron/fuses/-/fuses-1.8.0.tgz", - "integrity": "sha512-zx0EIq78WlY/lBb1uXlziZmDZI4ubcCXIMJ4uGjXzZW0nS19TjSPeXPAjzzTmKQlJUZm0SbmZhPKP7tuQ1SsEw==", - "dependencies": { - "chalk": "^4.1.1", - "fs-extra": "^9.0.1", - "minimist": "^1.2.5" - }, - "bin": { - "electron-fuses": "dist/bin.js" - } - }, - "node_modules/@electron/fuses/node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@electron/get": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz", diff --git a/package.json b/package.json index 872849eb851..391474243b4 100644 --- a/package.json +++ b/package.json @@ -157,7 +157,6 @@ "@angular/platform-browser": "16.2.12", "@angular/platform-browser-dynamic": "16.2.12", "@angular/router": "16.2.12", - "@electron/fuses": "1.8.0", "@koa/multer": "3.0.2", "@koa/router": "12.0.1", "@microsoft/signalr": "8.0.7", From 9e45e32c7d0c95f88b3b74aee5ed4f803b402519 Mon Sep 17 00:00:00 2001 From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com> Date: Mon, 9 Sep 2024 06:25:41 -0700 Subject: [PATCH 14/36] [PM-8277] - Password generator history component (#10921) --- apps/browser/src/_locales/en/messages.json | 9 +++ apps/browser/src/popup/app-routing.module.ts | 6 +- ...redential-generator-history.component.html | 20 ++++++ .../credential-generator-history.component.ts | 66 +++++++++++++++++++ .../src/services/jslib-services.module.ts | 9 +++ ...redential-generator-history.component.html | 20 ++++++ .../credential-generator-history.component.ts | 58 ++++++++++++++++ .../empty-credential-history.component.html | 7 ++ .../src/empty-credential-history.component.ts | 18 +++++ .../src/icons/no-credentials.icon.ts | 27 ++++++++ libs/tools/generator/components/src/index.ts | 2 + 11 files changed, 239 insertions(+), 3 deletions(-) create mode 100644 apps/browser/src/tools/popup/generator/credential-generator-history.component.html create mode 100644 apps/browser/src/tools/popup/generator/credential-generator-history.component.ts create mode 100644 libs/tools/generator/components/src/credential-generator-history.component.html create mode 100644 libs/tools/generator/components/src/credential-generator-history.component.ts create mode 100644 libs/tools/generator/components/src/empty-credential-history.component.html create mode 100644 libs/tools/generator/components/src/empty-credential-history.component.ts create mode 100644 libs/tools/generator/components/src/icons/no-credentials.icon.ts diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json index 32215013ac7..05525be6ffd 100644 --- a/apps/browser/src/_locales/en/messages.json +++ b/apps/browser/src/_locales/en/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "There are no passwords to list." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Remove" }, diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts index 7af88316842..50f1aef6c00 100644 --- a/apps/browser/src/popup/app-routing.module.ts +++ b/apps/browser/src/popup/app-routing.module.ts @@ -53,6 +53,7 @@ import { PremiumV2Component } from "../billing/popup/settings/premium-v2.compone import { PremiumComponent } from "../billing/popup/settings/premium.component"; import BrowserPopupUtils from "../platform/popup/browser-popup-utils"; import { popupRouterCacheGuard } from "../platform/popup/view-cache/popup-router-cache.service"; +import { CredentialGeneratorHistoryComponent } from "../tools/popup/generator/credential-generator-history.component"; import { CredentialGeneratorComponent } from "../tools/popup/generator/credential-generator.component"; import { GeneratorComponent } from "../tools/popup/generator/generator.component"; import { PasswordGeneratorHistoryComponent } from "../tools/popup/generator/password-generator-history.component"; @@ -276,12 +277,11 @@ const routes: Routes = [ canActivate: [authGuard], data: { state: "generator" }, }, - { + ...extensionRefreshSwap(PasswordGeneratorHistoryComponent, CredentialGeneratorHistoryComponent, { path: "generator-history", - component: PasswordGeneratorHistoryComponent, canActivate: [authGuard], data: { state: "generator-history" }, - }, + }), ...extensionRefreshSwap(ImportBrowserComponent, ImportBrowserV2Component, { path: "import", canActivate: [authGuard], diff --git a/apps/browser/src/tools/popup/generator/credential-generator-history.component.html b/apps/browser/src/tools/popup/generator/credential-generator-history.component.html new file mode 100644 index 00000000000..48f0479d8d6 --- /dev/null +++ b/apps/browser/src/tools/popup/generator/credential-generator-history.component.html @@ -0,0 +1,20 @@ + + + + + + + + + + + + diff --git a/apps/browser/src/tools/popup/generator/credential-generator-history.component.ts b/apps/browser/src/tools/popup/generator/credential-generator-history.component.ts new file mode 100644 index 00000000000..0de71cf5b98 --- /dev/null +++ b/apps/browser/src/tools/popup/generator/credential-generator-history.component.ts @@ -0,0 +1,66 @@ +import { CommonModule } from "@angular/common"; +import { Component } from "@angular/core"; +import { takeUntilDestroyed } from "@angular/core/rxjs-interop"; +import { BehaviorSubject, distinctUntilChanged, firstValueFrom, map, switchMap } from "rxjs"; + +import { JslibModule } from "@bitwarden/angular/jslib.module"; +import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; +import { UserId } from "@bitwarden/common/types/guid"; +import { ButtonModule, ContainerComponent } from "@bitwarden/components"; +import { + CredentialGeneratorHistoryComponent as CredentialGeneratorHistoryToolsComponent, + EmptyCredentialHistoryComponent, +} from "@bitwarden/generator-components"; +import { GeneratorHistoryService } from "@bitwarden/generator-history"; + +import { PopOutComponent } from "../../../platform/popup/components/pop-out.component"; +import { PopupFooterComponent } from "../../../platform/popup/layout/popup-footer.component"; +import { PopupHeaderComponent } from "../../../platform/popup/layout/popup-header.component"; +import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.component"; + +@Component({ + selector: "app-credential-generator-history", + templateUrl: "credential-generator-history.component.html", + standalone: true, + imports: [ + ButtonModule, + CommonModule, + ContainerComponent, + JslibModule, + PopOutComponent, + PopupHeaderComponent, + PopupPageComponent, + CredentialGeneratorHistoryToolsComponent, + EmptyCredentialHistoryComponent, + PopupFooterComponent, + ], +}) +export class CredentialGeneratorHistoryComponent { + protected readonly hasHistory$ = new BehaviorSubject(false); + protected readonly userId$ = new BehaviorSubject(null); + + constructor( + private accountService: AccountService, + private history: GeneratorHistoryService, + ) { + this.accountService.activeAccount$ + .pipe( + takeUntilDestroyed(), + map(({ id }) => id), + distinctUntilChanged(), + ) + .subscribe(this.userId$); + + this.userId$ + .pipe( + takeUntilDestroyed(), + switchMap((id) => id && this.history.credentials$(id)), + map((credentials) => credentials.length > 0), + ) + .subscribe(this.hasHistory$); + } + + clear = async () => { + await this.history.clear(await firstValueFrom(this.userId$)); + }; +} diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index 49f11fabc81..5ccba9ead3c 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/libs/angular/src/services/jslib-services.module.ts @@ -243,6 +243,10 @@ import { FolderService } from "@bitwarden/common/vault/services/folder/folder.se import { TotpService } from "@bitwarden/common/vault/services/totp.service"; import { VaultSettingsService } from "@bitwarden/common/vault/services/vault-settings/vault-settings.service"; import { ToastService } from "@bitwarden/components"; +import { + GeneratorHistoryService, + LocalGeneratorHistoryService, +} from "@bitwarden/generator-history"; import { legacyPasswordGenerationServiceFactory, legacyUsernameGenerationServiceFactory, @@ -592,6 +596,11 @@ const safeProviders: SafeProvider[] = [ StateProvider, ], }), + safeProvider({ + provide: GeneratorHistoryService, + useClass: LocalGeneratorHistoryService, + deps: [EncryptService, CryptoServiceAbstraction, StateProvider], + }), safeProvider({ provide: UsernameGenerationServiceAbstraction, useFactory: legacyUsernameGenerationServiceFactory, diff --git a/libs/tools/generator/components/src/credential-generator-history.component.html b/libs/tools/generator/components/src/credential-generator-history.component.html new file mode 100644 index 00000000000..2b8802b9327 --- /dev/null +++ b/libs/tools/generator/components/src/credential-generator-history.component.html @@ -0,0 +1,20 @@ + +
+
+

{{ credential.credential }}

+ {{ + credential.generationDate | date: "medium" + }} +
+ +
+ diff --git a/libs/tools/generator/components/src/credential-generator-history.component.ts b/libs/tools/generator/components/src/credential-generator-history.component.ts new file mode 100644 index 00000000000..2f76027a941 --- /dev/null +++ b/libs/tools/generator/components/src/credential-generator-history.component.ts @@ -0,0 +1,58 @@ +import { CommonModule } from "@angular/common"; +import { Component } from "@angular/core"; +import { takeUntilDestroyed } from "@angular/core/rxjs-interop"; +import { RouterLink } from "@angular/router"; +import { BehaviorSubject, distinctUntilChanged, map, switchMap } from "rxjs"; + +import { JslibModule } from "@bitwarden/angular/jslib.module"; +import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; +import { UserId } from "@bitwarden/common/types/guid"; +import { + CardComponent, + IconButtonModule, + NoItemsModule, + SectionComponent, + SectionHeaderComponent, +} from "@bitwarden/components"; +import { GeneratedCredential, GeneratorHistoryService } from "@bitwarden/generator-history"; + +@Component({ + standalone: true, + selector: "bit-credential-generator-history", + templateUrl: "credential-generator-history.component.html", + imports: [ + CommonModule, + IconButtonModule, + NoItemsModule, + JslibModule, + RouterLink, + CardComponent, + SectionComponent, + SectionHeaderComponent, + ], +}) +export class CredentialGeneratorHistoryComponent { + protected readonly userId$ = new BehaviorSubject(null); + protected readonly credentials$ = new BehaviorSubject([]); + + constructor( + private accountService: AccountService, + private history: GeneratorHistoryService, + ) { + this.accountService.activeAccount$ + .pipe( + takeUntilDestroyed(), + map(({ id }) => id), + distinctUntilChanged(), + ) + .subscribe(this.userId$); + + this.userId$ + .pipe( + takeUntilDestroyed(), + switchMap((id) => id && this.history.credentials$(id)), + map((credentials) => credentials), + ) + .subscribe(this.credentials$); + } +} diff --git a/libs/tools/generator/components/src/empty-credential-history.component.html b/libs/tools/generator/components/src/empty-credential-history.component.html new file mode 100644 index 00000000000..ee28dc58958 --- /dev/null +++ b/libs/tools/generator/components/src/empty-credential-history.component.html @@ -0,0 +1,7 @@ +
+
+ +

{{ "noPasswordsToShow" | i18n }}

+
{{ "noRecentlyGeneratedPassword" | i18n }}
+
+
diff --git a/libs/tools/generator/components/src/empty-credential-history.component.ts b/libs/tools/generator/components/src/empty-credential-history.component.ts new file mode 100644 index 00000000000..1e23adf0bb1 --- /dev/null +++ b/libs/tools/generator/components/src/empty-credential-history.component.ts @@ -0,0 +1,18 @@ +import { Component } from "@angular/core"; + +import { JslibModule } from "@bitwarden/angular/jslib.module"; +import { IconModule, TypographyModule } from "@bitwarden/components"; + +import { NoCredentialsIcon } from "./icons/no-credentials.icon"; + +@Component({ + standalone: true, + selector: "bit-empty-credential-history", + templateUrl: "empty-credential-history.component.html", + imports: [JslibModule, IconModule, TypographyModule], +}) +export class EmptyCredentialHistoryComponent { + noCredentialsIcon = NoCredentialsIcon; + + constructor() {} +} diff --git a/libs/tools/generator/components/src/icons/no-credentials.icon.ts b/libs/tools/generator/components/src/icons/no-credentials.icon.ts new file mode 100644 index 00000000000..63843faccc9 --- /dev/null +++ b/libs/tools/generator/components/src/icons/no-credentials.icon.ts @@ -0,0 +1,27 @@ +import { svgIcon } from "@bitwarden/components"; + +export const NoCredentialsIcon = svgIcon` + + + + + + + + + + + + + + + + + + + + + + + + `; diff --git a/libs/tools/generator/components/src/index.ts b/libs/tools/generator/components/src/index.ts index 0fc0655a024..5915c5d59f6 100644 --- a/libs/tools/generator/components/src/index.ts +++ b/libs/tools/generator/components/src/index.ts @@ -1,2 +1,4 @@ export { PassphraseSettingsComponent } from "./passphrase-settings.component"; +export { CredentialGeneratorHistoryComponent } from "./credential-generator-history.component"; +export { EmptyCredentialHistoryComponent } from "./empty-credential-history.component"; export { PasswordSettingsComponent } from "./password-settings.component"; From 60e9969017d532a4753468c4da483ad4dd828a8f Mon Sep 17 00:00:00 2001 From: Conner Turnbull <133619638+cturnbull-bitwarden@users.noreply.github.com> Date: Mon, 9 Sep 2024 09:39:02 -0400 Subject: [PATCH 15/36] [AC-2568] Split billing history calls to separately call for invoices and transactions. Added paging buttons (#10697) * Split billing history calls to separately call for invoices and transactions. Added paging button * Added missing button types --- .../billing-history-view.component.html | 24 ++++++------ .../billing-history-view.component.ts | 35 +++++++++++++++--- ...zation-billing-history-view.component.html | 28 ++++++-------- ...nization-billing-history-view.component.ts | 35 +++++++++++++++--- .../shared/billing-history.component.ts | 18 ++++----- .../src/services/jslib-services.module.ts | 14 +++++++ ...account-billing-api.service.abstraction.ts | 12 ++++++ ...ization-billing-api.service.abstraction.ts | 12 ++++++ .../models/response/billing.response.ts | 2 + .../account/account-billing-api.service.ts | 34 +++++++++++++++++ .../organization-billing-api.service.ts | 37 +++++++++++++++++++ 11 files changed, 202 insertions(+), 49 deletions(-) create mode 100644 libs/common/src/billing/abstractions/account/account-billing-api.service.abstraction.ts create mode 100644 libs/common/src/billing/abstractions/organizations/organization-billing-api.service.abstraction.ts create mode 100644 libs/common/src/billing/services/account/account-billing-api.service.ts create mode 100644 libs/common/src/billing/services/organization/organization-billing-api.service.ts diff --git a/apps/web/src/app/billing/individual/billing-history-view.component.html b/apps/web/src/app/billing/individual/billing-history-view.component.html index 2491fc42c7f..7dbd8d1792a 100644 --- a/apps/web/src/app/billing/individual/billing-history-view.component.html +++ b/apps/web/src/app/billing/individual/billing-history-view.component.html @@ -2,17 +2,6 @@

{{ "billingHistory" | i18n }}

-

{{ "loading" | 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 3ee6415d6dd..e88d9bb1545 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 @@ -1,8 +1,11 @@ import { Component, OnInit } from "@angular/core"; import { Router } from "@angular/router"; -import { ApiService } from "@bitwarden/common/abstractions/api.service"; -import { BillingHistoryResponse } from "@bitwarden/common/billing/models/response/billing-history.response"; +import { AccountBillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/account/account-billing-api.service.abstraction"; +import { + BillingInvoiceResponse, + BillingTransactionResponse, +} from "@bitwarden/common/billing/models/response/billing.response"; import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service"; @Component({ @@ -11,12 +14,14 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl export class BillingHistoryViewComponent implements OnInit { loading = false; firstLoaded = false; - billing: BillingHistoryResponse; + invoices: BillingInvoiceResponse[] = []; + transactions: BillingTransactionResponse[] = []; + hasAdditionalHistory: boolean = false; constructor( - private apiService: ApiService, private platformUtilsService: PlatformUtilsService, private router: Router, + private accountBillingApiService: AccountBillingApiServiceAbstraction, ) {} async ngOnInit() { @@ -35,7 +40,27 @@ export class BillingHistoryViewComponent implements OnInit { return; } this.loading = true; - this.billing = await this.apiService.getUserBillingHistory(); + + const invoicesPromise = this.accountBillingApiService.getBillingInvoices( + this.invoices.length > 0 ? this.invoices[this.invoices.length - 1].id : null, + ); + + const transactionsPromise = this.accountBillingApiService.getBillingTransactions( + this.transactions.length > 0 + ? this.transactions[this.transactions.length - 1].createdDate + : null, + ); + + const accountInvoices = await invoicesPromise; + const accountTransactions = await transactionsPromise; + const pageSize = 5; + + this.invoices = [...this.invoices, ...accountInvoices]; + this.transactions = [...this.transactions, ...accountTransactions]; + this.hasAdditionalHistory = !( + accountInvoices.length < pageSize && accountTransactions.length < pageSize + ); + this.loading = false; } } diff --git a/apps/web/src/app/billing/organizations/organization-billing-history-view.component.html b/apps/web/src/app/billing/organizations/organization-billing-history-view.component.html index 087009b2910..20bf0475eed 100644 --- a/apps/web/src/app/billing/organizations/organization-billing-history-view.component.html +++ b/apps/web/src/app/billing/organizations/organization-billing-history-view.component.html @@ -1,17 +1,4 @@ - - - + @@ -22,7 +9,16 @@ > {{ "loading" | i18n }} - - + + + 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 cd293452001..00ab3fa7772 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 @@ -2,8 +2,11 @@ import { Component, OnDestroy, OnInit } from "@angular/core"; import { ActivatedRoute } from "@angular/router"; import { concatMap, Subject, takeUntil } from "rxjs"; -import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction"; -import { BillingHistoryResponse } from "@bitwarden/common/billing/models/response/billing-history.response"; +import { OrganizationBillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/organizations/organization-billing-api.service.abstraction"; +import { + BillingInvoiceResponse, + BillingTransactionResponse, +} from "@bitwarden/common/billing/models/response/billing.response"; @Component({ templateUrl: "organization-billing-history-view.component.html", @@ -11,13 +14,15 @@ import { BillingHistoryResponse } from "@bitwarden/common/billing/models/respons export class OrgBillingHistoryViewComponent implements OnInit, OnDestroy { loading = false; firstLoaded = false; - billing: BillingHistoryResponse; + invoices: BillingInvoiceResponse[] = []; + transactions: BillingTransactionResponse[] = []; organizationId: string; + hasAdditionalHistory: boolean = false; private destroy$ = new Subject(); constructor( - private organizationApiService: OrganizationApiServiceAbstraction, + private organizationBillingApiService: OrganizationBillingApiServiceAbstraction, private route: ActivatedRoute, ) {} @@ -43,8 +48,28 @@ export class OrgBillingHistoryViewComponent implements OnInit, OnDestroy { if (this.loading) { return; } + this.loading = true; - this.billing = await this.organizationApiService.getBillingHistory(this.organizationId); + + const invoicesPromise = this.organizationBillingApiService.getBillingInvoices( + this.organizationId, + this.invoices.length > 0 ? this.invoices[this.invoices.length - 1].id : null, + ); + + const transactionsPromise = this.organizationBillingApiService.getBillingTransactions( + this.organizationId, + this.transactions.length > 0 + ? this.transactions[this.transactions.length - 1].createdDate + : null, + ); + + const invoices = await invoicesPromise; + const transactions = await transactionsPromise; + const pageSize = 5; + + this.invoices = [...this.invoices, ...invoices]; + this.transactions = [...this.transactions, ...transactions]; + this.hasAdditionalHistory = !(invoices.length < pageSize && transactions.length < pageSize); this.loading = false; } } diff --git a/apps/web/src/app/billing/shared/billing-history.component.ts b/apps/web/src/app/billing/shared/billing-history.component.ts index ec85da7d33c..ac16b3dc72a 100644 --- a/apps/web/src/app/billing/shared/billing-history.component.ts +++ b/apps/web/src/app/billing/shared/billing-history.component.ts @@ -1,7 +1,10 @@ import { Component, Input } from "@angular/core"; import { PaymentMethodType, TransactionType } from "@bitwarden/common/billing/enums"; -import { BillingHistoryResponse } from "@bitwarden/common/billing/models/response/billing-history.response"; +import { + BillingInvoiceResponse, + BillingTransactionResponse, +} from "@bitwarden/common/billing/models/response/billing.response"; @Component({ selector: "app-billing-history", @@ -9,19 +12,14 @@ import { BillingHistoryResponse } from "@bitwarden/common/billing/models/respons }) export class BillingHistoryComponent { @Input() - billing: BillingHistoryResponse; + invoices: BillingInvoiceResponse[]; + + @Input() + transactions: BillingTransactionResponse[]; paymentMethodType = PaymentMethodType; transactionType = TransactionType; - get invoices() { - return this.billing != null ? this.billing.invoices : null; - } - - get transactions() { - return this.billing != null ? this.billing.transactions : null; - } - paymentMethodClasses(type: PaymentMethodType) { switch (type) { case PaymentMethodType.Card: diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index 5ccba9ead3c..cdf6a273909 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/libs/angular/src/services/jslib-services.module.ts @@ -125,9 +125,13 @@ import { BillingApiServiceAbstraction, OrganizationBillingServiceAbstraction, } from "@bitwarden/common/billing/abstractions"; +import { AccountBillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/account/account-billing-api.service.abstraction"; import { BillingAccountProfileStateService } from "@bitwarden/common/billing/abstractions/account/billing-account-profile-state.service"; +import { OrganizationBillingApiServiceAbstraction } from "@bitwarden/common/billing/abstractions/organizations/organization-billing-api.service.abstraction"; +import { AccountBillingApiService } from "@bitwarden/common/billing/services/account/account-billing-api.service"; import { DefaultBillingAccountProfileStateService } from "@bitwarden/common/billing/services/account/billing-account-profile-state.service"; import { BillingApiService } from "@bitwarden/common/billing/services/billing-api.service"; +import { OrganizationBillingApiService } from "@bitwarden/common/billing/services/organization/organization-billing-api.service"; import { OrganizationBillingService } from "@bitwarden/common/billing/services/organization-billing.service"; import { AppIdService as AppIdServiceAbstraction } from "@bitwarden/common/platform/abstractions/app-id.service"; import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service"; @@ -985,6 +989,16 @@ const safeProviders: SafeProvider[] = [ // subscribes to sync notifications and will update itself based on that. deps: [ApiServiceAbstraction, SyncService], }), + safeProvider({ + provide: OrganizationBillingApiServiceAbstraction, + useClass: OrganizationBillingApiService, + deps: [ApiServiceAbstraction], + }), + safeProvider({ + provide: AccountBillingApiServiceAbstraction, + useClass: AccountBillingApiService, + deps: [ApiServiceAbstraction], + }), safeProvider({ provide: DefaultConfigService, useClass: DefaultConfigService, diff --git a/libs/common/src/billing/abstractions/account/account-billing-api.service.abstraction.ts b/libs/common/src/billing/abstractions/account/account-billing-api.service.abstraction.ts new file mode 100644 index 00000000000..4b67ce55c30 --- /dev/null +++ b/libs/common/src/billing/abstractions/account/account-billing-api.service.abstraction.ts @@ -0,0 +1,12 @@ +import { + BillingInvoiceResponse, + BillingTransactionResponse, +} from "@bitwarden/common/billing/models/response/billing.response"; + +export class AccountBillingApiServiceAbstraction { + getBillingInvoices: (id: string, startAfter?: string) => Promise; + getBillingTransactions: ( + id: string, + startAfter?: string, + ) => Promise; +} diff --git a/libs/common/src/billing/abstractions/organizations/organization-billing-api.service.abstraction.ts b/libs/common/src/billing/abstractions/organizations/organization-billing-api.service.abstraction.ts new file mode 100644 index 00000000000..4b3592bb6d3 --- /dev/null +++ b/libs/common/src/billing/abstractions/organizations/organization-billing-api.service.abstraction.ts @@ -0,0 +1,12 @@ +import { + BillingInvoiceResponse, + BillingTransactionResponse, +} from "@bitwarden/common/billing/models/response/billing.response"; + +export class OrganizationBillingApiServiceAbstraction { + getBillingInvoices: (id: string, startAfter?: string) => Promise; + getBillingTransactions: ( + id: string, + startAfter?: string, + ) => Promise; +} diff --git a/libs/common/src/billing/models/response/billing.response.ts b/libs/common/src/billing/models/response/billing.response.ts index 45d3cf1e67e..b94fc1b64b0 100644 --- a/libs/common/src/billing/models/response/billing.response.ts +++ b/libs/common/src/billing/models/response/billing.response.ts @@ -29,6 +29,7 @@ export class BillingSourceResponse extends BaseResponse { } export class BillingInvoiceResponse extends BaseResponse { + id: string; url: string; pdfUrl: string; number: string; @@ -38,6 +39,7 @@ export class BillingInvoiceResponse extends BaseResponse { constructor(response: any) { super(response); + this.id = this.getResponseProperty("Id"); this.url = this.getResponseProperty("Url"); this.pdfUrl = this.getResponseProperty("PdfUrl"); this.number = this.getResponseProperty("Number"); diff --git a/libs/common/src/billing/services/account/account-billing-api.service.ts b/libs/common/src/billing/services/account/account-billing-api.service.ts new file mode 100644 index 00000000000..ddd5bad02e1 --- /dev/null +++ b/libs/common/src/billing/services/account/account-billing-api.service.ts @@ -0,0 +1,34 @@ +import { ApiService } from "../../../abstractions/api.service"; +import { AccountBillingApiServiceAbstraction } from "../../abstractions/account/account-billing-api.service.abstraction"; +import { + BillingInvoiceResponse, + BillingTransactionResponse, +} from "../../models/response/billing.response"; + +export class AccountBillingApiService implements AccountBillingApiServiceAbstraction { + constructor(private apiService: ApiService) {} + + async getBillingInvoices(startAfter?: string): Promise { + const queryParams = startAfter ? `?startAfter=${startAfter}` : ""; + const r = await this.apiService.send( + "GET", + `/accounts/billing/invoices${queryParams}`, + null, + true, + true, + ); + return r?.map((i: any) => new BillingInvoiceResponse(i)) || []; + } + + async getBillingTransactions(startAfter?: string): Promise { + const queryParams = startAfter ? `?startAfter=${startAfter}` : ""; + const r = await this.apiService.send( + "GET", + `/accounts/billing/transactions${queryParams}`, + null, + true, + true, + ); + return r?.map((i: any) => new BillingTransactionResponse(i)) || []; + } +} diff --git a/libs/common/src/billing/services/organization/organization-billing-api.service.ts b/libs/common/src/billing/services/organization/organization-billing-api.service.ts new file mode 100644 index 00000000000..acf12e83209 --- /dev/null +++ b/libs/common/src/billing/services/organization/organization-billing-api.service.ts @@ -0,0 +1,37 @@ +import { ApiService } from "../../../abstractions/api.service"; +import { OrganizationBillingApiServiceAbstraction } from "../../abstractions/organizations/organization-billing-api.service.abstraction"; +import { + BillingInvoiceResponse, + BillingTransactionResponse, +} from "../../models/response/billing.response"; + +export class OrganizationBillingApiService implements OrganizationBillingApiServiceAbstraction { + constructor(private apiService: ApiService) {} + + async getBillingInvoices(id: string, startAfter?: string): Promise { + const queryParams = startAfter ? `?startAfter=${startAfter}` : ""; + const r = await this.apiService.send( + "GET", + `/organizations/${id}/billing/invoices${queryParams}`, + null, + true, + true, + ); + return r?.map((i: any) => new BillingInvoiceResponse(i)) || []; + } + + async getBillingTransactions( + id: string, + startAfter?: string, + ): Promise { + const queryParams = startAfter ? `?startAfter=${startAfter}` : ""; + const r = await this.apiService.send( + "GET", + `/organizations/${id}/billing/transactions${queryParams}`, + null, + true, + true, + ); + return r?.map((i: any) => new BillingTransactionResponse(i)) || []; + } +} From e9546217615898c466f9bf0bea96cb33d2058721 Mon Sep 17 00:00:00 2001 From: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com> Date: Mon, 9 Sep 2024 10:03:30 -0400 Subject: [PATCH 16/36] Auth/PM-10684 - Fix CLI asking for MP even if session key provided as command option (#10917) * PM-10684 - ServiceContainer - Add better docs * PM-10684 - UserAutoUnlockKeyService - setUserKeyInMemoryIfAutoUserKeySet - refactor method to return a bool instead of nothing so users can know if a user key was retrieved & set without another call. * PM-10684 - Remove async code ( Program.ts) responsible for setting the auto user key from the session option handler (event emitter which fires when a user passes --session to a command). Returning this to synchronous execution prevents a race condition between the setting of the user key and the command executing the exitIfLocked logic in the base-program which would check if the user key had been set to determine if the command should be allowed to execute or if the user was locked. When running a loop from a script, the command would often trigger the exitIfLocked before the auto user key could be set in state from the option:session session. * PM-10684 - Clean up missed item per PR feedback --- apps/cli/src/base-program.ts | 77 ++++++++++++------- apps/cli/src/program.ts | 13 +--- .../service-container/service-container.ts | 4 + .../services/user-auto-unlock-key.service.ts | 8 +- 4 files changed, 58 insertions(+), 44 deletions(-) diff --git a/apps/cli/src/base-program.ts b/apps/cli/src/base-program.ts index e4340b68e22..0f200d49d9d 100644 --- a/apps/cli/src/base-program.ts +++ b/apps/cli/src/base-program.ts @@ -3,6 +3,7 @@ import { firstValueFrom, map } from "rxjs"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum"; +import { UserId } from "@bitwarden/common/types/guid"; import { UnlockCommand } from "./auth/commands/unlock.command"; import { Response } from "./models/response"; @@ -135,37 +136,55 @@ export abstract class BaseProgram { protected async exitIfLocked() { const userId = await this.exitIfNotAuthed(); - if (await this.serviceContainer.cryptoService.hasUserKey()) { + + // If the process.env does not have a BW_SESSION key, then we will never be able to retrieve + // the auto user key from secure storage. This is because the auto user key is encrypted with + // the session key. + const hasUserKey = + await this.serviceContainer.userAutoUnlockKeyService.setUserKeyInMemoryIfAutoUserKeySet( + userId, + ); + + if (hasUserKey) { + // User is unlocked return; - } else if (process.env.BW_NOINTERACTION !== "true") { - // must unlock - if (await this.serviceContainer.keyConnectorService.getUsesKeyConnector(userId)) { - 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.", - ); - this.processResponse(response, true); - } else { - const command = new UnlockCommand( - this.serviceContainer.accountService, - this.serviceContainer.masterPasswordService, - this.serviceContainer.cryptoService, - this.serviceContainer.userVerificationService, - this.serviceContainer.cryptoFunctionService, - this.serviceContainer.logService, - this.serviceContainer.keyConnectorService, - this.serviceContainer.environmentService, - this.serviceContainer.syncService, - this.serviceContainer.organizationApiService, - this.serviceContainer.logout, - ); - const response = await command.run(null, null); - if (!response.success) { - this.processResponse(response, true); - } - } - } else { + } + + // User is locked + await this.handleLockedUser(userId); + } + + private async handleLockedUser(userId: UserId) { + if (process.env.BW_NOINTERACTION === "true") { this.processResponse(Response.error("Vault is locked."), true); + return; + } + + // must unlock with interaction allowed + if (await this.serviceContainer.keyConnectorService.getUsesKeyConnector(userId)) { + 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.", + ); + this.processResponse(response, true); + } else { + const command = new UnlockCommand( + this.serviceContainer.accountService, + this.serviceContainer.masterPasswordService, + this.serviceContainer.cryptoService, + this.serviceContainer.userVerificationService, + this.serviceContainer.cryptoFunctionService, + this.serviceContainer.logService, + this.serviceContainer.keyConnectorService, + this.serviceContainer.environmentService, + this.serviceContainer.syncService, + this.serviceContainer.organizationApiService, + this.serviceContainer.logout, + ); + const response = await command.run(null, null); + if (!response.success) { + this.processResponse(response, true); + } } } diff --git a/apps/cli/src/program.ts b/apps/cli/src/program.ts index 6ecdb249315..7582c760959 100644 --- a/apps/cli/src/program.ts +++ b/apps/cli/src/program.ts @@ -1,6 +1,5 @@ import * as chalk from "chalk"; import { program, Command, OptionValues } from "commander"; -import { firstValueFrom } from "rxjs"; import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status"; @@ -61,18 +60,8 @@ export class Program extends BaseProgram { process.env.BW_NOINTERACTION = "true"; }); - program.on("option:session", async (key) => { + program.on("option:session", (key) => { process.env.BW_SESSION = key; - - // once we have the session key, we can set the user key in memory - const activeAccount = await firstValueFrom( - this.serviceContainer.accountService.activeAccount$, - ); - if (activeAccount) { - await this.serviceContainer.userAutoUnlockKeyService.setUserKeyInMemoryIfAutoUserKeySet( - activeAccount.id, - ); - } }); program.on("command:*", () => { diff --git a/apps/cli/src/service-container/service-container.ts b/apps/cli/src/service-container/service-container.ts index be1b1cc9e2b..ba73c26085a 100644 --- a/apps/cli/src/service-container/service-container.ts +++ b/apps/cli/src/service-container/service-container.ts @@ -803,6 +803,10 @@ export class ServiceContainer { await this.i18nService.init(); this.twoFactorService.init(); + // If a user has a BW_SESSION key stored in their env (not process.env.BW_SESSION), + // this should set the user key to unlock the vault on init. + // TODO: ideally, we wouldn't want to do this here but instead only for commands that require the vault to be unlocked + // as this runs on every command and could be a performance hit const activeAccount = await firstValueFrom(this.accountService.activeAccount$); if (activeAccount?.id) { await this.userAutoUnlockKeyService.setUserKeyInMemoryIfAutoUserKeySet(activeAccount.id); diff --git a/libs/common/src/platform/services/user-auto-unlock-key.service.ts b/libs/common/src/platform/services/user-auto-unlock-key.service.ts index 6c8ce3f0489..b4a154133c1 100644 --- a/libs/common/src/platform/services/user-auto-unlock-key.service.ts +++ b/libs/common/src/platform/services/user-auto-unlock-key.service.ts @@ -16,10 +16,11 @@ export class UserAutoUnlockKeyService { * However, for users that have the auto unlock user key set, we need to set the user key in memory * on application bootstrap and on active account changes so that the user's vault loads unlocked. * @param userId - The user id to check for an auto user key. + * @returns True if the auto user key is set successfully, false otherwise. */ - async setUserKeyInMemoryIfAutoUserKeySet(userId: UserId): Promise { + async setUserKeyInMemoryIfAutoUserKeySet(userId: UserId): Promise { if (userId == null) { - return; + return false; } const autoUserKey = await this.cryptoService.getUserKeyFromStorage( @@ -28,9 +29,10 @@ export class UserAutoUnlockKeyService { ); if (autoUserKey == null) { - return; + return false; } await this.cryptoService.setUserKey(autoUserKey, userId); + return true; } } From d189b4e2943721f14bb4e2f82e78695f6dac23c7 Mon Sep 17 00:00:00 2001 From: rr-bw <102181210+rr-bw@users.noreply.github.com> Date: Mon, 9 Sep 2024 07:05:04 -0700 Subject: [PATCH 17/36] [PM-8013] CLI MAC failure logs - update secureStorageService deps (#10935) --- apps/cli/src/service-container/service-container.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/cli/src/service-container/service-container.ts b/apps/cli/src/service-container/service-container.ts index ba73c26085a..b9225fec43d 100644 --- a/apps/cli/src/service-container/service-container.ts +++ b/apps/cli/src/service-container/service-container.ts @@ -285,7 +285,13 @@ export class ServiceContainer { this.secureStorageService = new NodeEnvSecureStorageService( this.storageService, this.logService, - this.encryptService, + // MAC failures for secure storage are being logged for customers today and + // they occur when users unlock / login and refresh a session key but don't + // export it into their environment (e.g. BW_SESSION_KEY). This leaves a stale + // BW_SESSION key in the env which is attempted to be used to decrypt the auto + // unlock user key which obviously fails. So, to resolve this, we will not log + // MAC failures for secure storage. + new EncryptServiceImplementation(this.cryptoFunctionService, this.logService, false), ); this.memoryStorageService = new MemoryStorageService(); From c161873ce52596bb9f25e38805f3f5a9ae7f7501 Mon Sep 17 00:00:00 2001 From: Nick Krantz <125900171+nick-livefront@users.noreply.github.com> Date: Mon, 9 Sep 2024 09:38:32 -0500 Subject: [PATCH 18/36] reset min-width to zero to override flex from setting min-width to auto (#10936) --- libs/components/src/item/item-content.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/components/src/item/item-content.component.html b/libs/components/src/item/item-content.component.html index da45c8b3b61..bed8b2f5b76 100644 --- a/libs/components/src/item/item-content.component.html +++ b/libs/components/src/item/item-content.component.html @@ -1,4 +1,4 @@ -
+
From e37af18359949424464b42d2ad94a23e75caa596 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:39:28 +0000 Subject: [PATCH 19/36] Autosync the updated translations (#10957) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com> --- apps/desktop/src/locales/az/messages.json | 16 +- apps/desktop/src/locales/et/messages.json | 452 +++++++++++----------- 2 files changed, 234 insertions(+), 234 deletions(-) diff --git a/apps/desktop/src/locales/az/messages.json b/apps/desktop/src/locales/az/messages.json index f56a342d375..8c31a6e7029 100644 --- a/apps/desktop/src/locales/az/messages.json +++ b/apps/desktop/src/locales/az/messages.json @@ -865,7 +865,7 @@ "message": "Bizi izləyin" }, "syncVault": { - "message": "Anbarı eyniləşdir" + "message": "Anbarı sinxronlaşdır" }, "changeMasterPass": { "message": "Ana parolu dəyişdir" @@ -894,10 +894,10 @@ "message": "Brauzer uzantısını al" }, "syncingComplete": { - "message": "Eyniləşdirmə tamamlandı" + "message": "Sinxr tamamlandı" }, "syncingFailed": { - "message": "Uğursuz eyniləşdirmə" + "message": "Sinxr uğursuz oldu" }, "yourVaultIsLocked": { "message": "Anbarınız kilidlənib. Davam etmək üçün kimliyinizi doğrulayın." @@ -928,10 +928,10 @@ "message": "İki mərhələli giriş" }, "vaultTimeout": { - "message": "Anbara müraciət bitəcək" + "message": "Anbar vaxtının bitməsi" }, "vaultTimeoutDesc": { - "message": "Anbara müraciətin bitəcəyi vaxtı seçin və seçilən əməliyyatı icra edin." + "message": "Anbarın vaxt bitmə əməliyyatını nə vaxt icra edəcəyini seçin." }, "immediately": { "message": "Dərhal" @@ -1617,13 +1617,13 @@ "message": "Bir və ya daha çox təşkilat siyasətləri yaradıcı seçimlərinizə təsir edir." }, "vaultTimeoutAction": { - "message": "Anbara müraciət vaxtının bitmə əməliyyatı" + "message": "Anbar vaxtının bitmə əməliyyatı" }, "vaultTimeoutActionLockDesc": { - "message": "Kilidli bir anbar, təkrar müraciət etmək üçün ana parolunuzu yenidən yazmağınızı tələb edir." + "message": "Anbarınıza təkrar müraciət etmək üçün ana parol və ya digər kilid açma üsulu tələb olunur." }, "vaultTimeoutActionLogOutDesc": { - "message": "Anbarınıza yenidən müraciət etmək üçün təkrar kimlik doğrulama tələb olunur." + "message": "Anbarınıza təkrar müraciət etmək üçün təkrar kimlik doğrulama tələb olunur." }, "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Anbar vaxt bitməsi əməliyyatınızı dəyişdirmək üçün bir kilid açma üsulu quraşdırın." diff --git a/apps/desktop/src/locales/et/messages.json b/apps/desktop/src/locales/et/messages.json index 2d661f6db49..033da99272d 100644 --- a/apps/desktop/src/locales/et/messages.json +++ b/apps/desktop/src/locales/et/messages.json @@ -404,7 +404,7 @@ "message": "Pikkus" }, "passwordMinLength": { - "message": "Minimum password length" + "message": "Parooli miinimumpikkus" }, "uppercase": { "message": "Suurtäht (A-Z)" @@ -479,7 +479,7 @@ "message": "Maksimaalne faili suurus on 500 MB." }, "encryptionKeyMigrationRequired": { - "message": "Encryption key migration required. Please login through the web vault to update your encryption key." + "message": "Krüpteerimisvõtme ühendamine nõutud. Palun logi sisse läbi veebibrauseri, et uuendada enda krüpteerimisvõtit." }, "editedFolder": { "message": "Kaust on muudetud" @@ -500,10 +500,10 @@ "message": "Konto loomine" }, "setAStrongPassword": { - "message": "Set a strong password" + "message": "Määra tugev parool" }, "finishCreatingYourAccountBySettingAPassword": { - "message": "Finish creating your account by setting a password" + "message": "Lõpeta konto loomine määrates parooli" }, "logIn": { "message": "Logi sisse" @@ -527,7 +527,7 @@ "message": "Ülemparooli vihje (ei ole kohustuslik)" }, "masterPassHintText": { - "message": "If you forget your password, the password hint can be sent to your email. $CURRENT$/$MAXIMUM$ character maximum.", + "message": "Kui sa unustad oma parooli, saad saata parooli vihje e-mailile.\n$CURRENT$/$MAXIMUM$ tähepiirang.", "placeholders": { "current": { "content": "$1", @@ -540,22 +540,22 @@ } }, "masterPassword": { - "message": "Master password" + "message": "Ülemparool" }, "masterPassImportant": { - "message": "Your master password cannot be recovered if you forget it!" + "message": "Ülemparooli ei saa taastada, kui sa selle unustama peaksid!" }, "confirmMasterPassword": { - "message": "Confirm master password" + "message": "Kinnita ülemparool" }, "masterPassHintLabel": { - "message": "Master password hint" + "message": "Ülemparooli vihje" }, "joinOrganization": { - "message": "Join organization" + "message": "Liitu organisatsiooniga" }, "finishJoiningThisOrganizationBySettingAMasterPassword": { - "message": "Finish joining this organization by setting a master password." + "message": "Lõpeta organisatsiooniga liitumine määrates ülemparool." }, "settings": { "message": "Seaded" @@ -592,10 +592,10 @@ } }, "youSuccessfullyLoggedIn": { - "message": "You successfully logged in" + "message": "Sisselogimine õnnestus" }, "youMayCloseThisWindow": { - "message": "You may close this window" + "message": "Võid selle akna sulgeda" }, "masterPassDoesntMatch": { "message": "Ülemparoolid ei ühti." @@ -604,10 +604,10 @@ "message": "Sinu konto on loodud! Võid nüüd sisse logida." }, "newAccountCreated2": { - "message": "Your new account has been created!" + "message": "Uus konto loodud!" }, "youHaveBeenLoggedIn": { - "message": "You have been logged in!" + "message": "Olete sisse logitud!" }, "masterPassSent": { "message": "Ülemparooli vihje saadeti Sinu e-postile." @@ -640,7 +640,7 @@ "message": "Nõutav on kinnituskood." }, "webauthnCancelOrTimeout": { - "message": "The authentication was cancelled or took too long. Please try again." + "message": "Autentimine tühistati või kestis liiga kaua aega. Palun proovi uuesti." }, "invalidVerificationCode": { "message": "Vale kinnituskood" @@ -694,17 +694,17 @@ "message": "Autentimise rakendus" }, "authenticatorAppDescV2": { - "message": "Enter a code generated by an authenticator app like Bitwarden Authenticator.", + "message": "Sisesta oma autentikaatori (näiteks Bitwarden Authenticator) genereeritud kood.", "description": "'Bitwarden Authenticator' is a product name and should not be translated." }, "yubiKeyTitleV2": { - "message": "Yubico OTP security key" + "message": "Yubico OTP turvavõti" }, "yubiKeyDesc": { "message": "Kasuta kontole ligipääsemiseks YubiKey-d. See töötab YubiKey 4, 4 Nano, 4C ja NEO seadmetega." }, "duoDescV2": { - "message": "Enter a code generated by Duo Security.", + "message": "Sisesta Duo Security genereeritud kood.", "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated." }, "duoOrganizationDesc": { @@ -721,7 +721,7 @@ "message": "E-post" }, "emailDescV2": { - "message": "Enter a code sent to your email." + "message": "Sisesta oma emailile saadetud kood." }, "loginUnavailable": { "message": "Sisselogimine ei ole saadaval" @@ -742,13 +742,13 @@ "message": "Specify the base URL of your on-premise hosted bitwarden installation." }, "selfHostedBaseUrlHint": { - "message": "Specify the base URL of your on-premises hosted Bitwarden installation. Example: https://bitwarden.company.com" + "message": "Sisesta enda ise-majutatud Bitwardeni serveri nimi (base URL). Näiteks: https://bitwarden.company.com" }, "selfHostedCustomEnvHeader": { - "message": "For advanced configuration, you can specify the base URL of each service independently." + "message": "Täpsemaks seadistamiseks võid määrata serveri nime (base URL) igale teenusele eraldi." }, "selfHostedEnvFormInvalid": { - "message": "You must add either the base Server URL or at least one custom environment." + "message": "Sa pead lisama serveri nime (base URL) või vähemalt ühe iseseadistatud keskkonna." }, "customEnvironment": { "message": "Kohandatud keskkond" @@ -799,22 +799,22 @@ "message": "Välja logitud" }, "loggedOutDesc": { - "message": "You have been logged out of your account." + "message": "Kontolt edukalt välja logitud." }, "loginExpired": { "message": "Sessioon on aegunud." }, "restartRegistration": { - "message": "Restart registration" + "message": "Alusta registreerimist uuesti" }, "expiredLink": { - "message": "Expired link" + "message": "Aegunud link" }, "pleaseRestartRegistrationOrTryLoggingIn": { - "message": "Please restart registration or try logging in." + "message": "Palun alusta registreerimist uuesti või proovi sisse logida." }, "youMayAlreadyHaveAnAccount": { - "message": "You may already have an account" + "message": "Sul on juba võib-olla konto" }, "logOutConfirmation": { "message": "Oled kindel, et soovid välja logida?" @@ -871,10 +871,10 @@ "message": "Muuda ülemparooli" }, "continueToWebApp": { - "message": "Continue to web app?" + "message": "Jätka veebibrauseris?" }, "changeMasterPasswordOnWebConfirmation": { - "message": "You can change your master password on the Bitwarden web app." + "message": "Ülemparooli saab muuta Bitwardeni veebirakenduses." }, "fingerprintPhrase": { "message": "Unikaalne sõnajada", @@ -1160,7 +1160,7 @@ "message": "1 GB ulatuses krüpteeritud salvestusruum." }, "premiumSignUpTwoStepOptions": { - "message": "Proprietary two-step login options such as YubiKey and Duo." + "message": "Eraomanduses kaheastmelise logimise valikud, nagu näiteks YubiKey ja Duo." }, "premiumSignUpReports": { "message": "Parooli hügieen, konto seisukord ja andmelekete raportid aitavad hoidlat turvalisena hoida." @@ -1181,7 +1181,7 @@ "message": "Saad Preemium versiooni osta bitwarden.com veebihoidlas. Soovid seda kohe teha?" }, "premiumPurchaseAlertV2": { - "message": "You can purchase Premium from your account settings on the Bitwarden web app." + "message": "Sa saad hankida Preemiumi oma konto seadetes veebibrauseris." }, "premiumCurrentMember": { "message": "Oled preemium kasutaja!" @@ -1286,10 +1286,10 @@ } }, "errorRefreshingAccessToken": { - "message": "Access Token Refresh Error" + "message": "Juurdepääsukoodi Värskendamine Ebaõnnestus" }, "errorRefreshingAccessTokenDesc": { - "message": "No refresh token or API keys found. Please try logging out and logging back in." + "message": "Ei leidnud värskendamise koodi või API võtit. Palun proovi logida välja ja uuesti sisse." }, "help": { "message": "Abi" @@ -1379,7 +1379,7 @@ "description": "ex. Date this password was updated" }, "exportFrom": { - "message": "Export from" + "message": "Ekspordi asukohast" }, "exportVault": { "message": "Ekspordi hoidla" @@ -1388,31 +1388,31 @@ "message": "Failivorming" }, "fileEncryptedExportWarningDesc": { - "message": "This file export will be password protected and require the file password to decrypt." + "message": "See eksporditav fail on parooliga kaitstud ja nõuab dekrüpteerimiseks parooli." }, "filePassword": { - "message": "File password" + "message": "Faili parool" }, "exportPasswordDescription": { - "message": "This password will be used to export and import this file" + "message": "Seda parooli kasutatakse selle faili eksportimiseks ja importimiseks" }, "accountRestrictedOptionDescription": { - "message": "Use your account encryption key, derived from your account's username and Master Password, to encrypt the export and restrict import to only the current Bitwarden account." + "message": "Kasuta oma konto krüpteerimise võtit, mis koosneb sinu kasutajanimest ja ülemparoolist, et krüpteerida fail ja takistada selle importimine teistesse kontodesse." }, "passwordProtected": { - "message": "Password protected" + "message": "Parooliga kaitstud" }, "passwordProtectedOptionDescription": { - "message": "Set a file password to encrypt the export and import it to any Bitwarden account using the password for decryption." + "message": "Määra faili parool, et see krüpteerida ja importida teise Bitwardeni kontosse kasutates seda parooli dekrüpteerimiseks." }, "exportTypeHeading": { - "message": "Export type" + "message": "Ekspordi tüüp" }, "accountRestricted": { - "message": "Account restricted" + "message": "Kontosisene" }, "filePasswordAndConfirmFilePasswordDoNotMatch": { - "message": "“File password” and “Confirm file password“ do not match." + "message": "\"Faili parool\" ja \"Faili parooli kinnitus\" ei kattu." }, "hCaptchaUrl": { "message": "hCaptcha Url", @@ -1511,28 +1511,28 @@ "message": "Vale PIN kood." }, "tooManyInvalidPinEntryAttemptsLoggingOut": { - "message": "Too many invalid PIN entry attempts. Logging out." + "message": "Liiga palju ebaõnnestunud katseid. Login välja." }, "unlockWithWindowsHello": { "message": "Lukusta lahti Windows Helloga" }, "additionalWindowsHelloSettings": { - "message": "Additional Windows Hello settings" + "message": "Windows Hello lisaseaded" }, "unlockWithPolkit": { - "message": "Unlock with system authentication" + "message": "Ava arvuti autentimissüsteemiga" }, "windowsHelloConsentMessage": { "message": "Kinnita Bitwardenisse sisselogimine." }, "polkitConsentMessage": { - "message": "Authenticate to unlock Bitwarden." + "message": "Autentiteeri ennast Bitwardeni avamiseks." }, "unlockWithTouchId": { "message": "Lukusta lahti Touch ID-ga" }, "additionalTouchIdSettings": { - "message": "Additional Touch ID settings" + "message": "Muud Touch ID seaded" }, "touchIdConsentMessage": { "message": "Kinnita Bitwardenisse sisselogimine." @@ -1541,16 +1541,16 @@ "message": "Küsi avamisel Windows Hello tuvastust" }, "autoPromptPolkit": { - "message": "Ask for system authentication on launch" + "message": "Kasuta käivitamisel arvuti autentimissüsteemi" }, "autoPromptTouchId": { "message": "Küsi avamisel Touch ID tuvastust" }, "requirePasswordOnStart": { - "message": "Require password or PIN on app start" + "message": "Nõua parooli või PINi rakenduse kävitumisel" }, "recommendedForSecurity": { - "message": "Recommended for security." + "message": "Soovitatud turvalisuse huvides." }, "lockWithMasterPassOnRestart": { "message": "Lukusta ülemparooliga, kui rakendus taaskäivitatakse" @@ -1626,7 +1626,7 @@ "message": "Hoidlast väljalogimine nõuab taaskordseks ligipääsuks uut autentimist." }, "unlockMethodNeededToChangeTimeoutActionDesc": { - "message": "Set up an unlock method to change your vault timeout action." + "message": "Hoidla ajalõpu muutmiseks vali esmalt lahtilukustamise meetod." }, "lock": { "message": "Lukusta", @@ -1667,15 +1667,15 @@ "message": "Määra ülemparool" }, "orgPermissionsUpdatedMustSetPassword": { - "message": "Your organization permissions were updated, requiring you to set a master password.", + "message": "Teie organisatsiooni seadeid värskendati, mistõttu peate määrama ülemparooli.", "description": "Used as a card title description on the set password page to explain why the user is there" }, "orgRequiresYouToSetPassword": { - "message": "Your organization requires you to set a master password.", + "message": "Sinu organisatsioon nõuab sult ülemparooli seadistamist.", "description": "Used as a card title description on the set password page to explain why the user is there" }, "verificationRequired": { - "message": "Verification required", + "message": "Tuvastamine vajalik", "description": "Default title for the user verification dialog." }, "currentMasterPass": { @@ -1730,19 +1730,19 @@ "message": "Uus ülemparool ei vasta eeskirjades väljatoodud tingimustele." }, "receiveMarketingEmailsV2": { - "message": "Get advice, announcements, and research opportunities from Bitwarden in your inbox." + "message": "Soovin saada nõuandeid, uudiseid ja pakkumisi Bitwardenilt oma postkasti." }, "unsubscribe": { - "message": "Unsubscribe" + "message": "Lõpeta tellimus" }, "atAnyTime": { - "message": "at any time." + "message": "iga hetk." }, "byContinuingYouAgreeToThe": { - "message": "By continuing, you agree to the" + "message": "Jätkates nõustud sa" }, "and": { - "message": "and" + "message": "ja" }, "acceptPolicies": { "message": "Märkeruudu markeerimisel nõustud järgnevaga:" @@ -1766,10 +1766,10 @@ "message": "Brauseri integratsioon ei ole toetatud" }, "browserIntegrationErrorTitle": { - "message": "Error enabling browser integration" + "message": "Brauseriga ühendamine ebaõnnestus" }, "browserIntegrationErrorDesc": { - "message": "An error has occurred while enabling browser integration." + "message": "Midagi läks valesti brauseriga ühendamisel." }, "browserIntegrationMasOnlyDesc": { "message": "Paraku on brauseri integratsioon hetkel toetatud ainult Mac App Store'i versioonis." @@ -1787,10 +1787,10 @@ "message": "See seadistus võimaldab täiendavat kaitset, küsides brauseriga ühendamisel teie unikaalset sõnajada. Sisselülitamisel nõuab see seadistus iga kord kasutaja kinnitust, kui luuakse ühendus brauseri ja töölaua rakenduse vahel." }, "enableHardwareAcceleration": { - "message": "Use hardware acceleration" + "message": "Kasuta riistvaralist kiirendamist" }, "enableHardwareAccelerationDesc": { - "message": "By default this setting is ON. Turn OFF only if you experience graphical issues. Restart is required." + "message": "See seade on vaikimisi SEES. Lülita see VÄLJA kui sul tekib probleeme graafikaga. Arvuti tuleb pärast seda taaskäivitada." }, "approve": { "message": "Kinnita" @@ -1823,10 +1823,10 @@ "message": "Selleks, et kasutada biomeetriat brauseris, peab selle esmalt Bitwardeni töölaua rakenduse seadetes sisse lülitama." }, "biometricsManualSetupTitle": { - "message": "Automatic setup not available" + "message": "Automaatne seadistamine ei ole saadaval" }, "biometricsManualSetupDesc": { - "message": "Due to the installation method, biometrics support could not be automatically enabled. Would you like to open the documentation on how to do this manually?" + "message": "Tänu sinu installimise meetodile ei õnnestunud automaatselt biomeetria sisse lülitada. Kas soovid avada juhise kuidas seda käsitsi teha?" }, "personalOwnershipSubmitError": { "message": "Ettevõtte poliitika tõttu ei saa sa andmeid oma personaalsesse Hoidlasse salvestada. Vali Omanikuks organisatsioon ja vali mõni saadavaolevatest Kogumikest." @@ -1838,7 +1838,7 @@ "message": "Organisatsiooni poliitika on seadnud omaniku valikutele piirangu." }, "personalOwnershipPolicyInEffectImports": { - "message": "An organization policy has blocked importing items into your individual vault." + "message": "Kirjete importimine isiklikku hoidlasse on organisatsiooni poolt keelatud." }, "allSends": { "message": "Kõik Sendid", @@ -2013,7 +2013,7 @@ "message": "Vajalik on e-posti kinnitamine" }, "emailVerifiedV2": { - "message": "Email verified" + "message": "Email kinnitatud" }, "emailVerificationRequiredDesc": { "message": "Enne selle funktsiooni kasutamist pead oma e-posti kinnitama." @@ -2040,43 +2040,43 @@ "message": "Sinu ülemparool ei vasta ühele või rohkemale organisatsiooni poolt seatud poliitikale. Hoidlale ligipääsemiseks pead oma ülemaprooli uuendama. Jätkamisel logitakse sind praegusest sessioonist välja, mistõttu pead uuesti sisse logima. Teistes seadmetes olevad aktiivsed sessioonid aeguvad umbes ühe tunni jooksul." }, "tdeDisabledMasterPasswordRequired": { - "message": "Your organization has disabled trusted device encryption. Please set a master password to access your vault." + "message": "Sinu organisatsioon on keelanud ära krüpteerimisvõtmete hoiustamise arvutites. Palun määra ülemparool oma hoidlale ligi pääsemiseks." }, "tryAgain": { - "message": "Try again" + "message": "Proovi uuesti" }, "verificationRequiredForActionSetPinToContinue": { - "message": "Verification required for this action. Set a PIN to continue." + "message": "Selle muudatuse jõustamiseks on vaja teid kinnitada. Jätkamiseks sisestage PIN." }, "setPin": { - "message": "Set PIN" + "message": "Määra PIN" }, "verifyWithBiometrics": { - "message": "Verify with biometrics" + "message": "Kinnita biomeetriaga" }, "awaitingConfirmation": { - "message": "Awaiting confirmation" + "message": "Ootan kinnitust" }, "couldNotCompleteBiometrics": { - "message": "Could not complete biometrics." + "message": "Biomeetria kasutamine ebaõnnestus." }, "needADifferentMethod": { - "message": "Need a different method?" + "message": "Soovid kasutada teist võimalust?" }, "useMasterPassword": { - "message": "Use master password" + "message": "Kasuta ülemparooli" }, "usePin": { - "message": "Use PIN" + "message": "Kasuta PIN-koodi" }, "useBiometrics": { - "message": "Use biometrics" + "message": "Kasuta biomeetriat" }, "enterVerificationCodeSentToEmail": { - "message": "Enter the verification code that was sent to your email." + "message": "Sisesta oma e-posti aadressile saadetud kinnituskood." }, "resendCode": { - "message": "Resend code" + "message": "Saada kood uuesti" }, "hours": { "message": "Tundi" @@ -2127,7 +2127,7 @@ "message": "Valitud hoidla ajalõpp ei ole organisatsiooni poolt määratud reeglitega kooskõlas." }, "inviteAccepted": { - "message": "Invitation accepted" + "message": "Kutse vastu võetud" }, "resetPasswordPolicyAutoEnroll": { "message": "Automaatne liitumine" @@ -2199,7 +2199,7 @@ "message": "Vaheta kontot" }, "alreadyHaveAccount": { - "message": "Already have an account?" + "message": "On juba konto?" }, "options": { "message": "Valikud" @@ -2220,10 +2220,10 @@ } }, "exportingOrganizationVaultTitle": { - "message": "Exporting organization vault" + "message": "Ekspordin organisatsiooni hoidlat" }, "exportingOrganizationVaultDesc": { - "message": "Only the organization vault associated with $ORGANIZATION$ will be exported. Items in individual vaults or other organizations will not be included.", + "message": "Ainult organisatsiooniga $ORGANIZATION$ seotud kirjed eksportidakse. Personaalsete hoidlate ja teiste organisatsioonide kirjeid ei ekspordita.", "placeholders": { "organization": { "content": "$1", @@ -2310,11 +2310,11 @@ } }, "forwarderGeneratedBy": { - "message": "Generated by Bitwarden.", + "message": "Genereeritud Bitwardeni poolt.", "description": "Displayed with the address on the forwarding service's configuration screen." }, "forwarderGeneratedByWithWebsite": { - "message": "Website: $WEBSITE$. Generated by Bitwarden.", + "message": "Veebisait: $WEBSITE$. Genereeritud Bitwardeni poolt.", "description": "Displayed with the address on the forwarding service's configuration screen.", "placeholders": { "WEBSITE": { @@ -2324,7 +2324,7 @@ } }, "forwaderInvalidToken": { - "message": "Invalid $SERVICENAME$ API token", + "message": "Vigane $SERVICENAME$ API võti", "description": "Displayed when the user's API token is empty or rejected by the forwarding service.", "placeholders": { "servicename": { @@ -2334,7 +2334,7 @@ } }, "forwaderInvalidTokenWithMessage": { - "message": "Invalid $SERVICENAME$ API token: $ERRORMESSAGE$", + "message": "Vigane $SERVICENAME$ API võti: $ERRORMESSAGE$", "description": "Displayed when the user's API token is rejected by the forwarding service with an error message.", "placeholders": { "servicename": { @@ -2348,7 +2348,7 @@ } }, "forwarderNoAccountId": { - "message": "Unable to obtain $SERVICENAME$ masked email account ID.", + "message": "Ei õnnestunud hankida pakkuja $SERVICENAME$ maskeeritud emaili konto ID-d.", "description": "Displayed when the forwarding service fails to return an account ID.", "placeholders": { "servicename": { @@ -2358,7 +2358,7 @@ } }, "forwarderNoDomain": { - "message": "Invalid $SERVICENAME$ domain.", + "message": "Vigane $SERVICENAME$ domeen.", "description": "Displayed when the domain is empty or domain authorization failed at the forwarding service.", "placeholders": { "servicename": { @@ -2368,7 +2368,7 @@ } }, "forwarderNoUrl": { - "message": "Invalid $SERVICENAME$ url.", + "message": "Vigane $SERVICENAME$ URL.", "description": "Displayed when the url of the forwarding service wasn't supplied.", "placeholders": { "servicename": { @@ -2378,7 +2378,7 @@ } }, "forwarderUnknownError": { - "message": "Unknown $SERVICENAME$ error occurred.", + "message": "Tundmatu error pakkujaga $SERVICENAME$.", "description": "Displayed when the forwarding service failed due to an unknown error.", "placeholders": { "servicename": { @@ -2388,7 +2388,7 @@ } }, "forwarderUnknownForwarder": { - "message": "Unknown forwarder: '$SERVICENAME$'.", + "message": "Tundmatu edastaja: '$SERVICENAME$'.", "description": "Displayed when the forwarding service is not supported.", "placeholders": { "servicename": { @@ -2450,7 +2450,7 @@ "message": "Logi sisse läbi teise seadme" }, "loginInitiated": { - "message": "Login initiated" + "message": "Alustan sisselogimist" }, "notificationSentDevice": { "message": "Sinu seadmesse saadeti teavitus." @@ -2548,25 +2548,25 @@ "message": "Sisselogimise päring on saadetud" }, "creatingAccountOn": { - "message": "Creating account on" + "message": "Loon kontot asukohas" }, "checkYourEmail": { - "message": "Check your email" + "message": "Kontrollige oma postkasti" }, "followTheLinkInTheEmailSentTo": { - "message": "Follow the link in the email sent to" + "message": "Ava sulle emailiga saadetud link" }, "andContinueCreatingYourAccount": { - "message": "and continue creating your account." + "message": "ja jätka konto loomist." }, "noEmail": { - "message": "No email?" + "message": "Pole emaili?" }, "goBack": { - "message": "Go back" + "message": "Tagasi" }, "toEditYourEmailAddress": { - "message": "to edit your email address." + "message": "et muuta oma meiliaadressi." }, "exposedMasterPassword": { "message": "Ülemparool on haavatav" @@ -2587,10 +2587,10 @@ "message": "Tähtis:" }, "accessTokenUnableToBeDecrypted": { - "message": "You have been logged out because your access token could not be decrypted. Please log in again to resolve this issue." + "message": "Sind logiti välja, sest sinu juurdepääsuvõtit (access token) ei õnnestunud dekrüpteerida. Probleemi lahendamiseks palun logige uuesti sisse." }, "refreshTokenSecureStorageRetrievalFailure": { - "message": "You have been logged out because your refresh token could not be retrieved. Please log in again to resolve this issue." + "message": "Sind logiti välja, sest sinu uuendamisvõtit (refresh token) ei õnnestunud saada. Probleemi lahendamiseks palun logige uuesti sisse." }, "masterPasswordHint": { "message": "Ülemparooli ei saa taastada, kui sa selle unustama peaksid!" @@ -2605,83 +2605,83 @@ } }, "windowsBiometricUpdateWarning": { - "message": "Bitwarden recommends updating your biometric settings to require your master password (or PIN) on the first unlock. Would you like to update your settings now?" + "message": "Bitwarden soovitab muuta oma biomeetria seadeid, et nõuda esimesel sisselogimisel ülemparooli (või PINi). Kas soovid uuendada oma seadeid kohe?" }, "windowsBiometricUpdateWarningTitle": { - "message": "Recommended Settings Update" + "message": "Soovitatud Muudatus Seadetes" }, "deviceApprovalRequired": { - "message": "Device approval required. Select an approval option below:" + "message": "Seadme kinnitamine on nõutud. Palun vali kuidas soovid seda teha:" }, "rememberThisDevice": { - "message": "Remember this device" + "message": "Hoia see seade meeles" }, "uncheckIfPublicDevice": { - "message": "Uncheck if using a public device" + "message": "Lülita see välja, kui oled avalikus seadmes" }, "approveFromYourOtherDevice": { - "message": "Approve from your other device" + "message": "Kinnita teises seadmes" }, "requestAdminApproval": { - "message": "Request admin approval" + "message": "Küsi administraatori nõusolekut" }, "approveWithMasterPassword": { - "message": "Approve with master password" + "message": "Kinnita ülemparooliga" }, "region": { - "message": "Region" + "message": "Piirkond" }, "ssoIdentifierRequired": { - "message": "Organization SSO identifier is required." + "message": "Organisatsiooni SSO identifikaator on nõutud." }, "eu": { - "message": "EU", + "message": "EL", "description": "European Union" }, "loggingInOn": { - "message": "Logging in on" + "message": "Login sisse aadressil" }, "selfHostedServer": { - "message": "self-hosted" + "message": "ise majutatud" }, "accessDenied": { - "message": "Access denied. You do not have permission to view this page." + "message": "Ligipääs keelatud. Sul pole lubatud seda lehekülge vaadata." }, "accountSuccessfullyCreated": { - "message": "Account successfully created!" + "message": "Konto edukalt loodud!" }, "adminApprovalRequested": { - "message": "Admin approval requested" + "message": "Taotlus administraatorile saadetud" }, "adminApprovalRequestSentToAdmins": { - "message": "Your request has been sent to your admin." + "message": "Sinu taotlus saadeti administraatorile." }, "youWillBeNotifiedOnceApproved": { - "message": "You will be notified once approved." + "message": "Kinnitamise järel saad selle kohta teavituse." }, "troubleLoggingIn": { - "message": "Trouble logging in?" + "message": "Ei õnnestu sisse logida?" }, "loginApproved": { - "message": "Login approved" + "message": "Sisselogimine kinnitatud" }, "userEmailMissing": { - "message": "User email missing" + "message": "Kasutaja email puudub" }, "deviceTrusted": { - "message": "Device trusted" + "message": "Usaldusväärne seade" }, "inputRequired": { - "message": "Input is required." + "message": "Sisend on nõutud." }, "required": { - "message": "required" + "message": "nõutud" }, "search": { - "message": "Search" + "message": "Otsi" }, "inputMinLength": { - "message": "Input must be at least $COUNT$ characters long.", + "message": "Sisend peab olema vähemalt $COUNT$ tähemärki pikk.", "placeholders": { "count": { "content": "$1", @@ -2690,7 +2690,7 @@ } }, "inputMaxLength": { - "message": "Input must not exceed $COUNT$ characters in length.", + "message": "Sisend ei tohi olla üle $COUNT$ tähemärgi pikkune.", "placeholders": { "count": { "content": "$1", @@ -2699,7 +2699,7 @@ } }, "inputForbiddenCharacters": { - "message": "The following characters are not allowed: $CHARACTERS$", + "message": "Järgnevad märgid pole lubatud: $CHARACTERS$", "placeholders": { "characters": { "content": "$1", @@ -2708,7 +2708,7 @@ } }, "inputMinValue": { - "message": "Input value must be at least $MIN$.", + "message": "Selle väärtus peab olema vähemalt $MIN$.", "placeholders": { "min": { "content": "$1", @@ -2717,7 +2717,7 @@ } }, "inputMaxValue": { - "message": "Input value must not exceed $MAX$.", + "message": "Selle väärtus ei tohi ületada $MAX$.", "placeholders": { "max": { "content": "$1", @@ -2726,17 +2726,17 @@ } }, "multipleInputEmails": { - "message": "1 or more emails are invalid" + "message": "Üks või rohkem emaili on vigased" }, "inputTrimValidator": { - "message": "Input must not contain only whitespace.", + "message": "Sisend ei tohi koosneda ainult tühikutest.", "description": "Notification to inform the user that a form's input can't contain only whitespace." }, "inputEmail": { - "message": "Input is not an email address." + "message": "See pole e-posti aadress." }, "fieldsNeedAttention": { - "message": "$COUNT$ field(s) above need your attention.", + "message": "$COUNT$ välja nõuab tähelepanu.", "placeholders": { "count": { "content": "$1", @@ -2745,22 +2745,22 @@ } }, "selectPlaceholder": { - "message": "-- Select --" + "message": "-- Vali --" }, "multiSelectPlaceholder": { - "message": "-- Type to filter --" + "message": "-- Filtreerimiseks trüki siia --" }, "multiSelectLoading": { - "message": "Retrieving options..." + "message": "Valikute hankimine..." }, "multiSelectNotFound": { - "message": "No items found" + "message": "Ühtki kirjet ei leitud" }, "multiSelectClearAll": { - "message": "Clear all" + "message": "Tühjenda kõik" }, "plusNMore": { - "message": "+ $QUANTITY$ more", + "message": "+ $QUANTITY$ veel", "placeholders": { "quantity": { "content": "$1", @@ -2769,47 +2769,47 @@ } }, "submenu": { - "message": "Submenu" + "message": "Alammenüü" }, "toggleSideNavigation": { - "message": "Toggle side navigation" + "message": "Lülita sisse külgpaneel" }, "skipToContent": { - "message": "Skip to content" + "message": "Sisu juurde" }, "typePasskey": { - "message": "Passkey" + "message": "Pääsuvõti" }, "passkeyNotCopied": { - "message": "Passkey will not be copied" + "message": "Pääsuvõtit ei kopeerita" }, "passkeyNotCopiedAlert": { - "message": "The passkey will not be copied to the cloned item. Do you want to continue cloning this item?" + "message": "Pääsukoodi ei kopeerita kloonitud kirjele. Oled kindel, et soovid jätkata?" }, "aliasDomain": { - "message": "Alias domain" + "message": "Varidomeen" }, "importData": { - "message": "Import data", + "message": "Impordi andmed", "description": "Used for the desktop menu item and the header of the import dialog" }, "importError": { - "message": "Import error" + "message": "Tõrge importimisel" }, "importErrorDesc": { - "message": "There was a problem with the data you tried to import. Please resolve the errors listed below in your source file and try again." + "message": "Andmete importimisel ilmnes tõrge. Paranda originaalfailis olevad vead (kuvatud all) ning proovi uuesti." }, "resolveTheErrorsBelowAndTryAgain": { - "message": "Resolve the errors below and try again." + "message": "Lahenda allolevad probleemid ja proovi uuesti." }, "description": { - "message": "Description" + "message": "Kirjeldus" }, "importSuccess": { - "message": "Data successfully imported" + "message": "Andmed edukalt imporditud" }, "importSuccessNumberOfItems": { - "message": "A total of $AMOUNT$ items were imported.", + "message": "Kokku imporditi $AMOUNT$ kirjet.", "placeholders": { "amount": { "content": "$1", @@ -2818,10 +2818,10 @@ } }, "total": { - "message": "Total" + "message": "Kokku" }, "importWarning": { - "message": "You are importing data to $ORGANIZATION$. Your data may be shared with members of this organization. Do you want to proceed?", + "message": "Impordid andmeid organisatsiooni $ORGANIZATION$. Neid andmeid võidakse jagada teiste organisatsiooni liikmetega. Soovid jätkata?", "placeholders": { "organization": { "content": "$1", @@ -2830,43 +2830,43 @@ } }, "duoHealthCheckResultsInNullAuthUrlError": { - "message": "Error connecting with the Duo service. Use a different two-step login method or contact Duo for assistance." + "message": "Duo teenustega ühendamine ebaõnnestus. Kasuta teist kahe-astmelise sisselogimise meetodit või kontakteeru Duoga." }, "launchDuoAndFollowStepsToFinishLoggingIn": { - "message": "Launch Duo and follow the steps to finish logging in." + "message": "Käivita Duo ja järgi juhiseid, et lõpetada sisselogimine." }, "duoRequiredByOrgForAccount": { - "message": "Duo two-step login is required for your account." + "message": "Duo kahe-astmeline sisselogimine on sinu kontol nõutud." }, "launchDuo": { - "message": "Launch Duo in Browser" + "message": "Käivita Duo brauseris" }, "importFormatError": { - "message": "Data is not formatted correctly. Please check your import file and try again." + "message": "Andmed ei ole korrektsed. Palun kontrollige imporditavat faili ja proovige uuesti." }, "importNothingError": { - "message": "Nothing was imported." + "message": "Ei imporditud midagi." }, "importEncKeyError": { - "message": "Error decrypting the exported file. Your encryption key does not match the encryption key used export the data." + "message": "Eksporditud faili dekrüpteerimine nurjus. Sinu krüpteerimisvõti ei ühti selle võtmega, mida kasutati andmete eksportimisel." }, "invalidFilePassword": { - "message": "Invalid file password, please use the password you entered when you created the export file." + "message": "Vale parool, palun kasuta seda parooli mille sisestasid eksportfaili loomisel." }, "destination": { - "message": "Destination" + "message": "Sihtkoht" }, "learnAboutImportOptions": { - "message": "Learn about your import options" + "message": "Lisainfo importimise valikute kohta" }, "selectImportFolder": { - "message": "Select a folder" + "message": "Vali kaust" }, "selectImportCollection": { - "message": "Select a collection" + "message": "Vali kogumik" }, "importTargetHint": { - "message": "Select this option if you want the imported file contents moved to a $DESTINATION$", + "message": "Tee siin valik, kui soovid, et imporditud faili sisu liigutatakse asukohta $DESTINATION$", "description": "Located as a hint under the import target. Will be appended by either folder or collection, depending if the user is importing into an individual or an organizational vault.", "placeholders": { "destination": { @@ -2876,25 +2876,25 @@ } }, "importUnassignedItemsError": { - "message": "File contains unassigned items." + "message": "Fail sisaldab määramata kirjeid." }, "selectFormat": { - "message": "Select the format of the import file" + "message": "Vali imporditava faili formaat" }, "selectImportFile": { - "message": "Select the import file" + "message": "Vali imporditav fail" }, "chooseFile": { - "message": "Choose File" + "message": "Vali fail" }, "noFileChosen": { - "message": "No file chosen" + "message": "Ühtegi faili pole valitud" }, "orCopyPasteFileContents": { - "message": "or copy/paste the import file contents" + "message": "või kopeeri/kleebi imporditava faili sisu" }, "instructionsFor": { - "message": "$NAME$ Instructions", + "message": "$NAME$ Kasutusjuhend", "description": "The title for the import tool instructions.", "placeholders": { "name": { @@ -2904,120 +2904,120 @@ } }, "confirmVaultImport": { - "message": "Confirm vault import" + "message": "Kinnita hoidla importimine" }, "confirmVaultImportDesc": { - "message": "This file is password-protected. Please enter the file password to import data." + "message": "Fail on parooliga kaitstud. Palun sisesta faili importimiseks selle parool." }, "confirmFilePassword": { - "message": "Confirm file password" + "message": "Kinnita faili parool" }, "exportSuccess": { - "message": "Vault data exported" + "message": "Hoidla sisu edukalt eksporditud" }, "multifactorAuthenticationCancelled": { - "message": "Multifactor authentication cancelled" + "message": "Mitmeastmeline autentiteerimine tühistatud" }, "noLastPassDataFound": { - "message": "No LastPass data found" + "message": "Ei leidnud LastPassi andmeid" }, "incorrectUsernameOrPassword": { - "message": "Incorrect username or password" + "message": "Vale kasutajanimi või parool" }, "incorrectPassword": { - "message": "Incorrect password" + "message": "Vale parool" }, "incorrectCode": { - "message": "Incorrect code" + "message": "Vale kood" }, "incorrectPin": { - "message": "Incorrect PIN" + "message": "Vale PIN-kood" }, "multifactorAuthenticationFailed": { - "message": "Multifactor authentication failed" + "message": "Mitmeastmeline autentiteerimine ebaõnnestus" }, "includeSharedFolders": { - "message": "Include shared folders" + "message": "Lisa ka jagatud kaustad" }, "lastPassEmail": { - "message": "LastPass Email" + "message": "LastPassi Email" }, "importingYourAccount": { - "message": "Importing your account..." + "message": "Impordin sinu kontot..." }, "lastPassMFARequired": { - "message": "LastPass multifactor authentication required" + "message": "LastPassi mitmeastmeline autentiteerimine nõutud" }, "lastPassMFADesc": { - "message": "Enter your one-time passcode from your authentication app" + "message": "Sisesta oma ühekordne kood autentiteerimise rakendusest" }, "lastPassOOBDesc": { - "message": "Approve the login request in your authentication app or enter a one-time passcode." + "message": "Kinnita sisselogimistaotlus oma autentiteerimisrakenduses või sisesta ühekordne kood." }, "passcode": { - "message": "Passcode" + "message": "Pääsukood" }, "lastPassMasterPassword": { - "message": "LastPass master password" + "message": "LastPassi ülemparool" }, "lastPassAuthRequired": { - "message": "LastPass authentication required" + "message": "LastPassi autentiteerimine nõutud" }, "awaitingSSO": { - "message": "Awaiting SSO authentication" + "message": "Ootan SSO autentiteerimise kinnitamist" }, "awaitingSSODesc": { - "message": "Please continue to log in using your company credentials." + "message": "Sisselogimiseks palun jätka kasutades oma firma andmeid." }, "seeDetailedInstructions": { - "message": "See detailed instructions on our help site at", + "message": "Vaata täpsemaid juhiseid meie veebilehel", "description": "This is followed a by a hyperlink to the help website." }, "importDirectlyFromLastPass": { - "message": "Import directly from LastPass" + "message": "Impordi otse LastPassist" }, "importFromCSV": { - "message": "Import from CSV" + "message": "Impordi CSV-st" }, "lastPassTryAgainCheckEmail": { - "message": "Try again or look for an email from LastPass to verify it's you." + "message": "Proovi uuesti või kinnita sulle LastPassilt saadetud kirjas, et see oled sina." }, "collection": { - "message": "Collection" + "message": "Kogumik" }, "lastPassYubikeyDesc": { - "message": "Insert the YubiKey associated with your LastPass account into your computer's USB port, then touch its button." + "message": "Sisesta sinu LastPassi kontoga seotud YubiKey oma arvuti USB porti ja vajuta nuppu selle peal." }, "commonImportFormats": { - "message": "Common formats", + "message": "Tüüpilised meetodid", "description": "Label indicating the most common import formats" }, "success": { - "message": "Success" + "message": "Tehtud" }, "troubleshooting": { - "message": "Troubleshooting" + "message": "Tõrkeotsing" }, "disableHardwareAccelerationRestart": { - "message": "Disable hardware acceleration and restart" + "message": "Lülita riistavara kiirendus välja ja tee taaskäivitus" }, "enableHardwareAccelerationRestart": { - "message": "Enable hardware acceleration and restart" + "message": "Lülita riistavara kiirendus sisse ja tee taaskäivitus" }, "removePasskey": { - "message": "Remove passkey" + "message": "Eemalda pääsuvõti" }, "passkeyRemoved": { - "message": "Passkey removed" + "message": "Pääsuvõti eemaldatud" }, "errorAssigningTargetCollection": { - "message": "Error assigning target collection." + "message": "Sihtkogumikku määramine ebaõnnestus." }, "errorAssigningTargetFolder": { - "message": "Error assigning target folder." + "message": "Sihtkausta määramine ebaõnnestus." }, "viewItemsIn": { - "message": "View items in $NAME$", + "message": "Vaata kirjeid asukohas $NAME$", "description": "Button to view the contents of a folder or collection", "placeholders": { "name": { @@ -3027,7 +3027,7 @@ } }, "backTo": { - "message": "Back to $NAME$", + "message": "Tagasi asukohta $NAME$", "description": "Navigate back to a previous folder or collection", "placeholders": { "name": { @@ -3037,11 +3037,11 @@ } }, "back": { - "message": "Back", + "message": "Tagasi", "description": "Button text to navigate back" }, "removeItem": { - "message": "Remove $NAME$", + "message": "Eemalda $NAME$", "description": "Remove a selected option, such as a folder or collection", "placeholders": { "name": { @@ -3051,15 +3051,15 @@ } }, "data": { - "message": "Data" + "message": "Andmed" }, "fileSends": { - "message": "File Sends" + "message": "Kõik Send Failid" }, "textSends": { - "message": "Text Sends" + "message": "Kõik Tekst-Sendid" }, "ssoError": { - "message": "No free ports could be found for the sso login." + "message": "SSO-ga sisselogimiseks ei leitud ühtegi vaba porti." } } From bf7a490a76e81dd8120ac941517504c431c28a41 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:55:53 +0000 Subject: [PATCH 20/36] Autosync the updated translations (#10959) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com> --- apps/web/src/locales/af/messages.json | 7 +- apps/web/src/locales/ar/messages.json | 7 +- apps/web/src/locales/az/messages.json | 7 +- apps/web/src/locales/be/messages.json | 7 +- apps/web/src/locales/bg/messages.json | 7 +- apps/web/src/locales/bn/messages.json | 7 +- apps/web/src/locales/bs/messages.json | 7 +- apps/web/src/locales/ca/messages.json | 7 +- apps/web/src/locales/cs/messages.json | 7 +- apps/web/src/locales/cy/messages.json | 7 +- apps/web/src/locales/da/messages.json | 7 +- apps/web/src/locales/de/messages.json | 21 +- apps/web/src/locales/el/messages.json | 7 +- apps/web/src/locales/en_GB/messages.json | 7 +- apps/web/src/locales/en_IN/messages.json | 7 +- apps/web/src/locales/eo/messages.json | 7 +- apps/web/src/locales/es/messages.json | 7 +- apps/web/src/locales/et/messages.json | 293 ++++++++++++----------- apps/web/src/locales/eu/messages.json | 7 +- apps/web/src/locales/fa/messages.json | 7 +- apps/web/src/locales/fi/messages.json | 7 +- apps/web/src/locales/fil/messages.json | 7 +- apps/web/src/locales/fr/messages.json | 7 +- apps/web/src/locales/gl/messages.json | 7 +- apps/web/src/locales/he/messages.json | 7 +- apps/web/src/locales/hi/messages.json | 7 +- apps/web/src/locales/hr/messages.json | 21 +- apps/web/src/locales/hu/messages.json | 7 +- apps/web/src/locales/id/messages.json | 7 +- apps/web/src/locales/it/messages.json | 7 +- apps/web/src/locales/ja/messages.json | 7 +- apps/web/src/locales/ka/messages.json | 7 +- apps/web/src/locales/km/messages.json | 7 +- apps/web/src/locales/kn/messages.json | 7 +- apps/web/src/locales/ko/messages.json | 7 +- apps/web/src/locales/lv/messages.json | 7 +- apps/web/src/locales/ml/messages.json | 7 +- apps/web/src/locales/mr/messages.json | 7 +- apps/web/src/locales/my/messages.json | 7 +- apps/web/src/locales/nb/messages.json | 7 +- apps/web/src/locales/ne/messages.json | 7 +- apps/web/src/locales/nl/messages.json | 7 +- apps/web/src/locales/nn/messages.json | 7 +- apps/web/src/locales/or/messages.json | 7 +- apps/web/src/locales/pl/messages.json | 7 +- apps/web/src/locales/pt_BR/messages.json | 7 +- apps/web/src/locales/pt_PT/messages.json | 7 +- apps/web/src/locales/ro/messages.json | 7 +- apps/web/src/locales/ru/messages.json | 11 +- apps/web/src/locales/si/messages.json | 7 +- apps/web/src/locales/sk/messages.json | 21 +- apps/web/src/locales/sl/messages.json | 7 +- apps/web/src/locales/sr/messages.json | 7 +- apps/web/src/locales/sr_CS/messages.json | 7 +- apps/web/src/locales/sv/messages.json | 7 +- apps/web/src/locales/te/messages.json | 7 +- apps/web/src/locales/th/messages.json | 7 +- apps/web/src/locales/tr/messages.json | 7 +- apps/web/src/locales/uk/messages.json | 21 +- apps/web/src/locales/vi/messages.json | 7 +- apps/web/src/locales/zh_CN/messages.json | 7 +- apps/web/src/locales/zh_TW/messages.json | 7 +- 62 files changed, 483 insertions(+), 297 deletions(-) diff --git a/apps/web/src/locales/af/messages.json b/apps/web/src/locales/af/messages.json index 20b77c53fb9..f5f39bd0223 100644 --- a/apps/web/src/locales/af/messages.json +++ b/apps/web/src/locales/af/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/ar/messages.json b/apps/web/src/locales/ar/messages.json index 3556df1e13f..b8747656223 100644 --- a/apps/web/src/locales/ar/messages.json +++ b/apps/web/src/locales/ar/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/az/messages.json b/apps/web/src/locales/az/messages.json index 78876040eb8..b19ac2c3913 100644 --- a/apps/web/src/locales/az/messages.json +++ b/apps/web/src/locales/az/messages.json @@ -9050,8 +9050,11 @@ "message": "Hər kəsə açıq API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Əlavə məzmun əlçatandır" + "showCharacterCount": { + "message": "Xarakter sayını göstər" + }, + "hideCharacterCount": { + "message": "Xarakter sayını gizlət" }, "editAccess": { "message": "Müraciətə düzəliş et" diff --git a/apps/web/src/locales/be/messages.json b/apps/web/src/locales/be/messages.json index 607d633da56..340b7fb1f4e 100644 --- a/apps/web/src/locales/be/messages.json +++ b/apps/web/src/locales/be/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/bg/messages.json b/apps/web/src/locales/bg/messages.json index a877a5edf10..dda600ce091 100644 --- a/apps/web/src/locales/bg/messages.json +++ b/apps/web/src/locales/bg/messages.json @@ -9050,8 +9050,11 @@ "message": "Публичен ППИ", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Има налично допълнително съдържание" + "showCharacterCount": { + "message": "Показване на броя знаци" + }, + "hideCharacterCount": { + "message": "Скриване на броя знаци" }, "editAccess": { "message": "Редактиране на достъпа" diff --git a/apps/web/src/locales/bn/messages.json b/apps/web/src/locales/bn/messages.json index 59016f510ed..c7112cc6c1a 100644 --- a/apps/web/src/locales/bn/messages.json +++ b/apps/web/src/locales/bn/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/bs/messages.json b/apps/web/src/locales/bs/messages.json index 25404f49daf..829615cc551 100644 --- a/apps/web/src/locales/bs/messages.json +++ b/apps/web/src/locales/bs/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/ca/messages.json b/apps/web/src/locales/ca/messages.json index 6b3ee609bfc..26794588127 100644 --- a/apps/web/src/locales/ca/messages.json +++ b/apps/web/src/locales/ca/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/cs/messages.json b/apps/web/src/locales/cs/messages.json index 914bc3471c5..6f7367b8033 100644 --- a/apps/web/src/locales/cs/messages.json +++ b/apps/web/src/locales/cs/messages.json @@ -9050,8 +9050,11 @@ "message": "Veřejné API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Je k dispozici další obsah" + "showCharacterCount": { + "message": "Zobrazit počet znaků" + }, + "hideCharacterCount": { + "message": "Skrýt počet znaků" }, "editAccess": { "message": "Upravit přístup" diff --git a/apps/web/src/locales/cy/messages.json b/apps/web/src/locales/cy/messages.json index c88b9519d3f..5e1de3971d7 100644 --- a/apps/web/src/locales/cy/messages.json +++ b/apps/web/src/locales/cy/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/da/messages.json b/apps/web/src/locales/da/messages.json index 23b588f5314..fae10f4eef0 100644 --- a/apps/web/src/locales/da/messages.json +++ b/apps/web/src/locales/da/messages.json @@ -9050,8 +9050,11 @@ "message": "Offentlig API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Yderligere indhold er tilgængeligt" + "showCharacterCount": { + "message": "Vis tegnantal" + }, + "hideCharacterCount": { + "message": "Skjul tegnantal" }, "editAccess": { "message": "Redigér adgang" diff --git a/apps/web/src/locales/de/messages.json b/apps/web/src/locales/de/messages.json index c6d0b2caec0..9e83c16860a 100644 --- a/apps/web/src/locales/de/messages.json +++ b/apps/web/src/locales/de/messages.json @@ -49,19 +49,19 @@ "message": "Zugangsdaten" }, "personalDetails": { - "message": "Personal details" + "message": "Persönliche Details" }, "identification": { - "message": "Identification" + "message": "Identifikation" }, "contactInfo": { - "message": "Contact info" + "message": "Kontaktinformation" }, "cardDetails": { - "message": "Card details" + "message": "Kartendetails" }, "cardBrandDetails": { - "message": "$BRAND$ details", + "message": "$BRAND$-Details", "placeholders": { "brand": { "content": "$1", @@ -70,7 +70,7 @@ } }, "itemHistory": { - "message": "Item history" + "message": "Eintragsverlauf" }, "authenticatorKey": { "message": "Authenticator-Schlüssel" @@ -464,7 +464,7 @@ "message": "Vollständiger Name" }, "address": { - "message": "Address" + "message": "Adresse" }, "address1": { "message": "Adresse 1" @@ -9050,8 +9050,11 @@ "message": "Öffentliche API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Zusätzlicher Inhalt ist verfügbar" + "showCharacterCount": { + "message": "Zeichenanzahl anzeigen" + }, + "hideCharacterCount": { + "message": "Zeichenanzahl ausblenden" }, "editAccess": { "message": "Zugriff bearbeiten" diff --git a/apps/web/src/locales/el/messages.json b/apps/web/src/locales/el/messages.json index 7f79cbd162a..cfe7d180e52 100644 --- a/apps/web/src/locales/el/messages.json +++ b/apps/web/src/locales/el/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/en_GB/messages.json b/apps/web/src/locales/en_GB/messages.json index 13d23f14593..aab1efb7c5e 100644 --- a/apps/web/src/locales/en_GB/messages.json +++ b/apps/web/src/locales/en_GB/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/en_IN/messages.json b/apps/web/src/locales/en_IN/messages.json index 90293bb066f..7ccd08f86b1 100644 --- a/apps/web/src/locales/en_IN/messages.json +++ b/apps/web/src/locales/en_IN/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/eo/messages.json b/apps/web/src/locales/eo/messages.json index 495b9c6e78c..b7615fe4471 100644 --- a/apps/web/src/locales/eo/messages.json +++ b/apps/web/src/locales/eo/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/es/messages.json b/apps/web/src/locales/es/messages.json index 639c0f34e63..a9458b47176 100644 --- a/apps/web/src/locales/es/messages.json +++ b/apps/web/src/locales/es/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/et/messages.json b/apps/web/src/locales/et/messages.json index 72ad36be3e2..9a54611285d 100644 --- a/apps/web/src/locales/et/messages.json +++ b/apps/web/src/locales/et/messages.json @@ -52,10 +52,10 @@ "message": "Isikuandmed" }, "identification": { - "message": "Identification" + "message": "Tuvastamine" }, "contactInfo": { - "message": "Contact info" + "message": "Kontaktinfo" }, "cardDetails": { "message": "Pangakaardi detailid" @@ -756,7 +756,7 @@ "message": "Aegunud link" }, "pleaseRestartRegistrationOrTryLoggingIn": { - "message": "Please restart registration or try logging in." + "message": "Palun alusta uuesti registreerimist või proovi sisse logida." }, "youMayAlreadyHaveAnAccount": { "message": "Sul on võib-olla juba konto" @@ -837,7 +837,7 @@ "message": "Kasuta hoidla krüpteerimiseks" }, "useForVaultEncryptionInfo": { - "message": "Log in and unlock on supported devices without your master password. Follow the prompts from your browser to finalize setup." + "message": "Kasuta toetatud seadmetel sisselogimis- ja avamisfunktsioone ilma ülemparoolita. Järgi brauseri juhiseid, et lõpetada seadistus." }, "useForVaultEncryptionErrorReadingPasskey": { "message": "Ei õnnestunud pääsuvõtit lugeda. Proovi uuesti või tühjendage see valik." @@ -849,7 +849,7 @@ "message": "Seadista krüpteerimine" }, "usedForEncryption": { - "message": "Used for encryption" + "message": "Kasutatakse krüpteerimiseks" }, "loginWithPasskeyEnabled": { "message": "Logi sisse pääsuvõti sisse lülitatult" @@ -1253,10 +1253,10 @@ "message": "Kopeeri UUID" }, "errorRefreshingAccessToken": { - "message": "Access Token Refresh Error" + "message": "Juurdepääsukoodi Värskendamine Ebaõnnestus" }, "errorRefreshingAccessTokenDesc": { - "message": "No refresh token or API keys found. Please try logging out and logging back in." + "message": "Ei leidnud värskendamise koodi või API võtit. Palun proovi logida välja ja uuesti sisse." }, "warning": { "message": "Hoiatus" @@ -1283,7 +1283,7 @@ "message": "Ekspordi" }, "exportFrom": { - "message": "Ekspordi vorm" + "message": "Export from" }, "exportVault": { "message": "Hoidla sisu eksportimine" @@ -2474,7 +2474,7 @@ "message": "Tellimuse haldamine" }, "launchCloudSubscription": { - "message": "Launch Cloud Subscription" + "message": "Ühenda Tasuline Tellimus" }, "storage": { "message": "Salvestusruum" @@ -2573,7 +2573,7 @@ "message": "Võta klienditoega ühendust" }, "contactSupportShort": { - "message": "Võta kasutajatoega ühendust" + "message": "Klienditugi" }, "updatedPaymentMethod": { "message": "Maksemeetod on muudetud." @@ -3001,7 +3001,7 @@ "message": "Anna Juurdepääs" }, "addAccessFilter": { - "message": "Add Access Filter" + "message": "Piira Juurdepääsu" }, "refresh": { "message": "Värskenda" @@ -3451,7 +3451,7 @@ "message": "Seade" }, "creatingAccountOn": { - "message": "Creating account on" + "message": "Konto loomise asukoht" }, "checkYourEmail": { "message": "Kontrolli oma e-posti" @@ -3586,7 +3586,7 @@ "message": "Pääsed organisatsiooni kirjetele ligi niipea, kui administraator sinu liikmelisuse kinnitab. Teavitame sind sellest e-posti teel." }, "inviteInitAcceptedDesc": { - "message": "You can now access this organization." + "message": "Sul on nüüd ligipääs sellele organisatsioonile." }, "inviteAcceptFailed": { "message": "Kutse vastuvõtmine nurjus. Palu organisatsiooni administraatoril uus kutse saata." @@ -3625,7 +3625,7 @@ "message": "Oled avaldanud soovi oma Bitwardeni konto kustutamiseks. Selle kinnitamiseks kliki allolevale nupule." }, "deleteRecoverOrgConfirmDesc": { - "message": "You have requested to delete your Bitwarden organization." + "message": "Kas sa oled kindel, et soovid kustudada oma Bitwardeni organisatsiooni?" }, "myOrganization": { "message": "Minu organisatsioon" @@ -3754,14 +3754,14 @@ "message": "Määra maksimaalne kasutajate limiit. Limiidi täitumisel ei saa enam uusi kasutajaid kutsuda." }, "limitSmSubscriptionDesc": { - "message": "Set a seat limit for your Secrets Manager subscription. Once this limit is reached, you will not be able to invite new members." + "message": "Määra maksimaalne Secrets Manageri kasutajate limiit. Limiidi täitumisel ei saa enam uusi liikmeid kutsuda." }, "maxSeatLimit": { - "message": "Maksimaalne kasutajate limiit (valikuline)", + "message": "Kasutajate limiit (valikuline)", "description": "Upper limit of seats to allow through autoscaling" }, "maxSeatCost": { - "message": "Max potential seat cost" + "message": "Suurim võimalik hind inimese kohta" }, "addSeats": { "message": "Lisa kasutajaid", @@ -3772,7 +3772,7 @@ "description": "Seat = User Seat" }, "subscriptionDesc": { - "message": "Adjustments to your subscription will result in prorated changes to your billing totals. If newly invited users exceed your subscription seats, you will immediately receive a prorated charge for the additional users." + "message": "Muudatused sinu tellimusele kajastuvad arve lõppsummas. Kui sinu kasutajate arv ületab tellimuse kohtade arvu, saad kohe arve uute kasutajate eest." }, "subscriptionUserSeats": { "message": "Sinu tellimus lubab kasutada/luua kokku $COUNT$ kasutajakontot.", @@ -3784,34 +3784,34 @@ } }, "limitSubscription": { - "message": "Limit subscription (optional)" + "message": "Määra kasutajate ülempiir (valikuline)" }, "subscriptionSeats": { - "message": "Subscription seats" + "message": "Tellimuse kasutajate arv" }, "subscriptionUpdated": { - "message": "Subscription updated" + "message": "Tellimus uuendatud" }, "subscribedToSecretsManager": { - "message": "Subscription updated. You now have access to Secrets Manager." + "message": "Tellimus uuendatud. Nüüd on sul ligipääs Secrets Managerile." }, "additionalOptions": { "message": "Lisavalikud" }, "additionalOptionsDesc": { - "message": "For additional help in managing your subscription, please contact Customer Support." + "message": "Küsimustega seoses oma tellimuse haldamisega kontakteeruge Kasutajatoega." }, "subscriptionUserSeatsUnlimitedAutoscale": { - "message": "Adjustments to your subscription will result in prorated changes to your billing totals. If newly invited members exceed your subscription seats, you will immediately receive a prorated charge for the additional members." + "message": "Muudatused sinu tellimusele kajastuvad arve lõppsummas. Kui sinu liikmete arv ületab tellimuse kohtade arvu, saad kohe arve uute liikmete eest." }, "smStandaloneTrialSeatCountUpdateMessageFragment1": { - "message": "If you want to add additional" + "message": "Kui sa soovid lisada tootesse" }, "smStandaloneTrialSeatCountUpdateMessageFragment2": { - "message": "seats without the bundled offer, please contact" + "message": "teisi liikmeid ilma teiste pakkumisteta, võta ühendust osakonnaga" }, "subscriptionUserSeatsLimitedAutoscale": { - "message": "Adjustments to your subscription will result in prorated changes to your billing totals. If newly invited members exceed your subscription seats, you will immediately receive a prorated charge for the additional members until your $MAX$ seat limit is reached.", + "message": "Muudatused sinu tellimusele kajastuvad arve lõppsummas. Kui sinu liikmete arv ületab tellimuse kohtade arvu, saad kohe arve uute liikmete eest, kuni su maksimaalne liikmete arv ($MAX$) on saavutatud.", "placeholders": { "max": { "content": "$1", @@ -3820,7 +3820,7 @@ } }, "subscriptionUserSeatsWithoutAdditionalSeatsOption": { - "message": "You can invite up to $COUNT$ members for no additional charge. Contact Customer Support to upgrade your plan and invite more members.", + "message": "Sa saad kutsuda tasuta kuni $COUNT$ liiget. Kontakteeru kasutajatoega, et muuta oma tellimust ja kutsuda veel rohkem liikmeid.", "placeholders": { "count": { "content": "$1", @@ -3829,7 +3829,7 @@ } }, "subscriptionFreePlan": { - "message": "You cannot invite more than $COUNT$ members without upgrading your plan.", + "message": "Sa ei saa kutsuda rohkem kui $COUNT$ liiget ilma oma tellimust muutmata.", "placeholders": { "count": { "content": "$1", @@ -3838,7 +3838,7 @@ } }, "subscriptionUpgrade": { - "message": "You cannot invite more than $COUNT$ members without upgrading your plan.", + "message": "Sa ei saa kutsuda rohkem kui $COUNT$ liiget ilma oma tellimust muutmata.", "placeholders": { "count": { "content": "$1", @@ -3847,7 +3847,7 @@ } }, "subscriptionSponsoredFamiliesPlan": { - "message": "Your subscription allows for a total of $COUNT$ members. Your plan is sponsored and billed to an external organization.", + "message": "Sinu tellimust saab kasutada korraga kuni $COUNT$ liiget. Seda tellimust haldab väline organisatsioon.", "placeholders": { "count": { "content": "$1", @@ -3856,7 +3856,7 @@ } }, "subscriptionMaxReached": { - "message": "Adjustments to your subscription will result in prorated changes to your billing totals. You cannot invite more than $COUNT$ members without increasing your subscription seats.", + "message": "Muudatused sinu tellimusele kajastuvad arve lõppsummas. Sa ei saa kutsuda rohkem kui $COUNT$ liiget ilma oma tellimuse kasutajate arvu suurendamata.", "placeholders": { "count": { "content": "$1", @@ -3865,7 +3865,7 @@ } }, "subscriptionSeatMaxReached": { - "message": "You cannot invite more than $COUNT$ members without increasing your subscription seats.", + "message": "Sa ei saa kutsuda rohkem kui $COUNT$ liiget ilma oma tellimuse kasutajate arvu muutmata.", "placeholders": { "count": { "content": "$1", @@ -4009,19 +4009,19 @@ "description": "ex. Date this password was updated" }, "organizationIsDisabled": { - "message": "Organisatsioon on välja lülitatud." + "message": "Organisatsioon on määramata ajaks peatatud" }, "secretsAccessSuspended": { - "message": "Suspended organizations cannot be accessed. Please contact your organization owner for assistance." + "message": "Peatatud organisatsioonidele ei ole võimalik ligi pääseda. Palun kontakteeruge oma organisatsiooni haldajaga." }, "secretsCannotCreate": { - "message": "Secrets cannot be created in suspended organizations. Please contact your organization owner for assistance." + "message": "Peatatud organisatsioonidesse ei ole võimalik salvestada uusi IT-saladusi. Palun kontakteeruge oma organisatsiooni haldajaga." }, "projectsCannotCreate": { - "message": "Projects cannot be created in suspended organizations. Please contact your organization owner for assistance." + "message": "Peatatud organisatsioonides ei ole võimalik luua uusi projekte. Palun kontakteeruge oma organisatsiooni haldajaga." }, "serviceAccountsCannotCreate": { - "message": "Service accounts cannot be created in suspended organizations. Please contact your organization owner for assistance." + "message": "Peatatud organisatsioonides ei ole võimalik luua uusi kontosid. Palun kontakteeruge oma organisatsiooni haldajaga." }, "disabledOrganizationFilterError": { "message": "Organisatsiooni alla kuuluvatele kirjetele ei ole ligipääsu. Kontakteeru oma organisatsiooni omanikuga." @@ -4923,64 +4923,64 @@ "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more, see how it works, **or** try it now.'" }, "developmentDevOpsAndITTeamsChooseBWSecret": { - "message": "Development, DevOps, and IT teams choose Bitwarden Secrets Manager to securely manage and deploy their infrastructure and machine secrets." + "message": "Arendus- ja IT-tiimid kasutavad Bitwarden Secrets Manageri, et turvaliselt hallata ja hoiustada oma infrastruktuuri ja süsteemide saladusi." }, "centralizeSecretsManagement": { - "message": "Centralize secrets management." + "message": "Koguge IT-saladused ühte kohta." }, "centralizeSecretsManagementDescription": { - "message": "Securely store and manage secrets in one location to prevent secret sprawl across your organization." + "message": "Hoiusta ja halda ohutult IT-saladusi ühes asukohas, et vältida nende kadumist organisatsioonis laiali valgudes." }, "preventSecretLeaks": { - "message": "Prevent secret leaks." + "message": "Väldi saladuste lekkimist." }, "preventSecretLeaksDescription": { - "message": "Protect secrets with end-to-end encryption. No more hard coding secrets or sharing through .env files." + "message": "Kaitse IT-saladusi täieliku krüpteerimisega. Ütle ei nende koodibaasi lisamisele või jagamisele läbi .env failide." }, "enhanceDeveloperProductivity": { - "message": "Enhance developer productivity." + "message": "Paranda programmeerijate ja arendajate produktiivsust." }, "enhanceDeveloperProductivityDescription": { - "message": "Programmatically retrieve and deploy secrets at runtime so developers can focus on what matters most, like improving code quality." + "message": "Kasuta IT-saladusi otse läbi programmi ja loo uusi saladusi masinat peatamata, nii et arendajad saavad keskenduda sellele, mis on kõige tähtsam, näiteks vigade parandamisele." }, "strengthenBusinessSecurity": { - "message": "Strengthen business security." + "message": "Paranda firma turvalisust." }, "strengthenBusinessSecurityDescription": { - "message": "Maintain tight control over machine and human access to secrets with SSO integrations, event logs, and access rotation." + "message": "Säilita kontroll masinate ja inimeste ligipääsu üle IT-saladustele läbi SSO kasutamise, sündmuste ajaloo ja ligipääsu uuendamise." }, "tryItNow": { - "message": "Try it now" + "message": "Proovi kohe" }, "sendRequest": { - "message": "Send request" + "message": "Saada taotlus" }, "addANote": { - "message": "Add a note" + "message": "Lisa märge" }, "bitwardenSecretsManager": { "message": "Bitwarden Secrets Manager" }, "moreProductsFromBitwarden": { - "message": "More products from Bitwarden" + "message": "Veel tooteid Bitwardenilt" }, "requestAccessToSecretsManager": { - "message": "Request access to Secrets Manager" + "message": "Esita taotlus Secrets Manageri kasutamiseks" }, "youNeedApprovalFromYourAdminToTrySecretsManager": { - "message": "You need approval from your administrator to try Secrets Manager." + "message": "Sul on vaja enda administraatori nõusolekut Secrets Manageri proovimiseks." }, "smAccessRequestEmailSent": { - "message": "Access request for secrets manager email sent to admins." + "message": "Secrets Manageri kasutamise taotlus saadetud administraatorile." }, "requestAccessSMDefaultEmailContent": { - "message": "Hi,\n\nI am requesting a subscription to Bitwarden Secrets Manager for our team. Your support would mean a great deal!\n\nBitwarden Secrets Manager is an end-to-end encrypted secrets management solution for securely storing, sharing, and deploying machine credentials like API keys, database passwords, and authentication certificates.\n\nSecrets Manager will help us to:\n\n- Improve security\n- Streamline operations\n- Prevent costly secret leaks\n\nTo request a free trial for our team, please reach out to Bitwarden.\n\nThank you for your help!" + "message": "Tere!\n\nEsitan palve Bitwarden Secrets Manageri kasutamiseks meie tiimi jaoks. Teie toetus oleks meile suureks abiks!\n\nBitwarden Secrets Manager on täielikult krüpteeritud IT-saladuste (näiteks API võtmete, andmebaasi paroolide ja autentiteerimise sertifikaatide) haldamise lahendus, mis on mõeldud nende turvaliselt hoiustamiseks, jagamiseks ja kasutamiseks.\n\nSecrets Manager aitab meil:\n\n- Parandada turvalisust\n- Muuta toimingud sujuvamaks\n- Takistada võimalikke andmelekkeid\n\nEt esitada taotlus tasuta prooviajaks, palun kontakteeruge Bitwardeniga.\n\nSuur tänu teie abi eest!" }, "giveMembersAccess": { "message": "Give members access:" }, "viewAndSelectTheMembers": { - "message": "view and select the members you want to give access to Secrets Manager." + "message": "vaata ja vali liikmeid, kellele sa soovid anda ligipääsu Secrets Managerile." }, "openYourOrganizations": { "message": "Open your organization's" @@ -5271,10 +5271,10 @@ "message": "Provider successfully set up" }, "clients": { - "message": "Clients" + "message": "Kliendid" }, "client": { - "message": "Client", + "message": "Klient", "description": "This is used as a table header to describe which client application created an event log." }, "providerAdmin": { @@ -5354,7 +5354,7 @@ } }, "providerIsDisabled": { - "message": "Provider suspended" + "message": "Teenusepakkuja on peatatud määramata ajaks" }, "providerUpdated": { "message": "Provider saved" @@ -5627,43 +5627,43 @@ "message": "Single sign-on configuration saved" }, "sponsoredFamilies": { - "message": "Free Bitwarden Families" + "message": "Tasuta Bitwarden Families pakett" }, "sponsoredFamiliesEligible": { - "message": "You and your family are eligible for Free Bitwarden Families. Redeem with your personal email to keep your data secure even when you are not at work." + "message": "Sina ja su pere olete valitud tasuta Bitwarden Families paketi saamiseks. Lunasta see läbi oma emaili, et hoida oma andmed ohutus kohas isegi kui sa ei ole tööl." }, "sponsoredFamiliesEligibleCard": { - "message": "Redeem your Free Bitwarden for Families plan today to keep your data secure even when you are not at work." + "message": "Lunasta tasuta pakett Bitwarden for Families juba täna, et kaitsta oma andmeid isegi siis, kui sa ei ole tööl." }, "sponsoredFamiliesInclude": { - "message": "The Bitwarden for Families plan include" + "message": "Pakett Bitwarden for Families sisaldab" }, "sponsoredFamiliesPremiumAccess": { - "message": "Premium access for up to 6 users" + "message": "Ligipääs Preemiumile kuni kuuele inimesele" }, "sponsoredFamiliesSharedCollections": { - "message": "Shared collections for Family secrets" + "message": "Jagatud kogumikud pere saladuste talletamiseks" }, "badToken": { - "message": "The link is no longer valid. Please have the sponsor resend the offer." + "message": "See link ei ole enam aktiivne. Uue lingi saamiseks kontakteeruge oma sponsoriga, et ta saadaks pakkumise uuesti." }, "reclaimedFreePlan": { - "message": "Reclaimed free plan" + "message": "Uuendatud tasuta pakett" }, "redeem": { - "message": "Redeem" + "message": "Lunasta" }, "sponsoredFamiliesSelectOffer": { - "message": "Select the organization you would like sponsored" + "message": "Vali organisatsioon, mida soovid sponsoreerida" }, "familiesSponsoringOrgSelect": { - "message": "Which Free Families offer would you like to redeem?" + "message": "Millist Free Families pakkumist soovid sa lunastada?" }, "sponsoredFamiliesEmail": { - "message": "Enter your personal email to redeem Bitwarden Families" + "message": "Sisesta oma isiklik email, et lunastada Bitwarden Families" }, "sponsoredFamiliesLeaveCopy": { - "message": "If you remove an offer or are removed from the sponsoring organization, your Families sponsorship will expire at the next renewal date." + "message": "Kui sa lõpetad pakkumise, või sind eemaldatakse sponsoreerivast organisatsioonist, siis sinu Families sponsorlus lõpetatakse perioodi lõpus." }, "acceptBitwardenFamiliesHelp": { "message": "Accept offer for an existing organization or create a new Families organization." @@ -5723,13 +5723,13 @@ "message": "Recipient" }, "removeSponsorship": { - "message": "Remove sponsorship" + "message": "Eemalda sponsorlus" }, "removeSponsorshipConfirmation": { - "message": "After removing a sponsorship, you will be responsible for this subscription and related invoices. Are you sure you want to continue?" + "message": "Peale sponsorluse eemaldamist vastutad sa selle tellimusega seotud arvete eest. Kas oled kindel, et soovid jätkata?" }, "sponsorshipCreated": { - "message": "Sponsorship created" + "message": "Sponsorlus loodud" }, "emailSent": { "message": "E-kiri on saadetud" @@ -5780,30 +5780,30 @@ } }, "leaveOrganization": { - "message": "Leave organization" + "message": "Lahku organisatsioonist" }, "removeMasterPassword": { - "message": "Remove master password" + "message": "Eemalda ülemparool" }, "removedMasterPassword": { - "message": "Master password removed" + "message": "Ülemparool eemaldatud" }, "allowSso": { - "message": "Allow SSO authentication" + "message": "Lülita SSO autentiteerimine sisse" }, "allowSsoDesc": { "message": "Once set up, your configuration will be saved and members will be able to authenticate using their Identity Provider credentials." }, "ssoPolicyHelpStart": { - "message": "Use the", + "message": "Kasuta", "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'" }, "ssoPolicyHelpAnchor": { - "message": "require single sign-on authentication policy", + "message": "\"nõua ühekordse sisselogimise autentimise (SSO) kasutamist\",", "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'" }, "ssoPolicyHelpEnd": { - "message": "to require all members to log in with SSO.", + "message": "et nõuda liikmetelt SSO kasutamist.", "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'" }, "memberDecryptionOption": { @@ -5831,10 +5831,10 @@ "message": "\"Login with SSO and Key Connector Decryption\" is activated. This policy will only apply to owners and admins." }, "enabledSso": { - "message": "SSO turned on" + "message": "SSO sisse lülitatud" }, "disabledSso": { - "message": "SSO turned on" + "message": "SSO välja lülitatud" }, "enabledKeyConnector": { "message": "Key Connector activated" @@ -5858,7 +5858,7 @@ "message": "New Families organization" }, "acceptOffer": { - "message": "Accept offer" + "message": "Nõustu pakkumisega" }, "sponsoringOrg": { "message": "Sponsoring organization" @@ -5969,16 +5969,16 @@ "message": "Sent (awaiting sync)" }, "sent": { - "message": "Sent" + "message": "Saadetud" }, "requestRemoved": { "message": "Removed (awaiting sync)" }, "requested": { - "message": "Requested" + "message": "Taotlus esitatud" }, "formErrorSummaryPlural": { - "message": "$COUNT$ fields above need your attention.", + "message": "$COUNT$ välja nõuab tähelepanu.", "placeholders": { "count": { "content": "$1", @@ -5987,10 +5987,10 @@ } }, "formErrorSummarySingle": { - "message": "1 field above needs your attention." + "message": "1 väli nõuab tähelepanu." }, "fieldRequiredError": { - "message": "$FIELDNAME$ is required.", + "message": "$FIELDNAME$ on nõutud.", "placeholders": { "fieldname": { "content": "$1", @@ -5999,7 +5999,7 @@ } }, "required": { - "message": "required" + "message": "nõutud" }, "charactersCurrentAndMaximum": { "message": "$CURRENT$/$MAX$ character maximum", @@ -6326,7 +6326,7 @@ "description": "Part of a URL." }, "apiAccessToken": { - "message": "API ligipääsu märk" + "message": "API võti" }, "deviceVerification": { "message": "Seadme kinnitamine" @@ -6608,17 +6608,17 @@ "description": "Action to delete a single secret from the system." }, "deleteSecrets": { - "message": "Delete secrets", + "message": "Kustuta IT-saladusi", "description": "The action to delete multiple secrets from the system." }, "hardDeleteSecret": { "message": "Permanently delete secret" }, "hardDeleteSecrets": { - "message": "Permanently delete secrets" + "message": "Kustuta valitud jäädavalt" }, "secretProjectAssociationDescription": { - "message": "Select projects that the secret will be associated with. Only organization users with access to these projects will be able to see the secret.", + "message": "Vali projektid, millega see saladus seotud on. Seda saladust saavad vaadata ainult organisatsiooni kasutajad ligipääsuga nendele projektidele.", "description": "A prompt explaining how secrets can be associated with projects." }, "selectProjects": { @@ -6630,7 +6630,7 @@ "description": "Label for the search bar used to search projects." }, "project": { - "message": "Project", + "message": "Projekt", "description": "Similar to collections, projects can be used to group secrets." }, "editProject": { @@ -6662,11 +6662,11 @@ "description": "The title for the section that deals with service accounts." }, "secrets": { - "message": "Secrets", + "message": "IT-saladused", "description": "The title for the section of the application that deals with secrets." }, "nameValuePair": { - "message": "Name/Value pair", + "message": "Nimi/Väärtus", "description": "Title for a name/ value pair. Secrets typically consist of a name and value pair." }, "secretEdited": { @@ -6686,15 +6686,15 @@ "description": "Title for creating a new service account." }, "secretsNoItemsTitle": { - "message": "No secrets to show", + "message": "Siin ei ole ühtegi saladust", "description": "Empty state to indicate that there are no secrets to display." }, "secretsNoItemsMessage": { - "message": "To get started, add a new secret or import secrets.", + "message": "Alustamiseks loo uus IT-saladus või kasuta meie importimise funktsiooni.", "description": "Message to encourage the user to start adding secrets." }, "secretsTrashNoItemsMessage": { - "message": "There are no secrets in the trash." + "message": "Prügikast on tühi." }, "serviceAccountsNoItemsMessage": { "message": "Create a new service account to get started automating secret access.", @@ -6705,7 +6705,7 @@ "description": "Title to indicate that there are no service accounts to display." }, "searchSecrets": { - "message": "Search secrets", + "message": "Otsi IT-saladusi", "description": "Placeholder text for searching secrets." }, "deleteServiceAccounts": { @@ -6780,21 +6780,21 @@ "description": "Title for creating a new project." }, "softDeleteSecretWarning": { - "message": "Deleting secrets can affect existing integrations.", + "message": "IT-saladuste kustutamine võib mõjuta ühendatud süsteeme.", "description": "Warns that deleting secrets can have consequences on integrations" }, "softDeletesSuccessToast": { - "message": "Secrets sent to trash", + "message": "IT-saladused prügikasti teisaldatud", "description": "Notifies that the selected secrets have been moved to the trash" }, "hardDeleteSecretConfirmation": { "message": "Are you sure you want to permanently delete this secret?" }, "hardDeleteSecretsConfirmation": { - "message": "Are you sure you want to permanently delete these secrets?" + "message": "Kas sa oled kindel, et soovid kustutada need IT-saladused?" }, "hardDeletesSuccessToast": { - "message": "Secrets permanently deleted" + "message": "IT-saladused lõplikult kustutatud" }, "smAccess": { "message": "Access", @@ -6817,7 +6817,7 @@ "description": "Notifies that a service account has been updated" }, "newSaSelectAccess": { - "message": "Type or select projects or secrets", + "message": "Trüki või vali mõni projekt või saladus", "description": "Instructions for selecting projects or secrets for a new service account" }, "newSaTypeToFilter": { @@ -6881,7 +6881,7 @@ "description": "Empty state to be displayed when there are no projects to display in the list." }, "projectsNoItemsMessage": { - "message": "Add a new project to get started organizing secrets.", + "message": "Loo uus projekt, et alustada oma saladuste organiseerimisega.", "description": "Message to be displayed when there are no projects to display in the list." }, "smConfirmationRequired": { @@ -6940,7 +6940,7 @@ "description": "Copies the generated access token to the user's clipboard." }, "accessToken": { - "message": "Access token", + "message": "Juurdepääsuvõti", "description": "A unique string that gives a client application (eg. CLI) access to a secret or set of secrets." }, "accessTokenExpirationRequired": { @@ -6952,7 +6952,7 @@ "description": "Notification to inform the user that the access token has been created and copied to the clipboard." }, "revokeAccessToken": { - "message": "Revoke access token", + "message": "Eemalda juurdepääsuvõti", "description": "Invalidates / cancels an access token and as such removes access to secrets for the client application." }, "revokeAccessTokens": { @@ -7315,7 +7315,7 @@ "message": "Exporting Organization Secret Data" }, "exportingOrganizationSecretDataDescription": { - "message": "Only the Secrets Manager data associated with $ORGANIZATION$ will be exported. Items in other products or from other organizations will not be included.", + "message": "Ainult organisatsiooni $ORGANIZATION$ Secrets Manageri andmed eksporditakse. Kirjed teistes toodetes või organisatsioonides ei kuulu nende hulka.", "placeholders": { "ORGANIZATION": { "content": "$1", @@ -7423,10 +7423,10 @@ "message": "Secrets Manager" }, "secretsManagerAccessDescription": { - "message": "Activate user access to Secrets Manager." + "message": "Anna kasutajale juurdepääs Secrets Managerile." }, "userAccessSecretsManagerGA": { - "message": "This user can access Secrets Manager" + "message": "See kasutaja pääseb ligi Secrets Managerile" }, "important": { "message": "Important:" @@ -7482,14 +7482,14 @@ "message": "Create a service account" }, "downloadThe": { - "message": "Download the", + "message": "Lae alla", "description": "Link to a downloadable resource. This will be used as part of a larger phrase. Example: Download the Secrets Manager CLI" }, "smCLI": { "message": "Secrets Manager CLI" }, "importSecrets": { - "message": "Import secrets" + "message": "Impordi saladusi" }, "getStarted": { "message": "Get started" @@ -7511,19 +7511,19 @@ "message": "Restore secret" }, "restoreSecrets": { - "message": "Restore secrets" + "message": "Taasta saladusi" }, "restoreSecretPrompt": { "message": "Are you sure you want to restore this secret?" }, "restoreSecretsPrompt": { - "message": "Are you sure you want to restore these secrets?" + "message": "Kas sa oled kindel, et soovid taastada need saladused?" }, "secretRestoredSuccessToast": { "message": "Secret restored" }, "secretsRestoredSuccessToast": { - "message": "Secrets restored" + "message": "IT-saladused taastatud" }, "selectionIsRequired": { "message": "Selection is required." @@ -7593,7 +7593,7 @@ "message": "This feature is not available for free organizations. Contact your organization owner to upgrade." }, "smProjectSecretsNoItemsNoAccess": { - "message": "Contact your organization's admin to manage secrets for this project.", + "message": "Kontakteeruge oma organisatsiooni administraatoriga, et hallata selle projekti saladusi.", "description": "The message shown to the user under a project's secrets tab when the user only has read access to the project." }, "enforceOnLoginDesc": { @@ -7693,18 +7693,18 @@ "message": "User updated a password issued through account recovery." }, "activatedAccessToSecretsManager": { - "message": "Activated access to Secrets Manager", + "message": "Juurdepääs Secrets Managerile aktiveeritud", "description": "Confirmation message that one or more users gained access to Secrets Manager" }, "activateAccess": { "message": "Activate access" }, "bulkEnableSecretsManagerDescription": { - "message": "Grant the following members access to Secrets Manager. The role granted in the Password Manager will apply to Secrets Manager.", + "message": "Anna järgnevatele inimestele ligipääs Secrets Managerile. Password Manageris antud roll kehtib ka Secrets Managerile.", "description": "This description is shown to an admin when they are attempting to add more users to Secrets Manager." }, "activateSecretsManager": { - "message": "Activate Secrets Manager" + "message": "Aktiveeri Secrets Manager" }, "yourOrganizationsFingerprint": { "message": "Sinu organisatsiooni unikaalne sõnajada", @@ -7798,7 +7798,7 @@ } }, "startYour7DayFreeTrialOfBitwardenSecretsManagerFor": { - "message": "Start your 7-Day free trial of Bitwarden Secrets Manager for $ORG$", + "message": "Alusta oma organisatsiooni $ORG$ 7-päevast tasuta Bitwarden Secrets Manageri katseperioodi", "placeholders": { "org": { "content": "$1", @@ -7851,7 +7851,7 @@ "message": "Invite Users" }, "secretsManagerForPlan": { - "message": "Secrets Manager for $PLAN$", + "message": "Secrets Manager plaanile $PLAN$", "placeholders": { "plan": { "content": "$1", @@ -7860,13 +7860,13 @@ } }, "secretsManagerForPlanDesc": { - "message": "For engineering and DevOps teams to manage secrets throughout the software development lifecycle." + "message": "Arendus- ja programmeerimistiimidele, et hallata saladusi läbi kogu tarkvara arendustsükli." }, "free2PersonOrganization": { "message": "Free 2-person Organizations" }, "unlimitedSecrets": { - "message": "Unlimited secrets" + "message": "Piiramatult IT-saladusi" }, "unlimitedProjects": { "message": "Unlimited projects" @@ -7899,10 +7899,10 @@ } }, "subscribeToSecretsManager": { - "message": "Subscribe to Secrets Manager" + "message": "Telli Secrets Manager" }, "addSecretsManagerUpgradeDesc": { - "message": "Add Secrets Manager to your upgraded plan to maintain access to any secrets created with your previous plan." + "message": "Lisa Secrets Manager oma uude plaani, et säilitada juurdepääs kõigile eelmise plaaniga loodud saladustele." }, "additionalServiceAccounts": { "message": "Additional service accounts" @@ -7944,10 +7944,10 @@ "message": "Password Manager plan price" }, "secretsManagerPlanPrice": { - "message": "Secrets Manager plan price" + "message": "Secrets Manageri plaani hind" }, "passwordManager": { - "message": "Password Manager" + "message": "Paroolihaldur" }, "freeOrganization": { "message": "Free Organization" @@ -8086,7 +8086,7 @@ "message": "Confirmation details" }, "smFreeTrialThankYou": { - "message": "Thank you for signing up for Bitwarden Secrets Manager!" + "message": "Aitäh registreerimast Bitwarden Secrets Manageri!" }, "smFreeTrialConfirmationEmail": { "message": "We've sent a confirmation email to your email at " @@ -8276,10 +8276,10 @@ "description": "The date header used when a subscription is cancelled." }, "machineAccountsCannotCreate": { - "message": "Machine accounts cannot be created in suspended organizations. Please contact your organization owner for assistance." + "message": "Peatatud organisatsioonides ei ole võimalik luua uusi kontosid arvutitele. Palun kontakteeruge oma organisatsiooni haldajaga." }, "machineAccount": { - "message": "Machine account", + "message": "Arvuti konto", "description": "A machine user which can be used to automate processes and access secrets in the system." }, "machineAccounts": { @@ -8491,13 +8491,13 @@ "message": "Integrations" }, "integrationsDesc": { - "message": "Automatically sync secrets from Bitwarden Secrets Manager to a third-party service." + "message": "Sünkroniseeri enda Bitwarden Secrets Manageri saladusi kolmandate isikutega." }, "sdks": { "message": "SDKs" }, "sdksDesc": { - "message": "Use Bitwarden Secrets Manager SDK in the following programming languages to build your own applications." + "message": "Kasuta Bitwarden Secrets Manageri SDK järgnevates programmeerimiskeeltes, millega saad ehitada enda rakendusi." }, "setUpGithubActions": { "message": "Set up Github Actions" @@ -8590,16 +8590,16 @@ "message": "Start your 7-Day free trial of Bitwarden for Enterprise" }, "startYour7DayFreeTrialOfBitwardenSecretsManager": { - "message": "Start your 7-Day free trial of Bitwarden Secrets Manager" + "message": "Alusta oma 7-päevast prooviaega Bitwarden Secrets Manageriga" }, "startYour7DayFreeTrialOfBitwardenSecretsManagerForTeams": { - "message": "Start your 7-Day free trial of Bitwarden Secrets Manager for Teams" + "message": "Alusta oma 7-päevast prooviaega Bitwarden Secrets Manageri ja plaaniga Teams" }, "startYour7DayFreeTrialOfBitwardenSecretsManagerForFamilies": { - "message": "Start your 7-Day free trial of Bitwarden Secrets Manager for Families" + "message": "Alusta oma 7-päevast prooviaega Bitwarden Secrets Manageri ja plaaniga Families" }, "startYour7DayFreeTrialOfBitwardenSecretsManagerForEnterprise": { - "message": "Start your 7-Day free trial of Bitwarden Secrets Manager for Enterprise" + "message": "Alusta oma 7-päevast prooviaega Bitwarden Secrets Manageri ja plaaniga Enterprise" }, "startYour7DayFreeTrialOfBitwardenPasswordManager": { "message": "Start your 7-Day free trial of Bitwarden Password Manager" @@ -8829,10 +8829,10 @@ "message": "Download CSV" }, "monthlySubscriptionUserSeatsMessage": { - "message": "Adjustments to your subscription will result in prorated charges to your billing totals on your next billing period. " + "message": "Muudatused sinu tellimusele kajastuvad järgmise perioodi arve lõppsummas. " }, "annualSubscriptionUserSeatsMessage": { - "message": "Adjustments to your subscription will result in prorated charges on a monthly billing cycle. " + "message": "Muudatused sinu tellimusele kajastuvad igakuiselt arvete lõppsummades. " }, "billingHistoryDescription": { "message": "Download a CSV to obtain client details for each billing date. Prorated charges are not included in the CSV and may vary from the linked invoice. For the most accurate billing details, refer to your monthly invoices.", @@ -9023,7 +9023,7 @@ "message": "Custom roles" }, "unlimitedSecretsStorage": { - "message": "Unlimited secrets storage" + "message": "Piiramatult ruumi saladustele" }, "unlimitedUsers": { "message": "Unlimited users" @@ -9038,7 +9038,7 @@ "message": "Current" }, "secretsManagerSubInfo": { - "message": "Your Secrets Manager subscription will upgrade base on the plan selected" + "message": "Sinu Secrets Manageri tellimus uueneb vastavalt sinu valitud plaanile" }, "bitwardenPasswordManager": { "message": "Bitwarden Password Manager" @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/eu/messages.json b/apps/web/src/locales/eu/messages.json index dbabb5e4a2c..091d5c62f93 100644 --- a/apps/web/src/locales/eu/messages.json +++ b/apps/web/src/locales/eu/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/fa/messages.json b/apps/web/src/locales/fa/messages.json index 380bd9f5944..c977cc38f8d 100644 --- a/apps/web/src/locales/fa/messages.json +++ b/apps/web/src/locales/fa/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/fi/messages.json b/apps/web/src/locales/fi/messages.json index c9ebc389147..6952ef43b22 100644 --- a/apps/web/src/locales/fi/messages.json +++ b/apps/web/src/locales/fi/messages.json @@ -9050,8 +9050,11 @@ "message": "Julkinen API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Lisää sisältöä on saatavilla" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Muokkaa käyttöoikeuksia" diff --git a/apps/web/src/locales/fil/messages.json b/apps/web/src/locales/fil/messages.json index 0f9f0dd212d..303f12643f8 100644 --- a/apps/web/src/locales/fil/messages.json +++ b/apps/web/src/locales/fil/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/fr/messages.json b/apps/web/src/locales/fr/messages.json index a0f58f9f58b..b1ac1951908 100644 --- a/apps/web/src/locales/fr/messages.json +++ b/apps/web/src/locales/fr/messages.json @@ -9050,8 +9050,11 @@ "message": "API publique", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Du contenu supplémentaire est disponible" + "showCharacterCount": { + "message": "Afficher le nombre de caractères" + }, + "hideCharacterCount": { + "message": "Cacher le nombre de caractères" }, "editAccess": { "message": "Modifier l'accès" diff --git a/apps/web/src/locales/gl/messages.json b/apps/web/src/locales/gl/messages.json index 3d105f01e0c..f7d33277076 100644 --- a/apps/web/src/locales/gl/messages.json +++ b/apps/web/src/locales/gl/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/he/messages.json b/apps/web/src/locales/he/messages.json index bef6306e921..c0f0f764a9c 100644 --- a/apps/web/src/locales/he/messages.json +++ b/apps/web/src/locales/he/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/hi/messages.json b/apps/web/src/locales/hi/messages.json index ee6caf70e15..65902135793 100644 --- a/apps/web/src/locales/hi/messages.json +++ b/apps/web/src/locales/hi/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/hr/messages.json b/apps/web/src/locales/hr/messages.json index 57e49d591c6..60c214ad181 100644 --- a/apps/web/src/locales/hr/messages.json +++ b/apps/web/src/locales/hr/messages.json @@ -49,19 +49,19 @@ "message": "Vjerodajnice za prijavu" }, "personalDetails": { - "message": "Personal details" + "message": "Osobni podaci" }, "identification": { - "message": "Identification" + "message": "Identifikacija" }, "contactInfo": { - "message": "Contact info" + "message": "Kontakt podaci" }, "cardDetails": { - "message": "Card details" + "message": "Detalji kartice" }, "cardBrandDetails": { - "message": "$BRAND$ details", + "message": "$BRAND$ detalji", "placeholders": { "brand": { "content": "$1", @@ -70,7 +70,7 @@ } }, "itemHistory": { - "message": "Item history" + "message": "Povijest stavke" }, "authenticatorKey": { "message": "Kôd za provjeru" @@ -464,7 +464,7 @@ "message": "Ime i prezime" }, "address": { - "message": "Address" + "message": "Adresa" }, "address1": { "message": "Adresa 1" @@ -9050,8 +9050,11 @@ "message": "Javni API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Dostupan je dodatni sadržaj" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Uredi pristup" diff --git a/apps/web/src/locales/hu/messages.json b/apps/web/src/locales/hu/messages.json index a54509a011d..f216aaa91a6 100644 --- a/apps/web/src/locales/hu/messages.json +++ b/apps/web/src/locales/hu/messages.json @@ -9050,8 +9050,11 @@ "message": "Nyilvános API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Kiegészítő tartalom érhető el." + "showCharacterCount": { + "message": "Karakterszámláló megjelenítése" + }, + "hideCharacterCount": { + "message": "Karakterszámláló elrejtése" }, "editAccess": { "message": "Hozzáférés szerkesztése" diff --git a/apps/web/src/locales/id/messages.json b/apps/web/src/locales/id/messages.json index 5473dece733..30e1638a869 100644 --- a/apps/web/src/locales/id/messages.json +++ b/apps/web/src/locales/id/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/it/messages.json b/apps/web/src/locales/it/messages.json index 8d0d248adcb..b2849a20338 100644 --- a/apps/web/src/locales/it/messages.json +++ b/apps/web/src/locales/it/messages.json @@ -9050,8 +9050,11 @@ "message": "API pubblica", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Sono disponibili ulteriori contenuti" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Modifica accesso" diff --git a/apps/web/src/locales/ja/messages.json b/apps/web/src/locales/ja/messages.json index 0cff337d393..88973293334 100644 --- a/apps/web/src/locales/ja/messages.json +++ b/apps/web/src/locales/ja/messages.json @@ -9050,8 +9050,11 @@ "message": "公開 API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "追加コンテンツが利用可能です" + "showCharacterCount": { + "message": "文字数を表示" + }, + "hideCharacterCount": { + "message": "文字数を隠す" }, "editAccess": { "message": "編集権限" diff --git a/apps/web/src/locales/ka/messages.json b/apps/web/src/locales/ka/messages.json index d096dc4d17b..67364dde68d 100644 --- a/apps/web/src/locales/ka/messages.json +++ b/apps/web/src/locales/ka/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/km/messages.json b/apps/web/src/locales/km/messages.json index 2127f7a553e..21e8cf62999 100644 --- a/apps/web/src/locales/km/messages.json +++ b/apps/web/src/locales/km/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/kn/messages.json b/apps/web/src/locales/kn/messages.json index 58014cce859..c9c9ab49f71 100644 --- a/apps/web/src/locales/kn/messages.json +++ b/apps/web/src/locales/kn/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/ko/messages.json b/apps/web/src/locales/ko/messages.json index 41aab58f69b..934929b1ee0 100644 --- a/apps/web/src/locales/ko/messages.json +++ b/apps/web/src/locales/ko/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/lv/messages.json b/apps/web/src/locales/lv/messages.json index cdfa7d28ca4..3fa2249bcd0 100644 --- a/apps/web/src/locales/lv/messages.json +++ b/apps/web/src/locales/lv/messages.json @@ -9050,8 +9050,11 @@ "message": "Publiskais API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Ir pieejams papildu saturs" + "showCharacterCount": { + "message": "Rādīt rakstzīmju skaitu" + }, + "hideCharacterCount": { + "message": "Paslēpt rakstzīmju skaitu" }, "editAccess": { "message": "Labot piekļuvi" diff --git a/apps/web/src/locales/ml/messages.json b/apps/web/src/locales/ml/messages.json index 5f34bbb176a..12d14414b5c 100644 --- a/apps/web/src/locales/ml/messages.json +++ b/apps/web/src/locales/ml/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/mr/messages.json b/apps/web/src/locales/mr/messages.json index 2127f7a553e..21e8cf62999 100644 --- a/apps/web/src/locales/mr/messages.json +++ b/apps/web/src/locales/mr/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/my/messages.json b/apps/web/src/locales/my/messages.json index 2127f7a553e..21e8cf62999 100644 --- a/apps/web/src/locales/my/messages.json +++ b/apps/web/src/locales/my/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/nb/messages.json b/apps/web/src/locales/nb/messages.json index 26319da87b3..a33e12c544b 100644 --- a/apps/web/src/locales/nb/messages.json +++ b/apps/web/src/locales/nb/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/ne/messages.json b/apps/web/src/locales/ne/messages.json index 01e22e16b00..f9ba74ae957 100644 --- a/apps/web/src/locales/ne/messages.json +++ b/apps/web/src/locales/ne/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/nl/messages.json b/apps/web/src/locales/nl/messages.json index 60f02836bf5..0f208d53fce 100644 --- a/apps/web/src/locales/nl/messages.json +++ b/apps/web/src/locales/nl/messages.json @@ -9050,8 +9050,11 @@ "message": "Openbare API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Extra inhoud beschikbaar" + "showCharacterCount": { + "message": "Aantal tekens weergeven" + }, + "hideCharacterCount": { + "message": "Aantal tekens verbergen" }, "editAccess": { "message": "Toegang bewerken" diff --git a/apps/web/src/locales/nn/messages.json b/apps/web/src/locales/nn/messages.json index 59e6bc8fc4e..ff329b1a781 100644 --- a/apps/web/src/locales/nn/messages.json +++ b/apps/web/src/locales/nn/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/or/messages.json b/apps/web/src/locales/or/messages.json index 2127f7a553e..21e8cf62999 100644 --- a/apps/web/src/locales/or/messages.json +++ b/apps/web/src/locales/or/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/pl/messages.json b/apps/web/src/locales/pl/messages.json index b5d5bacc6f4..205104c177b 100644 --- a/apps/web/src/locales/pl/messages.json +++ b/apps/web/src/locales/pl/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/pt_BR/messages.json b/apps/web/src/locales/pt_BR/messages.json index 27d0fcaca5e..2aecf452ea6 100644 --- a/apps/web/src/locales/pt_BR/messages.json +++ b/apps/web/src/locales/pt_BR/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/pt_PT/messages.json b/apps/web/src/locales/pt_PT/messages.json index 0217ec41278..50805349223 100644 --- a/apps/web/src/locales/pt_PT/messages.json +++ b/apps/web/src/locales/pt_PT/messages.json @@ -9050,8 +9050,11 @@ "message": "API pública", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Estão disponíveis conteúdos adicionais" + "showCharacterCount": { + "message": "Mostrar contagem de caracteres" + }, + "hideCharacterCount": { + "message": "Ocultar contagem de caracteres" }, "editAccess": { "message": "Editar acesso" diff --git a/apps/web/src/locales/ro/messages.json b/apps/web/src/locales/ro/messages.json index 629f1a24ade..7384da233f5 100644 --- a/apps/web/src/locales/ro/messages.json +++ b/apps/web/src/locales/ro/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/ru/messages.json b/apps/web/src/locales/ru/messages.json index a55ab9d52c2..b3e2c6efa77 100644 --- a/apps/web/src/locales/ru/messages.json +++ b/apps/web/src/locales/ru/messages.json @@ -222,7 +222,7 @@ "message": "Истек срок действия карты" }, "cardExpiredMessage": { - "message": "If you've renewed it, update the card's information" + "message": "Если вы заменили карту, обновите информацию о ней" }, "expirationMonth": { "message": "Месяц" @@ -3754,7 +3754,7 @@ "message": "Установите лимит мест для вашей подписки. По достижении этого лимита вы не сможете приглашать новых пользователей." }, "limitSmSubscriptionDesc": { - "message": "Установите лимит мест для вашей подписки на Менеджер секретов. По достижении этого лимита вы не сможете приглашать новых пользователей." + "message": "Установите лимит мест для вашей подписки на Менеджер секретов. По достижении этого лимита вы не сможете приглашать новых пользователей.Менеджер секретов" }, "maxSeatLimit": { "message": "Предел мест (необязательно)", @@ -9050,8 +9050,11 @@ "message": "Публичный API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Дополнительный контент доступен" + "showCharacterCount": { + "message": "Показать количество символов" + }, + "hideCharacterCount": { + "message": "Скрыть количество символов" }, "editAccess": { "message": "Изменить доступ" diff --git a/apps/web/src/locales/si/messages.json b/apps/web/src/locales/si/messages.json index fcc73af4a2c..f4585132675 100644 --- a/apps/web/src/locales/si/messages.json +++ b/apps/web/src/locales/si/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/sk/messages.json b/apps/web/src/locales/sk/messages.json index 7b42265fece..1d90ff61265 100644 --- a/apps/web/src/locales/sk/messages.json +++ b/apps/web/src/locales/sk/messages.json @@ -49,19 +49,19 @@ "message": "Prihlasovacie údaje" }, "personalDetails": { - "message": "Personal details" + "message": "Osobné údaje" }, "identification": { - "message": "Identification" + "message": "Identifikácia" }, "contactInfo": { - "message": "Contact info" + "message": "Kontaktné informácie" }, "cardDetails": { - "message": "Card details" + "message": "Podrobnosti o karte" }, "cardBrandDetails": { - "message": "$BRAND$ details", + "message": "Podrobnosti o $BRAND$", "placeholders": { "brand": { "content": "$1", @@ -70,7 +70,7 @@ } }, "itemHistory": { - "message": "Item history" + "message": "História položky" }, "authenticatorKey": { "message": "Kľúč overovacej aplikácie" @@ -464,7 +464,7 @@ "message": "Celé meno" }, "address": { - "message": "Address" + "message": "Adresa" }, "address1": { "message": "Adresa 1" @@ -9050,8 +9050,11 @@ "message": "Verejné API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "K dispozícii je ďalší obsah" + "showCharacterCount": { + "message": "Zobraziť počítadlo znakov" + }, + "hideCharacterCount": { + "message": "Skryť počítadlo znakov" }, "editAccess": { "message": "Upraviť prístup" diff --git a/apps/web/src/locales/sl/messages.json b/apps/web/src/locales/sl/messages.json index b804301bccb..6ff12ad4596 100644 --- a/apps/web/src/locales/sl/messages.json +++ b/apps/web/src/locales/sl/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/sr/messages.json b/apps/web/src/locales/sr/messages.json index 38efcf5e2a5..f0bea1eb573 100644 --- a/apps/web/src/locales/sr/messages.json +++ b/apps/web/src/locales/sr/messages.json @@ -9050,8 +9050,11 @@ "message": "Јавни API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/sr_CS/messages.json b/apps/web/src/locales/sr_CS/messages.json index 5c5e0a9251d..5df939b84e7 100644 --- a/apps/web/src/locales/sr_CS/messages.json +++ b/apps/web/src/locales/sr_CS/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/sv/messages.json b/apps/web/src/locales/sv/messages.json index 0fc92e37fa7..5aab64e9cbe 100644 --- a/apps/web/src/locales/sv/messages.json +++ b/apps/web/src/locales/sv/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Visa antal tecken" + }, + "hideCharacterCount": { + "message": "Dölj antal tecken" }, "editAccess": { "message": "Redigera åtkomst" diff --git a/apps/web/src/locales/te/messages.json b/apps/web/src/locales/te/messages.json index 2127f7a553e..21e8cf62999 100644 --- a/apps/web/src/locales/te/messages.json +++ b/apps/web/src/locales/te/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/th/messages.json b/apps/web/src/locales/th/messages.json index 3d7f0c4c9d9..9055bc1c9f8 100644 --- a/apps/web/src/locales/th/messages.json +++ b/apps/web/src/locales/th/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/tr/messages.json b/apps/web/src/locales/tr/messages.json index 95aff845125..640ddc5a5d6 100644 --- a/apps/web/src/locales/tr/messages.json +++ b/apps/web/src/locales/tr/messages.json @@ -9050,8 +9050,11 @@ "message": "Genel API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Ek içerikler mevcut" + "showCharacterCount": { + "message": "Karakter sayacını göster" + }, + "hideCharacterCount": { + "message": "Karakter sayacını gizle" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/uk/messages.json b/apps/web/src/locales/uk/messages.json index 61f5962e6e9..c8ae5f4b56e 100644 --- a/apps/web/src/locales/uk/messages.json +++ b/apps/web/src/locales/uk/messages.json @@ -49,19 +49,19 @@ "message": "Облікові дані для входу" }, "personalDetails": { - "message": "Personal details" + "message": "Особисті дані" }, "identification": { - "message": "Identification" + "message": "Ідентифікація" }, "contactInfo": { - "message": "Contact info" + "message": "Контактні дані" }, "cardDetails": { - "message": "Card details" + "message": "Подробиці картки" }, "cardBrandDetails": { - "message": "$BRAND$ details", + "message": "Подробиці $BRAND$", "placeholders": { "brand": { "content": "$1", @@ -70,7 +70,7 @@ } }, "itemHistory": { - "message": "Item history" + "message": "Історія запису" }, "authenticatorKey": { "message": "Ключ автентифікації" @@ -464,7 +464,7 @@ "message": "Повне ім'я" }, "address": { - "message": "Address" + "message": "Адреса" }, "address1": { "message": "Адреса 1" @@ -9050,8 +9050,11 @@ "message": "Відкритий API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Доступний додатковий вміст" + "showCharacterCount": { + "message": "Показати кількість символів" + }, + "hideCharacterCount": { + "message": "Приховати кількість символів" }, "editAccess": { "message": "Редагувати доступ" diff --git a/apps/web/src/locales/vi/messages.json b/apps/web/src/locales/vi/messages.json index 21f040dd0e9..90eca2660ec 100644 --- a/apps/web/src/locales/vi/messages.json +++ b/apps/web/src/locales/vi/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" diff --git a/apps/web/src/locales/zh_CN/messages.json b/apps/web/src/locales/zh_CN/messages.json index f6280a00110..34804b736ea 100644 --- a/apps/web/src/locales/zh_CN/messages.json +++ b/apps/web/src/locales/zh_CN/messages.json @@ -9050,8 +9050,11 @@ "message": "公共 API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "其他内容可用" + "showCharacterCount": { + "message": "显示字符计数" + }, + "hideCharacterCount": { + "message": "隐藏字符计数" }, "editAccess": { "message": "编辑权限" diff --git a/apps/web/src/locales/zh_TW/messages.json b/apps/web/src/locales/zh_TW/messages.json index 77d1dd696ff..680d3759829 100644 --- a/apps/web/src/locales/zh_TW/messages.json +++ b/apps/web/src/locales/zh_TW/messages.json @@ -9050,8 +9050,11 @@ "message": "Public API", "description": "The text, 'API', is an acronymn and should not be translated." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "editAccess": { "message": "Edit access" From 55cd021471b0c27aa4ce3fd0875e101d8a847e72 Mon Sep 17 00:00:00 2001 From: Bitwarden DevOps <106330231+bitwarden-devops-bot@users.noreply.github.com> Date: Mon, 9 Sep 2024 10:57:25 -0400 Subject: [PATCH 21/36] Bumped client version(s) (#10960) --- apps/browser/package.json | 2 +- apps/browser/src/manifest.json | 2 +- apps/browser/src/manifest.v3.json | 2 +- apps/cli/package.json | 2 +- apps/desktop/package.json | 2 +- apps/desktop/src/package-lock.json | 4 ++-- apps/desktop/src/package.json | 2 +- apps/web/package.json | 2 +- package-lock.json | 8 ++++---- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/browser/package.json b/apps/browser/package.json index c5332a08016..b76a1e84126 100644 --- a/apps/browser/package.json +++ b/apps/browser/package.json @@ -1,6 +1,6 @@ { "name": "@bitwarden/browser", - "version": "2024.8.2", + "version": "2024.9.0", "scripts": { "build": "cross-env MANIFEST_VERSION=3 webpack", "build:mv2": "webpack", diff --git a/apps/browser/src/manifest.json b/apps/browser/src/manifest.json index 5792c10c053..f916555fef2 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": "2024.8.2", + "version": "2024.9.0", "description": "__MSG_extDesc__", "default_locale": "en", "author": "Bitwarden Inc.", diff --git a/apps/browser/src/manifest.v3.json b/apps/browser/src/manifest.v3.json index fe99c9e9889..12d501ba9ed 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": "2024.8.2", + "version": "2024.9.0", "description": "__MSG_extDesc__", "default_locale": "en", "author": "Bitwarden Inc.", diff --git a/apps/cli/package.json b/apps/cli/package.json index 8fe0284ed7d..a7759043ff6 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": "2024.8.2", + "version": "2024.9.0", "keywords": [ "bitwarden", "password", diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 4562653978b..40ce2fec5d9 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": "2024.9.0", + "version": "2024.9.1", "keywords": [ "bitwarden", "password", diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json index 6823bddceb8..ce08dfde2cd 100644 --- a/apps/desktop/src/package-lock.json +++ b/apps/desktop/src/package-lock.json @@ -1,12 +1,12 @@ { "name": "@bitwarden/desktop", - "version": "2024.9.0", + "version": "2024.9.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@bitwarden/desktop", - "version": "2024.9.0", + "version": "2024.9.1", "license": "GPL-3.0", "dependencies": { "@bitwarden/desktop-napi": "file:../desktop_native/napi", diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json index 18a046d5bce..e34641f1e09 100644 --- a/apps/desktop/src/package.json +++ b/apps/desktop/src/package.json @@ -2,7 +2,7 @@ "name": "@bitwarden/desktop", "productName": "Bitwarden", "description": "A secure and free password manager for all of your devices.", - "version": "2024.9.0", + "version": "2024.9.1", "author": "Bitwarden Inc. (https://bitwarden.com)", "homepage": "https://bitwarden.com", "license": "GPL-3.0", diff --git a/apps/web/package.json b/apps/web/package.json index de153ea1a23..08b8d182837 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "@bitwarden/web-vault", - "version": "2024.8.3", + "version": "2024.9.0", "scripts": { "build:oss": "webpack", "build:bit": "webpack -c ../../bitwarden_license/bit-web/webpack.config.js", diff --git a/package-lock.json b/package-lock.json index 15138a66967..2fb382d5e68 100644 --- a/package-lock.json +++ b/package-lock.json @@ -192,11 +192,11 @@ }, "apps/browser": { "name": "@bitwarden/browser", - "version": "2024.8.2" + "version": "2024.9.0" }, "apps/cli": { "name": "@bitwarden/cli", - "version": "2024.8.2", + "version": "2024.9.0", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@koa/multer": "3.0.2", @@ -232,7 +232,7 @@ }, "apps/desktop": { "name": "@bitwarden/desktop", - "version": "2024.9.0", + "version": "2024.9.1", "hasInstallScript": true, "license": "GPL-3.0" }, @@ -246,7 +246,7 @@ }, "apps/web": { "name": "@bitwarden/web-vault", - "version": "2024.8.3" + "version": "2024.9.0" }, "libs/admin-console": { "name": "@bitwarden/admin-console", From 4624cd850673af10f1987c5628c9215f257f6abd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:58:13 +0000 Subject: [PATCH 22/36] Autosync the updated translations (#10958) Co-authored-by: bitwarden-devops-bot <106330231+bitwarden-devops-bot@users.noreply.github.com> --- apps/browser/src/_locales/ar/messages.json | 16 +- apps/browser/src/_locales/az/messages.json | 16 +- apps/browser/src/_locales/be/messages.json | 16 +- apps/browser/src/_locales/bg/messages.json | 16 +- apps/browser/src/_locales/bn/messages.json | 16 +- apps/browser/src/_locales/bs/messages.json | 16 +- apps/browser/src/_locales/ca/messages.json | 16 +- apps/browser/src/_locales/cs/messages.json | 18 ++- apps/browser/src/_locales/cy/messages.json | 16 +- apps/browser/src/_locales/da/messages.json | 16 +- apps/browser/src/_locales/de/messages.json | 24 ++- apps/browser/src/_locales/el/messages.json | 16 +- apps/browser/src/_locales/en_GB/messages.json | 16 +- apps/browser/src/_locales/en_IN/messages.json | 16 +- apps/browser/src/_locales/es/messages.json | 16 +- apps/browser/src/_locales/et/messages.json | 146 ++++++++++-------- apps/browser/src/_locales/eu/messages.json | 16 +- apps/browser/src/_locales/fa/messages.json | 16 +- apps/browser/src/_locales/fi/messages.json | 16 +- apps/browser/src/_locales/fil/messages.json | 16 +- apps/browser/src/_locales/fr/messages.json | 16 +- apps/browser/src/_locales/gl/messages.json | 16 +- apps/browser/src/_locales/he/messages.json | 16 +- apps/browser/src/_locales/hi/messages.json | 16 +- apps/browser/src/_locales/hr/messages.json | 24 ++- apps/browser/src/_locales/hu/messages.json | 16 +- apps/browser/src/_locales/id/messages.json | 16 +- apps/browser/src/_locales/it/messages.json | 16 +- apps/browser/src/_locales/ja/messages.json | 16 +- apps/browser/src/_locales/ka/messages.json | 16 +- apps/browser/src/_locales/km/messages.json | 16 +- apps/browser/src/_locales/kn/messages.json | 16 +- apps/browser/src/_locales/ko/messages.json | 16 +- apps/browser/src/_locales/lt/messages.json | 16 +- apps/browser/src/_locales/lv/messages.json | 16 +- apps/browser/src/_locales/ml/messages.json | 16 +- apps/browser/src/_locales/mr/messages.json | 16 +- apps/browser/src/_locales/my/messages.json | 16 +- apps/browser/src/_locales/nb/messages.json | 16 +- apps/browser/src/_locales/ne/messages.json | 16 +- apps/browser/src/_locales/nl/messages.json | 16 +- apps/browser/src/_locales/nn/messages.json | 16 +- apps/browser/src/_locales/or/messages.json | 16 +- apps/browser/src/_locales/pl/messages.json | 16 +- apps/browser/src/_locales/pt_BR/messages.json | 60 ++++--- apps/browser/src/_locales/pt_PT/messages.json | 16 +- apps/browser/src/_locales/ro/messages.json | 16 +- apps/browser/src/_locales/ru/messages.json | 16 +- apps/browser/src/_locales/si/messages.json | 16 +- apps/browser/src/_locales/sk/messages.json | 16 +- apps/browser/src/_locales/sl/messages.json | 16 +- apps/browser/src/_locales/sr/messages.json | 16 +- apps/browser/src/_locales/sv/messages.json | 16 +- apps/browser/src/_locales/te/messages.json | 16 +- apps/browser/src/_locales/th/messages.json | 16 +- apps/browser/src/_locales/tr/messages.json | 16 +- apps/browser/src/_locales/uk/messages.json | 24 ++- apps/browser/src/_locales/vi/messages.json | 16 +- apps/browser/src/_locales/zh_CN/messages.json | 16 +- apps/browser/src/_locales/zh_TW/messages.json | 16 +- apps/browser/store/locales/et/copy.resx | 52 +++---- apps/browser/store/locales/pt_BR/copy.resx | 55 ++++--- 62 files changed, 992 insertions(+), 275 deletions(-) diff --git a/apps/browser/src/_locales/ar/messages.json b/apps/browser/src/_locales/ar/messages.json index 8f7a71d086c..0090391fdba 100644 --- a/apps/browser/src/_locales/ar/messages.json +++ b/apps/browser/src/_locales/ar/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "لا توجد كلمات مرور للعرض." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "إزالة" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/az/messages.json b/apps/browser/src/_locales/az/messages.json index 788a7f05d07..341406772ee 100644 --- a/apps/browser/src/_locales/az/messages.json +++ b/apps/browser/src/_locales/az/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Sadalanacaq heç bir parol yoxdur." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Çıxart" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Müəssisə siyasət tələbləri bu ayara tətbiq edildi" }, - "additionalContentAvailable": { - "message": "Əlavə məzmun əlçatandır" + "showCharacterCount": { + "message": "Xarakter sayını göstər" + }, + "hideCharacterCount": { + "message": "Xarakter sayını gizlət" }, "itemsInTrash": { "message": "Tullantıdakı elementlər" diff --git a/apps/browser/src/_locales/be/messages.json b/apps/browser/src/_locales/be/messages.json index d38d44e1d9b..1a00659bbfb 100644 --- a/apps/browser/src/_locales/be/messages.json +++ b/apps/browser/src/_locales/be/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "У спісе адсутнічаюць паролі." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Выдаліць" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/bg/messages.json b/apps/browser/src/_locales/bg/messages.json index 5ac827b964a..bfc4fc04a17 100644 --- a/apps/browser/src/_locales/bg/messages.json +++ b/apps/browser/src/_locales/bg/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Няма пароли за показване." }, + "clearHistory": { + "message": "Изчистване на историята" + }, + "noPasswordsToShow": { + "message": "Няма пароли за показване" + }, + "noRecentlyGeneratedPassword": { + "message": "Скоро не сте генерирали пароли" + }, "remove": { "message": "Премахване" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Изискванията на политиката за големи компании бяха приложени към тази настройка" }, - "additionalContentAvailable": { - "message": "Има налично допълнително съдържание" + "showCharacterCount": { + "message": "Показване на броя знаци" + }, + "hideCharacterCount": { + "message": "Скриване на броя знаци" }, "itemsInTrash": { "message": "Елементи в кошчето" diff --git a/apps/browser/src/_locales/bn/messages.json b/apps/browser/src/_locales/bn/messages.json index ec97da7daca..fd084ed359d 100644 --- a/apps/browser/src/_locales/bn/messages.json +++ b/apps/browser/src/_locales/bn/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "তালিকার জন্য কোনও পাসওয়ার্ড নেই।" }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "সরান" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/bs/messages.json b/apps/browser/src/_locales/bs/messages.json index 1e7feb5e966..b80293fd04c 100644 --- a/apps/browser/src/_locales/bs/messages.json +++ b/apps/browser/src/_locales/bs/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "There are no passwords to list." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Remove" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/ca/messages.json b/apps/browser/src/_locales/ca/messages.json index 50e5f6673eb..2b7bc2198de 100644 --- a/apps/browser/src/_locales/ca/messages.json +++ b/apps/browser/src/_locales/ca/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "No hi ha cap contrasenya a llistar." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Suprimeix" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/cs/messages.json b/apps/browser/src/_locales/cs/messages.json index 6de62c8135e..c5d80fc8b33 100644 --- a/apps/browser/src/_locales/cs/messages.json +++ b/apps/browser/src/_locales/cs/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Nejsou k dispozici žádná hesla." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Odebrat" }, @@ -4125,7 +4134,7 @@ "message": "Použijte zaškrtávací políčka, pokud chcete automaticky vyplnit zaškrtávací políčko formuláře (např. pro zapamatování e-mailu)" }, "linkedHelpText": { - "message": "Použijte propojené pole, pokud máte problémy s automatickým vyplňováním na konkrétní webové stránce" + "message": "Použijte propojené pole, pokud máte problémy s automatickým vyplňováním na konkrétní webové stránce." }, "linkedLabelHelpText": { "message": "Zadejte ID pole z HTML, název, popisek nebo zástupný znak pole." @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Na toto nastavení byly uplatněny požadavky podnikových zásad" }, - "additionalContentAvailable": { - "message": "Je k dispozici další obsah" + "showCharacterCount": { + "message": "Zobrazit počet znaků" + }, + "hideCharacterCount": { + "message": "Skrýt počet znaků" }, "itemsInTrash": { "message": "Položky v koši" diff --git a/apps/browser/src/_locales/cy/messages.json b/apps/browser/src/_locales/cy/messages.json index 65e62517992..128894e754e 100644 --- a/apps/browser/src/_locales/cy/messages.json +++ b/apps/browser/src/_locales/cy/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Does dim cyfrineiriau i'w rhestru." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Tynnu" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/da/messages.json b/apps/browser/src/_locales/da/messages.json index b6d41eaf971..301e987dfd2 100644 --- a/apps/browser/src/_locales/da/messages.json +++ b/apps/browser/src/_locales/da/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Der er ingen kodeord at vise." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Fjern" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Virksomhedspolitikkrav er anvendt på denne indstilling" }, - "additionalContentAvailable": { - "message": "Yderligere indhold er tilgængeligt" + "showCharacterCount": { + "message": "Vis tegnantal" + }, + "hideCharacterCount": { + "message": "Skjul tegnantal" }, "itemsInTrash": { "message": "Emner i papirkurv" diff --git a/apps/browser/src/_locales/de/messages.json b/apps/browser/src/_locales/de/messages.json index 3101829840d..8abbdae03ff 100644 --- a/apps/browser/src/_locales/de/messages.json +++ b/apps/browser/src/_locales/de/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Keine Einträge zum Anzeigen vorhanden." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Entfernen" }, @@ -3478,7 +3487,7 @@ "message": "Überprüfung durch die initiierende Website erforderlich. Diese Funktion ist noch nicht für Konten ohne Master-Passwort implementiert." }, "logInWithPasskeyQuestion": { - "message": "Log in with passkey?" + "message": "Mit Passkey anmelden?" }, "passkeyAlreadyExists": { "message": "Für diese Anwendung existiert bereits ein Passkey." @@ -3490,7 +3499,7 @@ "message": "Du hast keinen passenden Zugangsdaten für diese Website." }, "noMatchingLoginsForSite": { - "message": "No matching logins for this site" + "message": "Keine passenden Zugangsdaten für diese Seite" }, "confirm": { "message": "Bestätigen" @@ -3502,10 +3511,10 @@ "message": "Passkey als neue Zugangsdaten speichern" }, "chooseCipherForPasskeySave": { - "message": "Choose a login to save this passkey to" + "message": "Wähle die Zugangsdaten aus, in die dieser Passkey gespeichert werden soll" }, "chooseCipherForPasskeyAuth": { - "message": "Choose a passkey to log in with" + "message": "Wähle einen Passkey zum Anmelden" }, "passkeyItem": { "message": "Passkey-Eintrag" @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Unternehmens-Richtlinienanforderungen wurden auf diese Einstellung angewandt" }, - "additionalContentAvailable": { - "message": "Zusätzlicher Inhalt ist verfügbar" + "showCharacterCount": { + "message": "Zeichenanzahl anzeigen" + }, + "hideCharacterCount": { + "message": "Zeichenanzahl ausblenden" }, "itemsInTrash": { "message": "Einträge im Papierkorb" diff --git a/apps/browser/src/_locales/el/messages.json b/apps/browser/src/_locales/el/messages.json index 26dabf51dce..5b1ee6011bc 100644 --- a/apps/browser/src/_locales/el/messages.json +++ b/apps/browser/src/_locales/el/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Δεν υπάρχουν κωδικοί στη λίστα." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Αφαίρεση" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Οι απαιτήσεις της πολιτικής για επιχειρήσεις έχουν εφαρμοστεί σε αυτήν τη ρύθμιση" }, - "additionalContentAvailable": { - "message": "Πρόσθετο περιεχόμενο είναι διαθέσιμο" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Αντικείμενα στον κάδο" diff --git a/apps/browser/src/_locales/en_GB/messages.json b/apps/browser/src/_locales/en_GB/messages.json index b4fb303e6b5..153c3987da3 100644 --- a/apps/browser/src/_locales/en_GB/messages.json +++ b/apps/browser/src/_locales/en_GB/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "There are no passwords to list." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Remove" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in the bin" diff --git a/apps/browser/src/_locales/en_IN/messages.json b/apps/browser/src/_locales/en_IN/messages.json index 4eb6149bbf4..9c0200ab42a 100644 --- a/apps/browser/src/_locales/en_IN/messages.json +++ b/apps/browser/src/_locales/en_IN/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "There are no passwords to list." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Remove" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in bin" diff --git a/apps/browser/src/_locales/es/messages.json b/apps/browser/src/_locales/es/messages.json index 74a4809f986..fc98d5e2778 100644 --- a/apps/browser/src/_locales/es/messages.json +++ b/apps/browser/src/_locales/es/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "No hay contraseñas que listar." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Eliminar" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Elementos en la papelera" diff --git a/apps/browser/src/_locales/et/messages.json b/apps/browser/src/_locales/et/messages.json index 7d55eec4fde..43d894be6c4 100644 --- a/apps/browser/src/_locales/et/messages.json +++ b/apps/browser/src/_locales/et/messages.json @@ -14,7 +14,7 @@ "message": "Logi oma olemasolevasse kontosse sisse või loo uus konto." }, "inviteAccepted": { - "message": "Invitation accepted" + "message": "Kutse vastu võetud" }, "createAccount": { "message": "Konto loomine" @@ -69,10 +69,10 @@ "message": "Ülemparooli vihje (ei ole kohustuslik)" }, "joinOrganization": { - "message": "Join organization" + "message": "Liitu organisatsiooniga" }, "finishJoiningThisOrganizationBySettingAMasterPassword": { - "message": "Finish joining this organization by setting a master password." + "message": "Lõpeta organisatsiooniga liitumine määrates ülemparool." }, "tab": { "message": "Kaart" @@ -114,19 +114,19 @@ "message": "Kopeeri turvakood" }, "copyName": { - "message": "Copy name" + "message": "Kopeeri nimi" }, "copyCompany": { - "message": "Copy company" + "message": "Kopeeri firma nimi" }, "copySSN": { - "message": "Copy Social Security number" + "message": "Kopeeri isikukood" }, "copyPassportNumber": { - "message": "Copy passport number" + "message": "Kopeeri passi number" }, "copyLicenseNumber": { - "message": "Copy license number" + "message": "Kopeeri litsentsi number" }, "autoFill": { "message": "Automaatne täitmine" @@ -225,7 +225,7 @@ "message": "Mine edasi veebilaienduste poodi?" }, "continueToBrowserExtensionStoreDesc": { - "message": "Help others find out if Bitwarden is right for them. Visit your browser's extension store and leave a rating now." + "message": "Aita meil jõuda rohkemate inimesteni. Külasta enda laienduste veebipoodi ja jäta sinna positiivne hinnang." }, "changeMasterPasswordOnWebConfirmation": { "message": "Ülemparooli saab muuta Bitwardeni veebirakenduses." @@ -251,7 +251,7 @@ "message": "Rakenduse info" }, "moreFromBitwarden": { - "message": "More from Bitwarden" + "message": "Rohkem Bitwardeni kohta" }, "continueToBitwardenDotCom": { "message": "Mine edasi bitwarden.com-i?" @@ -263,25 +263,25 @@ "message": "Bitwarden Authenticator" }, "continueToAuthenticatorPageDesc": { - "message": "Bitwarden Authenticator allows you to store authenticator keys and generate TOTP codes for 2-step verification flows. Learn more on the bitwarden.com website" + "message": "Bitwardeni Autentiteerijaga saad sa hoiustada autentiteerimise võtmeid ja luua TOTP koode kaheastmeliseks kinnitamiseks. Uuri lähemalt veebilehelt bitwarden.com" }, "bitwardenSecretsManager": { "message": "Bitwarden Secrets Manager" }, "continueToSecretsManagerPageDesc": { - "message": "Securely store, manage, and share developer secrets with Bitwarden Secrets Manager. Learn more on the bitwarden.com website." + "message": "Hoiusta, halda ja jaga turvaliselt arendajate saladusi läbi Bitwarden Secrets Manageri. Uuri lähemalt veebilehelt bitwarden.com." }, "passwordlessDotDev": { "message": "Passwordless.dev" }, "continueToPasswordlessDotDevPageDesc": { - "message": "Create smooth and secure login experiences free from traditional passwords with Passwordless.dev. Learn more on the bitwarden.com website." + "message": "Loo sujuv ja turvaline kogemus sisselogimisel Passwordless.dev-iga ja ilma traditsiooniliste paroolideta. Uuri lähemalt veebilehelt bitwarden.com." }, "freeBitwardenFamilies": { "message": "Tasuta Bitwarden Peredele" }, "freeBitwardenFamiliesPageDesc": { - "message": "You are eligible for Free Bitwarden Families. Redeem this offer today in the web app." + "message": "Sul on võimalik saada endale tasuta Bitwarden Families plaan. Lunasta see pakkumine meie veebirakenduses." }, "version": { "message": "Versioon" @@ -302,22 +302,22 @@ "message": "Muuda kausta" }, "newFolder": { - "message": "New folder" + "message": "Uus kaust" }, "folderName": { - "message": "Folder name" + "message": "Kausta nimi" }, "folderHintText": { - "message": "Nest a folder by adding the parent folder's name followed by a “/”. Example: Social/Forums" + "message": "Kausta teise kasuta panemiseks lisa sihtkausta nimi, millele järgneb \"/\". Näiteks: Sotsiaalmeedia/Foorumid" }, "noFoldersAdded": { - "message": "No folders added" + "message": "Ei lisanud ühtegi kausta" }, "createFoldersToOrganize": { - "message": "Create folders to organize your vault items" + "message": "Loo kaustasid, et oma hoidla kirjeid organiseerida" }, "deleteFolderPermanently": { - "message": "Are you sure you want to permanently delete this folder?" + "message": "Kas sa oled kindel, et soovid selle kausta jäädavalt kustutada?" }, "deleteFolder": { "message": "Kustuta Kaust" @@ -400,11 +400,11 @@ "description": "deprecated. Use specialCharactersLabel instead." }, "include": { - "message": "Include", + "message": "Kasuta", "description": "Card header for password generator include block" }, "uppercaseDescription": { - "message": "Include uppercase characters", + "message": "Kasuta trükitähti", "description": "Tooltip for the password generator uppercase character checkbox" }, "uppercaseLabel": { @@ -412,7 +412,7 @@ "description": "Label for the password generator uppercase character checkbox" }, "lowercaseDescription": { - "message": "Include lowercase characters", + "message": "Kasuta kirjatähti", "description": "Full description for the password generator lowercase character checkbox" }, "lowercaseLabel": { @@ -420,7 +420,7 @@ "description": "Label for the password generator lowercase character checkbox" }, "numbersDescription": { - "message": "Include numbers", + "message": "Kasuta numbreid", "description": "Full description for the password generator numbers checkbox" }, "numbersLabel": { @@ -428,7 +428,7 @@ "description": "Label for the password generator numbers checkbox" }, "specialCharactersDescription": { - "message": "Include special characters", + "message": "Kasuta sümboleid", "description": "Full description for the password generator special characters checkbox" }, "specialCharactersLabel": { @@ -459,7 +459,7 @@ "description": "deprecated. Use avoidAmbiguous instead." }, "avoidAmbiguous": { - "message": "Avoid ambiguous characters", + "message": "Väldi raskesti eristatavaid tähti ja sümboleid", "description": "Label for the avoid ambiguous characters checkbox." }, "searchVault": { @@ -484,7 +484,7 @@ "message": "Parool" }, "totp": { - "message": "Authenticator secret" + "message": "Salajane autentikaatori võti" }, "passphrase": { "message": "Paroolifraas" @@ -538,13 +538,13 @@ "message": "Muu" }, "unlockMethods": { - "message": "Unlock options" + "message": "Avamise valikud" }, "unlockMethodNeededToChangeTimeoutActionDesc": { "message": "Hoidla ajalõpu tegevuse muutmiseks vali esmalt lahtilukustamise meetod." }, "unlockMethodNeeded": { - "message": "Set up an unlock method in Settings" + "message": "Määra avamise meetod seadetes" }, "sessionTimeoutHeader": { "message": "Sessiooni ajalõpp" @@ -684,10 +684,10 @@ "message": "Konto on loodud! Võid nüüd sisse logida." }, "newAccountCreated2": { - "message": "Your new account has been created!" + "message": "Uus konto loodud!" }, "youHaveBeenLoggedIn": { - "message": "You have been logged in!" + "message": "Olete sisse logitud!" }, "youSuccessfullyLoggedIn": { "message": "Sisselogimine õnnestus" @@ -702,7 +702,7 @@ "message": "Nõutav on kinnituskood." }, "webauthnCancelOrTimeout": { - "message": "The authentication was cancelled or took too long. Please try again." + "message": "Autentimine tühistati või kestis liiga kaua aega. Palun proovi uuesti." }, "invalidVerificationCode": { "message": "Vale kinnituskood" @@ -724,25 +724,25 @@ "message": "Ei õnnestunud skännida sellelt lehelt QR-kood" }, "totpCaptureSuccess": { - "message": "Authenticator key added" + "message": "Autentimise võti on lisatud" }, "totpCapture": { - "message": "Scan authenticator QR code from current webpage" + "message": "Skänneeri see QR-kood läbi autentikaatori" }, "totpHelperTitle": { - "message": "Make 2-step verification seamless" + "message": "Muuda 2-astmeline kinnitamine sujuvaks" }, "totpHelper": { - "message": "Bitwarden can store and fill 2-step verification codes. Copy and paste the key into this field." + "message": "Bitwarden saab hoiustada ja täita 2-astmelise kinnitamise koode. Kopeeri ja kleebi võti siia." }, "totpHelperWithCapture": { - "message": "Bitwarden can store and fill 2-step verification codes. Select the camera icon to take a screenshot of this website's authenticator QR code, or copy and paste the key into this field." + "message": "Bitwarden saab hoiustada ja täita 2-astmelise kinnitamise koode. Vajuta kaamera ikoonile, et teha ekraanipilt autentiteerimise QR koodist või kopeeri ja kleebi võti siia." }, "learnMoreAboutAuthenticators": { - "message": "Learn more about authenticators" + "message": "Uuri lähemalt autentikaatorite kohta" }, "copyTOTP": { - "message": "Copy Authenticator key (TOTP)" + "message": "Kopeeri autentiteerimise võti (TOTP)" }, "loggedOut": { "message": "Välja logitud" @@ -754,16 +754,16 @@ "message": "Sessioon on aegunud." }, "logIn": { - "message": "Log in" + "message": "Logi sisse" }, "restartRegistration": { - "message": "Restart registration" + "message": "Alusta registreerimist uuesti" }, "expiredLink": { - "message": "Expired link" + "message": "Aegunud link" }, "pleaseRestartRegistrationOrTryLoggingIn": { - "message": "Please restart registration or try logging in." + "message": "Palun alusta registreerimist uuesti või proovi sisse logida." }, "youMayAlreadyHaveAnAccount": { "message": "You may already have an account" @@ -1469,7 +1469,7 @@ "message": "Boolean" }, "cfTypeCheckbox": { - "message": "Checkbox" + "message": "Märkeruut" }, "cfTypeLinked": { "message": "Ühenduses", @@ -1492,7 +1492,7 @@ "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." + "message": "Näita väikest tuttavat ikooni iga kirje kõrval. Kehtib ka sisselogitud kontodele." }, "enableBadgeCounter": { "message": "Kuva kirjete arvu" @@ -1654,7 +1654,7 @@ "message": "Identiteet" }, "newItemHeader": { - "message": "New $TYPE$", + "message": "Uus $TYPE$", "placeholders": { "type": { "content": "$1", @@ -1690,7 +1690,7 @@ "message": "Kogumikud" }, "nCollections": { - "message": "$COUNT$ collections", + "message": "$COUNT$ kogumikku", "placeholders": { "count": { "content": "$1", @@ -1743,7 +1743,7 @@ "description": "Domain name. Ex. website.com" }, "baseDomainOptionRecommended": { - "message": "Base domain (recommended)", + "message": "Serveri nimi [base domain] (soovitatav)", "description": "Domain name. Ex. website.com" }, "domainName": { @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Puuduvad paroolid, mida kuvada." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Eemalda" }, @@ -1864,7 +1873,7 @@ "message": "Vale PIN kood." }, "tooManyInvalidPinEntryAttemptsLoggingOut": { - "message": "Too many invalid PIN entry attempts. Logging out." + "message": "Liiga palju ebaõnnestunud katseid. Login välja." }, "unlockWithBiometrics": { "message": "Ava biomeetriaga" @@ -1891,26 +1900,26 @@ "message": "Organisatsiooni seaded mõjutavad parooli genereerija sätteid." }, "passwordGenerator": { - "message": "Password generator" + "message": "Parooli genereerija" }, "usernameGenerator": { - "message": "Username generator" + "message": "Kasutajanime genereerija" }, "useThisPassword": { - "message": "Use this password" + "message": "Kasuta seda parooli" }, "useThisUsername": { - "message": "Use this username" + "message": "Kasuta seda kasutajanime" }, "securePasswordGenerated": { - "message": "Secure password generated! Don't forget to also update your password on the website." + "message": "Turvaline parool loodud! Ära unusta uuendata seda ka veebisaidil." }, "useGeneratorHelpTextPartOne": { - "message": "Use the generator", + "message": "Kasuta generaatorit", "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'" }, "useGeneratorHelpTextPartTwo": { - "message": "to create a strong unique password", + "message": "et luua tugev ja ainulaadne parool", "description": "This will be used as part of a larger sentence, broken up to include the generator icon. The full sentence will read 'Use the generator [GENERATOR_ICON] to create a strong unique password'" }, "vaultTimeoutAction": { @@ -1943,7 +1952,7 @@ "message": "Kirje on taastatud" }, "alreadyHaveAccount": { - "message": "Already have an account?" + "message": "On juba konto?" }, "vaultTimeoutLogOutConfirmation": { "message": "Väljalogimine eemaldab hoidlale ligipääsu ning nõuab pärast ajalõpu perioodi uuesti autentimist. Oled kindel, et soovid seda valikut kasutada?" @@ -1955,7 +1964,7 @@ "message": "Täida ja salvesta" }, "fillAndSave": { - "message": "Fill and save" + "message": "Täida ja salvesta" }, "autoFillSuccessAndSavedUri": { "message": "Kirje täideti ja URI salvestati" @@ -2036,19 +2045,19 @@ "message": "Uus ülemparool ei vasta eeskirjades väljatoodud tingimustele." }, "receiveMarketingEmailsV2": { - "message": "Get advice, announcements, and research opportunities from Bitwarden in your inbox." + "message": "Soovin saada nõuandeid, uudiseid ja pakkumisi Bitwardenilt oma postkasti." }, "unsubscribe": { - "message": "Unsubscribe" + "message": "Lõpeta tellimus" }, "atAnyTime": { - "message": "at any time." + "message": "iga hetk." }, "byContinuingYouAgreeToThe": { - "message": "By continuing, you agree to the" + "message": "Jätkates nõustud sa" }, "and": { - "message": "and" + "message": "ja" }, "acceptPolicies": { "message": "Märkeruudu markeerimisel nõustud järgnevaga:" @@ -2069,10 +2078,10 @@ "message": "Ok" }, "errorRefreshingAccessToken": { - "message": "Access Token Refresh Error" + "message": "Juurdepääsukoodi Värskendamine Ebaõnnestus" }, "errorRefreshingAccessTokenDesc": { - "message": "No refresh token or API keys found. Please try logging out and logging back in." + "message": "Ei leidnud värskendamise koodi või API võtit. Palun proovi logida välja ja uuesti sisse." }, "desktopSyncVerificationTitle": { "message": "Töölaua sünkroonimise kinnitamine" @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/eu/messages.json b/apps/browser/src/_locales/eu/messages.json index 8c509fd7eda..175c5d305df 100644 --- a/apps/browser/src/_locales/eu/messages.json +++ b/apps/browser/src/_locales/eu/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Ez dago erakusteko pasahitzik." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Ezabatu" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/fa/messages.json b/apps/browser/src/_locales/fa/messages.json index 0b2a4bf9a36..45a01a0946a 100644 --- a/apps/browser/src/_locales/fa/messages.json +++ b/apps/browser/src/_locales/fa/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "هیچ کلمه عبوری برای فهرست کردن وجود ندارد." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "حذف" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/fi/messages.json b/apps/browser/src/_locales/fi/messages.json index 110264c6a03..07281c5df41 100644 --- a/apps/browser/src/_locales/fi/messages.json +++ b/apps/browser/src/_locales/fi/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Ei näytettäviä salasanoja." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Poista" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Yrityskäytännön vaatimuksia on sovellettu tähän asetukseen" }, - "additionalContentAvailable": { - "message": "Lisää sisältöä on saatavilla" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Roskakorin kohteet" diff --git a/apps/browser/src/_locales/fil/messages.json b/apps/browser/src/_locales/fil/messages.json index d31c41f2280..cc1fb49eb96 100644 --- a/apps/browser/src/_locales/fil/messages.json +++ b/apps/browser/src/_locales/fil/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Walang mga password na i-list." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Alisin" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/fr/messages.json b/apps/browser/src/_locales/fr/messages.json index e2b04da786e..66cd4bf6f85 100644 --- a/apps/browser/src/_locales/fr/messages.json +++ b/apps/browser/src/_locales/fr/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Aucun mot de passe à afficher." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Supprimer" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Les exigences de la politique d'entreprise ont été appliquées à ce paramètre" }, - "additionalContentAvailable": { - "message": "Du contenu supplémentaire est disponible" + "showCharacterCount": { + "message": "Afficher le nombre de caractères" + }, + "hideCharacterCount": { + "message": "Cacher le nombre de caractères" }, "itemsInTrash": { "message": "Éléments dans la corbeille" diff --git a/apps/browser/src/_locales/gl/messages.json b/apps/browser/src/_locales/gl/messages.json index 420dd0b7894..50915596072 100644 --- a/apps/browser/src/_locales/gl/messages.json +++ b/apps/browser/src/_locales/gl/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Non hai contrasinais que listar." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Eliminar" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/he/messages.json b/apps/browser/src/_locales/he/messages.json index 658adcc6052..89f6719289d 100644 --- a/apps/browser/src/_locales/he/messages.json +++ b/apps/browser/src/_locales/he/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "אין סיסמאות להצגה ברשימה." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "הסר" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/hi/messages.json b/apps/browser/src/_locales/hi/messages.json index 5368a992c4c..b9bfa5b5959 100644 --- a/apps/browser/src/_locales/hi/messages.json +++ b/apps/browser/src/_locales/hi/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "सूची के लिए कोई पासवर्ड नहीं हैं।" }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "हटाएं" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "इस सेटिंग पर एंटरप्राइज़ नीति आवश्यकताएँ लागू की गई हैं" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/hr/messages.json b/apps/browser/src/_locales/hr/messages.json index 2fd8b3f24d0..0c6ca6bef75 100644 --- a/apps/browser/src/_locales/hr/messages.json +++ b/apps/browser/src/_locales/hr/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Nema lozinki na popisu." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Ukloni" }, @@ -3478,7 +3487,7 @@ "message": "Ishodišna stranica zahtijeva verifikaciju. Ova značajka još nije implementirana za račune bez glavne lozinke." }, "logInWithPasskeyQuestion": { - "message": "Log in with passkey?" + "message": "Prijava pristupnim ključem?" }, "passkeyAlreadyExists": { "message": "Za ovu aplikaciju već postoji pristupni ključ." @@ -3490,7 +3499,7 @@ "message": "Nema odgovarajuće prijavu za ovu stranicu." }, "noMatchingLoginsForSite": { - "message": "No matching logins for this site" + "message": "Nema prijava za ovu web stranicu" }, "confirm": { "message": "Autoriziraj" @@ -3502,10 +3511,10 @@ "message": "Spremi pristupni ključ kao novu prijavu" }, "chooseCipherForPasskeySave": { - "message": "Choose a login to save this passkey to" + "message": "Odaberi za koju prijavu želiš spremiti ovaj pristupni ključ" }, "chooseCipherForPasskeyAuth": { - "message": "Choose a passkey to log in with" + "message": "Odaberi pristupni ključ za prijavu" }, "passkeyItem": { "message": "Stavka pristupnog ključa" @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Pravila tvrtke primijenjena su na ovu postavku" }, - "additionalContentAvailable": { - "message": "Dostupan je dodatni sadržaj" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Stavke u smeću" diff --git a/apps/browser/src/_locales/hu/messages.json b/apps/browser/src/_locales/hu/messages.json index e304fe39362..17c6b7e5e44 100644 --- a/apps/browser/src/_locales/hu/messages.json +++ b/apps/browser/src/_locales/hu/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Nincsenek listázható jelszavak." }, + "clearHistory": { + "message": "Előzmények törlése" + }, + "noPasswordsToShow": { + "message": "Nincsenek megjeleníthető jelszavak." + }, + "noRecentlyGeneratedPassword": { + "message": "Mostanában nem lett jelszó generálva." + }, "remove": { "message": "Eltávolítás" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Erre a beállításra a vállalkozás rendszabály követelmények lettek alkalmazva." }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Karakterszámláló megjelenítése" + }, + "hideCharacterCount": { + "message": "Karakterszámláló elrejtése" }, "itemsInTrash": { "message": "elem van a lomtárban." diff --git a/apps/browser/src/_locales/id/messages.json b/apps/browser/src/_locales/id/messages.json index 2a3e44a9429..44dff3c8189 100644 --- a/apps/browser/src/_locales/id/messages.json +++ b/apps/browser/src/_locales/id/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Tidak ada sandi yang dapat dicantumkan." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Hapus" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/it/messages.json b/apps/browser/src/_locales/it/messages.json index fec8c6bc458..3bccac4121c 100644 --- a/apps/browser/src/_locales/it/messages.json +++ b/apps/browser/src/_locales/it/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Non ci sono password da mostrare." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Rimuovi" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "I requisiti della policy aziendale sono stati applicati a questa impostazione" }, - "additionalContentAvailable": { - "message": "Sono disponibili ulteriori contenuti" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Elementi nel cestino" diff --git a/apps/browser/src/_locales/ja/messages.json b/apps/browser/src/_locales/ja/messages.json index 631cd6a9361..40d8cef50c6 100644 --- a/apps/browser/src/_locales/ja/messages.json +++ b/apps/browser/src/_locales/ja/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "表示するパスワードがありません" }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "削除" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "エンタープライズポリシー要件がこの設定に適用されました" }, - "additionalContentAvailable": { - "message": "追加コンテンツが利用可能です" + "showCharacterCount": { + "message": "文字数を表示" + }, + "hideCharacterCount": { + "message": "文字数を隠す" }, "itemsInTrash": { "message": "ゴミ箱にあるアイテム" diff --git a/apps/browser/src/_locales/ka/messages.json b/apps/browser/src/_locales/ka/messages.json index 6c275ffb160..f277d76bfab 100644 --- a/apps/browser/src/_locales/ka/messages.json +++ b/apps/browser/src/_locales/ka/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "There are no passwords to list." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Remove" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/km/messages.json b/apps/browser/src/_locales/km/messages.json index 0aa83ad1d7c..81f6bacb96c 100644 --- a/apps/browser/src/_locales/km/messages.json +++ b/apps/browser/src/_locales/km/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "There are no passwords to list." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Remove" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/kn/messages.json b/apps/browser/src/_locales/kn/messages.json index db1a9ee3687..e8d36e6fffb 100644 --- a/apps/browser/src/_locales/kn/messages.json +++ b/apps/browser/src/_locales/kn/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "ಪಟ್ಟಿ ಮಾಡಲು ಯಾವುದೇ ಪಾಸ್ವರ್ಡ್ಗಳು ಇಲ್ಲ." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "ತೆಗೆ" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/ko/messages.json b/apps/browser/src/_locales/ko/messages.json index 67284fce5e1..74c9103943b 100644 --- a/apps/browser/src/_locales/ko/messages.json +++ b/apps/browser/src/_locales/ko/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "비밀번호가 없습니다." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "제거" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/lt/messages.json b/apps/browser/src/_locales/lt/messages.json index 29e92c4097d..ebcf61ffd6d 100644 --- a/apps/browser/src/_locales/lt/messages.json +++ b/apps/browser/src/_locales/lt/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Slaptažodžių sąraše nėra." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Pašalinti" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/lv/messages.json b/apps/browser/src/_locales/lv/messages.json index cd121342612..0a847e86f65 100644 --- a/apps/browser/src/_locales/lv/messages.json +++ b/apps/browser/src/_locales/lv/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Nav paroļu, ko parādīt." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Noņemt" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Šim iestatījumam tika piemērotas uzņēmējdarbības nosacījumu prasības" }, - "additionalContentAvailable": { - "message": "Ir pieejams papildu saturs" + "showCharacterCount": { + "message": "Rādīt rakstzīmju skaitu" + }, + "hideCharacterCount": { + "message": "Paslēpt rakstzīmju skaitu" }, "itemsInTrash": { "message": "Vienumi atkritnē" diff --git a/apps/browser/src/_locales/ml/messages.json b/apps/browser/src/_locales/ml/messages.json index bf53c4b52d5..8a27d914ea9 100644 --- a/apps/browser/src/_locales/ml/messages.json +++ b/apps/browser/src/_locales/ml/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "പ്രദർശിപ്പിക്കാൻ പാസ്സ്‌വേഡുകൾ ഒന്നും ഇല്ല." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "നീക്കുക" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/mr/messages.json b/apps/browser/src/_locales/mr/messages.json index 15116fe3d48..890fc14fdd0 100644 --- a/apps/browser/src/_locales/mr/messages.json +++ b/apps/browser/src/_locales/mr/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "There are no passwords to list." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Remove" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/my/messages.json b/apps/browser/src/_locales/my/messages.json index 0aa83ad1d7c..81f6bacb96c 100644 --- a/apps/browser/src/_locales/my/messages.json +++ b/apps/browser/src/_locales/my/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "There are no passwords to list." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Remove" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/nb/messages.json b/apps/browser/src/_locales/nb/messages.json index ffd1a4e7a19..a5d503d3987 100644 --- a/apps/browser/src/_locales/nb/messages.json +++ b/apps/browser/src/_locales/nb/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Det er ingen passord å liste opp." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Fjern" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/ne/messages.json b/apps/browser/src/_locales/ne/messages.json index 0aa83ad1d7c..81f6bacb96c 100644 --- a/apps/browser/src/_locales/ne/messages.json +++ b/apps/browser/src/_locales/ne/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "There are no passwords to list." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Remove" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/nl/messages.json b/apps/browser/src/_locales/nl/messages.json index 78a817da8c7..791fd7b2374 100644 --- a/apps/browser/src/_locales/nl/messages.json +++ b/apps/browser/src/_locales/nl/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Er zijn geen wachtwoorden om weer te geven." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Verwijderen" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Bedrijfsbeleidseisen zijn op deze instelling toegepast" }, - "additionalContentAvailable": { - "message": "Extra inhoud beschikbaar" + "showCharacterCount": { + "message": "Aantal tekens weergeven" + }, + "hideCharacterCount": { + "message": "Aantal tekens verbergen" }, "itemsInTrash": { "message": "Items in prullenbak" diff --git a/apps/browser/src/_locales/nn/messages.json b/apps/browser/src/_locales/nn/messages.json index 0aa83ad1d7c..81f6bacb96c 100644 --- a/apps/browser/src/_locales/nn/messages.json +++ b/apps/browser/src/_locales/nn/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "There are no passwords to list." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Remove" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/or/messages.json b/apps/browser/src/_locales/or/messages.json index 0aa83ad1d7c..81f6bacb96c 100644 --- a/apps/browser/src/_locales/or/messages.json +++ b/apps/browser/src/_locales/or/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "There are no passwords to list." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Remove" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/pl/messages.json b/apps/browser/src/_locales/pl/messages.json index b5ac0206c9b..7576f8a0cab 100644 --- a/apps/browser/src/_locales/pl/messages.json +++ b/apps/browser/src/_locales/pl/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Brak haseł." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Usuń" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/pt_BR/messages.json b/apps/browser/src/_locales/pt_BR/messages.json index a14c0ce1709..6abab6b104d 100644 --- a/apps/browser/src/_locales/pt_BR/messages.json +++ b/apps/browser/src/_locales/pt_BR/messages.json @@ -400,11 +400,11 @@ "description": "deprecated. Use specialCharactersLabel instead." }, "include": { - "message": "Include", + "message": "Incluir", "description": "Card header for password generator include block" }, "uppercaseDescription": { - "message": "Include uppercase characters", + "message": "Incluir caracteres maiúsculos", "description": "Tooltip for the password generator uppercase character checkbox" }, "uppercaseLabel": { @@ -412,7 +412,7 @@ "description": "Label for the password generator uppercase character checkbox" }, "lowercaseDescription": { - "message": "Include lowercase characters", + "message": "Incluir caracteres minúsculos", "description": "Full description for the password generator lowercase character checkbox" }, "lowercaseLabel": { @@ -420,15 +420,15 @@ "description": "Label for the password generator lowercase character checkbox" }, "numbersDescription": { - "message": "Include numbers", + "message": "Incluir números", "description": "Full description for the password generator numbers checkbox" }, "numbersLabel": { - "message": "0-9", + "message": "0 – 9", "description": "Label for the password generator numbers checkbox" }, "specialCharactersDescription": { - "message": "Include special characters", + "message": "Incluir caracteres especiais", "description": "Full description for the password generator special characters checkbox" }, "specialCharactersLabel": { @@ -459,7 +459,7 @@ "description": "deprecated. Use avoidAmbiguous instead." }, "avoidAmbiguous": { - "message": "Avoid ambiguous characters", + "message": "Evitar Caracteres Ambíguos", "description": "Label for the avoid ambiguous characters checkbox." }, "searchVault": { @@ -684,10 +684,10 @@ "message": "A sua nova conta foi criada! Agora você pode iniciar a sessão." }, "newAccountCreated2": { - "message": "Your new account has been created!" + "message": "Sua nova conta foi criada!" }, "youHaveBeenLoggedIn": { - "message": "You have been logged in!" + "message": "Você está conectado!" }, "youSuccessfullyLoggedIn": { "message": "Você logou na sua conta com sucesso" @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Não existem senhas para listar." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Remover" }, @@ -3478,7 +3487,7 @@ "message": "Verificação requerida pelo site que a iniciou. Esse recurso ainda não está implementado para contas sem senha mestra." }, "logInWithPasskeyQuestion": { - "message": "Log in with passkey?" + "message": "Fazer ‘login’ com chave de acesso?" }, "passkeyAlreadyExists": { "message": "Uma chave de acesso já existe para este aplicativo." @@ -3490,7 +3499,7 @@ "message": "Você não tem um login correspondente para este site." }, "noMatchingLoginsForSite": { - "message": "No matching logins for this site" + "message": "Sem credenciais correspondentes para este site" }, "confirm": { "message": "Confirmar" @@ -3502,10 +3511,10 @@ "message": "Salvar chave de acesso como um novo login" }, "chooseCipherForPasskeySave": { - "message": "Choose a login to save this passkey to" + "message": "Escolha um ‘login’ para salvar com essa chave de acesso" }, "chooseCipherForPasskeyAuth": { - "message": "Choose a passkey to log in with" + "message": "Escolha uma senha para iniciar sessão" }, "passkeyItem": { "message": "Item de chave de acesso" @@ -3703,7 +3712,7 @@ "description": "Notification message for when saving credentials has succeeded." }, "passwordSaved": { - "message": "Password saved!", + "message": "Senha salva!", "description": "Notification message for when saving credentials has succeeded." }, "updateCipherAttemptSuccess": { @@ -3711,7 +3720,7 @@ "description": "Notification message for when updating credentials has succeeded." }, "passwordUpdated": { - "message": "Password updated!", + "message": "Senha atualizada!", "description": "Notification message for when updating credentials has succeeded." }, "saveCipherAttemptFailed": { @@ -4300,28 +4309,31 @@ "enterprisePolicyRequirementsApplied": { "message": "Os requisitos de política empresarial foram aplicados nesta configuração" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Mostrar contagem de caracteres" + }, + "hideCharacterCount": { + "message": "Esconder contagem de caracteres" }, "itemsInTrash": { - "message": "Items in trash" + "message": "Itens na lixeira" }, "noItemsInTrash": { - "message": "No items in trash" + "message": "Nenhum item na lixeira" }, "noItemsInTrashDesc": { - "message": "Items you delete will appear here and be permanently deleted after 30 days" + "message": "Os itens que você excluir aparecerão aqui e serão excluídos permanentemente após 30 dias" }, "trashWarning": { - "message": "Items that have been in trash more than 30 days will automatically be deleted" + "message": "Os itens que ficarem na lixeira por mais de 30 dias serão excluídos automaticamente" }, "restore": { - "message": "Restore" + "message": "Restaurar" }, "deleteForever": { - "message": "Delete forever" + "message": "Apagar permanentemente" }, "noEditPermissions": { - "message": "You don't have permission to edit this item" + "message": "Você não tem permissão para editar este arquivo" } } diff --git a/apps/browser/src/_locales/pt_PT/messages.json b/apps/browser/src/_locales/pt_PT/messages.json index 459200c735f..c516d2d1ed1 100644 --- a/apps/browser/src/_locales/pt_PT/messages.json +++ b/apps/browser/src/_locales/pt_PT/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Não existem palavras-passe para listar." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Remover" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Os requisitos da política empresarial foram aplicados a esta definição" }, - "additionalContentAvailable": { - "message": "Estão disponíveis conteúdos adicionais" + "showCharacterCount": { + "message": "Mostrar contagem de caracteres" + }, + "hideCharacterCount": { + "message": "Ocultar contagem de caracteres" }, "itemsInTrash": { "message": "Itens no lixo" diff --git a/apps/browser/src/_locales/ro/messages.json b/apps/browser/src/_locales/ro/messages.json index 24e77c0564e..62dda4fe0f4 100644 --- a/apps/browser/src/_locales/ro/messages.json +++ b/apps/browser/src/_locales/ro/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Nicio parolă de afișat." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Ștergere" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/ru/messages.json b/apps/browser/src/_locales/ru/messages.json index 1099825fba9..fec64ad9ce1 100644 --- a/apps/browser/src/_locales/ru/messages.json +++ b/apps/browser/src/_locales/ru/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Нет паролей для отображения." }, + "clearHistory": { + "message": "Очистить историю" + }, + "noPasswordsToShow": { + "message": "Нет паролей для отображения" + }, + "noRecentlyGeneratedPassword": { + "message": "Нет недавно сгенерированных паролей" + }, "remove": { "message": "Удалить" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "К этой настройке были применены требования корпоративной политики" }, - "additionalContentAvailable": { - "message": "Дополнительный контент доступен" + "showCharacterCount": { + "message": "Показать количество символов" + }, + "hideCharacterCount": { + "message": "Скрыть количество символов" }, "itemsInTrash": { "message": "Элементы в корзине" diff --git a/apps/browser/src/_locales/si/messages.json b/apps/browser/src/_locales/si/messages.json index acea5593e43..9b906a57ea3 100644 --- a/apps/browser/src/_locales/si/messages.json +++ b/apps/browser/src/_locales/si/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "ලැයිස්තු ගත කිරීමට මුරපද නොමැත." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "ඉවත් කරන්න" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/sk/messages.json b/apps/browser/src/_locales/sk/messages.json index 2eb0172d1f1..0f9088dc5e8 100644 --- a/apps/browser/src/_locales/sk/messages.json +++ b/apps/browser/src/_locales/sk/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Neboli nájdené žiadne heslá." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Odstrániť" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Na toto nastavenie boli uplatnené požiadavky pravidiel spoločnosti" }, - "additionalContentAvailable": { - "message": "K dispozícii je ďalší obsah" + "showCharacterCount": { + "message": "Zobraziť počítadlo znakov" + }, + "hideCharacterCount": { + "message": "Skryť počítadlo znakov" }, "itemsInTrash": { "message": "Položky v koši" diff --git a/apps/browser/src/_locales/sl/messages.json b/apps/browser/src/_locales/sl/messages.json index 030ae2eac77..b9f72e0dae7 100644 --- a/apps/browser/src/_locales/sl/messages.json +++ b/apps/browser/src/_locales/sl/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Ni takšnih gesel." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Odstrani" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/sr/messages.json b/apps/browser/src/_locales/sr/messages.json index b3d179ef2bc..257478519b1 100644 --- a/apps/browser/src/_locales/sr/messages.json +++ b/apps/browser/src/_locales/sr/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Нема лозинки у листи." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Уклони" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Захтеви политике предузећа су примењени на ово подешавање" }, - "additionalContentAvailable": { - "message": "Додатни садржај је доступан" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Ставке у смећу" diff --git a/apps/browser/src/_locales/sv/messages.json b/apps/browser/src/_locales/sv/messages.json index 270c1fb374b..6c8715a9582 100644 --- a/apps/browser/src/_locales/sv/messages.json +++ b/apps/browser/src/_locales/sv/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Det finns inga lösenord att lista." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Ta bort" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Visa antal tecken" + }, + "hideCharacterCount": { + "message": "Dölj antal tecken" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/te/messages.json b/apps/browser/src/_locales/te/messages.json index 0aa83ad1d7c..81f6bacb96c 100644 --- a/apps/browser/src/_locales/te/messages.json +++ b/apps/browser/src/_locales/te/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "There are no passwords to list." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Remove" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/th/messages.json b/apps/browser/src/_locales/th/messages.json index 6332df29b79..645cfc5e379 100644 --- a/apps/browser/src/_locales/th/messages.json +++ b/apps/browser/src/_locales/th/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "ไม่มีรหัสผ่านที่จะแสดง" }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "ลบ" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/tr/messages.json b/apps/browser/src/_locales/tr/messages.json index d510619a5cc..9539f49b9f9 100644 --- a/apps/browser/src/_locales/tr/messages.json +++ b/apps/browser/src/_locales/tr/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Listelenecek parola yok." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Kaldır" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Bu ayara kurumsal ilke gereksinimleri uygulandı" }, - "additionalContentAvailable": { - "message": "Ek içerikler mevcut" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Çöp kutusundaki kayıtlar" diff --git a/apps/browser/src/_locales/uk/messages.json b/apps/browser/src/_locales/uk/messages.json index ad39629b28e..47f5bb486b1 100644 --- a/apps/browser/src/_locales/uk/messages.json +++ b/apps/browser/src/_locales/uk/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Немає паролів." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Вилучити" }, @@ -3478,7 +3487,7 @@ "message": "Сайт ініціює обов'язкову верифікацію. Ця функція ще не реалізована для облікових записів без головного пароля." }, "logInWithPasskeyQuestion": { - "message": "Log in with passkey?" + "message": "Увійти з ключем доступу?" }, "passkeyAlreadyExists": { "message": "Ключ доступу для цієї програми вже існує." @@ -3490,7 +3499,7 @@ "message": "У вас немає відповідних записів для цього сайту." }, "noMatchingLoginsForSite": { - "message": "No matching logins for this site" + "message": "Немає відповідних записів для цього сайту" }, "confirm": { "message": "Підтвердити" @@ -3502,10 +3511,10 @@ "message": "Зберегти ключ доступу як новий запис" }, "chooseCipherForPasskeySave": { - "message": "Choose a login to save this passkey to" + "message": "Виберіть запис для збереження цього ключа доступу" }, "chooseCipherForPasskeyAuth": { - "message": "Choose a passkey to log in with" + "message": "Виберіть ключ доступу для входу" }, "passkeyItem": { "message": "Ключ доступу" @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "До цього налаштування застосовано вимоги політики компанії" }, - "additionalContentAvailable": { - "message": "Доступний додатковий вміст" + "showCharacterCount": { + "message": "Показати кількість символів" + }, + "hideCharacterCount": { + "message": "Приховати кількість символів" }, "itemsInTrash": { "message": "Записи в смітнику" diff --git a/apps/browser/src/_locales/vi/messages.json b/apps/browser/src/_locales/vi/messages.json index 698f87f78b6..559000d519a 100644 --- a/apps/browser/src/_locales/vi/messages.json +++ b/apps/browser/src/_locales/vi/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "Không có mật khẩu để liệt kê." }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "Xoá" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/src/_locales/zh_CN/messages.json b/apps/browser/src/_locales/zh_CN/messages.json index fac6baff19b..de2bfdf63fb 100644 --- a/apps/browser/src/_locales/zh_CN/messages.json +++ b/apps/browser/src/_locales/zh_CN/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "没有可列出的密码。" }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "移除" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "企业策略要求已应用于此设置" }, - "additionalContentAvailable": { - "message": "其他内容可用" + "showCharacterCount": { + "message": "显示字符计数" + }, + "hideCharacterCount": { + "message": "隐藏字符计数" }, "itemsInTrash": { "message": "回收站中的项目" diff --git a/apps/browser/src/_locales/zh_TW/messages.json b/apps/browser/src/_locales/zh_TW/messages.json index e2b2705fdaf..8f6673017c0 100644 --- a/apps/browser/src/_locales/zh_TW/messages.json +++ b/apps/browser/src/_locales/zh_TW/messages.json @@ -1796,6 +1796,15 @@ "noPasswordsInList": { "message": "沒有可列出的密碼。" }, + "clearHistory": { + "message": "Clear history" + }, + "noPasswordsToShow": { + "message": "No passwords to show" + }, + "noRecentlyGeneratedPassword": { + "message": "You haven't generated a password recently" + }, "remove": { "message": "移除" }, @@ -4300,8 +4309,11 @@ "enterprisePolicyRequirementsApplied": { "message": "Enterprise policy requirements have been applied to this setting" }, - "additionalContentAvailable": { - "message": "Additional content is available" + "showCharacterCount": { + "message": "Show character count" + }, + "hideCharacterCount": { + "message": "Hide character count" }, "itemsInTrash": { "message": "Items in trash" diff --git a/apps/browser/store/locales/et/copy.resx b/apps/browser/store/locales/et/copy.resx index 0f0c8c13fb8..d2a6be860ce 100644 --- a/apps/browser/store/locales/et/copy.resx +++ b/apps/browser/store/locales/et/copy.resx @@ -124,48 +124,48 @@ Kodus, tööl ja teel - Bitwarden hoiustab imelihtsalt kõik su paroolid, pääsuvõtmed ja tundliku info. - Recognized as the best password manager by PCMag, WIRED, The Verge, CNET, G2, and more! + Tunnustatud firmade PCMag, WIRED, The Verge, CNET, G2 ja teiste poolt kui parim paroolihaldur! -SECURE YOUR DIGITAL LIFE -Secure your digital life and protect against data breaches by generating and saving unique, strong passwords for every account. Maintain everything in an end-to-end encrypted password vault that only you can access. +KAITSE ENDA DIGITAALSET MAAILMA +Lukusta oma digitaalne maailm ja kaitse seda andmelekete vastu luues ja salvestades unikaalsed ja tugevad paroolid iga konto jaoks. Halda kõike täielikult krüpteeritud hoidlas, kuhu pääsed ainult sina ligi. -ACCESS YOUR DATA, ANYWHERE, ANYTIME, ON ANY DEVICE -Easily manage, store, secure, and share unlimited passwords across unlimited devices without restrictions. +PÄÄSE OMA ANDMETELE LIGI IGALT POOLT, IGAL AJAL, IGAST SEADMEST +Halda, hoiusta, kaitse ja jaga lõpmatult palju paroole mööda lõpmatult paljusid seadmeid ilma piiranguteta. -EVERYONE SHOULD HAVE THE TOOLS TO STAY SAFE ONLINE -Utilize Bitwarden for free with no ads or selling data. Bitwarden believes everyone should have the ability to stay safe online. Premium plans offer access to advanced features. +KÕIGIL PEAKSID OLEMA TÖÖRIISTAD OHUTULT INTERNETIS SEIKLEMISEKS +Kasuta Bitwardenit tasuta ilma reklaamide või andmete müümisega. Bitwarden usub, et kõigil peaks olema võimalus surfata ohutult internetis. Preemium plaanid pakuvad juurdepääsu veel rohkematele funktsioonidele. -EMPOWER YOUR TEAMS WITH BITWARDEN -Plans for Teams and Enterprise come with professional business features. Some examples include SSO integration, self-hosting, directory integration and SCIM provisioning, global policies, API access, event logs, and more. +VÕIMENDA OMA TIIME BITWARDENIGA +Tiimide ja ettevõtete plaanid tulevad koos professionaalsete ärifunktsioonidega. Mõned näited on SSO liides, ise majutamine, arvutikataloogide ühendamine ja SCIM kasutamine, globaalsed seaded, API, sündmuste logid ja veel rohkemgi. -Use Bitwarden to secure your workforce and share sensitive information with colleagues. +Kasuta Bitwardenit oma töötajate turvamiseks ja tundliku informatsiooni jagamiseks kolleegidega. -More reasons to choose Bitwarden: +Veel Põhjusi Miks Valida Bitwarden: -World-Class Encryption -Passwords are protected with advanced end-to-end encryption (AES-256 bit, salted hashtag, and PBKDF2 SHA-256) so your data stays secure and private. +Maailmatasemel Krüpteering +Paroolid on kaitstud tipptehnoloogilise täieliku krüpteerimisega (AES-256 bit, salted hashtag ja PBKDF2 SHA-256), nii et sinu andmed püsivad privaatsete ja turvalistena. -3rd-party Audits -Bitwarden regularly conducts comprehensive third-party security audits with notable security firms. These annual audits include source code assessments and penetration testing across Bitwarden IPs, servers, and web applications. +Põhjalikud turvatestid kolmandate firmade poolt +Bitwarden korraldab regulaarselt põhjalike turvateste tuntud kolmandate firmade poolt. Need igaaastased kontrolltestid sisaldavad kogu koodibaasi ülevaatust ja test-küberrünnakuid Bitwardeni IP-de, serverite ja veebirakenduste vastu. -Advanced 2FA -Secure your login with a third-party authenticator, emailed codes, or FIDO2 WebAuthn credentials such as a hardware security key or passkey. +Kõrgetasemeline 2-astmeline autentiteerimine (2FA) +Kaitse oma andmeid kolmanda poole autentitaatoriga, emailile saadetud koodide või FIDO2 WebAuthn süsteemidega, nagu näiteks füüsiline turvavõti või pääsuvõti. Bitwarden Send -Transmit data directly to others while maintaining end-to-end encrypted security and limiting exposure. +Jaga andmeid otse teistega kasutades täieliku krüpteerimist ja vähenda lekke tõenäosust. -Built-in Generator -Create long, complex, and distinct passwords and unique usernames for every site you visit. Integrate with email alias providers for additional privacy. +Sisse ehitatud Generaator +Loo igale oma saidile pikkasid, keerulisi ning täiesti kordumatuid paroole ja ainulaadseid kasutajanimesid. Veel paremaks privaatsuseks saad end ühendada ka variemaili (email alias) pakkujatega. -Global Translations -Bitwarden translations exist for more than 60 languages, translated by the global community though Crowdin. +Paljudes Keeltes +Bitwardenit on tõlgitud juba 60 erinevasse keelde ja see arv kasvab, tänu meie globaalsele kogukonnale Crowdin platvormil. -Cross-Platform Applications -Secure and share sensitive data within your Bitwarden Vault from any browser, mobile device, or desktop OS, and more. +Kõigis Sinu Seadmetes +Kaitse ja jaga oma tundliku informatsiooni Bitwardeni Hoidlas nii brauserist, telefonist, arvutist kui ka mujaltki. -Bitwarden secures more than just passwords -End-to-end encrypted credential management solutions from Bitwarden empower organizations to secure everything, including developer secrets and passkey experiences. Visit Bitwarden.com to learn more about Bitwarden Secrets Manager and Bitwarden Passwordless.dev! +Bitwarden hoiustab peale paroolide veel muudki +Täielikult krüpteeritud andmehalduse lahendused Bitwardenilt võimendavad organisatsioone ja hoiustavad kõike, kaasa arvatud arendajate saladusi ja pääsuvõtmeid. Külasta veebilehte bitwarden.com, et uurida lähemalt Bitwarden Secrets Manageri kohta ja vaata lähemalt passwordless.dev! diff --git a/apps/browser/store/locales/pt_BR/copy.resx b/apps/browser/store/locales/pt_BR/copy.resx index 067f9357b23..24331b3a1ba 100644 --- a/apps/browser/store/locales/pt_BR/copy.resx +++ b/apps/browser/store/locales/pt_BR/copy.resx @@ -124,49 +124,46 @@ Em casa, no trabalho, ou em qualquer lugar, o Bitwarden protege facilmente todas as suas senhas, senhas e informações confidenciais. - Recognized as the best password manager by PCMag, WIRED, The Verge, CNET, G2, and more! + Reconhecido como o melhor gerenciador de senhas por "PCMag", 'WIRED', 'The Verge', 'CNET', 'G2', entre outros! -SECURE YOUR DIGITAL LIFE -Secure your digital life and protect against data breaches by generating and saving unique, strong passwords for every account. Maintain everything in an end-to-end encrypted password vault that only you can access. +PROTEJA A SUA VIDA DIGITAL +Deixe a sua vida digital segura e se proteja contra violações de dados gerando e salvando senhas únicas e fortes para cada conta pessoal. Mantendo tudo isso em um cofre encriptografado de ponta a ponta que apenas você pode acessar. -ACCESS YOUR DATA, ANYWHERE, ANYTIME, ON ANY DEVICE -Easily manage, store, secure, and share unlimited passwords across unlimited devices without restrictions. +ACESSE OS SEUS DADOS, EM QUALQUER LUGAR, HORA E DISPOSITIVO +Gerencie, armazene, proteja e compartilhe senhas facilmente entre dispositivos ilimitados e sem restrições. -EVERYONE SHOULD HAVE THE TOOLS TO STAY SAFE ONLINE -Utilize Bitwarden for free with no ads or selling data. Bitwarden believes everyone should have the ability to stay safe online. Premium plans offer access to advanced features. +TODOS DEVERIAM TEM FERRAMENTAS PARA SE PROTEGER ONLINE +Utilize Bitwarden de graça sem anuncios ou venda dos seus dados. A Bitwarden acredita que todos deveriam ter a opção de estar seguro online. Planos Premium oferecem recursos mais avançados. -EMPOWER YOUR TEAMS WITH BITWARDEN -Plans for Teams and Enterprise come with professional business features. Some examples include SSO integration, self-hosting, directory integration and SCIM provisioning, global policies, API access, event logs, and more. +EMPODERE O SEUS TIMES COM BITWARDEN +Os Planos para times e empresas vem com recursos profissionais para negócios. Alguns exemplos inculuem integração SSO, Auto-hospedagem, integração de diretório e provisionamento SCIM, políticas globais, acesso API, registro de eventos e mais. -Use Bitwarden to secure your workforce and share sensitive information with colleagues. +Utilizer Bitwarn para proteger os seus empregados e compartilhar informações sensíveis para os colegas. +Mais razões para escolher Bitwarden: -More reasons to choose Bitwarden: +Senhas encriptografadas por classe de palavras são protegidas com criptografia de ponta a ponta avançada (AES-256 bit, salted hashtag, and PBKDF2 SHA-256), então os seus dados ficam seguros e privados. -World-Class Encryption -Passwords are protected with advanced end-to-end encryption (AES-256 bit, salted hashtag, and PBKDF2 SHA-256) so your data stays secure and private. +Auditoria de Terceiros +Bitwarden regularmente conduz auditorias de terceiros com notáveis empresas de segurança. Essas audições anuais incluem qualificação e penetração do código fonte através de IPs da Bitwarden, servidores e aplicações WEB. -3rd-party Audits -Bitwarden regularly conducts comprehensive third-party security audits with notable security firms. These annual audits include source code assessments and penetration testing across Bitwarden IPs, servers, and web applications. +2FA Avançado +Proteja o seu login com um autenticador de doisfatores, códigos de email ou credenciais FIDO2 WebAuthn como chave de segurança por hardware ou chave de acesso. -Advanced 2FA -Secure your login with a third-party authenticator, emailed codes, or FIDO2 WebAuthn credentials such as a hardware security key or passkey. +Envio Bitwarden +Transmita dados diretamente para outros enquanto mantem segurança de encriptografia ponta a ponta e limitando exposição. -Bitwarden Send -Transmit data directly to others while maintaining end-to-end encrypted security and limiting exposure. +Gerador integrado +Crie senhas grandes, complexas e diferentes e nomes de usuário unicos para cada site que visitar. Integre com provedores de email para privacidade adicional -Built-in Generator -Create long, complex, and distinct passwords and unique usernames for every site you visit. Integrate with email alias providers for additional privacy. +Tradutores globais +As traduções da Bitwarden estão disponíveis para mais de 60 líguas, traduzidas pela comunidade global através do Crowdin. -Global Translations -Bitwarden translations exist for more than 60 languages, translated by the global community though Crowdin. +Aplicações Multi-Plataforma +Proteja e compartilhe conteúdo sensível dentro do Vault da Bitwarden de qualquer navegador, dispositivo móvel, ou desktop OS, entre outros. -Cross-Platform Applications -Secure and share sensitive data within your Bitwarden Vault from any browser, mobile device, or desktop OS, and more. - -Bitwarden secures more than just passwords -End-to-end encrypted credential management solutions from Bitwarden empower organizations to secure everything, including developer secrets and passkey experiences. Visit Bitwarden.com to learn more about Bitwarden Secrets Manager and Bitwarden Passwordless.dev! - +Bitwarden protege mais do que apenas soluções em gerenciamento de credenciais de senhas encriptografadas ponta a ponta, Bitwarden empodera organizações para proteger qualquer coisa, incluindo segredos de desenvolvedor e chaves de acesso. +Visite Bitwarden.com para aprender mais sobre Bitwarden Secrets Manager e Bitwarden Passwordless.dev! Em casa, no trabalho, ou em qualquer lugar, o Bitwarden protege facilmente todas as suas senhas, senhas e informações confidenciais. From 456b1567295a1c76d8ce620897cd837fbbc8e9a9 Mon Sep 17 00:00:00 2001 From: Bitwarden DevOps <106330231+bitwarden-devops-bot@users.noreply.github.com> Date: Mon, 9 Sep 2024 11:05:49 -0400 Subject: [PATCH 23/36] Bumped client version(s) (#10961) --- apps/desktop/package.json | 2 +- apps/desktop/src/package-lock.json | 4 ++-- apps/desktop/src/package.json | 2 +- package-lock.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 40ce2fec5d9..4562653978b 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": "2024.9.1", + "version": "2024.9.0", "keywords": [ "bitwarden", "password", diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json index ce08dfde2cd..6823bddceb8 100644 --- a/apps/desktop/src/package-lock.json +++ b/apps/desktop/src/package-lock.json @@ -1,12 +1,12 @@ { "name": "@bitwarden/desktop", - "version": "2024.9.1", + "version": "2024.9.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@bitwarden/desktop", - "version": "2024.9.1", + "version": "2024.9.0", "license": "GPL-3.0", "dependencies": { "@bitwarden/desktop-napi": "file:../desktop_native/napi", diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json index e34641f1e09..18a046d5bce 100644 --- a/apps/desktop/src/package.json +++ b/apps/desktop/src/package.json @@ -2,7 +2,7 @@ "name": "@bitwarden/desktop", "productName": "Bitwarden", "description": "A secure and free password manager for all of your devices.", - "version": "2024.9.1", + "version": "2024.9.0", "author": "Bitwarden Inc. (https://bitwarden.com)", "homepage": "https://bitwarden.com", "license": "GPL-3.0", diff --git a/package-lock.json b/package-lock.json index 2fb382d5e68..94bc636b4ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -232,7 +232,7 @@ }, "apps/desktop": { "name": "@bitwarden/desktop", - "version": "2024.9.1", + "version": "2024.9.0", "hasInstallScript": true, "license": "GPL-3.0" }, From 8a199a1f663ff9e44790684ac808d50f200f6e4f Mon Sep 17 00:00:00 2001 From: Tom <144813356+ttalty@users.noreply.github.com> Date: Mon, 9 Sep 2024 11:48:08 -0400 Subject: [PATCH 24/36] [AC-2614] Member Access Localization (#10931) * Initial setup and modifications for member access report api implementation * Adding the permissions logic for getting the permissions text * fixing the test cases * Some refactoring on async calls * Comments on the model * Resolving the mock issue * messages * Localization of text * One more file to fix merge --- apps/web/src/locales/en/messages.json | 21 +++++++++++++++++++ .../services/member-access-report.service.ts | 21 ++++++++++++++----- .../view/member-access-export.view.ts | 8 +++---- 3 files changed, 41 insertions(+), 9 deletions(-) diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index 7a7785469bc..53ab34478a3 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -8756,6 +8756,27 @@ "memberAccessReportPageDesc": { "message": "Audit organization member access across groups, collections, and collection items. The CSV export provides a detailed breakdown per member, including information on collection permissions and account configurations." }, + "memberAccessReportNoCollection": { + "message": "(No Collection)" + }, + "memberAccessReportNoCollectionPermission": { + "message": "(No Collection Permission)" + }, + "memberAccessReportNoGroup": { + "message": "(No Group)" + }, + "memberAccessReportTwoFactorEnabledTrue": { + "message": "On" + }, + "memberAccessReportTwoFactorEnabledFalse": { + "message": "Off" + }, + "memberAccessReportAuthenticationEnabledTrue": { + "message": "On" + }, + "memberAccessReportAuthenticationEnabledFalse": { + "message": "Off" + }, "higherKDFIterations": { "message": "Higher KDF iterations can help protect your master password from being brute forced by an attacker." }, diff --git a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.ts b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.ts index 4ab7ffd6e42..0548841e8c3 100644 --- a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.ts +++ b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.ts @@ -64,14 +64,25 @@ export class MemberAccessReportService { const exportItems = memberAccessReports.flatMap((report) => { const userDetails = report.accessDetails.map((detail) => { + const collectionName = collectionNameMap.get(detail.collectionName.encryptedString); return { email: report.email, name: report.userName, - twoStepLogin: report.twoFactorEnabled ? "On" : "Off", - accountRecovery: report.accountRecoveryEnabled ? "On" : "Off", - group: detail.groupName, - collection: collectionNameMap.get(detail.collectionName.encryptedString), - collectionPermission: this.getPermissionText(detail), + twoStepLogin: report.twoFactorEnabled + ? this.i18nService.t("memberAccessReportTwoFactorEnabledTrue") + : this.i18nService.t("memberAccessReportTwoFactorEnabledFalse"), + accountRecovery: report.accountRecoveryEnabled + ? this.i18nService.t("memberAccessReportAuthenticationEnabledTrue") + : this.i18nService.t("memberAccessReportAuthenticationEnabledFalse"), + group: detail.groupName + ? detail.groupName + : this.i18nService.t("memberAccessReportNoGroup"), + collection: collectionName + ? collectionName + : this.i18nService.t("memberAccessReportNoCollection"), + collectionPermission: detail.collectionId + ? this.getPermissionText(detail) + : this.i18nService.t("memberAccessReportNoCollection"), totalItems: detail.itemCount.toString(), }; }); diff --git a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/view/member-access-export.view.ts b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/view/member-access-export.view.ts index be9035e1f2c..2b009011af1 100644 --- a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/view/member-access-export.view.ts +++ b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/view/member-access-export.view.ts @@ -10,12 +10,12 @@ export type MemberAccessExportItem = { }; export const userReportItemHeaders: { [key in keyof MemberAccessExportItem]: string } = { - email: "Email Address", - name: "Full Name", + email: "Email", + name: "Name", twoStepLogin: "Two-Step Login", accountRecovery: "Account Recovery", - group: "Group Name", - collection: "Collection Name", + group: "Group", + collection: "Collection", collectionPermission: "Collection Permission", totalItems: "Total Items", }; From e786eac87dbec269ed5a99fdcafa7602cd74bea1 Mon Sep 17 00:00:00 2001 From: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com> Date: Mon, 9 Sep 2024 18:21:09 +0100 Subject: [PATCH 25/36] Resolve the ui changes issues (#10955) --- .../change-plan-dialog.component.html | 29 +++++++++++++------ apps/web/src/locales/en/messages.json | 19 +++++++----- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html index d643c41e0ff..02071f5aa8c 100644 --- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html +++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html @@ -4,7 +4,7 @@ {{ "upgradeFreeOrganization" | i18n: currentPlanName }}
-

{{ "upgradePlan" | i18n }}

+

{{ "upgradePlans" | i18n }}

{{ "selectAPlan" | i18n }}
@@ -52,9 +52,21 @@ tabindex="0" >
-
+
+ {{ "recommended" | i18n }} +
+

- {{ + {{ selectableProduct.nameLocalizationKey | i18n }} @@ -73,9 +85,8 @@ ) | currency: "$" }} + /{{ "monthPerMember" | i18n }} - /{{ "month" | i18n }} - {{ "includesXMembers" | i18n: selectableProduct.PasswordManager.baseSeats }} @@ -108,7 +119,7 @@ | currency: "$") }} - /{{ "monthPerMember" | i18n }} + /{{ "monthPerMember" | i18n }} {{ "freeForever" | i18n }} @@ -125,7 +136,7 @@

{{ "bitwardenPasswordManager" | i18n }}

-

{{ "upgradeEnterpriseMessage" | i18n }}

+

{{ "enterprisePlanUpgradeMessage" | i18n }}

  • @@ -193,13 +204,13 @@ *ngIf="selectableProduct.productTier === productTypes.Teams" class="tw-text-xs tw-px-2" > - {{ "upgradeTeamsMessage" | i18n }} + {{ "teamsPlanUpgradeMessage" | i18n }}

    - {{ "upgradeFamilyMessage" | i18n }} + {{ "familyPlanUpgradeMessage" | i18n }}

      Date: Mon, 9 Sep 2024 19:32:13 +0200 Subject: [PATCH 26/36] Typescript 5.3: Fix-super-missuse-on-instance-properties (#10952) Co-authored-by: Daniel James Smith --- apps/browser/src/tools/popup/send/send-groupings.component.ts | 2 +- apps/browser/src/tools/popup/send/send-type.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 99cac6f73c8..87de6af31cf 100644 --- a/apps/browser/src/tools/popup/send/send-groupings.component.ts +++ b/apps/browser/src/tools/popup/send/send-groupings.component.ts @@ -64,7 +64,7 @@ export class SendGroupingsComponent extends BaseSendComponent implements OnInit, dialogService, toastService, ); - super.onSuccessfulLoad = async () => { + this.onSuccessfulLoad = async () => { this.selectAll(); }; } 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 2a555dfa928..8329831e0bc 100644 --- a/apps/browser/src/tools/popup/send/send-type.component.ts +++ b/apps/browser/src/tools/popup/send/send-type.component.ts @@ -66,7 +66,7 @@ export class SendTypeComponent extends BaseSendComponent implements OnInit, OnDe dialogService, toastService, ); - super.onSuccessfulLoad = async () => { + this.onSuccessfulLoad = async () => { this.selectType(this.type); }; this.applySavedState = From 124b4ce822d63923bc018d6ffce7dd9b1b183dd8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:33:19 -0400 Subject: [PATCH 27/36] [deps] AC: Update sass-loader to v16 (#10588) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 94bc636b4ec..055962ac492 100644 --- a/package-lock.json +++ b/package-lock.json @@ -168,7 +168,7 @@ "remark-gfm": "4.0.0", "rimraf": "6.0.1", "sass": "1.74.1", - "sass-loader": "14.2.1", + "sass-loader": "16.0.1", "storybook": "8.2.9", "style-loader": "3.3.4", "tailwindcss": "3.4.10", @@ -33494,9 +33494,9 @@ } }, "node_modules/sass-loader": { - "version": "14.2.1", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-14.2.1.tgz", - "integrity": "sha512-G0VcnMYU18a4N7VoNDegg2OuMjYtxnqzQWARVWCIVSZwJeiL9kg8QMsuIZOplsJgTzZLF6jGxI3AClj8I9nRdQ==", + "version": "16.0.1", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.1.tgz", + "integrity": "sha512-xACl1ToTsKnL9Ce5yYpRxrLj9QUDCnwZNhzpC7tKiFyA8zXsd3Ap+HGVnbCgkdQcm43E+i6oKAWBsvGA6ZoiMw==", "dev": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 391474243b4..1ed2e6cab99 100644 --- a/package.json +++ b/package.json @@ -130,7 +130,7 @@ "remark-gfm": "4.0.0", "rimraf": "6.0.1", "sass": "1.74.1", - "sass-loader": "14.2.1", + "sass-loader": "16.0.1", "storybook": "8.2.9", "style-loader": "3.3.4", "tailwindcss": "3.4.10", From cdb40818a8e8f395b48c9dc2b1195365acedb6f8 Mon Sep 17 00:00:00 2001 From: Tom <144813356+ttalty@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:58:56 -0400 Subject: [PATCH 28/36] [AC-2614] Member access test fix (#10969) * Initial setup and modifications for member access report api implementation * Adding the permissions logic for getting the permissions text * fixing the test cases * Some refactoring on async calls * Comments on the model * Resolving the mock issue * messages * Localization of text * One more file to fix merge * Fixing test case localization lookup * Fixed permissions lookup --- .../member-access-report.service.spec.ts | 16 ++++++++++------ .../services/member-access-report.service.ts | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.spec.ts b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.spec.ts index 20d33e314af..6aab54f77d5 100644 --- a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.spec.ts +++ b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.spec.ts @@ -10,13 +10,17 @@ describe("ImportService", () => { const mockOrganizationId = "mockOrgId" as OrganizationId; const reportApiService = mock(); let memberAccessReportService: MemberAccessReportService; - const i18nService = mock(); + const i18nMock = mock({ + t(key) { + return key; + }, + }); beforeEach(() => { reportApiService.getMemberAccessData.mockImplementation(() => Promise.resolve(memberAccessReportsMock), ); - memberAccessReportService = new MemberAccessReportService(reportApiService, i18nService); + memberAccessReportService = new MemberAccessReportService(reportApiService, i18nMock); }); describe("generateMemberAccessReportView", () => { @@ -92,16 +96,16 @@ describe("ImportService", () => { expect.objectContaining({ email: "sjohnson@email.com", name: "Sarah Johnson", - twoStepLogin: "On", - accountRecovery: "On", + twoStepLogin: "memberAccessReportTwoFactorEnabledTrue", + accountRecovery: "memberAccessReportAuthenticationEnabledTrue", group: "Group 1", totalItems: "20", }), expect.objectContaining({ email: "jlull@email.com", name: "James Lull", - twoStepLogin: "Off", - accountRecovery: "Off", + twoStepLogin: "memberAccessReportTwoFactorEnabledFalse", + accountRecovery: "memberAccessReportAuthenticationEnabledFalse", group: "Group 4", totalItems: "5", }), diff --git a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.ts b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.ts index 0548841e8c3..3616893e231 100644 --- a/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.ts +++ b/bitwarden_license/bit-web/src/app/tools/reports/member-access-report/services/member-access-report.service.ts @@ -82,7 +82,7 @@ export class MemberAccessReportService { : this.i18nService.t("memberAccessReportNoCollection"), collectionPermission: detail.collectionId ? this.getPermissionText(detail) - : this.i18nService.t("memberAccessReportNoCollection"), + : this.i18nService.t("memberAccessReportNoCollectionPermission"), totalItems: detail.itemCount.toString(), }; }); From 4e7399ed98985dd7041a54f3487bb1dc96f616be Mon Sep 17 00:00:00 2001 From: Nick Krantz <125900171+nick-livefront@users.noreply.github.com> Date: Mon, 9 Sep 2024 16:36:23 -0500 Subject: [PATCH 29/36] [PM-9733] Custom Vault Timeout (#10515) * handle timeout changes that are predefined string values - Passing a string to `Math.max` will cause a NaN to be set. * type form instance so TypeScript is more aware of the form values --- .../vault-timeout-input.component.spec.ts | 81 +++++++++++++++++++ .../vault-timeout-input.component.ts | 22 ++--- 2 files changed, 94 insertions(+), 9 deletions(-) create mode 100644 libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.spec.ts diff --git a/libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.spec.ts b/libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.spec.ts new file mode 100644 index 00000000000..6b39c90fc9b --- /dev/null +++ b/libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.spec.ts @@ -0,0 +1,81 @@ +import { ComponentFixture, TestBed } from "@angular/core/testing"; +import { BehaviorSubject } from "rxjs"; + +import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vault-timeout/vault-timeout-settings.service"; +import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; +import { VaultTimeoutStringType } from "@bitwarden/common/types/vault-timeout.type"; + +import { VaultTimeoutInputComponent } from "./vault-timeout-input.component"; + +describe("VaultTimeoutInputComponent", () => { + let component: VaultTimeoutInputComponent; + let fixture: ComponentFixture; + const get$ = jest.fn().mockReturnValue(new BehaviorSubject({})); + const availableVaultTimeoutActions$ = jest.fn().mockReturnValue(new BehaviorSubject([])); + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [VaultTimeoutInputComponent], + providers: [ + { provide: PolicyService, useValue: { get$ } }, + { provide: VaultTimeoutSettingsService, useValue: { availableVaultTimeoutActions$ } }, + { provide: I18nService, useValue: { t: (key: string) => key } }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(VaultTimeoutInputComponent); + component = fixture.componentInstance; + component.vaultTimeoutOptions = [ + { name: "oneMinute", value: 1 }, + { name: "fiveMinutes", value: 5 }, + { name: "fifteenMinutes", value: 15 }, + { name: "thirtyMinutes", value: 30 }, + { name: "oneHour", value: 60 }, + { name: "fourHours", value: 240 }, + { name: "onRefresh", value: VaultTimeoutStringType.OnRestart }, + ]; + fixture.detectChanges(); + }); + + describe("form", () => { + beforeEach(async () => { + await component.ngOnInit(); + }); + + it("invokes the onChange associated with `ControlValueAccessor`", () => { + const onChange = jest.fn(); + component.registerOnChange(onChange); + + component.form.controls.vaultTimeout.setValue(VaultTimeoutStringType.OnRestart); + + expect(onChange).toHaveBeenCalledWith(VaultTimeoutStringType.OnRestart); + }); + + it("updates custom value to match preset option", () => { + // 1 hour + component.form.controls.vaultTimeout.setValue(60); + + expect(component.form.value.custom).toEqual({ hours: 1, minutes: 0 }); + + // 17 minutes + component.form.controls.vaultTimeout.setValue(17); + + expect(component.form.value.custom).toEqual({ hours: 0, minutes: 17 }); + + // 2.25 hours + component.form.controls.vaultTimeout.setValue(135); + + expect(component.form.value.custom).toEqual({ hours: 2, minutes: 15 }); + }); + + it("sets custom timeout to 0 when a preset string option is selected", () => { + // Set custom value to random values + component.form.controls.custom.setValue({ hours: 1, minutes: 1 }); + + component.form.controls.vaultTimeout.setValue(VaultTimeoutStringType.OnLocked); + + expect(component.form.value.custom).toEqual({ hours: 0, minutes: 0 }); + }); + }); +}); diff --git a/libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.ts b/libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.ts index f1cfcec8c3e..7c760835603 100644 --- a/libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.ts +++ b/libs/auth/src/angular/vault-timeout-input/vault-timeout-input.component.ts @@ -4,6 +4,8 @@ import { AbstractControl, ControlValueAccessor, FormBuilder, + FormControl, + FormGroup, NG_VALIDATORS, NG_VALUE_ACCESSOR, ReactiveFormsModule, @@ -22,13 +24,15 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { VaultTimeout, VaultTimeoutOption } from "@bitwarden/common/types/vault-timeout.type"; import { FormFieldModule, SelectModule } from "@bitwarden/components"; -interface VaultTimeoutFormValue { - vaultTimeout: VaultTimeout | null; - custom: { - hours: number | null; - minutes: number | null; - }; -} +type VaultTimeoutForm = FormGroup<{ + vaultTimeout: FormControl; + custom: FormGroup<{ + hours: FormControl; + minutes: FormControl; + }>; +}>; + +type VaultTimeoutFormValue = VaultTimeoutForm["value"]; @Component({ selector: "auth-vault-timeout-input", @@ -64,7 +68,7 @@ export class VaultTimeoutInputComponent static CUSTOM_VALUE = -100; static MIN_CUSTOM_MINUTES = 0; - form = this.formBuilder.group({ + form: VaultTimeoutForm = this.formBuilder.group({ vaultTimeout: [null], custom: this.formBuilder.group({ hours: [null], @@ -120,7 +124,7 @@ export class VaultTimeoutInputComponent takeUntil(this.destroy$), ) .subscribe((value) => { - const current = Math.max(value, 0); + const current = typeof value === "string" ? 0 : Math.max(value, 0); // This cannot emit an event b/c it would cause form.valueChanges to fire again // and we are already handling that above so just silently update From 12967b0c17643898a89d3f5f36b0914f4c8d55b9 Mon Sep 17 00:00:00 2001 From: rr-bw <102181210+rr-bw@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:12:31 -0700 Subject: [PATCH 30/36] h3 typography on small screens, h2 on medium-large screens (#10939) --- .../angular/anon-layout/anon-layout.component.html | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libs/auth/src/angular/anon-layout/anon-layout.component.html b/libs/auth/src/angular/anon-layout/anon-layout.component.html index 39570dabc8b..6603fa970d4 100644 --- a/libs/auth/src/angular/anon-layout/anon-layout.component.html +++ b/libs/auth/src/angular/anon-layout/anon-layout.component.html @@ -13,9 +13,16 @@

-

- {{ title }} -

+ + +

+ {{ title }} +

+ +

+ {{ title }} +

+
{{ subtitle }}
From 71e5bcb9477c9d626f162dc55e0218e27edaebce Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 12:02:05 +0200 Subject: [PATCH 31/36] [PM-11885] [deps] Tools: Update electron to v32.0.2 (#10964) * [deps] Tools: Update electron to v32.0.2 * Bump version electron-builder.json --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Daniel James Smith Co-authored-by: Daniel James Smith <2670567+djsmith85@users.noreply.github.com> --- apps/desktop/electron-builder.json | 2 +- package-lock.json | 8 ++++---- package.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json index b6572587faa..49e414dfe99 100644 --- a/apps/desktop/electron-builder.json +++ b/apps/desktop/electron-builder.json @@ -25,7 +25,7 @@ "**/node_modules/argon2/package.json", "**/node_modules/argon2/build/Release/argon2.node" ], - "electronVersion": "32.0.1", + "electronVersion": "32.0.2", "generateUpdatesFilesForAllChannels": true, "publish": { "provider": "generic", diff --git a/package-lock.json b/package-lock.json index 055962ac492..0a9936bbf2b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -129,7 +129,7 @@ "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", "css-loader": "7.1.2", - "electron": "32.0.1", + "electron": "32.0.2", "electron-builder": "24.13.3", "electron-log": "5.0.1", "electron-reload": "2.0.0-alpha.1", @@ -16433,9 +16433,9 @@ } }, "node_modules/electron": { - "version": "32.0.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-32.0.1.tgz", - "integrity": "sha512-5Hd5Jaf9niYVR2hZxoRd3gOrcxPOxQV1XPV5WaoSfT9jLJHFadhlKtuSDIk3U6rQZke+aC7GqPPAv55nWFCMsA==", + "version": "32.0.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-32.0.2.tgz", + "integrity": "sha512-nmZblq8wW3HZ17MAyaUuiMI9Mb0Cgc7UR3To85h/rVopbfyF5s34NxtK4gvyRfYPxpDGP4k+HoQIPniPPrdE3w==", "dev": true, "hasInstallScript": true, "license": "MIT", diff --git a/package.json b/package.json index 1ed2e6cab99..9e1921cbdf8 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", "css-loader": "7.1.2", - "electron": "32.0.1", + "electron": "32.0.2", "electron-builder": "24.13.3", "electron-log": "5.0.1", "electron-reload": "2.0.0-alpha.1", From c1b1db071d9def6a293fb6860a1c664d737fed74 Mon Sep 17 00:00:00 2001 From: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com> Date: Tue, 10 Sep 2024 12:57:47 +0100 Subject: [PATCH 32/36] [AC-3029][Defect] Organization storage count is not carried over to the Upgrade dialog Total section (#10965) * Resolve the ui changes issues * Resolve the storage ui issue --- .../change-plan-dialog.component.html | 24 ++++++++++++------- .../change-plan-dialog.component.ts | 21 ++++++++++++++-- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html index 02071f5aa8c..1c92cbf6632 100644 --- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.html +++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.html @@ -389,17 +389,21 @@ bitTypography="body2" *ngIf=" selectedPlan.PasswordManager.hasAdditionalStorageOption && - !organization.useSecretsManager + !organization.useSecretsManager && + organization.maxStorageGb > 0 " > - {{ 0 }} + {{ organization.maxStorageGb }} {{ "additionalStorageGbMessage" | i18n }} × - {{ selectedPlan.PasswordManager.additionalStoragePricePerGb | currency: "$" }} + {{ additionalStoragePriceMonthly(selectedPlan) | currency: "$" }} /{{ "year" | i18n }} - {{ 0 | currency: "$" }} + {{ + organization.maxStorageGb * selectedPlan.PasswordManager.additionalStoragePricePerGb + | currency: "$" + }}

@@ -505,17 +509,21 @@ bitTypography="body2" *ngIf=" selectedPlan.PasswordManager.hasAdditionalStorageOption && - !organization.useSecretsManager + !organization.useSecretsManager && + organization.maxStorageGb > 0 " > - {{ 0 }} + {{ organization.maxStorageGb }} {{ "additionalStorageGbMessage" | i18n }} × - {{ selectedPlan.PasswordManager.additionalStoragePricePerGb | currency: "$" }} + {{ additionalStoragePriceMonthly(selectedPlan) | currency: "$" }} /{{ "month" | i18n }} - {{ 0 | currency: "$" }} + {{ + organization.maxStorageGb * selectedPlan.PasswordManager.additionalStoragePricePerGb + | currency: "$" + }}

diff --git a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts index a359c281ebe..9492b51fcb2 100644 --- a/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts +++ b/apps/web/src/app/billing/organizations/change-plan-dialog.component.ts @@ -477,6 +477,13 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy { ); } + additionalStoragePriceMonthly(selectedPlan: PlanResponse) { + if (!selectedPlan.isAnnual) { + return selectedPlan.PasswordManager.additionalStoragePricePerGb; + } + return selectedPlan.PasswordManager.additionalStoragePricePerGb / 12; + } + additionalServiceAccountTotal(plan: PlanResponse): number { if (!plan.SecretsManager.hasAdditionalServiceAccountOption || this.additionalServiceAccount) { return 0; @@ -525,9 +532,18 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy { get total() { if (this.organization.useSecretsManager) { - return this.passwordManagerSubtotal + this.secretsManagerSubtotal + this.taxCharges || 0; + return ( + this.passwordManagerSubtotal + + this.additionalStorageTotal(this.selectedPlan) + + this.secretsManagerSubtotal + + this.taxCharges || 0 + ); } - return this.passwordManagerSubtotal + this.taxCharges || 0; + return ( + this.passwordManagerSubtotal + + this.additionalStorageTotal(this.selectedPlan) + + this.taxCharges || 0 + ); } get teamsStarterPlanIsAvailable() { @@ -639,6 +655,7 @@ export class ChangePlanDialogComponent implements OnInit, OnDestroy { if (this.selectedPlan.productTier !== ProductTierType.Families) { request.additionalSeats = this.organization.seats; } + request.additionalStorageGb = this.organization.maxStorageGb; request.premiumAccessAddon = this.selectedPlan.PasswordManager.hasPremiumAccessOption && this.formGroup.controls.premiumAccessAddon.value; From 2d02b6ca5ce1e7d41d2e2acc89e44cc6aa75207d Mon Sep 17 00:00:00 2001 From: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com> Date: Tue, 10 Sep 2024 11:29:48 -0400 Subject: [PATCH 33/36] Auth/PM-11252 - Registration with Email Verification - Add new redirect connector (#10682) * PM-11252 - Registration with email verification - Add new signup redirect connector * PM-11252 - Make the redirect connector generic and extensible while updating it to reference the new fragment based approach which prevents open redirects and prevents the query string from being sent to servers or proxies. * PM-11252 - PR feedback - refactor redirect to simply forward any fragment onward with no query param parsing required leading to an even more generic solution. * PM-11252 - Docs * PM-11252 - PR Feedback - Include styles in chunks to remove need to manually import scss * PM-11252 - Update redirect html to tailwind. --- apps/web/src/connectors/redirect.html | 29 +++++++++++++++++++++++++++ apps/web/src/connectors/redirect.ts | 17 ++++++++++++++++ apps/web/webpack.config.js | 6 ++++++ 3 files changed, 52 insertions(+) create mode 100644 apps/web/src/connectors/redirect.html create mode 100644 apps/web/src/connectors/redirect.ts diff --git a/apps/web/src/connectors/redirect.html b/apps/web/src/connectors/redirect.html new file mode 100644 index 00000000000..13b05fb17e2 --- /dev/null +++ b/apps/web/src/connectors/redirect.html @@ -0,0 +1,29 @@ + + + + + + + + Bitwarden Web vault + + + + + + + + + +

+ Bitwarden + +
+ + diff --git a/apps/web/src/connectors/redirect.ts b/apps/web/src/connectors/redirect.ts new file mode 100644 index 00000000000..82bd273fad3 --- /dev/null +++ b/apps/web/src/connectors/redirect.ts @@ -0,0 +1,17 @@ +// This redirect connector is used to redirect users to the correct URL after they have been sent here from an email link. +// The fragment contains the information needed to redirect the user to the correct page. +// This is required because android app links couldn't properly handle the angular hash based route we originally had in the email link. +window.addEventListener("load", () => { + // ex: https://vault.bitwarden.com/redirect-connector.html#finish-signup?token=fakeToken&email=example%40example.com&fromEmail=true + const currentUrl = new URL(window.location.href); + + // Get the fragment (everything after the #) + const fragment = currentUrl.hash.substring(1); // Remove the leading # + + if (!fragment) { + throw new Error("No fragment found in URL. Cannot determine redirect."); + } + + const newUrl = `${window.location.origin}/#/${fragment}`; + window.location.href = newUrl; +}); diff --git a/apps/web/webpack.config.js b/apps/web/webpack.config.js index ce3979f7918..cec4bf044be 100644 --- a/apps/web/webpack.config.js +++ b/apps/web/webpack.config.js @@ -111,6 +111,11 @@ const plugins = [ filename: "sso-connector.html", chunks: ["connectors/sso"], }), + new HtmlWebpackPlugin({ + template: "./src/connectors/redirect.html", + filename: "redirect-connector.html", + chunks: ["connectors/redirect", "styles"], + }), new HtmlWebpackPlugin({ template: "./src/connectors/captcha.html", filename: "captcha-connector.html", @@ -325,6 +330,7 @@ const webpackConfig = { "connectors/sso": "./src/connectors/sso.ts", "connectors/captcha": "./src/connectors/captcha.ts", "connectors/duo-redirect": "./src/connectors/duo-redirect.ts", + "connectors/redirect": "./src/connectors/redirect.ts", styles: ["./src/scss/styles.scss", "./src/scss/tailwind.css"], theme_head: "./src/theme.ts", }, From 4128b18b27ed8f183f7787514630cc63185f3a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=9C=A8=20Audrey=20=E2=9C=A8?= Date: Tue, 10 Sep 2024 12:43:33 -0400 Subject: [PATCH 34/36] [PM-8279] password generation component (#10805) --- .../credential-generator.component.html | 2 +- .../credential-generator.component.ts | 7 +- libs/common/src/tools/dependencies.ts | 2 +- .../integration/rpc/integration-request.ts | 11 +- libs/common/src/tools/types.ts | 17 + .../generator/components/src/dependencies.ts | 37 +- libs/tools/generator/components/src/index.ts | 1 + .../src/password-generator.component.html | 44 ++ .../src/password-generator.component.ts | 117 +++++ .../generator/core/src/data/generators.ts | 15 + .../src/engine/password-randomizer.spec.ts | 36 ++ .../core/src/engine/password-randomizer.ts | 52 ++- .../credential-generator.service.spec.ts | 297 ++++++++++++- .../services/credential-generator.service.ts | 60 ++- .../passphrase-generator-strategy.spec.ts | 2 +- .../passphrase-generator-strategy.ts | 12 +- .../strategies/password-generator-strategy.ts | 59 +-- .../core/src/types/credential-category.ts | 5 + .../credential-generator-configuration.ts | 20 + .../core/src/types/credential-generator.ts | 12 + .../src/types/generated-credential.spec.ts | 58 +++ .../core/src/types/generated-credential.ts | 47 ++ libs/tools/generator/core/src/types/index.ts | 3 + libs/tools/generator/core/src/util.spec.ts | 411 +++++++++++++++++- libs/tools/generator/core/src/util.ts | 83 ++++ 25 files changed, 1292 insertions(+), 118 deletions(-) create mode 100644 libs/tools/generator/components/src/password-generator.component.html create mode 100644 libs/tools/generator/components/src/password-generator.component.ts create mode 100644 libs/tools/generator/core/src/types/credential-category.ts create mode 100644 libs/tools/generator/core/src/types/credential-generator.ts create mode 100644 libs/tools/generator/core/src/types/generated-credential.spec.ts create mode 100644 libs/tools/generator/core/src/types/generated-credential.ts diff --git a/apps/browser/src/tools/popup/generator/credential-generator.component.html b/apps/browser/src/tools/popup/generator/credential-generator.component.html index 0b43b0e257c..d8c49da5b1a 100644 --- a/apps/browser/src/tools/popup/generator/credential-generator.component.html +++ b/apps/browser/src/tools/popup/generator/credential-generator.component.html @@ -1 +1 @@ - + diff --git a/apps/browser/src/tools/popup/generator/credential-generator.component.ts b/apps/browser/src/tools/popup/generator/credential-generator.component.ts index f07affd2374..16938fbe79f 100644 --- a/apps/browser/src/tools/popup/generator/credential-generator.component.ts +++ b/apps/browser/src/tools/popup/generator/credential-generator.component.ts @@ -1,14 +1,11 @@ import { Component } from "@angular/core"; -import { - PassphraseSettingsComponent, - PasswordSettingsComponent, -} from "@bitwarden/generator-components"; +import { PasswordGeneratorComponent } from "@bitwarden/generator-components"; @Component({ standalone: true, selector: "credential-generator", templateUrl: "credential-generator.component.html", - imports: [PassphraseSettingsComponent, PasswordSettingsComponent], + imports: [PasswordGeneratorComponent], }) export class CredentialGeneratorComponent {} diff --git a/libs/common/src/tools/dependencies.ts b/libs/common/src/tools/dependencies.ts index 0488291b446..8b860591d54 100644 --- a/libs/common/src/tools/dependencies.ts +++ b/libs/common/src/tools/dependencies.ts @@ -77,7 +77,7 @@ export type SingleUserDependency = { export type OnDependency = { /** The stream that controls emissions */ - on$: Observable; + on$: Observable; }; /** A pattern for types that emit when a dependency is `true`. diff --git a/libs/common/src/tools/integration/rpc/integration-request.ts b/libs/common/src/tools/integration/rpc/integration-request.ts index 84a7b517abe..9f1808a632b 100644 --- a/libs/common/src/tools/integration/rpc/integration-request.ts +++ b/libs/common/src/tools/integration/rpc/integration-request.ts @@ -1,11 +1,6 @@ +import { GenerationRequest } from "../../types"; + /** Options that provide contextual information about the application state * when an integration is invoked. */ -export type IntegrationRequest = { - /** @param website The domain of the website the requested integration is used - * within. This should be set to `null` when the request is not specific - * to any website. - * @remarks this field contains sensitive data - */ - website: string | null; -}; +export type IntegrationRequest = Partial; diff --git a/libs/common/src/tools/types.ts b/libs/common/src/tools/types.ts index 0c2f2832eaa..83d69edb06c 100644 --- a/libs/common/src/tools/types.ts +++ b/libs/common/src/tools/types.ts @@ -46,3 +46,20 @@ export type Constraints = { /** utility type for methods that evaluate constraints generically. */ export type AnyConstraint = PrimitiveConstraint & StringConstraints & NumberConstraints; + +/** Options that provide contextual information about the application state + * when a generator is invoked. + */ +export type VaultItemRequest = { + /** The domain of the website the requested credential is used + * within. This should be set to `null` when the request is not specific + * to any website. + * @remarks this field contains sensitive data + */ + website: string | null; +}; + +/** Options that provide contextual information about the application state + * when a generator is invoked. + */ +export type GenerationRequest = Partial; diff --git a/libs/tools/generator/components/src/dependencies.ts b/libs/tools/generator/components/src/dependencies.ts index 927c3811c86..d96ff0db8d6 100644 --- a/libs/tools/generator/components/src/dependencies.ts +++ b/libs/tools/generator/components/src/dependencies.ts @@ -4,41 +4,60 @@ import { ReactiveFormsModule } from "@angular/forms"; import { JslibModule } from "@bitwarden/angular/jslib.module"; import { safeProvider } from "@bitwarden/angular/platform/utils/safe-provider"; +import { SafeInjectionToken } from "@bitwarden/angular/services/injection-tokens"; import { JslibServicesModule } from "@bitwarden/angular/services/jslib-services.module"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; +import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { StateProvider } from "@bitwarden/common/platform/state"; import { CardComponent, CheckboxModule, ColorPasswordModule, FormFieldModule, + IconButtonModule, InputModule, + ItemModule, SectionComponent, SectionHeaderComponent, + ToggleGroupModule, } from "@bitwarden/components"; -import { CredentialGeneratorService } from "@bitwarden/generator-core"; +import { + createRandomizer, + CredentialGeneratorService, + Randomizer, +} from "@bitwarden/generator-core"; + +const RANDOMIZER = new SafeInjectionToken("Randomizer"); /** Shared module containing generator component dependencies */ @NgModule({ - imports: [SectionComponent, SectionHeaderComponent, CardComponent], + imports: [CardComponent, SectionComponent, SectionHeaderComponent], exports: [ + CardComponent, + CheckboxModule, + CommonModule, + ColorPasswordModule, + FormFieldModule, + IconButtonModule, + InputModule, + ItemModule, JslibModule, JslibServicesModule, - FormFieldModule, - CommonModule, ReactiveFormsModule, - ColorPasswordModule, - InputModule, - CheckboxModule, SectionComponent, SectionHeaderComponent, - CardComponent, + ToggleGroupModule, ], providers: [ + safeProvider({ + provide: RANDOMIZER, + useFactory: createRandomizer, + deps: [CryptoService], + }), safeProvider({ provide: CredentialGeneratorService, useClass: CredentialGeneratorService, - deps: [StateProvider, PolicyService], + deps: [RANDOMIZER, StateProvider, PolicyService], }), ], declarations: [], diff --git a/libs/tools/generator/components/src/index.ts b/libs/tools/generator/components/src/index.ts index 5915c5d59f6..4423f8a1ec9 100644 --- a/libs/tools/generator/components/src/index.ts +++ b/libs/tools/generator/components/src/index.ts @@ -2,3 +2,4 @@ export { PassphraseSettingsComponent } from "./passphrase-settings.component"; export { CredentialGeneratorHistoryComponent } from "./credential-generator-history.component"; export { EmptyCredentialHistoryComponent } from "./empty-credential-history.component"; export { PasswordSettingsComponent } from "./password-settings.component"; +export { PasswordGeneratorComponent } from "./password-generator.component"; diff --git a/libs/tools/generator/components/src/password-generator.component.html b/libs/tools/generator/components/src/password-generator.component.html new file mode 100644 index 00000000000..db5a1ed379b --- /dev/null +++ b/libs/tools/generator/components/src/password-generator.component.html @@ -0,0 +1,44 @@ + + + {{ "password" | i18n }} + + + {{ "passphrase" | i18n }} + + + +
+ +
+
+ + +
+ + + diff --git a/libs/tools/generator/components/src/password-generator.component.ts b/libs/tools/generator/components/src/password-generator.component.ts new file mode 100644 index 00000000000..6c84d83c4cf --- /dev/null +++ b/libs/tools/generator/components/src/password-generator.component.ts @@ -0,0 +1,117 @@ +import { Component, EventEmitter, Input, NgZone, OnDestroy, OnInit, Output } from "@angular/core"; +import { BehaviorSubject, distinctUntilChanged, map, Subject, switchMap, takeUntil } from "rxjs"; + +import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; +import { UserId } from "@bitwarden/common/types/guid"; +import { CredentialGeneratorService, Generators, GeneratorType } from "@bitwarden/generator-core"; +import { GeneratedCredential } from "@bitwarden/generator-history"; + +import { DependenciesModule } from "./dependencies"; +import { PassphraseSettingsComponent } from "./passphrase-settings.component"; +import { PasswordSettingsComponent } from "./password-settings.component"; + +/** Options group for passwords */ +@Component({ + standalone: true, + selector: "bit-password-generator", + templateUrl: "password-generator.component.html", + imports: [DependenciesModule, PasswordSettingsComponent, PassphraseSettingsComponent], +}) +export class PasswordGeneratorComponent implements OnInit, OnDestroy { + constructor( + private generatorService: CredentialGeneratorService, + private accountService: AccountService, + private zone: NgZone, + ) {} + + /** Binds the passphrase component to a specific user's settings. + * When this input is not provided, the form binds to the active + * user + */ + @Input() + userId: UserId | null; + + /** tracks the currently selected credential type */ + protected credentialType$ = new BehaviorSubject("password"); + + /** Emits the last generated value. */ + protected readonly value$ = new BehaviorSubject(""); + + /** Emits when the userId changes */ + protected readonly userId$ = new BehaviorSubject(null); + + /** Emits when a new credential is requested */ + protected readonly generate$ = new Subject(); + + /** Tracks changes to the selected credential type + * @param type the new credential type + */ + protected onCredentialTypeChanged(type: GeneratorType) { + if (this.credentialType$.value !== type) { + this.credentialType$.next(type); + this.generate$.next(); + } + } + + /** Emits credentials created from a generation request. */ + @Output() + readonly onGenerated = new EventEmitter(); + + async ngOnInit() { + if (this.userId) { + this.userId$.next(this.userId); + } else { + this.accountService.activeAccount$ + .pipe( + map((acct) => acct.id), + distinctUntilChanged(), + takeUntil(this.destroyed), + ) + .subscribe(this.userId$); + } + + this.credentialType$ + .pipe( + switchMap((type) => this.typeToGenerator$(type)), + takeUntil(this.destroyed), + ) + .subscribe((generated) => { + // update subjects within the angular zone so that the + // template bindings refresh immediately + this.zone.run(() => { + this.onGenerated.next(generated); + this.value$.next(generated.credential); + }); + }); + } + + private typeToGenerator$(type: GeneratorType) { + const dependencies = { + on$: this.generate$, + userId$: this.userId$, + }; + + switch (type) { + case "password": + return this.generatorService.generate$(Generators.Password, dependencies); + + case "passphrase": + return this.generatorService.generate$(Generators.Passphrase, dependencies); + default: + throw new Error(`Invalid generator type: "${type}"`); + } + } + + private readonly destroyed = new Subject(); + ngOnDestroy(): void { + // tear down subscriptions + this.destroyed.complete(); + + // finalize subjects + this.generate$.complete(); + this.value$.complete(); + + // finalize component bindings + this.onGenerated.complete(); + } +} diff --git a/libs/tools/generator/core/src/data/generators.ts b/libs/tools/generator/core/src/data/generators.ts index 94e289be03e..f71d484f9c2 100644 --- a/libs/tools/generator/core/src/data/generators.ts +++ b/libs/tools/generator/core/src/data/generators.ts @@ -1,5 +1,8 @@ +import { Randomizer } from "../abstractions"; +import { PasswordRandomizer } from "../engine"; import { PASSPHRASE_SETTINGS, PASSWORD_SETTINGS } from "../strategies/storage"; import { + CredentialGenerator, PassphraseGenerationOptions, PassphraseGeneratorPolicy, PasswordGenerationOptions, @@ -14,6 +17,12 @@ import { DefaultPasswordGenerationOptions } from "./default-password-generation- import { Policies } from "./policies"; const PASSPHRASE = Object.freeze({ + category: "passphrase", + engine: { + create(randomizer: Randomizer): CredentialGenerator { + return new PasswordRandomizer(randomizer); + }, + }, settings: { initial: DefaultPassphraseGenerationOptions, constraints: { @@ -32,6 +41,12 @@ const PASSPHRASE = Object.freeze({ >); const PASSWORD = Object.freeze({ + category: "password", + engine: { + create(randomizer: Randomizer): CredentialGenerator { + return new PasswordRandomizer(randomizer); + }, + }, settings: { initial: DefaultPasswordGenerationOptions, constraints: { diff --git a/libs/tools/generator/core/src/engine/password-randomizer.spec.ts b/libs/tools/generator/core/src/engine/password-randomizer.spec.ts index bbc31a4a293..fca98855fd5 100644 --- a/libs/tools/generator/core/src/engine/password-randomizer.spec.ts +++ b/libs/tools/generator/core/src/engine/password-randomizer.spec.ts @@ -335,4 +335,40 @@ describe("PasswordRandomizer", () => { expect(result).toEqual("foo-foo"); }); }); + + describe("generate", () => { + it("processes password generation options", async () => { + const password = new PasswordRandomizer(randomizer); + + const result = await password.generate( + {}, + { + length: 10, + }, + ); + + expect(result.category).toEqual("password"); + }); + + it("processes passphrase generation options", async () => { + const password = new PasswordRandomizer(randomizer); + + const result = await password.generate( + {}, + { + numWords: 10, + }, + ); + + expect(result.category).toEqual("passphrase"); + }); + + it("throws when it cannot recognize the options type", async () => { + const password = new PasswordRandomizer(randomizer); + + const result = password.generate({}, {}); + + await expect(result).rejects.toBeInstanceOf(Error); + }); + }); }); diff --git a/libs/tools/generator/core/src/engine/password-randomizer.ts b/libs/tools/generator/core/src/engine/password-randomizer.ts index 438ea8b8b47..c3a2e2b5d93 100644 --- a/libs/tools/generator/core/src/engine/password-randomizer.ts +++ b/libs/tools/generator/core/src/engine/password-randomizer.ts @@ -1,13 +1,26 @@ import { EFFLongWordList } from "@bitwarden/common/platform/misc/wordlist"; +import { GenerationRequest } from "@bitwarden/common/tools/types"; + +import { + CredentialGenerator, + GeneratedCredential, + PassphraseGenerationOptions, + PasswordGenerationOptions, +} from "../types"; +import { optionsToEffWordListRequest, optionsToRandomAsciiRequest } from "../util"; import { Randomizer } from "./abstractions"; import { Ascii } from "./data"; import { CharacterSet, EffWordListRequest, RandomAsciiRequest } from "./types"; /** Generation algorithms that produce randomized secrets */ -export class PasswordRandomizer { +export class PasswordRandomizer + implements + CredentialGenerator, + CredentialGenerator +{ /** Instantiates the password randomizer - * @param random data source for random data + * @param randomizer data source for random data */ constructor(private randomizer: Randomizer) {} @@ -52,6 +65,41 @@ export class PasswordRandomizer { return wordList.join(request.separator); } + + generate( + request: GenerationRequest, + settings: PasswordGenerationOptions, + ): Promise; + generate( + request: GenerationRequest, + settings: PassphraseGenerationOptions, + ): Promise; + async generate( + _request: GenerationRequest, + settings: PasswordGenerationOptions | PassphraseGenerationOptions, + ) { + if (isPasswordGenerationOptions(settings)) { + const request = optionsToRandomAsciiRequest(settings); + const password = await this.randomAscii(request); + + return new GeneratedCredential(password, "password", Date.now()); + } else if (isPassphraseGenerationOptions(settings)) { + const request = optionsToEffWordListRequest(settings); + const passphrase = await this.randomEffLongWords(request); + + return new GeneratedCredential(passphrase, "passphrase", Date.now()); + } + + throw new Error("Invalid settings received by generator."); + } +} + +function isPasswordGenerationOptions(settings: any): settings is PasswordGenerationOptions { + return "length" in (settings ?? {}); +} + +function isPassphraseGenerationOptions(settings: any): settings is PassphraseGenerationOptions { + return "numWords" in (settings ?? {}); } // given a generator request, convert each of its `number | undefined` properties diff --git a/libs/tools/generator/core/src/services/credential-generator.service.spec.ts b/libs/tools/generator/core/src/services/credential-generator.service.spec.ts index 31f5134918b..5b784b3d07b 100644 --- a/libs/tools/generator/core/src/services/credential-generator.service.spec.ts +++ b/libs/tools/generator/core/src/services/credential-generator.service.spec.ts @@ -1,5 +1,5 @@ import { mock } from "jest-mock-extended"; -import { BehaviorSubject, firstValueFrom } from "rxjs"; +import { BehaviorSubject, filter, firstValueFrom, Subject } from "rxjs"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { PolicyType } from "@bitwarden/common/admin-console/enums"; @@ -8,9 +8,14 @@ import { GENERATOR_DISK, UserKeyDefinition } from "@bitwarden/common/platform/st import { Constraints } from "@bitwarden/common/tools/types"; import { OrganizationId, PolicyId, UserId } from "@bitwarden/common/types/guid"; -import { FakeStateProvider, FakeAccountService, awaitAsync } from "../../../../../common/spec"; -import { PolicyEvaluator } from "../abstractions"; -import { CredentialGeneratorConfiguration } from "../types"; +import { + FakeStateProvider, + FakeAccountService, + awaitAsync, + ObservableTracker, +} from "../../../../../common/spec"; +import { PolicyEvaluator, Randomizer } from "../abstractions"; +import { CredentialGeneratorConfiguration, GeneratedCredential } from "../types"; import { CredentialGeneratorService } from "./credential-generator.service"; @@ -34,8 +39,23 @@ const somePolicy = new Policy({ enabled: true, }); +const SomeTime = new Date(1); +const SomeCategory = "passphrase"; + // fake the configuration const SomeConfiguration: CredentialGeneratorConfiguration = { + category: SomeCategory, + engine: { + create: (randomizer) => { + return { + generate: (request, settings) => { + const credential = request.website ? `${request.website}|${settings.foo}` : settings.foo; + const result = new GeneratedCredential(credential, SomeCategory, SomeTime); + return Promise.resolve(result); + }, + }; + }, + }, settings: { initial: { foo: "initial" }, constraints: { foo: {} }, @@ -87,6 +107,9 @@ const accountService = new FakeAccountService({ // fake state const stateProvider = new FakeStateProvider(accountService); +// fake randomizer +const randomizer = mock(); + describe("CredentialGeneratorService", () => { beforeEach(async () => { await accountService.switchAccount(SomeUser); @@ -94,10 +117,242 @@ describe("CredentialGeneratorService", () => { jest.clearAllMocks(); }); + describe("generate$", () => { + it("emits a generation for the active user when subscribed", async () => { + const settings = { foo: "value" }; + await stateProvider.setUserState(SettingsKey, settings, SomeUser); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); + const generated = new ObservableTracker(generator.generate$(SomeConfiguration)); + + const result = await generated.expectEmission(); + + expect(result).toEqual(new GeneratedCredential("value", SomeCategory, SomeTime)); + }); + + it("follows the active user", async () => { + const someSettings = { foo: "some value" }; + const anotherSettings = { foo: "another value" }; + await stateProvider.setUserState(SettingsKey, someSettings, SomeUser); + await stateProvider.setUserState(SettingsKey, anotherSettings, AnotherUser); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); + const generated = new ObservableTracker(generator.generate$(SomeConfiguration)); + + await accountService.switchAccount(AnotherUser); + await generated.pauseUntilReceived(2); + generated.unsubscribe(); + + expect(generated.emissions).toEqual([ + new GeneratedCredential("some value", SomeCategory, SomeTime), + new GeneratedCredential("another value", SomeCategory, SomeTime), + ]); + }); + + it("emits a generation when the settings change", async () => { + const someSettings = { foo: "some value" }; + const anotherSettings = { foo: "another value" }; + await stateProvider.setUserState(SettingsKey, someSettings, SomeUser); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); + const generated = new ObservableTracker(generator.generate$(SomeConfiguration)); + + await stateProvider.setUserState(SettingsKey, anotherSettings, SomeUser); + await generated.pauseUntilReceived(2); + generated.unsubscribe(); + + expect(generated.emissions).toEqual([ + new GeneratedCredential("some value", SomeCategory, SomeTime), + new GeneratedCredential("another value", SomeCategory, SomeTime), + ]); + }); + + // FIXME: test these when the fake state provider can create the required emissions + it.todo("errors when the settings error"); + it.todo("completes when the settings complete"); + + it("includes `website$`'s last emitted value", async () => { + const settings = { foo: "value" }; + await stateProvider.setUserState(SettingsKey, settings, SomeUser); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); + const website$ = new BehaviorSubject("some website"); + const generated = new ObservableTracker(generator.generate$(SomeConfiguration, { website$ })); + + const result = await generated.expectEmission(); + + expect(result).toEqual(new GeneratedCredential("some website|value", SomeCategory, SomeTime)); + }); + + it("errors when `website$` errors", async () => { + await stateProvider.setUserState(SettingsKey, null, SomeUser); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); + const website$ = new BehaviorSubject("some website"); + let error = null; + + generator.generate$(SomeConfiguration, { website$ }).subscribe({ + error: (e: unknown) => { + error = e; + }, + }); + website$.error({ some: "error" }); + await awaitAsync(); + + expect(error).toEqual({ some: "error" }); + }); + + it("completes when `website$` completes", async () => { + await stateProvider.setUserState(SettingsKey, null, SomeUser); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); + const website$ = new BehaviorSubject("some website"); + let completed = false; + + generator.generate$(SomeConfiguration, { website$ }).subscribe({ + complete: () => { + completed = true; + }, + }); + website$.complete(); + await awaitAsync(); + + expect(completed).toBeTruthy(); + }); + + it("emits a generation for a specific user when `user$` supplied", async () => { + await stateProvider.setUserState(SettingsKey, { foo: "value" }, SomeUser); + await stateProvider.setUserState(SettingsKey, { foo: "another" }, AnotherUser); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); + const userId$ = new BehaviorSubject(AnotherUser).asObservable(); + const generated = new ObservableTracker(generator.generate$(SomeConfiguration, { userId$ })); + + const result = await generated.expectEmission(); + + expect(result).toEqual(new GeneratedCredential("another", SomeCategory, SomeTime)); + }); + + it("emits a generation for a specific user when `user$` emits", async () => { + await stateProvider.setUserState(SettingsKey, { foo: "value" }, SomeUser); + await stateProvider.setUserState(SettingsKey, { foo: "another" }, AnotherUser); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); + const userId = new BehaviorSubject(SomeUser); + const userId$ = userId.pipe(filter((u) => !!u)); + const generated = new ObservableTracker(generator.generate$(SomeConfiguration, { userId$ })); + + userId.next(AnotherUser); + const result = await generated.pauseUntilReceived(2); + + expect(result).toEqual([ + new GeneratedCredential("value", SomeCategory, SomeTime), + new GeneratedCredential("another", SomeCategory, SomeTime), + ]); + }); + + it("errors when `user$` errors", async () => { + await stateProvider.setUserState(SettingsKey, null, SomeUser); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); + const userId$ = new BehaviorSubject(SomeUser); + let error = null; + + generator.generate$(SomeConfiguration, { userId$ }).subscribe({ + error: (e: unknown) => { + error = e; + }, + }); + userId$.error({ some: "error" }); + await awaitAsync(); + + expect(error).toEqual({ some: "error" }); + }); + + it("completes when `user$` completes", async () => { + await stateProvider.setUserState(SettingsKey, null, SomeUser); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); + const userId$ = new BehaviorSubject(SomeUser); + let completed = false; + + generator.generate$(SomeConfiguration, { userId$ }).subscribe({ + complete: () => { + completed = true; + }, + }); + userId$.complete(); + await awaitAsync(); + + expect(completed).toBeTruthy(); + }); + + it("emits a generation only when `on$` emits", async () => { + // This test breaks from arrange/act/assert because it is testing causality + await stateProvider.setUserState(SettingsKey, { foo: "value" }, SomeUser); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); + const on$ = new Subject(); + const results: any[] = []; + + // confirm no emission during subscription + const sub = generator + .generate$(SomeConfiguration, { on$ }) + .subscribe((result) => results.push(result)); + await awaitAsync(); + expect(results.length).toEqual(0); + + // confirm forwarded emission + on$.next(); + await awaitAsync(); + expect(results).toEqual([new GeneratedCredential("value", SomeCategory, SomeTime)]); + + // confirm updating settings does not cause an emission + await stateProvider.setUserState(SettingsKey, { foo: "next" }, SomeUser); + await awaitAsync(); + expect(results.length).toBe(1); + + // confirm forwarded emission takes latest value + on$.next(); + await awaitAsync(); + sub.unsubscribe(); + + expect(results).toEqual([ + new GeneratedCredential("value", SomeCategory, SomeTime), + new GeneratedCredential("next", SomeCategory, SomeTime), + ]); + }); + + it("errors when `on$` errors", async () => { + await stateProvider.setUserState(SettingsKey, { foo: "value" }, SomeUser); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); + const on$ = new Subject(); + let error: any = null; + + // confirm no emission during subscription + generator.generate$(SomeConfiguration, { on$ }).subscribe({ + error: (e: unknown) => { + error = e; + }, + }); + on$.error({ some: "error" }); + await awaitAsync(); + + expect(error).toEqual({ some: "error" }); + }); + + it("completes when `on$` completes", async () => { + await stateProvider.setUserState(SettingsKey, { foo: "value" }, SomeUser); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); + const on$ = new Subject(); + let complete = false; + + // confirm no emission during subscription + generator.generate$(SomeConfiguration, { on$ }).subscribe({ + complete: () => { + complete = true; + }, + }); + on$.complete(); + await awaitAsync(); + + expect(complete).toBeTruthy(); + }); + }); + describe("settings$", () => { it("defaults to the configuration's initial settings if settings aren't found", async () => { await stateProvider.setUserState(SettingsKey, null, SomeUser); - const generator = new CredentialGeneratorService(stateProvider, policyService); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); const result = await firstValueFrom(generator.settings$(SomeConfiguration)); @@ -107,7 +362,7 @@ describe("CredentialGeneratorService", () => { it("reads from the active user's configuration-defined storage", async () => { const settings = { foo: "value" }; await stateProvider.setUserState(SettingsKey, settings, SomeUser); - const generator = new CredentialGeneratorService(stateProvider, policyService); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); const result = await firstValueFrom(generator.settings$(SomeConfiguration)); @@ -119,7 +374,7 @@ describe("CredentialGeneratorService", () => { await stateProvider.setUserState(SettingsKey, settings, SomeUser); const policy$ = new BehaviorSubject([somePolicy]); policyService.getAll$.mockReturnValue(policy$); - const generator = new CredentialGeneratorService(stateProvider, policyService); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); const result = await firstValueFrom(generator.settings$(SomeConfiguration)); @@ -131,7 +386,7 @@ describe("CredentialGeneratorService", () => { const anotherSettings = { foo: "another" }; await stateProvider.setUserState(SettingsKey, someSettings, SomeUser); await stateProvider.setUserState(SettingsKey, anotherSettings, AnotherUser); - const generator = new CredentialGeneratorService(stateProvider, policyService); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); const results: any = []; const sub = generator.settings$(SomeConfiguration).subscribe((r) => results.push(r)); @@ -148,7 +403,7 @@ describe("CredentialGeneratorService", () => { await stateProvider.setUserState(SettingsKey, { foo: "value" }, SomeUser); const anotherSettings = { foo: "another" }; await stateProvider.setUserState(SettingsKey, anotherSettings, AnotherUser); - const generator = new CredentialGeneratorService(stateProvider, policyService); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); const userId$ = new BehaviorSubject(AnotherUser).asObservable(); const result = await firstValueFrom(generator.settings$(SomeConfiguration, { userId$ })); @@ -161,7 +416,7 @@ describe("CredentialGeneratorService", () => { await stateProvider.setUserState(SettingsKey, someSettings, SomeUser); const anotherSettings = { foo: "another" }; await stateProvider.setUserState(SettingsKey, anotherSettings, AnotherUser); - const generator = new CredentialGeneratorService(stateProvider, policyService); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); const userId = new BehaviorSubject(SomeUser); const userId$ = userId.asObservable(); const results: any = []; @@ -180,7 +435,7 @@ describe("CredentialGeneratorService", () => { it("errors when the arbitrary user's stream errors", async () => { await stateProvider.setUserState(SettingsKey, null, SomeUser); - const generator = new CredentialGeneratorService(stateProvider, policyService); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); const userId = new BehaviorSubject(SomeUser); const userId$ = userId.asObservable(); let error = null; @@ -198,7 +453,7 @@ describe("CredentialGeneratorService", () => { it("completes when the arbitrary user's stream completes", async () => { await stateProvider.setUserState(SettingsKey, null, SomeUser); - const generator = new CredentialGeneratorService(stateProvider, policyService); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); const userId = new BehaviorSubject(SomeUser); const userId$ = userId.asObservable(); let completed = false; @@ -216,7 +471,7 @@ describe("CredentialGeneratorService", () => { it("ignores repeated arbitrary user emissions", async () => { await stateProvider.setUserState(SettingsKey, null, SomeUser); - const generator = new CredentialGeneratorService(stateProvider, policyService); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); const userId = new BehaviorSubject(SomeUser); const userId$ = userId.asObservable(); let count = 0; @@ -240,7 +495,7 @@ describe("CredentialGeneratorService", () => { describe("settings", () => { it("writes to the user's state", async () => { const singleUserId$ = new BehaviorSubject(SomeUser).asObservable(); - const generator = new CredentialGeneratorService(stateProvider, policyService); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); const subject = await generator.settings(SomeConfiguration, { singleUserId$ }); subject.next({ foo: "next value" }); @@ -253,7 +508,7 @@ describe("CredentialGeneratorService", () => { it("waits for the user to become available", async () => { const singleUserId = new BehaviorSubject(null); const singleUserId$ = singleUserId.asObservable(); - const generator = new CredentialGeneratorService(stateProvider, policyService); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); let completed = false; const promise = generator.settings(SomeConfiguration, { singleUserId$ }).then((settings) => { @@ -271,7 +526,7 @@ describe("CredentialGeneratorService", () => { describe("policy$", () => { it("creates a disabled policy evaluator when there is no policy", async () => { - const generator = new CredentialGeneratorService(stateProvider, policyService); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); const userId$ = new BehaviorSubject(SomeUser).asObservable(); const result = await firstValueFrom(generator.policy$(SomeConfiguration, { userId$ })); @@ -281,7 +536,7 @@ describe("CredentialGeneratorService", () => { }); it("creates an active policy evaluator when there is a policy", async () => { - const generator = new CredentialGeneratorService(stateProvider, policyService); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); const userId$ = new BehaviorSubject(SomeUser).asObservable(); const policy$ = new BehaviorSubject([somePolicy]); policyService.getAll$.mockReturnValue(policy$); @@ -293,7 +548,7 @@ describe("CredentialGeneratorService", () => { }); it("follows policy emissions", async () => { - const generator = new CredentialGeneratorService(stateProvider, policyService); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); const userId = new BehaviorSubject(SomeUser); const userId$ = userId.asObservable(); const somePolicySubject = new BehaviorSubject([somePolicy]); @@ -316,7 +571,7 @@ describe("CredentialGeneratorService", () => { }); it("follows user emissions", async () => { - const generator = new CredentialGeneratorService(stateProvider, policyService); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); const userId = new BehaviorSubject(SomeUser); const userId$ = userId.asObservable(); const somePolicy$ = new BehaviorSubject([somePolicy]).asObservable(); @@ -340,7 +595,7 @@ describe("CredentialGeneratorService", () => { }); it("errors when the user errors", async () => { - const generator = new CredentialGeneratorService(stateProvider, policyService); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); const userId = new BehaviorSubject(SomeUser); const userId$ = userId.asObservable(); const expectedError = { some: "error" }; @@ -358,7 +613,7 @@ describe("CredentialGeneratorService", () => { }); it("completes when the user completes", async () => { - const generator = new CredentialGeneratorService(stateProvider, policyService); + const generator = new CredentialGeneratorService(randomizer, stateProvider, policyService); const userId = new BehaviorSubject(SomeUser); const userId$ = userId.asObservable(); diff --git a/libs/tools/generator/core/src/services/credential-generator.service.ts b/libs/tools/generator/core/src/services/credential-generator.service.ts index 891d0016fef..d2012ecf20f 100644 --- a/libs/tools/generator/core/src/services/credential-generator.service.ts +++ b/libs/tools/generator/core/src/services/credential-generator.service.ts @@ -1,5 +1,7 @@ import { + BehaviorSubject, combineLatest, + concatMap, distinctUntilChanged, endWith, filter, @@ -8,32 +10,84 @@ import { map, mergeMap, Observable, + race, switchMap, takeUntil, + withLatestFrom, } from "rxjs"; +import { Simplify } from "type-fest"; import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { StateProvider } from "@bitwarden/common/platform/state"; -import { SingleUserDependency, UserDependency } from "@bitwarden/common/tools/dependencies"; +import { + OnDependency, + SingleUserDependency, + UserDependency, +} from "@bitwarden/common/tools/dependencies"; import { UserStateSubject } from "@bitwarden/common/tools/state/user-state-subject"; import { Constraints } from "@bitwarden/common/tools/types"; -import { PolicyEvaluator } from "../abstractions"; +import { PolicyEvaluator, Randomizer } from "../abstractions"; import { mapPolicyToEvaluatorV2 } from "../rx"; import { CredentialGeneratorConfiguration as Configuration } from "../types/credential-generator-configuration"; type Policy$Dependencies = UserDependency; type Settings$Dependencies = Partial; +type Generate$Dependencies = Simplify & Partial> & { + /** Emits the active website when subscribed. + * + * The generator does not respond to emissions of this interface; + * If it is provided, the generator blocks until a value becomes available. + * When `website$` is omitted, the generator uses the empty string instead. + * When `website$` completes, the generator completes. + * When `website$` errors, the generator forwards the error. + */ + website$?: Observable; +}; // FIXME: once the modernization is complete, switch the type parameters // in `PolicyEvaluator` and bake-in the constraints type. type Evaluator = PolicyEvaluator & Constraints; export class CredentialGeneratorService { constructor( + private randomizer: Randomizer, private stateProvider: StateProvider, private policyService: PolicyService, ) {} + /** Generates a stream of credentials + * @param configuration determines which generator's settings are loaded + * @param dependencies.on$ when specified, a new credential is emitted when + * this emits. Otherwise, a new credential is emitted when the settings + * update. + */ + generate$( + configuration: Readonly>, + dependencies?: Generate$Dependencies, + ) { + // instantiate the engine + const engine = configuration.engine.create(this.randomizer); + + // stream blocks until all of these values are received + const website$ = dependencies?.website$ ?? new BehaviorSubject(null); + const request$ = website$.pipe(map((website) => ({ website }))); + const settings$ = this.settings$(configuration, dependencies); + + // monitor completion + const requestComplete$ = request$.pipe(ignoreElements(), endWith(true)); + const settingsComplete$ = request$.pipe(ignoreElements(), endWith(true)); + const complete$ = race(requestComplete$, settingsComplete$); + + // generation proper + const generate$ = (dependencies?.on$ ?? settings$).pipe( + withLatestFrom(request$, settings$), + concatMap(([, request, settings]) => engine.generate(request, settings)), + takeUntil(complete$), + ); + + return generate$; + } + /** Get the settings for the provided configuration * @param configuration determines which generator's settings are loaded * @param dependencies.userId$ identifies the user to which the settings are bound. @@ -82,7 +136,7 @@ export class CredentialGeneratorService { * @remarks the subject enforces policy for the settings */ async settings( - configuration: Configuration, + configuration: Readonly>, dependencies: SingleUserDependency, ) { const userId = await firstValueFrom( diff --git a/libs/tools/generator/core/src/strategies/passphrase-generator-strategy.spec.ts b/libs/tools/generator/core/src/strategies/passphrase-generator-strategy.spec.ts index f9b346e02b0..6591b179fc2 100644 --- a/libs/tools/generator/core/src/strategies/passphrase-generator-strategy.spec.ts +++ b/libs/tools/generator/core/src/strategies/passphrase-generator-strategy.spec.ts @@ -17,7 +17,7 @@ import { PASSPHRASE_SETTINGS } from "./storage"; const SomeUser = "some user" as UserId; -describe("Password generation strategy", () => { +describe("Passphrase generation strategy", () => { describe("toEvaluator()", () => { it("should map to the policy evaluator", async () => { const strategy = new PassphraseGeneratorStrategy(null, null); diff --git a/libs/tools/generator/core/src/strategies/passphrase-generator-strategy.ts b/libs/tools/generator/core/src/strategies/passphrase-generator-strategy.ts index fe2731f9dd5..37d8b9e3fba 100644 --- a/libs/tools/generator/core/src/strategies/passphrase-generator-strategy.ts +++ b/libs/tools/generator/core/src/strategies/passphrase-generator-strategy.ts @@ -2,11 +2,11 @@ import { PolicyType } from "@bitwarden/common/admin-console/enums"; import { StateProvider } from "@bitwarden/common/platform/state"; import { GeneratorStrategy } from "../abstractions"; -import { DefaultPassphraseBoundaries, DefaultPassphraseGenerationOptions, Policies } from "../data"; +import { DefaultPassphraseGenerationOptions, Policies } from "../data"; import { PasswordRandomizer } from "../engine"; import { mapPolicyToEvaluator } from "../rx"; import { PassphraseGenerationOptions, PassphraseGeneratorPolicy } from "../types"; -import { observe$PerUserId, sharedStateByUserId } from "../util"; +import { observe$PerUserId, optionsToEffWordListRequest, sharedStateByUserId } from "../util"; import { PASSPHRASE_SETTINGS } from "./storage"; @@ -33,13 +33,7 @@ export class PassphraseGeneratorStrategy // algorithm async generate(options: PassphraseGenerationOptions): Promise { - const requestWords = options.numWords ?? DefaultPassphraseGenerationOptions.numWords; - const request = { - numberOfWords: Math.max(requestWords, DefaultPassphraseBoundaries.numWords.min), - capitalize: options.capitalize ?? DefaultPassphraseGenerationOptions.capitalize, - number: options.includeNumber ?? DefaultPassphraseGenerationOptions.includeNumber, - separator: options.wordSeparator ?? DefaultPassphraseGenerationOptions.wordSeparator, - }; + const request = optionsToEffWordListRequest(options); return this.randomizer.randomEffLongWords(request); } diff --git a/libs/tools/generator/core/src/strategies/password-generator-strategy.ts b/libs/tools/generator/core/src/strategies/password-generator-strategy.ts index 9ed62490c06..9ff8a3d88b0 100644 --- a/libs/tools/generator/core/src/strategies/password-generator-strategy.ts +++ b/libs/tools/generator/core/src/strategies/password-generator-strategy.ts @@ -6,7 +6,7 @@ import { Policies, DefaultPasswordGenerationOptions } from "../data"; import { PasswordRandomizer } from "../engine"; import { mapPolicyToEvaluator } from "../rx"; import { PasswordGenerationOptions, PasswordGeneratorPolicy } from "../types"; -import { observe$PerUserId, sharedStateByUserId, sum } from "../util"; +import { observe$PerUserId, optionsToRandomAsciiRequest, sharedStateByUserId } from "../util"; import { PASSWORD_SETTINGS } from "./storage"; @@ -32,62 +32,7 @@ export class PasswordGeneratorStrategy // algorithm async generate(options: PasswordGenerationOptions): Promise { - // converts password generation option sets, which are defined by - // an "enabled" and "quantity" parameter, to the password engine's - // parameters, which represent disabled options as `undefined` - // properties. - function process( - // values read from the options - enabled: boolean, - quantity: number, - // value used if an option is missing - defaultEnabled: boolean, - defaultQuantity: number, - ) { - const isEnabled = enabled ?? defaultEnabled; - const actualQuantity = quantity ?? defaultQuantity; - const result = isEnabled ? actualQuantity : undefined; - - return result; - } - - const request = { - uppercase: process( - options.uppercase, - options.minUppercase, - DefaultPasswordGenerationOptions.uppercase, - DefaultPasswordGenerationOptions.minUppercase, - ), - lowercase: process( - options.lowercase, - options.minLowercase, - DefaultPasswordGenerationOptions.lowercase, - DefaultPasswordGenerationOptions.minLowercase, - ), - digits: process( - options.number, - options.minNumber, - DefaultPasswordGenerationOptions.number, - DefaultPasswordGenerationOptions.minNumber, - ), - special: process( - options.special, - options.minSpecial, - DefaultPasswordGenerationOptions.special, - DefaultPasswordGenerationOptions.minSpecial, - ), - ambiguous: options.ambiguous ?? DefaultPasswordGenerationOptions.ambiguous, - all: 0, - }; - - // engine represents character sets as "include only"; you assert how many all - // characters there can be rather than a total length. This conversion has - // the character classes win, so that the result is always consistent with policy - // minimums. - const required = sum(request.uppercase, request.lowercase, request.digits, request.special); - const remaining = (options.length ?? 0) - required; - request.all = Math.max(remaining, 0); - + const request = optionsToRandomAsciiRequest(options); const result = await this.randomizer.randomAscii(request); return result; diff --git a/libs/tools/generator/core/src/types/credential-category.ts b/libs/tools/generator/core/src/types/credential-category.ts new file mode 100644 index 00000000000..54c8c5ed8e9 --- /dev/null +++ b/libs/tools/generator/core/src/types/credential-category.ts @@ -0,0 +1,5 @@ +/** Kinds of credentials that can be stored by the history service + * password - a secret consisting of arbitrary characters used to authenticate a user + * passphrase - a secret consisting of words used to authenticate a user + */ +export type CredentialCategory = "password" | "passphrase"; diff --git a/libs/tools/generator/core/src/types/credential-generator-configuration.ts b/libs/tools/generator/core/src/types/credential-generator-configuration.ts index 2a8b07b0e82..80d977a73c8 100644 --- a/libs/tools/generator/core/src/types/credential-generator-configuration.ts +++ b/libs/tools/generator/core/src/types/credential-generator-configuration.ts @@ -1,9 +1,29 @@ import { UserKeyDefinition } from "@bitwarden/common/platform/state"; import { Constraints } from "@bitwarden/common/tools/types"; +import { Randomizer } from "../abstractions"; import { PolicyConfiguration } from "../types"; +import { CredentialCategory } from "./credential-category"; +import { CredentialGenerator } from "./credential-generator"; + export type CredentialGeneratorConfiguration = { + /** Category describing usage of the credential generated by this configuration + */ + category: CredentialCategory; + + /** An algorithm that generates credentials when ran. */ + engine: { + /** Factory for the generator + */ + // FIXME: note that this erases the engine's type so that credentials are + // generated uniformly. This property needs to be maintained for + // the credential generator, but engine configurations should return + // the underlying type. `create` may be able to do double-duty w/ an + // engine definition if `CredentialGenerator` can be made covariant. + create: (randomizer: Randomizer) => CredentialGenerator; + }; + /** Defines the stored parameters for credential generation */ settings: { /** value used when an account's settings haven't been initialized */ initial: Readonly>; diff --git a/libs/tools/generator/core/src/types/credential-generator.ts b/libs/tools/generator/core/src/types/credential-generator.ts new file mode 100644 index 00000000000..c95ff25afff --- /dev/null +++ b/libs/tools/generator/core/src/types/credential-generator.ts @@ -0,0 +1,12 @@ +import { GenerationRequest } from "@bitwarden/common/tools/types"; + +import { GeneratedCredential } from "./generated-credential"; + +/** An algorithm that generates credentials. */ +export type CredentialGenerator = { + /** Generates a credential + * @param request runtime parameters + * @param settings stored parameters + */ + generate: (request: GenerationRequest, settings: Settings) => Promise; +}; diff --git a/libs/tools/generator/core/src/types/generated-credential.spec.ts b/libs/tools/generator/core/src/types/generated-credential.spec.ts new file mode 100644 index 00000000000..a687676576b --- /dev/null +++ b/libs/tools/generator/core/src/types/generated-credential.spec.ts @@ -0,0 +1,58 @@ +import { CredentialCategory, GeneratedCredential } from "."; + +describe("GeneratedCredential", () => { + describe("constructor", () => { + it("assigns credential", () => { + const result = new GeneratedCredential("example", "passphrase", new Date(100)); + + expect(result.credential).toEqual("example"); + }); + + it("assigns category", () => { + const result = new GeneratedCredential("example", "passphrase", new Date(100)); + + expect(result.category).toEqual("passphrase"); + }); + + it("passes through date parameters", () => { + const result = new GeneratedCredential("example", "password", new Date(100)); + + expect(result.generationDate).toEqual(new Date(100)); + }); + + it("converts numeric dates to Dates", () => { + const result = new GeneratedCredential("example", "password", 100); + + expect(result.generationDate).toEqual(new Date(100)); + }); + }); + + it("toJSON converts from a credential into a JSON object", () => { + const credential = new GeneratedCredential("example", "password", new Date(100)); + + const result = credential.toJSON(); + + expect(result).toEqual({ + credential: "example", + category: "password" as CredentialCategory, + generationDate: 100, + }); + }); + + it("fromJSON converts Json objects into credentials", () => { + const jsonValue = { + credential: "example", + category: "password" as CredentialCategory, + generationDate: 100, + }; + + const result = GeneratedCredential.fromJSON(jsonValue); + + expect(result).toBeInstanceOf(GeneratedCredential); + expect(result).toEqual({ + credential: "example", + category: "password", + generationDate: new Date(100), + }); + }); +}); diff --git a/libs/tools/generator/core/src/types/generated-credential.ts b/libs/tools/generator/core/src/types/generated-credential.ts new file mode 100644 index 00000000000..ff174b04a58 --- /dev/null +++ b/libs/tools/generator/core/src/types/generated-credential.ts @@ -0,0 +1,47 @@ +import { Jsonify } from "type-fest"; + +import { CredentialCategory } from "./credential-category"; + +/** A credential generation result */ +export class GeneratedCredential { + /** + * Instantiates a generated credential + * @param credential The value of the generated credential (e.g. a password) + * @param category The kind of credential + * @param generationDate The date that the credential was generated. + * Numeric values should are interpreted using {@link Date.valueOf} + * semantics. + */ + constructor( + readonly credential: string, + readonly category: CredentialCategory, + generationDate: Date | number, + ) { + if (typeof generationDate === "number") { + this.generationDate = new Date(generationDate); + } else { + this.generationDate = generationDate; + } + } + + /** The date that the credential was generated */ + generationDate: Date; + + /** Constructs a credential from its `toJSON` representation */ + static fromJSON(jsonValue: Jsonify) { + return new GeneratedCredential( + jsonValue.credential, + jsonValue.category, + jsonValue.generationDate, + ); + } + + /** Serializes a credential to a JSON-compatible object */ + toJSON() { + return { + credential: this.credential, + category: this.category, + generationDate: this.generationDate.valueOf(), + }; + } +} diff --git a/libs/tools/generator/core/src/types/index.ts b/libs/tools/generator/core/src/types/index.ts index 786b15b9d11..229ac1c0c38 100644 --- a/libs/tools/generator/core/src/types/index.ts +++ b/libs/tools/generator/core/src/types/index.ts @@ -1,8 +1,11 @@ export * from "./boundary"; export * from "./catchall-generator-options"; +export * from "./credential-category"; +export * from "./credential-generator"; export * from "./credential-generator-configuration"; export * from "./eff-username-generator-options"; export * from "./forwarder-options"; +export * from "./generated-credential"; export * from "./generator-options"; export * from "./generator-type"; export * from "./no-policy"; diff --git a/libs/tools/generator/core/src/util.spec.ts b/libs/tools/generator/core/src/util.spec.ts index 32bdc3ad3af..7ffd869535b 100644 --- a/libs/tools/generator/core/src/util.spec.ts +++ b/libs/tools/generator/core/src/util.spec.ts @@ -1,4 +1,5 @@ -import { sum } from "./util"; +import { DefaultPassphraseGenerationOptions } from "./data"; +import { optionsToEffWordListRequest, optionsToRandomAsciiRequest, sum } from "./util"; describe("sum", () => { it("returns 0 when the list is empty", () => { @@ -15,3 +16,411 @@ describe("sum", () => { expect(sum(1, 2, 3)).toBe(6); }); }); + +describe("optionsToRandomAsciiRequest", () => { + it("should map options", async () => { + const result = optionsToRandomAsciiRequest({ + length: 20, + ambiguous: true, + uppercase: true, + lowercase: true, + number: true, + special: true, + minUppercase: 1, + minLowercase: 2, + minNumber: 3, + minSpecial: 4, + }); + + expect(result).toEqual({ + all: 10, + uppercase: 1, + lowercase: 2, + digits: 3, + special: 4, + ambiguous: true, + }); + }); + + it("should disable uppercase", async () => { + const result = optionsToRandomAsciiRequest({ + length: 3, + ambiguous: true, + uppercase: false, + lowercase: true, + number: true, + special: true, + minUppercase: 1, + minLowercase: 1, + minNumber: 1, + minSpecial: 1, + }); + + expect(result).toEqual({ + all: 0, + uppercase: undefined, + lowercase: 1, + digits: 1, + special: 1, + ambiguous: true, + }); + }); + + it("should disable lowercase", async () => { + const result = optionsToRandomAsciiRequest({ + length: 3, + ambiguous: true, + uppercase: true, + lowercase: false, + number: true, + special: true, + minUppercase: 1, + minLowercase: 1, + minNumber: 1, + minSpecial: 1, + }); + + expect(result).toEqual({ + all: 0, + uppercase: 1, + lowercase: undefined, + digits: 1, + special: 1, + ambiguous: true, + }); + }); + + it("should disable digits", async () => { + const result = optionsToRandomAsciiRequest({ + length: 3, + ambiguous: true, + uppercase: true, + lowercase: true, + number: false, + special: true, + minUppercase: 1, + minLowercase: 1, + minNumber: 1, + minSpecial: 1, + }); + + expect(result).toEqual({ + all: 0, + uppercase: 1, + lowercase: 1, + digits: undefined, + special: 1, + ambiguous: true, + }); + }); + + it("should disable special", async () => { + const result = optionsToRandomAsciiRequest({ + length: 3, + ambiguous: true, + uppercase: true, + lowercase: true, + number: true, + special: false, + minUppercase: 1, + minLowercase: 1, + minNumber: 1, + minSpecial: 1, + }); + + expect(result).toEqual({ + all: 0, + uppercase: 1, + lowercase: 1, + digits: 1, + special: undefined, + ambiguous: true, + }); + }); + + it("should override length with minimums", async () => { + const result = optionsToRandomAsciiRequest({ + length: 20, + ambiguous: true, + uppercase: true, + lowercase: true, + number: true, + special: true, + minUppercase: 1, + minLowercase: 2, + minNumber: 3, + minSpecial: 4, + }); + + expect(result).toEqual({ + all: 10, + uppercase: 1, + lowercase: 2, + digits: 3, + special: 4, + ambiguous: true, + }); + }); + + it("should default uppercase", async () => { + const result = optionsToRandomAsciiRequest({ + length: 2, + ambiguous: true, + lowercase: true, + number: true, + special: true, + minUppercase: 2, + minLowercase: 0, + minNumber: 0, + minSpecial: 0, + }); + + expect(result).toEqual({ + all: 0, + uppercase: 2, + lowercase: 0, + digits: 0, + special: 0, + ambiguous: true, + }); + }); + + it("should default lowercase", async () => { + const result = optionsToRandomAsciiRequest({ + length: 0, + ambiguous: true, + uppercase: true, + number: true, + special: true, + minUppercase: 0, + minLowercase: 2, + minNumber: 0, + minSpecial: 0, + }); + + expect(result).toEqual({ + all: 0, + uppercase: 0, + lowercase: 2, + digits: 0, + special: 0, + ambiguous: true, + }); + }); + + it("should default number", async () => { + const result = optionsToRandomAsciiRequest({ + length: 0, + ambiguous: true, + uppercase: true, + lowercase: true, + special: true, + minUppercase: 0, + minLowercase: 0, + minNumber: 2, + minSpecial: 0, + }); + + expect(result).toEqual({ + all: 0, + uppercase: 0, + lowercase: 0, + digits: 2, + special: 0, + ambiguous: true, + }); + }); + + it("should default special", async () => { + const result = optionsToRandomAsciiRequest({ + length: 0, + ambiguous: true, + uppercase: true, + lowercase: true, + number: true, + minUppercase: 0, + minLowercase: 0, + minNumber: 0, + minSpecial: 0, + }); + + expect(result).toEqual({ + all: 0, + uppercase: 0, + lowercase: 0, + digits: 0, + special: undefined, + ambiguous: true, + }); + }); + + it("should default minUppercase", async () => { + const result = optionsToRandomAsciiRequest({ + length: 0, + ambiguous: true, + uppercase: true, + lowercase: true, + number: true, + special: true, + minLowercase: 0, + minNumber: 0, + minSpecial: 0, + }); + + expect(result).toEqual({ + all: 0, + uppercase: 1, + lowercase: 0, + digits: 0, + special: 0, + ambiguous: true, + }); + }); + + it("should default minLowercase", async () => { + const result = optionsToRandomAsciiRequest({ + length: 0, + ambiguous: true, + uppercase: true, + lowercase: true, + number: true, + special: true, + minUppercase: 0, + minNumber: 0, + minSpecial: 0, + }); + + expect(result).toEqual({ + all: 0, + uppercase: 0, + lowercase: 1, + digits: 0, + special: 0, + ambiguous: true, + }); + }); + + it("should default minNumber", async () => { + const result = optionsToRandomAsciiRequest({ + length: 0, + ambiguous: true, + uppercase: true, + lowercase: true, + number: true, + special: true, + minUppercase: 0, + minLowercase: 0, + minSpecial: 0, + }); + + expect(result).toEqual({ + all: 0, + uppercase: 0, + lowercase: 0, + digits: 1, + special: 0, + ambiguous: true, + }); + }); + + it("should default minSpecial", async () => { + const result = optionsToRandomAsciiRequest({ + length: 0, + ambiguous: true, + uppercase: true, + lowercase: true, + number: true, + special: true, + minUppercase: 0, + minLowercase: 0, + minNumber: 0, + }); + + expect(result).toEqual({ + all: 0, + uppercase: 0, + lowercase: 0, + digits: 0, + special: 0, + ambiguous: true, + }); + }); +}); + +describe("optionsToEffWordListRequest", () => { + it("should map options", async () => { + const result = optionsToEffWordListRequest({ + numWords: 4, + capitalize: true, + includeNumber: true, + wordSeparator: "!", + }); + + expect(result).toEqual({ + numberOfWords: 4, + capitalize: true, + number: true, + separator: "!", + }); + }); + + it("should default numWords", async () => { + const result = optionsToEffWordListRequest({ + capitalize: true, + includeNumber: true, + wordSeparator: "!", + }); + + expect(result).toEqual({ + numberOfWords: DefaultPassphraseGenerationOptions.numWords, + capitalize: true, + number: true, + separator: "!", + }); + }); + + it("should default capitalize", async () => { + const result = optionsToEffWordListRequest({ + numWords: 4, + includeNumber: true, + wordSeparator: "!", + }); + + expect(result).toEqual({ + numberOfWords: 4, + capitalize: DefaultPassphraseGenerationOptions.capitalize, + number: true, + separator: "!", + }); + }); + + it("should default includeNumber", async () => { + const result = optionsToEffWordListRequest({ + numWords: 4, + capitalize: true, + wordSeparator: "!", + }); + + expect(result).toEqual({ + numberOfWords: 4, + capitalize: true, + number: DefaultPassphraseGenerationOptions.includeNumber, + separator: "!", + }); + }); + + it("should default wordSeparator", async () => { + const result = optionsToEffWordListRequest({ + numWords: 4, + capitalize: true, + includeNumber: true, + }); + + expect(result).toEqual({ + numberOfWords: 4, + capitalize: true, + number: true, + separator: DefaultPassphraseGenerationOptions.wordSeparator, + }); + }); +}); diff --git a/libs/tools/generator/core/src/util.ts b/libs/tools/generator/core/src/util.ts index cca2c75834c..21e901765e2 100644 --- a/libs/tools/generator/core/src/util.ts +++ b/libs/tools/generator/core/src/util.ts @@ -7,6 +7,13 @@ import { } from "@bitwarden/common/platform/state"; import { UserId } from "@bitwarden/common/types/guid"; +import { + DefaultPassphraseBoundaries, + DefaultPassphraseGenerationOptions, + DefaultPasswordGenerationOptions, +} from "./data"; +import { PassphraseGenerationOptions, PasswordGenerationOptions } from "./types"; + /** construct a method that outputs a copy of `defaultValue` as an observable. */ export function observe$PerUserId( create: () => Partial, @@ -50,3 +57,79 @@ export function sharedStateByUserId(key: UserKeyDefinition, provid /** returns the sum of items in the list. */ export const sum = (...items: number[]) => (items ?? []).reduce((sum: number, current: number) => sum + (current ?? 0), 0); + +/* converts password generation option sets, which are defined by + * an "enabled" and "quantity" parameter, to the password engine's + * parameters, which represent disabled options as `undefined` + * properties. + */ +export function optionsToRandomAsciiRequest(options: PasswordGenerationOptions) { + // helper for processing common option sets + function process( + // values read from the options + enabled: boolean, + quantity: number, + // value used if an option is missing + defaultEnabled: boolean, + defaultQuantity: number, + ) { + const isEnabled = enabled ?? defaultEnabled; + const actualQuantity = quantity ?? defaultQuantity; + const result = isEnabled ? actualQuantity : undefined; + + return result; + } + + const request = { + uppercase: process( + options.uppercase, + options.minUppercase, + DefaultPasswordGenerationOptions.uppercase, + DefaultPasswordGenerationOptions.minUppercase, + ), + lowercase: process( + options.lowercase, + options.minLowercase, + DefaultPasswordGenerationOptions.lowercase, + DefaultPasswordGenerationOptions.minLowercase, + ), + digits: process( + options.number, + options.minNumber, + DefaultPasswordGenerationOptions.number, + DefaultPasswordGenerationOptions.minNumber, + ), + special: process( + options.special, + options.minSpecial, + DefaultPasswordGenerationOptions.special, + DefaultPasswordGenerationOptions.minSpecial, + ), + ambiguous: options.ambiguous ?? DefaultPasswordGenerationOptions.ambiguous, + all: 0, + }; + + // engine represents character sets as "include only"; you assert how many all + // characters there can be rather than a total length. This conversion has + // the character classes win, so that the result is always consistent with policy + // minimums. + const required = sum(request.uppercase, request.lowercase, request.digits, request.special); + const remaining = (options.length ?? 0) - required; + request.all = Math.max(remaining, 0); + + return request; +} + +/* converts passphrase generation option sets to the eff word list request + */ +export function optionsToEffWordListRequest(options: PassphraseGenerationOptions) { + const requestWords = options.numWords ?? DefaultPassphraseGenerationOptions.numWords; + const request = { + numberOfWords: Math.max(requestWords, DefaultPassphraseBoundaries.numWords.min), + capitalize: options.capitalize ?? DefaultPassphraseGenerationOptions.capitalize, + number: options.includeNumber ?? DefaultPassphraseGenerationOptions.includeNumber, + separator: options.wordSeparator ?? DefaultPassphraseGenerationOptions.wordSeparator, + }; + + return request; +} From 744a48183b15094d3d384573e10d639c2de4e15c Mon Sep 17 00:00:00 2001 From: Bitwarden DevOps <106330231+bitwarden-devops-bot@users.noreply.github.com> Date: Tue, 10 Sep 2024 12:47:18 -0400 Subject: [PATCH 35/36] Bumped client version(s) (#10975) --- apps/browser/package.json | 2 +- apps/browser/src/manifest.json | 2 +- apps/browser/src/manifest.v3.json | 2 +- package-lock.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/browser/package.json b/apps/browser/package.json index b76a1e84126..4d008b684cb 100644 --- a/apps/browser/package.json +++ b/apps/browser/package.json @@ -1,6 +1,6 @@ { "name": "@bitwarden/browser", - "version": "2024.9.0", + "version": "2024.9.1", "scripts": { "build": "cross-env MANIFEST_VERSION=3 webpack", "build:mv2": "webpack", diff --git a/apps/browser/src/manifest.json b/apps/browser/src/manifest.json index f916555fef2..2d7f46fa59a 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": "2024.9.0", + "version": "2024.9.1", "description": "__MSG_extDesc__", "default_locale": "en", "author": "Bitwarden Inc.", diff --git a/apps/browser/src/manifest.v3.json b/apps/browser/src/manifest.v3.json index 12d501ba9ed..5e132774e6e 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": "2024.9.0", + "version": "2024.9.1", "description": "__MSG_extDesc__", "default_locale": "en", "author": "Bitwarden Inc.", diff --git a/package-lock.json b/package-lock.json index 0a9936bbf2b..a1ef2eb87bb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -192,7 +192,7 @@ }, "apps/browser": { "name": "@bitwarden/browser", - "version": "2024.9.0" + "version": "2024.9.1" }, "apps/cli": { "name": "@bitwarden/cli", From 8921230b4f5f33d0948572e47261604a6a3d731e Mon Sep 17 00:00:00 2001 From: SmithThe4th Date: Tue, 10 Sep 2024 14:15:01 -0400 Subject: [PATCH 36/36] [PM-11200] Move delete item permission to Can Manage (#10890) * Refactored the showDelete function to check if a user can manage a collection Removed the can edit or manage cipher check from the show delete function * Add check for AC vault to return true when user has admin access * Check user is an admin or custom user with editAnyCollection * Check user is an admin or custom user with editAnyCollection --- .../vault-cipher-row.component.html | 2 +- .../vault-items/vault-cipher-row.component.ts | 1 + .../vault-items/vault-items.component.html | 3 ++ .../vault-items/vault-items.component.ts | 40 +++++++++++++++---- .../individual-vault/vault.component.html | 1 + 5 files changed, 38 insertions(+), 9 deletions(-) diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html index 524d9dff20b..6a04ff6071d 100644 --- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html +++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html @@ -157,7 +157,7 @@