Skip to content

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

Update item search filter logic to use core/client central version (#2439)

Leendert de Borstf8f85d70085b
diff --git a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
index a3c7b9f56..f5d69bef2 100644
--- a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
+++ b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
@@ -11,6 +11,7 @@ import { decryptVaultBlob, encryptVaultBlob } from '@aliasvault/client/crypto/Va
import { isSameItem, manifestForItemIn, scopedKey, type ItemRef } from '@aliasvault/client/database/ItemRef';
import { SqliteClient } from '@aliasvault/client/database/SqliteClient';
import { FaviconService } from '@aliasvault/client/items/FaviconService';
+import { applySearchFilter } from '@aliasvault/client/items/ItemFilters';
import { generateTotpCode } from '@aliasvault/client/items/TotpUtility';
import { filterItems, AutofillMatchingMode, extractRootDomain, isUrlAlreadyLinked } from '@aliasvault/client/rust/RustCore';
import { familySharingText } from '@aliasvault/client/sharing/FamilySharingView';
@@ -358,9 +359,8 @@ async function extractRootDomainFromUrl(url: string): Promise<string> {
}
/**
- * Filter items by search term.
- * Splits search into words and matches items where ALL words appear in searchable fields.
- * Word order doesn't matter - matching behavior consistent with popup search.
+ * Filter items by search term for the in-page autofill popup, with the same matching as the popup and web app search
+ * (core/client applySearchFilter). An empty term matches nothing, and results are sorted by name.
*
* @param items - The items to filter
* @param searchTerm - The search term to use
@@ -370,40 +370,7 @@ function filterItemsBySearchTerm(items: Item[], searchTerm: string): Item[] {
if (!searchTerm || searchTerm.trim() === '') {
return [];
}
-
- const searchLower = searchTerm.toLowerCase().trim();
-
- // Split search query into individual words (same as popup search)
- const searchWords = searchLower.split(/\s+/).filter(word => word.length > 0);
-
- const searchableFieldKeys = [
- FieldKey.LoginUsername,
- FieldKey.LoginEmail,
- FieldKey.LoginUrl,
- FieldKey.AliasFirstName,
- FieldKey.AliasLastName
- ];
-
- return items.filter((item: Item) => {
- // Build searchable fields array
- const searchableFields: string[] = [
- item.Name?.toLowerCase() || ''
- ];
-
- // Add field values to searchable fields
- item.Fields?.forEach((field: { FieldKey: string; Value: string | string[]; Label: string }) => {
- if ((searchableFieldKeys as string[]).includes(field.FieldKey)) {
- const value = Array.isArray(field.Value) ? field.Value.join(' ') : field.Value;
- searchableFields.push(value?.toLowerCase() || '');
- searchableFields.push(field.Label.toLowerCase());
- }
- });
-
- // Every word must appear in at least one searchable field (order doesn't matter)
- return searchWords.every(word =>
- searchableFields.some(field => field.includes(word))
- );
- }).sort((a: Item, b: Item) => (a.Name ?? '').localeCompare(b.Name ?? ''));
+ return applySearchFilter(items, searchTerm).sort((a: Item, b: Item) => (a.Name ?? '').localeCompare(b.Name ?? ''));
}
/**
diff --git a/apps/mobile-app/app/(tabs)/items/folder/[manifestId]/[id].tsx b/apps/mobile-app/app/(tabs)/items/folder/[manifestId]/[id].tsx
index 013ebb49f..c616daf4b 100644
--- a/apps/mobile-app/app/(tabs)/items/folder/[manifestId]/[id].tsx
+++ b/apps/mobile-app/app/(tabs)/items/folder/[manifestId]/[id].tsx
@@ -1,8 +1,7 @@
import { scopedKey, type ItemRef } from '@aliasvault/client/database/ItemRef';
import { canHaveSubfolders, getRecursiveItemCount, isSharedFolder } from '@aliasvault/client/items/FolderUtils';
-import { ItemFilter, applyTypeFilter, isItemTypeFilter, parseItemFilterType, type ItemFilterType } from '@aliasvault/client/items/ItemFilters';
+import { ItemFilter, applySearchFilter, applyTypeFilter, isItemTypeFilter, parseItemFilterType, type ItemFilterType } from '@aliasvault/client/items/ItemFilters';
import { multiManifestRendering } from '@aliasvault/client/sharing/MultiManifestRendering';
-import { getFieldValue, FieldKey } from '@aliasvault/models/vault';
import MaterialIcons from '@expo/vector-icons/MaterialIcons';
import { useNavigation, useRouter, useLocalSearchParams } from 'expo-router';
import { useState, useEffect, useCallback, useRef, useMemo } from 'react';
@@ -135,27 +134,7 @@ export default function FolderViewScreen(): React.ReactNode {
*/
const filteredItems = useMemo(() => {
const typeFiltered = applyTypeFilter(itemsList, filterType);
-
- const searchLower = searchQuery.toLowerCase().trim();
- if (!searchLower) {
- return typeFiltered;
- }
-
- const searchWords = searchLower.split(/\s+/).filter(word => word.length > 0);
-
- return typeFiltered.filter(item => {
- const searchableFields = [
- item.Name?.toLowerCase() || '',
- getFieldValue(item, FieldKey.LoginUsername)?.toLowerCase() || '',
- getFieldValue(item, FieldKey.LoginEmail)?.toLowerCase() || '',
- getFieldValue(item, FieldKey.LoginUrl)?.toLowerCase() || '',
- getFieldValue(item, FieldKey.NotesContent)?.toLowerCase() || '',
- ];
-
- return searchWords.every(word =>
- searchableFields.some(field => field.includes(word))
- );
- });
+ return applySearchFilter(typeFiltered, searchQuery);
}, [itemsList, searchQuery, filterType]);
/**
diff --git a/apps/mobile-app/app/(tabs)/items/index.tsx b/apps/mobile-app/app/(tabs)/items/index.tsx
index a3a6a604f..f9faf893e 100644
--- a/apps/mobile-app/app/(tabs)/items/index.tsx
+++ b/apps/mobile-app/app/(tabs)/items/index.tsx
@@ -1,8 +1,7 @@
import { scopedKey, type ItemRef } from '@aliasvault/client/database/ItemRef';
import { CredentialSortOrder } from '@aliasvault/client/database/repositories/SettingsRepository';
import { getRecursiveItemCount, isSharedFolder } from '@aliasvault/client/items/FolderUtils';
-import { ItemFilter, applyTypeFilter, isItemTypeFilter, type ItemFilterType } from '@aliasvault/client/items/ItemFilters';
-import { getFieldValue, FieldKey } from '@aliasvault/models/vault';
+import { ItemFilter, applySearchFilter, applyTypeFilter, isItemTypeFilter, type ItemFilterType } from '@aliasvault/client/items/ItemFilters';
import MaterialIcons from '@expo/vector-icons/MaterialIcons';
import { useNavigation, useRouter, useLocalSearchParams } from 'expo-router';
import { useState, useEffect, useCallback, useRef, useMemo } from 'react';
@@ -249,27 +248,7 @@ export default function ItemsScreen(): React.ReactNode {
: itemsList;
const typeFiltered = applyTypeFilter(folderScoped, filterType);
-
- const searchLower = searchQuery.toLowerCase().trim();
- if (!searchLower) {
- return typeFiltered;
- }
-
- const searchWords = searchLower.split(/\s+/).filter(word => word.length > 0);
-
- return typeFiltered.filter(item => {
- const searchableFields = [
- item.Name?.toLowerCase() || '',
- getFieldValue(item, FieldKey.LoginUsername)?.toLowerCase() || '',
- getFieldValue(item, FieldKey.LoginEmail)?.toLowerCase() || '',
- getFieldValue(item, FieldKey.LoginUrl)?.toLowerCase() || '',
- getFieldValue(item, FieldKey.NotesContent)?.toLowerCase() || '',
- ];
-
- return searchWords.every(word =>
- searchableFields.some(field => field.includes(word))
- );
- });
+ return applySearchFilter(typeFiltered, searchQuery);
}, [itemsList, searchQuery, filterType, showFolderItems]);
/**
diff --git a/apps/mobile-app/ios/VaultUI/Selection/Utils/ItemSearchMatcher.swift b/apps/mobile-app/ios/VaultUI/Selection/Utils/ItemSearchMatcher.swift
index 36343746c..2f5b93bda 100644
--- a/apps/mobile-app/ios/VaultUI/Selection/Utils/ItemSearchMatcher.swift
+++ b/apps/mobile-app/ios/VaultUI/Selection/Utils/ItemSearchMatcher.swift
@@ -4,10 +4,8 @@ import VaultModels
/// Free-text search matcher for items/credentials.
/// Uses substring matching across all searchable fields.
///
-/// Matches behavior of:
-/// - React Native: apps/mobile-app/app/(tabs)/items/index.tsx (lines 269-281)
-/// - Browser Extension: apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts (filterItemsBySearchTerm)
-/// - Blazor Web: apps/server/AliasVault.Client/Main/Components/Widgets/SearchWidget.razor (lines 224-234)
+/// Uses the same word matching as the item search of the apps (core/client/src/items/ItemFilters.ts, applySearchFilter),
+/// over the login fields an autofill credential carries; that search also matches the other non-secret fields of an item.
public class ItemSearchMatcher {
/// Filter credentials/items for free-text search using substring matching.
diff --git a/core/client/src/items/ItemFilters.ts b/core/client/src/items/ItemFilters.ts
index 7f8c76a36..2d9fa4b43 100644
--- a/core/client/src/items/ItemFilters.ts
+++ b/core/client/src/items/ItemFilters.ts
@@ -86,14 +86,14 @@ const isSecretField = (field: ItemField): boolean => field.IsHidden || field.Fie
* of a password cannot reveal which items hold it. Shared with the current-site suggestion
* so the suggested match count always equals what the search field itself returns.
*/
-export function applySearchFilter(items: Item[], searchTerm: string): Item[] {
+export function applySearchFilter<T extends Pick<Item, 'Name' | 'Fields'>>(items: T[], searchTerm: string): T[] {
const searchWords = searchTerm.toLowerCase().trim().split(/\s+/).filter(word => word.length > 0);
if (searchWords.length === 0) {
return items;
}
- return items.filter((item: Item) => {
+ return items.filter((item) => {
const searchableFields: string[] = [
item.Name?.toLowerCase() ?? '',
];