Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Add DraftItem calls (#2159)

Leendert de Borst253fb572c158
diff --git a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
index f356a018f..3794d9db5 100644
--- a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
+++ b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
@@ -4,6 +4,7 @@ import { storage } from 'wxt/utils/storage';
import { allVaultDataStorageKeys, AUTH_STORAGE_KEYS, dirtyScopeStorageKey, SESSION_STORAGE_KEYS, StorageKeys, VAULT_LOCK_STORAGE_KEYS } from '@/utils/constants/storageKeys';
import { TRASH_RETENTION_DAYS } from '@/utils/constants/vault';
+import type { DraftItem } from '@/utils/db/ItemRef';
import { devError, devLog, devWarn } from '@/utils/devLogger/DevLogger';
import type { EncryptionKeyDerivationParams } from '@/utils/dist/core/models/metadata';
import { FieldKey, ItemTypes, createSystemField, type Item, type PasswordSettings } from '@/utils/dist/core/models/vault';
@@ -2029,7 +2030,7 @@ export async function handleSaveLoginCredential(
}
// Create the new item
- const newItem: Item = {
+ const newItem: DraftItem = {
Id: '', // Will be generated by SQLite
Name: message.serviceName || message.domain,
ItemType: ItemTypes.Login,
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemIcon.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemIcon.tsx
index fa75c5fe8..e6d874c71 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemIcon.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemIcon.tsx
@@ -1,8 +1,8 @@
import React from 'react';
+import type { DraftItem } from '@/utils/db/ItemRef';
import type { ItemTypeIconKey } from '@/utils/dist/core/models/icons';
import { getAppIconSvg, ItemTypeIconSvgs } from '@/utils/dist/core/models/icons';
-import type { Item } from '@/utils/dist/core/models/vault';
import {
FieldKey,
LogoKinds,
@@ -11,7 +11,7 @@ import {
import SqliteClient from '@/utils/SqliteClient';
type ItemIconProps = {
- item: Item;
+ item: DraftItem;
className?: string;
};
diff --git a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemLogoPicker.tsx b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemLogoPicker.tsx
index 58d7302b3..4736317f0 100644
--- a/apps/browser-extension/src/entrypoints/popup/components/Items/ItemLogoPicker.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/components/Items/ItemLogoPicker.tsx
@@ -3,15 +3,16 @@ import { useTranslation } from 'react-i18next';
import LogoPickerModal from '@/entrypoints/popup/components/Items/LogoPickerModal';
+import type { DraftItem } from '@/utils/db/ItemRef';
import { getAppIconSvg } from '@/utils/dist/core/models/icons';
-import type { LogoSelection, Item, ItemLogo } from '@/utils/dist/core/models/vault';
+import type { LogoSelection, ItemLogo } from '@/utils/dist/core/models/vault';
import { LogoKinds } from '@/utils/dist/core/models/vault';
import SqliteClient from '@/utils/SqliteClient';
import ItemIconComponent from './ItemIcon';
type ItemLogoPickerProps = {
- item: Item;
+ item: DraftItem;
pendingSelection?: LogoSelection;
pendingPreview?: string | null;
onSelect: (selection: LogoSelection) => void;
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx
index 94aa374fb..f38f569ba 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx
@@ -30,8 +30,9 @@ import useFormPersistence from '@/entrypoints/popup/hooks/useFormPersistence';
import useServiceDetection from '@/entrypoints/popup/hooks/useServiceDetection';
import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';
+import type { DraftItem } from '@/utils/db/ItemRef';
import type { Folder } from '@/utils/db/repositories/FolderRepository';
-import type { Item, ItemField, ItemType, FieldType, Attachment, TotpCode, PasswordSettings, LogoSelection } from '@/utils/dist/core/models/vault';
+import type { ItemField, ItemType, FieldType, Attachment, TotpCode, PasswordSettings, LogoSelection } from '@/utils/dist/core/models/vault';
import { FieldCategories, FieldTypes, LogoKinds, ItemTypes, getSystemFieldsForItemType, getOptionalFieldsForItemType, isFieldShownByDefault, getSystemField, fieldAppliesToType } from '@/utils/dist/core/models/vault';
import { FaviconService } from '@/utils/FaviconService';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
@@ -41,7 +42,6 @@ import * as RustCore from '@/utils/RustCore';
import SqliteClient from '@/utils/SqliteClient';
import { browser } from '#imports';
-import type { DraftItem } from '@/utils/db/ItemRef';
// Valid item types from the shared model
const VALID_ITEM_TYPES: ItemType[] = [ItemTypes.Login, ItemTypes.Alias, ItemTypes.CreditCard, ItemTypes.Note];
@@ -54,7 +54,7 @@ const DEFAULT_ITEM_TYPE: ItemType = ItemTypes.Login;
* This is the data portion stored via useFormPersistence hook.
*/
type PersistedFormData = {
- item: Item | null;
+ item: DraftItem | null;
fieldValues: Record<string, string | string[]>;
customFields: CustomFieldDefinition[];
totpEditorState?: {
@@ -674,7 +674,7 @@ const ItemAddEdit: React.FC = () => {
* created item back into the originating tab and close this popup window. Returns true when the
* fill-back path handled the post-save behaviour (so the caller should skip normal navigation).
*/
- const fillBackAndCloseWindow = useCallback(async (savedItem: Item): Promise<boolean> => {
+ const fillBackAndCloseWindow = useCallback(async (savedItem: DraftItem): Promise<boolean> => {
if (isEditMode || !sourceTabIdParam) {
return false;
}
@@ -781,7 +781,7 @@ const ItemAddEdit: React.FC = () => {
});
});
- let updatedItem: Item = {
+ let updatedItem: DraftItem = {
...item,
/*
* For create mode, always generate a fresh ID to prevent UNIQUE constraint
@@ -833,7 +833,7 @@ const ItemAddEdit: React.FC = () => {
// Delete passkeys marked for deletion
if (passkeyIdsMarkedForDeletion.length > 0) {
for (const passkeyId of passkeyIdsMarkedForDeletion) {
- await dbContext.sqliteClient!.passkeys.deleteById(passkeyId);
+ await dbContext.sqliteClient!.passkeys.deleteById(passkeyId, item.ManifestId);
}
}
} else {
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx
index 6f83cb8bb..a8190eb70 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/RecentlyDeleted.tsx
@@ -101,7 +101,7 @@ const RecentlyDeleted: React.FC = () => {
await executeVaultMutationAsync(async () => {
for (const item of items) {
- await dbContext.sqliteClient!.items.permanentlyDelete(item.Id);
+ await dbContext.sqliteClient!.items.permanentlyDelete(item.Id, item.ManifestId);
}
});
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx
index 5762e3b34..5f5583853 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx
@@ -13,6 +13,7 @@ import { useWebApi } from '@/entrypoints/popup/context/WebApiContext';
import { useVaultLockRedirect } from '@/entrypoints/popup/hooks/useVaultLockRedirect';
import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';
+import type { DraftItem } from '@/utils/db/ItemRef';
import type { Item, Passkey } from '@/utils/dist/core/models/vault';
import { FieldKey, ItemTypes, getFieldValue, createSystemField } from '@/utils/dist/core/models/vault';
import { LocalPreferencesService } from '@/utils/LocalPreferencesService';
@@ -21,7 +22,6 @@ import { PasskeyAuthenticator } from '@/utils/passkey/PasskeyAuthenticator';
import { PasskeyHelper } from '@/utils/passkey/PasskeyHelper';
import type { CreateRequest, PasskeyCreateCredentialResponse, PendingPasskeyCreateRequest } from '@/utils/passkey/types';
import { extractDomain, filterItems, AutofillMatchingMode } from '@/utils/RustCore';
-import type { DraftItem } from '@/utils/db/ItemRef';
/**
* PasskeyCreate
@@ -335,7 +335,7 @@ const PasskeyCreate: React.FC = () => {
}
// Delete the old passkey
- await dbContext.sqliteClient!.passkeys.deleteById(selectedPasskeyToReplace);
+ await dbContext.sqliteClient!.passkeys.deleteById(selectedPasskeyToReplace, existingPasskey?.ManifestId);
/**
* Create new passkey with same item