π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Preserve Locker web Secret password whitespace
AmanRajSinghMouryacc5161bccf3a
diff --git a/web/apps/locker/src/components/create-item/item-form-fields-utils.ts b/web/apps/locker/src/components/create-item/item-form-fields-utils.tsindex 038b96fffe..d290e61351 100644--- a/web/apps/locker/src/components/create-item/item-form-fields-utils.ts+++ b/web/apps/locker/src/components/create-item/item-form-fields-utils.ts@@ -24,8 +24,16 @@ export const itemFormDataForSave = (): Record<string, string> => {const data: Record<string, string> = Object.fromEntries(Object.entries(formData)- .filter(([, value]) => value.trim())- .map(([key, value]) => [key, value.trim()]),+ .map(+ ([key, value]) =>+ [+ key,+ type === "accountCredential" && key === "password"+ ? value+ : value.trim(),+ ] as const,+ )+ .filter(([, value]) => value),);if (type === "note" && !data.title) {diff --git a/web/apps/locker/tests/item-metadata.test.ts b/web/apps/locker/tests/item-metadata.test.tsindex 3ea90bcf6e..3835543db5 100644--- a/web/apps/locker/tests/item-metadata.test.ts+++ b/web/apps/locker/tests/item-metadata.test.ts@@ -1,4 +1,5 @@import { afterEach, beforeEach, expect, test, vi } from "vitest";+import { itemFormDataForSave } from "../src/components/create-item/item-form-fields-utils";import { updateFileItem, updateInfoItem } from "../src/services/items";import {getEncryptedFileRecord,@@ -165,3 +166,30 @@ test("clearing optional credential fields replaces the saved info data", async (data: { name: "Netflix" },});});++test.each([" secret", "secret ", " secret ", " "])(+ "renaming a Secret preserves password whitespace in metadata: %j",+ async (password) => {+ const data = { name: "Account", password };+ decryptMetadataJSON.mockResolvedValue({+ info: { type: "accountCredential", data },+ });+ await updateInfoItem(+ 1,+ "accountCredential",+ itemFormDataForSave("accountCredential", {+ ...data,+ name: "Renamed",+ }),+ );+ const metadata = JSON.parse(+ new TextDecoder().decode(+ encryptBlob.mock.calls[0]![0] as Uint8Array,+ ),+ ) as Record<string, unknown>;+ expect(metadata.info).toEqual({+ type: "accountCredential",+ data: { name: "Renamed", password },+ });+ },+);diff --git a/web/apps/locker/tests/required-fields.test.ts b/web/apps/locker/tests/required-fields.test.tsindex 8a051c9212..c6ed596362 100644--- a/web/apps/locker/tests/required-fields.test.ts+++ b/web/apps/locker/tests/required-fields.test.ts@@ -46,8 +46,37 @@ test("cleared Thing and Secret fields are omitted on save", () => {itemFormDataForSave("accountCredential", {name: " Netflix ",username: "",- password: " ",+ password: "",notes: "",}),).toEqual({ name: "Netflix" });});++test.each([" secret", "secret ", " secret ", " "])(+ "saving a Secret preserves password whitespace: %j",+ (password) => {+ const data = itemFormDataForSave("accountCredential", {+ name: " Account ",+ username: " user ",+ password,+ notes: " Notes ",+ });+ expect(data).toEqual({+ name: "Account",+ username: "user",+ password,+ notes: "Notes",+ });+ expect(+ itemFormDataForSave("accountCredential", {+ ...data,+ name: "Renamed",+ }),+ ).toEqual({+ name: "Renamed",+ username: "user",+ password,+ notes: "Notes",+ });+ },+);diff --git a/web/apps/locker/tests/unsaved-changes.test.ts b/web/apps/locker/tests/unsaved-changes.test.tsindex 6a1566a977..cc7ab1c340 100644--- a/web/apps/locker/tests/unsaved-changes.test.ts+++ b/web/apps/locker/tests/unsaved-changes.test.ts@@ -24,3 +24,22 @@ test("detects collection changes and drafts but ignores collection order", () =>expect(hasUnsavedItemChanges({}, {}, [], [1], "")).toBe(true);expect(hasUnsavedItemChanges({}, {}, [], [], "New collection")).toBe(true);});++test.each([" secret", "secret ", " secret ", " "])(+ "reopening a Secret is unchanged, but editing password whitespace is dirty: %j",+ (password) => {+ const initial = { name: "Account", password };+ expect(hasUnsavedItemChanges({ ...initial }, initial, [], [], "")).toBe(+ false,+ );+ expect(+ hasUnsavedItemChanges(+ { ...initial, password: `${password} ` },+ initial,+ [],+ [],+ "",+ ),+ ).toBe(true);+ },+);