Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Refactor browser extension and move all local preferences to shared LocalPreferencesService.ts (#1598)
Leendert de Borst435478de532e
diff --git a/apps/browser-extension/src/entrypoints/background.ts b/apps/browser-extension/src/entrypoints/background.tsindex 8c126925e..8164588f9 100644--- a/apps/browser-extension/src/entrypoints/background.ts+++ b/apps/browser-extension/src/entrypoints/background.ts@@ -11,10 +11,10 @@ import { handleGetWebAuthnSettings, handleWebAuthnCreate, handleWebAuthnGet, hanimport { handleOpenPopup, handlePopupWithItem, handleOpenPopupCreateCredential, handleToggleContextMenu } from '@/entrypoints/background/PopupMessageHandler';import { handleCheckAuthStatus, handleClearPersistedFormValues, handleClearSession, handleClearVaultData, handleLockVault, handleCreateItem, handleGetFilteredItems, handleGetSearchItems, handleGetDefaultEmailDomain, handleGetDefaultIdentitySettings, handleGetEncryptionKey, handleGetEncryptionKeyDerivationParams, handleGetPasswordSettings, handleGetPersistedFormValues, handleGetVault, handlePersistFormValues, handleStoreEncryptionKey, handleStoreEncryptionKeyDerivationParams, handleStoreVaultMetadata, handleSyncVault, handleUploadVault, handleGetEncryptedVault, handleStoreEncryptedVault, handleGetSyncState, handleMarkVaultClean, handleGetServerRevision } from '@/entrypoints/background/VaultMessageHandler';-import { GLOBAL_CONTEXT_MENU_ENABLED_KEY } from '@/utils/Constants';import { EncryptionKeyDerivationParams } from "@/utils/dist/core/models/metadata";+import { LocalPreferencesService } from '@/utils/LocalPreferencesService';-import { defineBackground, storage, browser } from '#imports';+import { defineBackground, browser } from '#imports';export default defineBackground({/**@@ -83,7 +83,7 @@ export default defineBackground({onMessage('GET_REQUEST_DATA', ({ data }) => handleGetRequestData(data));// Setup context menus- const isContextMenuEnabled = await storage.getItem(GLOBAL_CONTEXT_MENU_ENABLED_KEY) ?? true;+ const isContextMenuEnabled = await LocalPreferencesService.getGlobalContextMenuEnabled();if (isContextMenuEnabled) {await setupContextMenus();}diff --git a/apps/browser-extension/src/entrypoints/background/AutolockTimeoutHandler.ts b/apps/browser-extension/src/entrypoints/background/AutolockTimeoutHandler.tsindex 4b5c67241..adac1ee59 100644--- a/apps/browser-extension/src/entrypoints/background/AutolockTimeoutHandler.ts+++ b/apps/browser-extension/src/entrypoints/background/AutolockTimeoutHandler.ts@@ -2,7 +2,7 @@ import { storage } from 'wxt/utils/storage';import { handleLockVault } from '@/entrypoints/background/VaultMessageHandler';-import { AUTO_LOCK_TIMEOUT_KEY } from '@/utils/Constants';+import { LocalPreferencesService } from '@/utils/LocalPreferencesService';let autoLockTimer: NodeJS.Timeout | null = null;@@ -24,7 +24,7 @@ export function handlePopupHeartbeat(): void {* Set the auto-lock timeout setting.*/export async function handleSetAutoLockTimeout(timeout: number): Promise<boolean> {- await storage.setItem(AUTO_LOCK_TIMEOUT_KEY, timeout);+ await LocalPreferencesService.setAutoLockTimeout(timeout);resetAutoLockTimer();return true;}@@ -40,7 +40,7 @@ async function resetAutoLockTimer(): Promise<void> {}// Get timeout setting- const timeout = await storage.getItem(AUTO_LOCK_TIMEOUT_KEY) as number ?? 0;+ const timeout = await LocalPreferencesService.getAutoLockTimeout();// Don't set timer if timeout is 0 (disabled) or if vault is already lockedif (timeout === 0) {@@ -74,7 +74,7 @@ async function resetAutoLockTimer(): Promise<void> {*/async function extendAutoLockTimer(): Promise<void> {// Get timeout setting- const timeout = await storage.getItem(AUTO_LOCK_TIMEOUT_KEY) as number ?? 0;+ const timeout = await LocalPreferencesService.getAutoLockTimeout();// Don't extend timer if timeout is 0 (disabled)if (timeout === 0) {diff --git a/apps/browser-extension/src/entrypoints/background/PasskeyHandler.ts b/apps/browser-extension/src/entrypoints/background/PasskeyHandler.tsindex c31b49d76..25d52abc6 100644--- a/apps/browser-extension/src/entrypoints/background/PasskeyHandler.ts+++ b/apps/browser-extension/src/entrypoints/background/PasskeyHandler.ts@@ -5,13 +5,10 @@/* eslint-disable @typescript-eslint/no-explicit-any */import { handleGetEncryptionKey } from '@/entrypoints/background/VaultMessageHandler';-import {- PASSKEY_PROVIDER_ENABLED_KEY,- PASSKEY_DISABLED_SITES_KEY-} from '@/utils/Constants';import type { PasskeyWithItem } from '@/utils/db/mappers/PasskeyMapper';import { EncryptionUtility } from '@/utils/EncryptionUtility';import { extractDomain, extractRootDomain } from '@/utils/itemMatcher/ItemMatcher';+import { LocalPreferencesService } from '@/utils/LocalPreferencesService';import { PasskeyHelper } from '@/utils/passkey/PasskeyHelper';import type {PasskeyPopupResponse,@@ -46,8 +43,8 @@ const pendingRequestData = new Map<string, PendingPasskeyRequest>();*/export async function handleGetWebAuthnSettings(data: any): Promise<WebAuthnSettingsResponse> {// Check if passkey provider is enabled in settings (default to true if not set)- const globalEnabled = await storage.getItem(PASSKEY_PROVIDER_ENABLED_KEY);- if (globalEnabled === false) {+ const globalEnabled = await LocalPreferencesService.getPasskeyProviderEnabled();+ if (!globalEnabled) {return { enabled: false };}@@ -58,7 +55,7 @@ export async function handleGetWebAuthnSettings(data: any): Promise<WebAuthnSettconst baseDomain = await extractRootDomain(await extractDomain(hostname));// Check disabled sites- const disabledSites = await storage.getItem(PASSKEY_DISABLED_SITES_KEY) as string[] ?? [];+ const disabledSites = await LocalPreferencesService.getPasskeyDisabledSites();if (disabledSites.includes(baseDomain)) {return { enabled: false };}diff --git a/apps/browser-extension/src/entrypoints/background/PopupMessageHandler.ts b/apps/browser-extension/src/entrypoints/background/PopupMessageHandler.tsindex eb8e8dfb4..4e99f6885 100644--- a/apps/browser-extension/src/entrypoints/background/PopupMessageHandler.ts+++ b/apps/browser-extension/src/entrypoints/background/PopupMessageHandler.ts@@ -1,7 +1,7 @@/* eslint-disable @typescript-eslint/no-explicit-any */import { setupContextMenus } from '@/entrypoints/background/ContextMenu';-import { SKIP_FORM_RESTORE_KEY } from '@/utils/Constants';+import { LocalPreferencesService } from '@/utils/LocalPreferencesService';import { BoolResponse } from '@/utils/types/messaging/BoolResponse';import { browser } from '#imports';@@ -60,7 +60,7 @@ export function handleOpenPopupCreateCredential(message: any) : Promise<BoolResp}// Set a localStorage flag to skip restoring previously persisted form values as we want to start fresh with this explicit create item request.- await browser.storage.local.set({ [SKIP_FORM_RESTORE_KEY]: true });+ await LocalPreferencesService.setSkipFormRestore(true);const urlParams = new URLSearchParams();urlParams.set('expanded', 'true');@@ -99,4 +99,4 @@ export function handleToggleContextMenu(message: any) : Promise<BoolResponse> {}return { success: true };})();-}\ No newline at end of file+}diff --git a/apps/browser-extension/src/entrypoints/contentScript/Popup.ts b/apps/browser-extension/src/entrypoints/contentScript/Popup.tsindex 2b2da1d76..adc04e3e6 100644--- a/apps/browser-extension/src/entrypoints/contentScript/Popup.ts+++ b/apps/browser-extension/src/entrypoints/contentScript/Popup.ts@@ -2,13 +2,12 @@ import { sendMessage } from 'webext-bridge/content-script';import { fillItem } from '@/entrypoints/contentScript/Form';-import { DISABLED_SITES_KEY, TEMPORARY_DISABLED_SITES_KEY, GLOBAL_AUTOFILL_POPUP_ENABLED_KEY, VAULT_LOCKED_DISMISS_UNTIL_KEY, AUTOFILL_MATCHING_MODE_KEY, CUSTOM_EMAIL_HISTORY_KEY, CUSTOM_USERNAME_HISTORY_KEY } from '@/utils/Constants';import { CreateIdentityGenerator, IdentityHelperUtils } from '@/utils/dist/core/identity-generator';import { ItemTypeIconSvgs } from '@/utils/dist/core/models/icons';import type { Item, ItemField } from '@/utils/dist/core/models/vault';import { ItemTypes, FieldKey, createSystemField } from '@/utils/dist/core/models/vault';import { CreatePasswordGenerator, PasswordGenerator, PasswordSettings } from '@/utils/dist/core/password-generator';-import { AutofillMatchingMode } from '@/utils/itemMatcher/ItemMatcher';+import { LocalPreferencesService } from '@/utils/LocalPreferencesService';import { ClickValidator } from '@/utils/security/ClickValidator';import { ServiceDetectionUtility } from '@/utils/serviceDetection/ServiceDetectionUtility';import { SqliteClient } from '@/utils/SqliteClient';@@ -19,8 +18,6 @@ import { StringResponse } from '@/utils/types/messaging/StringResponse';import { t } from '@/i18n/StandaloneI18n';-import { storage } from '#imports';-/*** WeakMap to store event listeners for popup containers*/@@ -87,7 +84,7 @@ export function openAutofillPopup(input: HTMLInputElement, container: HTMLElemen(async () : Promise<void> => {// Load autofill matching mode setting to send to background for filtering- const matchingMode = await storage.getItem(AUTOFILL_MATCHING_MODE_KEY) as AutofillMatchingMode ?? AutofillMatchingMode.DEFAULT;+ const matchingMode = await LocalPreferencesService.getAutofillMatchingMode();const response = await sendMessage('GET_FILTERED_ITEMS', {currentUrl: window.location.href,@@ -782,9 +779,9 @@ function createItemList(items: Item[], input: HTMLInputElement, rootContainer: H* Check if auto-popup is disabled for current site*/export async function isAutoShowPopupEnabled(): Promise<boolean> {- const disabledSites = await storage.getItem(DISABLED_SITES_KEY) as string[] ?? [];- const temporaryDisabledSites = await storage.getItem(TEMPORARY_DISABLED_SITES_KEY) as Record<string, number> ?? {};- const globalPopupEnabled = await storage.getItem(GLOBAL_AUTOFILL_POPUP_ENABLED_KEY) ?? true;+ const disabledSites = await LocalPreferencesService.getDisabledSites();+ const temporaryDisabledSites = await LocalPreferencesService.getTemporaryDisabledSites();+ const globalPopupEnabled = await LocalPreferencesService.getGlobalAutofillPopupEnabled();const currentHostname = window.location.hostname;@@ -806,7 +803,7 @@ export async function isAutoShowPopupEnabled(): Promise<boolean> {}// Check time-based dismissal- const dismissUntil = await storage.getItem(VAULT_LOCKED_DISMISS_UNTIL_KEY) as number;+ const dismissUntil = await LocalPreferencesService.getVaultLockedDismissUntil();if (dismissUntil && Date.now() < dismissUntil) {// Popup is dismissed for a certain amount of time.return false;@@ -823,15 +820,15 @@ export async function disableAutoShowPopup(temporary: boolean = false): Promise<if (temporary) {// Add to temporary disabled sites with 1 hour expiry- const temporaryDisabledSites = await storage.getItem(TEMPORARY_DISABLED_SITES_KEY) as Record<string, number> ?? {};+ const temporaryDisabledSites = await LocalPreferencesService.getTemporaryDisabledSites();temporaryDisabledSites[currentHostname] = Date.now() + (60 * 60 * 1000); // 1 hour from now- await storage.setItem(TEMPORARY_DISABLED_SITES_KEY, temporaryDisabledSites);+ await LocalPreferencesService.setTemporaryDisabledSites(temporaryDisabledSites);} else {// Add to permanently disabled sites- const disabledSites = await storage.getItem(DISABLED_SITES_KEY) as string[] ?? [];+ const disabledSites = await LocalPreferencesService.getDisabledSites();if (!disabledSites.includes(currentHostname)) {disabledSites.push(currentHostname);- await storage.setItem(DISABLED_SITES_KEY, disabledSites);+ await LocalPreferencesService.setDisabledSites(disabledSites);}}}@@ -844,8 +841,8 @@ export async function createAliasCreationPopup(suggestedNames: string[], rootConremoveExistingPopup(rootContainer);// Load history- const emailHistory = await storage.getItem(CUSTOM_EMAIL_HISTORY_KEY) as string[] ?? [];- const usernameHistory = await storage.getItem(CUSTOM_USERNAME_HISTORY_KEY) as string[] ?? [];+ const emailHistory = await LocalPreferencesService.getCustomEmailHistory();+ const usernameHistory = await LocalPreferencesService.getCustomUsernameHistory();return new Promise((resolve) => {(async (): Promise<void> => {@@ -1071,8 +1068,10 @@ export async function createAliasCreationPopup(suggestedNames: string[], rootCon/*** Update history with new value (max 2 unique entries)*/- const updateHistory = async (value: string, historyKey: typeof CUSTOM_EMAIL_HISTORY_KEY | typeof CUSTOM_USERNAME_HISTORY_KEY, maxItems: number = 2): Promise<string[]> => {- const history = await storage.getItem(historyKey) as string[] ?? [];+ const updateHistory = async (value: string, historyType: 'email' | 'username', maxItems: number = 2): Promise<string[]> => {+ const history = historyType === 'email'+ ? await LocalPreferencesService.getCustomEmailHistory()+ : await LocalPreferencesService.getCustomUsernameHistory();// Remove the value if it already existsconst filteredHistory = history.filter((item: string) => item !== value);@@ -1086,7 +1085,11 @@ export async function createAliasCreationPopup(suggestedNames: string[], rootConconst updatedHistory = filteredHistory.slice(0, maxItems);// Save the updated history- await storage.setItem(historyKey, updatedHistory);+ if (historyType === 'email') {+ await LocalPreferencesService.setCustomEmailHistory(updatedHistory);+ } else {+ await LocalPreferencesService.setCustomUsernameHistory(updatedHistory);+ }return updatedHistory;};@@ -1094,10 +1097,16 @@ export async function createAliasCreationPopup(suggestedNames: string[], rootCon/*** Remove item from history*/- const removeFromHistory = async (value: string, historyKey: typeof CUSTOM_EMAIL_HISTORY_KEY | typeof CUSTOM_USERNAME_HISTORY_KEY): Promise<string[]> => {- const history = await storage.getItem(historyKey) as string[] ?? [];+ const removeFromHistory = async (value: string, historyType: 'email' | 'username'): Promise<string[]> => {+ const history = historyType === 'email'+ ? await LocalPreferencesService.getCustomEmailHistory()+ : await LocalPreferencesService.getCustomUsernameHistory();const updatedHistory = history.filter((item: string) => item !== value);- await storage.setItem(historyKey, updatedHistory);+ if (historyType === 'email') {+ await LocalPreferencesService.setCustomEmailHistory(updatedHistory);+ } else {+ await LocalPreferencesService.setCustomUsernameHistory(updatedHistory);+ }return updatedHistory;};@@ -1168,7 +1177,7 @@ export async function createAliasCreationPopup(suggestedNames: string[], rootConif (target.classList.contains('av-suggestion-pill-delete')) {const value = target.dataset.value;if (value) {- const updatedHistory = await removeFromHistory(value, CUSTOM_EMAIL_HISTORY_KEY);+ const updatedHistory = await removeFromHistory(value, 'email');emailHistory.splice(0, emailHistory.length, ...updatedHistory);updateSuggestions(customEmail, emailSuggestions, emailHistory);}@@ -1196,7 +1205,7 @@ export async function createAliasCreationPopup(suggestedNames: string[], rootConif (target.classList.contains('av-suggestion-pill-delete')) {const value = target.dataset.value;if (value) {- const updatedHistory = await removeFromHistory(value, CUSTOM_USERNAME_HISTORY_KEY);+ const updatedHistory = await removeFromHistory(value, 'username');usernameHistory.splice(0, usernameHistory.length, ...updatedHistory);updateSuggestions(customUsername, usernameSuggestions, usernameHistory);}@@ -1628,10 +1637,10 @@ export async function createAliasCreationPopup(suggestedNames: string[], rootCon// Update history when savingif (finalEmail) {- await updateHistory(finalEmail, CUSTOM_EMAIL_HISTORY_KEY);+ await updateHistory(finalEmail, 'email');}if (finalUsername) {- await updateHistory(finalUsername, CUSTOM_USERNAME_HISTORY_KEY);+ await updateHistory(finalUsername, 'username');}closePopup({@@ -1876,11 +1885,11 @@ export async function dismissVaultLockedPopup(): Promise<void> {if (authStatus.isLoggedIn) {// User is logged in - dismiss for 4 hoursconst fourHoursFromNow = Date.now() + (4 * 60 * 60 * 1000);- await storage.setItem(VAULT_LOCKED_DISMISS_UNTIL_KEY, fourHoursFromNow);+ await LocalPreferencesService.setVaultLockedDismissUntil(fourHoursFromNow);} else {// User is not logged in - dismiss for 3 daysconst threeDaysFromNow = Date.now() + (3 * 24 * 60 * 60 * 1000);- await storage.setItem(VAULT_LOCKED_DISMISS_UNTIL_KEY, threeDaysFromNow);+ await LocalPreferencesService.setVaultLockedDismissUntil(threeDaysFromNow);}}diff --git a/apps/browser-extension/src/entrypoints/popup/context/AuthContext.tsx b/apps/browser-extension/src/entrypoints/popup/context/AuthContext.tsxindex c78fb449c..cdc2b3157 100644--- a/apps/browser-extension/src/entrypoints/popup/context/AuthContext.tsx+++ b/apps/browser-extension/src/entrypoints/popup/context/AuthContext.tsx@@ -3,7 +3,7 @@ import { sendMessage } from 'webext-bridge/popup';import { useDb } from '@/entrypoints/popup/context/DbContext';-import { VAULT_LOCKED_DISMISS_UNTIL_KEY } from '@/utils/Constants';+import { LocalPreferencesService } from '@/utils/LocalPreferencesService';import { removeAndDisablePin } from '@/utils/PinUnlockService';import { storage } from '#imports';@@ -60,7 +60,7 @@ export const AuthProvider: React.FC<{ children: React.ReactNode }> = ({ childrenawait storage.setItem('local:refreshToken', refreshToken);// Clear dismiss until (which can be enabled after user has dimissed vault is locked popup) to ensure popup is shown.- await storage.setItem(VAULT_LOCKED_DISMISS_UNTIL_KEY, 0);+ await LocalPreferencesService.setVaultLockedDismissUntil(0);setUsername(username);}, []);diff --git a/apps/browser-extension/src/entrypoints/popup/hooks/useVaultLockRedirect.ts b/apps/browser-extension/src/entrypoints/popup/hooks/useVaultLockRedirect.tsindex 0c27e10b5..d6a66537e 100644--- a/apps/browser-extension/src/entrypoints/popup/hooks/useVaultLockRedirect.ts+++ b/apps/browser-extension/src/entrypoints/popup/hooks/useVaultLockRedirect.ts@@ -3,9 +3,7 @@ import { useLocation, useNavigate } from 'react-router-dom';import { useDb } from '@/entrypoints/popup/context/DbContext';-import { PENDING_REDIRECT_URL_KEY } from '@/utils/Constants';--import { storage } from '#imports';+import { LocalPreferencesService } from '@/utils/LocalPreferencesService';/*** Hook to handle vault lock redirects.@@ -27,7 +25,7 @@ export function useVaultLockRedirect(options: { enabled?: boolean } = {}): { isLif (!dbAvailable) {// Store the full current URL (pathname + search) for restoration after unlockconst currentUrl = `${location.pathname}${location.search}`;- storage.setItem(PENDING_REDIRECT_URL_KEY, currentUrl);+ LocalPreferencesService.setPendingRedirectUrl(currentUrl);// Navigate to unlock without redirect in URL - we use storage insteadnavigate('/unlock');@@ -46,9 +44,9 @@ export function useVaultLockRedirect(options: { enabled?: boolean } = {}): { isL* @returns The pending redirect URL, or null if none exists*/export async function consumePendingRedirectUrl(): Promise<string | null> {- const url = await storage.getItem<string>(PENDING_REDIRECT_URL_KEY);+ const url = await LocalPreferencesService.getPendingRedirectUrl();if (url) {- await storage.removeItem(PENDING_REDIRECT_URL_KEY);+ await LocalPreferencesService.setPendingRedirectUrl(null);}return url;}@@ -58,5 +56,5 @@ export async function consumePendingRedirectUrl(): Promise<string | null> {* Used when popup is opened without a specific hash path to clear stale redirects.*/export async function clearPendingRedirectUrl(): Promise<void> {- await storage.removeItem(PENDING_REDIRECT_URL_KEY);+ await LocalPreferencesService.setPendingRedirectUrl(null);}diff --git a/apps/browser-extension/src/entrypoints/popup/pages/auth/AuthSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/auth/AuthSettings.tsxindex cd382d642..2518a2bfa 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/AuthSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/AuthSettings.tsx@@ -6,7 +6,7 @@ import LanguageSwitcher from '@/entrypoints/popup/components/LanguageSwitcher';import { useLoading } from '@/entrypoints/popup/context/LoadingContext';import { AppInfo } from '@/utils/AppInfo';-import { GLOBAL_AUTOFILL_POPUP_ENABLED_KEY, DISABLED_SITES_KEY, VAULT_LOCKED_DISMISS_UNTIL_KEY } from '@/utils/Constants';+import { LocalPreferencesService } from '@/utils/LocalPreferencesService';import { storage } from '#imports';@@ -102,8 +102,8 @@ const AuthSettings: React.FC = () => {const loadStoredSettings = async () : Promise<void> => {const apiUrl = await storage.getItem('local:apiUrl') as string;const clientUrl = await storage.getItem('local:clientUrl') as string;- const globallyEnabled = await storage.getItem(GLOBAL_AUTOFILL_POPUP_ENABLED_KEY) !== false; // Default to true if not set- const dismissUntil = await storage.getItem(VAULT_LOCKED_DISMISS_UNTIL_KEY) as number;+ const globallyEnabled = await LocalPreferencesService.getGlobalAutofillPopupEnabled();+ const dismissUntil = await LocalPreferencesService.getVaultLockedDismissUntil();if (dismissUntil) {setIsGloballyEnabled(false);@@ -208,12 +208,12 @@ const AuthSettings: React.FC = () => {const toggleGlobalPopup = async () : Promise<void> => {const newGloballyEnabled = !isGloballyEnabled;- await storage.setItem(GLOBAL_AUTOFILL_POPUP_ENABLED_KEY, newGloballyEnabled);+ await LocalPreferencesService.setGlobalAutofillPopupEnabled(newGloballyEnabled);if (newGloballyEnabled) {// Reset all disabled sites when enabling globally- await storage.setItem(DISABLED_SITES_KEY, []);- await storage.setItem(VAULT_LOCKED_DISMISS_UNTIL_KEY, 0);+ await LocalPreferencesService.setDisabledSites([]);+ await LocalPreferencesService.setVaultLockedDismissUntil(0);}setIsGloballyEnabled(newGloballyEnabled);diff --git a/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx b/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsxindex 53ae40a5d..672b10c84 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx@@ -20,8 +20,8 @@ import { PopoutUtility } from '@/entrypoints/popup/utils/PopoutUtility';import SrpUtility from '@/entrypoints/popup/utils/SrpUtility';import { SrpAuthService } from '@/utils/auth/SrpAuthService';-import { VAULT_LOCKED_DISMISS_UNTIL_KEY } from '@/utils/Constants';import type { EncryptionKeyDerivationParams } from '@/utils/dist/core/models/metadata';+import { LocalPreferencesService } from '@/utils/LocalPreferencesService';import {getPinLength,isPinEnabled,@@ -34,8 +34,6 @@ import {import { VaultVersionIncompatibleError } from '@/utils/types/errors/VaultVersionIncompatibleError';import type { MobileLoginResult } from '@/utils/types/messaging/MobileLoginResult';-import { storage } from '#imports';-/*** Unlock mode type*/@@ -292,7 +290,7 @@ const Unlock: React.FC = () => {}// Clear dismiss until- await storage.setItem(VAULT_LOCKED_DISMISS_UNTIL_KEY, 0);+ await LocalPreferencesService.setVaultLockedDismissUntil(0);// Reset PIN failed attempts on successful password unlockawait resetFailedAttempts();@@ -390,7 +388,7 @@ const Unlock: React.FC = () => {}// Clear dismiss until- await storage.setItem(VAULT_LOCKED_DISMISS_UNTIL_KEY, 0);+ await LocalPreferencesService.setVaultLockedDismissUntil(0);// Navigate to reinitialize which will call syncVault to sync with servernavigate('/reinitialize', { replace: true });@@ -485,7 +483,7 @@ const Unlock: React.FC = () => {}// Clear dismiss until- await storage.setItem(VAULT_LOCKED_DISMISS_UNTIL_KEY, 0);+ await LocalPreferencesService.setVaultLockedDismissUntil(0);// Reset PIN failed attempts on successful unlockawait resetFailedAttempts();diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsxindex 73aae1b81..b99eeb53a 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemAddEdit.tsx@@ -28,13 +28,11 @@ import useFormPersistence from '@/entrypoints/popup/hooks/useFormPersistence';import useServiceDetection from '@/entrypoints/popup/hooks/useServiceDetection';import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';-import { SKIP_FORM_RESTORE_KEY } from '@/utils/Constants';import { UsernameEmailGenerator, Gender } from '@/utils/dist/core/identity-generator';import type { Item, ItemField, ItemType, FieldType, Attachment, TotpCode, PasswordSettings } from '@/utils/dist/core/models/vault';import { FieldCategories, FieldTypes, ItemTypes, getSystemFieldsForItemType, getOptionalFieldsForItemType, isFieldShownByDefault, getSystemField, fieldAppliesToType } from '@/utils/dist/core/models/vault';import { FaviconService } from '@/utils/FaviconService';--import { browser } from '#imports';+import { LocalPreferencesService } from '@/utils/LocalPreferencesService';// Valid item types from the shared modelconst VALID_ITEM_TYPES: ItemType[] = [ItemTypes.Login, ItemTypes.Alias, ItemTypes.CreditCard, ItemTypes.Note];@@ -380,10 +378,10 @@ const ItemAddEdit: React.FC = () => {}// Check if we should skip form restoration (e.g., when opened from popout button)- const result = await browser.storage.local.get([SKIP_FORM_RESTORE_KEY]);- if (result[SKIP_FORM_RESTORE_KEY]) {+ const skipFormRestore = await LocalPreferencesService.getSkipFormRestore();+ if (skipFormRestore) {// Clear the flag after using it- await browser.storage.local.remove([SKIP_FORM_RESTORE_KEY]);+ await LocalPreferencesService.setSkipFormRestore(false);} else {// Load persisted form values normallyawait loadPersistedValues();diff --git a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsxindex 33d7f59dd..e8343c269 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/items/ItemsList.tsx@@ -624,7 +624,7 @@ const ItemsList: React.FC = () => {}}className="absolute right-2 top-1/2 -translate-y-1/2 flex items-center gap-1.5 px-2 py-1 text-xs text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300 rounded hover:bg-gray-200 dark:hover:bg-gray-600">- <span>{t('items.filters.showFolders')}</span>+ <span>{t('items.filters.folders')}</span><svgclassName={`w-5 h-5 ${showFolders ? 'text-orange-500 dark:text-orange-400' : 'text-gray-400 dark:text-gray-500'}`}viewBox="0 0 24 24"diff --git a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyAuthenticate.tsx b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyAuthenticate.tsxindex f94a6cf7e..c5178159b 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyAuthenticate.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyAuthenticate.tsx@@ -10,14 +10,12 @@ import { useDb } from '@/entrypoints/popup/context/DbContext';import { useLoading } from '@/entrypoints/popup/context/LoadingContext';import { useVaultLockRedirect } from '@/entrypoints/popup/hooks/useVaultLockRedirect';-import { PASSKEY_DISABLED_SITES_KEY } from '@/utils/Constants';import { extractDomain, extractRootDomain } from '@/utils/itemMatcher/ItemMatcher';+import { LocalPreferencesService } from '@/utils/LocalPreferencesService';import { PasskeyAuthenticator } from '@/utils/passkey/PasskeyAuthenticator';import { PasskeyHelper } from '@/utils/passkey/PasskeyHelper';import type { GetRequest, PasskeyGetCredentialResponse, PendingPasskeyGetRequest, StoredPasskeyRecord } from '@/utils/passkey/types';-import { storage } from "#imports";-/*** PasskeyAuthenticate*/@@ -319,10 +317,10 @@ const PasskeyAuthenticate: React.FC = () => {const hostname = new URL(request.origin).hostname;const baseDomain = await extractRootDomain(await extractDomain(hostname));- const disabledSites = await storage.getItem(PASSKEY_DISABLED_SITES_KEY) as string[] ?? [];+ const disabledSites = await LocalPreferencesService.getPasskeyDisabledSites();if (!disabledSites.includes(baseDomain)) {disabledSites.push(baseDomain);- await storage.setItem(PASSKEY_DISABLED_SITES_KEY, disabledSites);+ await LocalPreferencesService.setPasskeyDisabledSites(disabledSites);}}// For 'once', we don't store anything - just bypass this one timediff --git a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsxindex c43782512..02c095be2 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/passkeys/PasskeyCreate.tsx@@ -14,16 +14,14 @@ import { useWebApi } from '@/entrypoints/popup/context/WebApiContext';import { useVaultLockRedirect } from '@/entrypoints/popup/hooks/useVaultLockRedirect';import { useVaultMutate } from '@/entrypoints/popup/hooks/useVaultMutate';-import { PASSKEY_DISABLED_SITES_KEY } from '@/utils/Constants';import type { Item, Passkey } from '@/utils/dist/core/models/vault';import { FieldKey, ItemTypes, getFieldValue, createSystemField } from '@/utils/dist/core/models/vault';import { extractDomain, extractRootDomain, filterItems, AutofillMatchingMode } from '@/utils/itemMatcher/ItemMatcher';+import { LocalPreferencesService } from '@/utils/LocalPreferencesService';import { PasskeyAuthenticator } from '@/utils/passkey/PasskeyAuthenticator';import { PasskeyHelper } from '@/utils/passkey/PasskeyHelper';import type { CreateRequest, PasskeyCreateCredentialResponse, PendingPasskeyCreateRequest } from '@/utils/passkey/types';-import { storage } from "#imports";-/*** PasskeyCreate*/@@ -495,10 +493,10 @@ const PasskeyCreate: React.FC = () => {const hostname = new URL(request.origin).hostname;const baseDomain = await extractRootDomain(await extractDomain(hostname));- const disabledSites = await storage.getItem(PASSKEY_DISABLED_SITES_KEY) as string[] ?? [];+ const disabledSites = await LocalPreferencesService.getPasskeyDisabledSites();if (!disabledSites.includes(baseDomain)) {disabledSites.push(baseDomain);- await storage.setItem(PASSKEY_DISABLED_SITES_KEY, disabledSites);+ await LocalPreferencesService.setPasskeyDisabledSites(disabledSites);}}// For 'once', we don't store anything - just bypass this one timediff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/AutoLockSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/AutoLockSettings.tsxindex 25ed337aa..733299942 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/AutoLockSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/AutoLockSettings.tsx@@ -5,9 +5,7 @@ import { sendMessage } from 'webext-bridge/popup';import HelpModal from '@/entrypoints/popup/components/Dialogs/HelpModal';import { useLoading } from '@/entrypoints/popup/context/LoadingContext';-import { AUTO_LOCK_TIMEOUT_KEY } from '@/utils/Constants';--import { storage } from "#imports";+import { LocalPreferencesService } from '@/utils/LocalPreferencesService';/*** Auto-lock settings page component.@@ -23,7 +21,7 @@ const AutoLockSettings: React.FC = () => {*/const loadSettings = async () : Promise<void> => {// Load auto-lock timeout- const autoLockTimeoutValue = await storage.getItem(AUTO_LOCK_TIMEOUT_KEY) as number ?? 0;+ const autoLockTimeoutValue = await LocalPreferencesService.getAutoLockTimeout();setAutoLockTimeout(autoLockTimeoutValue);setIsInitialLoading(false);};@@ -35,7 +33,7 @@ const AutoLockSettings: React.FC = () => {* Set auto-lock timeout.*/const setAutoLockTimeoutSetting = async (timeout: number) : Promise<void> => {- await storage.setItem(AUTO_LOCK_TIMEOUT_KEY, timeout);+ await LocalPreferencesService.setAutoLockTimeout(timeout);await sendMessage('SET_AUTO_LOCK_TIMEOUT', timeout, 'background');setAutoLockTimeout(timeout);};@@ -80,4 +78,4 @@ const AutoLockSettings: React.FC = () => {);};-export default AutoLockSettings;\ No newline at end of file+export default AutoLockSettings;diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/AutofillSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/AutofillSettings.tsxindex 7567692b3..5f8c5b758 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/AutofillSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/AutofillSettings.tsx@@ -3,15 +3,9 @@ import { useTranslation } from 'react-i18next';import { useLoading } from '@/entrypoints/popup/context/LoadingContext';-import {- DISABLED_SITES_KEY,- GLOBAL_AUTOFILL_POPUP_ENABLED_KEY,- TEMPORARY_DISABLED_SITES_KEY,- AUTOFILL_MATCHING_MODE_KEY-} from '@/utils/Constants';-import { AutofillMatchingMode } from '@/utils/itemMatcher/ItemMatcher';+import { AutofillMatchingMode, LocalPreferencesService } from '@/utils/LocalPreferencesService';-import { storage, browser } from "#imports";+import { browser } from "#imports";/*** Autofill settings type.@@ -55,10 +49,10 @@ const AutofillSettings: React.FC = () => {const tab = await getCurrentTab();const currentUrl = new URL(tab.url ?? '').hostname;- // Load settings local storage.- const disabledUrls = await storage.getItem(DISABLED_SITES_KEY) as string[] ?? [];- const temporaryDisabledUrls = await storage.getItem(TEMPORARY_DISABLED_SITES_KEY) as Record<string, number> ?? {};- const isGloballyEnabled = await storage.getItem(GLOBAL_AUTOFILL_POPUP_ENABLED_KEY) !== false; // Default to true if not set+ // Load settings using LocalPreferencesService+ const disabledUrls = await LocalPreferencesService.getDisabledSites();+ const temporaryDisabledUrls = await LocalPreferencesService.getTemporaryDisabledSites();+ const isGloballyEnabled = await LocalPreferencesService.getGlobalAutofillPopupEnabled();// Clean up expired temporary disablesconst now = Date.now();@@ -67,11 +61,11 @@ const AutofillSettings: React.FC = () => {);if (Object.keys(cleanedTemporaryDisabledUrls).length !== Object.keys(temporaryDisabledUrls).length) {- await storage.setItem(TEMPORARY_DISABLED_SITES_KEY, cleanedTemporaryDisabledUrls);+ await LocalPreferencesService.setTemporaryDisabledSites(cleanedTemporaryDisabledUrls);}// Load autofill matching mode- const matchingModeValue = await storage.getItem(AUTOFILL_MATCHING_MODE_KEY) as AutofillMatchingMode ?? AutofillMatchingMode.DEFAULT;+ const matchingModeValue = await LocalPreferencesService.getAutofillMatchingMode();setAutofillMatchingMode(matchingModeValue);setSettings({@@ -110,8 +104,8 @@ const AutofillSettings: React.FC = () => {delete newTemporaryDisabledUrls[currentUrl];}- await storage.setItem(DISABLED_SITES_KEY, newDisabledUrls);- await storage.setItem(TEMPORARY_DISABLED_SITES_KEY, newTemporaryDisabledUrls);+ await LocalPreferencesService.setDisabledSites(newDisabledUrls);+ await LocalPreferencesService.setTemporaryDisabledSites(newTemporaryDisabledUrls);setSettings(prev => ({...prev,@@ -125,8 +119,8 @@ const AutofillSettings: React.FC = () => {* Reset settings.*/const resetSettings = async () : Promise<void> => {- await storage.setItem(DISABLED_SITES_KEY, []);- await storage.setItem(TEMPORARY_DISABLED_SITES_KEY, {});+ await LocalPreferencesService.setDisabledSites([]);+ await LocalPreferencesService.setTemporaryDisabledSites({});setSettings(prev => ({...prev,@@ -142,7 +136,7 @@ const AutofillSettings: React.FC = () => {const toggleGlobalPopup = async () : Promise<void> => {const newGloballyEnabled = !settings.isGloballyEnabled;- await storage.setItem(GLOBAL_AUTOFILL_POPUP_ENABLED_KEY, newGloballyEnabled);+ await LocalPreferencesService.setGlobalAutofillPopupEnabled(newGloballyEnabled);setSettings(prev => ({...prev,@@ -154,7 +148,7 @@ const AutofillSettings: React.FC = () => {* Set autofill matching mode.*/const setAutofillMatchingModeSetting = async (mode: AutofillMatchingMode) : Promise<void> => {- await storage.setItem(AUTOFILL_MATCHING_MODE_KEY, mode);+ await LocalPreferencesService.setAutofillMatchingMode(mode);setAutofillMatchingMode(mode);};@@ -257,4 +251,4 @@ const AutofillSettings: React.FC = () => {);};-export default AutofillSettings;\ No newline at end of file+export default AutofillSettings;diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/ClipboardSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/ClipboardSettings.tsxindex 9ba80fe2e..fd35e2fd2 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/ClipboardSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/ClipboardSettings.tsx@@ -4,9 +4,7 @@ import { sendMessage } from 'webext-bridge/popup';import { useLoading } from '@/entrypoints/popup/context/LoadingContext';-import { CLIPBOARD_CLEAR_TIMEOUT_KEY } from '@/utils/Constants';--import { storage } from "#imports";+import { LocalPreferencesService } from '@/utils/LocalPreferencesService';/*** Clipboard settings page component.@@ -22,7 +20,7 @@ const ClipboardSettings: React.FC = () => {*/const loadSettings = async () : Promise<void> => {// Load clipboard clear timeout- const timeout = await storage.getItem(CLIPBOARD_CLEAR_TIMEOUT_KEY) as number ?? 10;+ const timeout = await LocalPreferencesService.getClipboardClearTimeout();setClipboardTimeout(timeout);setIsInitialLoading(false);};@@ -34,7 +32,7 @@ const ClipboardSettings: React.FC = () => {* Set clipboard clear timeout.*/const setClipboardClearTimeout = async (timeout: number) : Promise<void> => {- await storage.setItem(CLIPBOARD_CLEAR_TIMEOUT_KEY, timeout);+ await LocalPreferencesService.setClipboardClearTimeout(timeout);await sendMessage('SET_CLIPBOARD_CLEAR_TIMEOUT', timeout, 'background');setClipboardTimeout(timeout);};@@ -66,4 +64,4 @@ const ClipboardSettings: React.FC = () => {);};-export default ClipboardSettings;\ No newline at end of file+export default ClipboardSettings;diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/ContextMenuSettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/ContextMenuSettings.tsxindex 3284a5a53..e3b3ae828 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/ContextMenuSettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/ContextMenuSettings.tsx@@ -4,9 +4,7 @@ import { sendMessage } from 'webext-bridge/popup';import { useLoading } from '@/entrypoints/popup/context/LoadingContext';-import { GLOBAL_CONTEXT_MENU_ENABLED_KEY } from '@/utils/Constants';--import { storage } from "#imports";+import { LocalPreferencesService } from '@/utils/LocalPreferencesService';/*** Context menu settings page component.@@ -20,7 +18,7 @@ const ContextMenuSettings: React.FC = () => {* Load settings.*/const loadSettings = useCallback(async () : Promise<void> => {- const isEnabled = await storage.getItem(GLOBAL_CONTEXT_MENU_ENABLED_KEY) !== false; // Default to true if not set+ const isEnabled = await LocalPreferencesService.getGlobalContextMenuEnabled();setIsContextMenuEnabled(isEnabled);setIsInitialLoading(false);}, [setIsInitialLoading]);@@ -35,7 +33,7 @@ const ContextMenuSettings: React.FC = () => {const toggleContextMenu = async () : Promise<void> => {const newContextMenuEnabled = !isContextMenuEnabled;- await storage.setItem(GLOBAL_CONTEXT_MENU_ENABLED_KEY, newContextMenuEnabled);+ await LocalPreferencesService.setGlobalContextMenuEnabled(newContextMenuEnabled);await sendMessage('TOGGLE_CONTEXT_MENU', { enabled: newContextMenuEnabled }, 'background');setIsContextMenuEnabled(newContextMenuEnabled);@@ -75,4 +73,4 @@ const ContextMenuSettings: React.FC = () => {);};-export default ContextMenuSettings;\ No newline at end of file+export default ContextMenuSettings;diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/PasskeySettings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/PasskeySettings.tsxindex 6a26f8bc2..ebff301a6 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/PasskeySettings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/PasskeySettings.tsx@@ -3,13 +3,10 @@ import { useTranslation } from 'react-i18next';import { useLoading } from '@/entrypoints/popup/context/LoadingContext';-import {- PASSKEY_PROVIDER_ENABLED_KEY,- PASSKEY_DISABLED_SITES_KEY-} from '@/utils/Constants';import { extractDomain, extractRootDomain } from '@/utils/itemMatcher/ItemMatcher';+import { LocalPreferencesService } from '@/utils/LocalPreferencesService';-import { storage, browser } from "#imports";+import { browser } from "#imports";/*** Passkey settings type.@@ -51,9 +48,9 @@ const PasskeySettings: React.FC = () => {const hostname = new URL(tab.url ?? '').hostname;const baseDomain = await extractRootDomain(await extractDomain(hostname));- // Load settings from local storage- const disabledUrls = await storage.getItem(PASSKEY_DISABLED_SITES_KEY) as string[] ?? [];- const isGloballyEnabled = await storage.getItem(PASSKEY_PROVIDER_ENABLED_KEY) !== false; // Default to true if not set+ // Load settings using LocalPreferencesService+ const disabledUrls = await LocalPreferencesService.getPasskeyDisabledSites();+ const isGloballyEnabled = await LocalPreferencesService.getPasskeyProviderEnabled();// Check if current base domain is disabledconst isEnabled = !disabledUrls.includes(baseDomain);@@ -89,7 +86,7 @@ const PasskeySettings: React.FC = () => {newDisabledUrls = newDisabledUrls.filter(url => url !== currentUrl);}- await storage.setItem(PASSKEY_DISABLED_SITES_KEY, newDisabledUrls);+ await LocalPreferencesService.setPasskeyDisabledSites(newDisabledUrls);setSettings(prev => ({...prev,@@ -102,7 +99,7 @@ const PasskeySettings: React.FC = () => {* Reset settings.*/const resetSettings = async () : Promise<void> => {- await storage.setItem(PASSKEY_DISABLED_SITES_KEY, []);+ await LocalPreferencesService.setPasskeyDisabledSites([]);setSettings(prev => ({...prev,@@ -117,7 +114,7 @@ const PasskeySettings: React.FC = () => {const toggleGlobalPasskeyProvider = async () : Promise<void> => {const newGloballyEnabled = !settings.isGloballyEnabled;- await storage.setItem(PASSKEY_PROVIDER_ENABLED_KEY, newGloballyEnabled);+ await LocalPreferencesService.setPasskeyProviderEnabled(newGloballyEnabled);setSettings(prev => ({...prev,diff --git a/apps/browser-extension/src/i18n/locales/en.json b/apps/browser-extension/src/i18n/locales/en.jsonindex 1f028784c..d652757fe 100644--- a/apps/browser-extension/src/i18n/locales/en.json+++ b/apps/browser-extension/src/i18n/locales/en.json@@ -202,7 +202,7 @@"deleteFolderAndItems": "Delete folder and all items","deleteFolderAndItemsDescription": "{{count}} item(s) will be moved to Recently Deleted.","filters": {- "showFolders": "show folders",+ "folders": "Folders","passkeys": "Passkeys"},"sort": {diff --git a/apps/browser-extension/src/utils/Constants.ts b/apps/browser-extension/src/utils/Constants.tsdeleted file mode 100644index 61f51a305..000000000--- a/apps/browser-extension/src/utils/Constants.ts+++ /dev/null@@ -1,16 +0,0 @@-export const DISABLED_SITES_KEY = 'local:aliasvault_disabled_sites';-export const GLOBAL_AUTOFILL_POPUP_ENABLED_KEY = 'local:aliasvault_global_autofill_popup_enabled';-export const GLOBAL_CONTEXT_MENU_ENABLED_KEY = 'local:aliasvault_global_context_menu_enabled';-export const VAULT_LOCKED_DISMISS_UNTIL_KEY = 'local:aliasvault_vault_locked_dismiss_until';-export const TEMPORARY_DISABLED_SITES_KEY = 'local:aliasvault_temporary_disabled_sites';-export const CLIPBOARD_CLEAR_TIMEOUT_KEY = 'local:aliasvault_clipboard_clear_timeout';-export const AUTO_LOCK_TIMEOUT_KEY = 'local:aliasvault_auto_lock_timeout';-export const AUTOFILL_MATCHING_MODE_KEY = 'local:aliasvault_autofill_matching_mode';-export const PASSKEY_PROVIDER_ENABLED_KEY = 'local:aliasvault_passkey_provider_enabled';-export const PASSKEY_DISABLED_SITES_KEY = 'local:aliasvault_passkey_disabled_sites';-export const PENDING_REDIRECT_URL_KEY = 'session:pendingRedirectUrl';--// TODO: store these settings in the actual vault when updating the datamodel for roadmap v1.0.-export const CUSTOM_EMAIL_HISTORY_KEY = 'local:aliasvault_custom_email_history';-export const CUSTOM_USERNAME_HISTORY_KEY = 'local:aliasvault_custom_username_history';-export const SKIP_FORM_RESTORE_KEY = 'local:aliasvault_skip_form_restore';diff --git a/apps/browser-extension/src/utils/LocalPreferencesService.ts b/apps/browser-extension/src/utils/LocalPreferencesService.tsindex 575b676ab..8cfa730fb 100644--- a/apps/browser-extension/src/utils/LocalPreferencesService.ts+++ b/apps/browser-extension/src/utils/LocalPreferencesService.ts@@ -29,6 +29,10 @@ const KEYS = {// UI preferencesSHOW_FOLDERS: 'local:aliasvault_show_folders',++ // Session/Navigation state+ PENDING_REDIRECT_URL: 'session:pendingRedirectUrl',+ SKIP_FORM_RESTORE: 'local:aliasvault_skip_form_restore',} as const;/**@@ -45,12 +49,6 @@ export enum AutofillMatchingMode {* Provides typed getters/setters with sensible defaults for all local storage settings.*/export const LocalPreferencesService = {- /*- * ============================================- * UI Preferences- * ============================================- */-/*** Get the show folders preference.* @returns Whether to show folders (true) or show all items flat (false). Defaults to true.@@ -67,12 +65,6 @@ export const LocalPreferencesService = {await storage.setItem(KEYS.SHOW_FOLDERS, showFolders);},- /*- * ============================================- * Autofill Settings- * ============================================- */-/*** Get whether the global autofill popup is enabled.* @returns Whether autofill popup is globally enabled. Defaults to true.@@ -137,12 +129,6 @@ export const LocalPreferencesService = {await storage.setItem(KEYS.TEMPORARY_DISABLED_SITES, sites);},- /*- * ============================================- * Context Menu Settings- * ============================================- */-/*** Get whether the global context menu is enabled.* @returns Whether context menu is globally enabled. Defaults to true.@@ -197,12 +183,6 @@ export const LocalPreferencesService = {await storage.setItem(KEYS.PASSKEY_DISABLED_SITES, sites);},- /*- * ============================================- * Timeout Settings- * ============================================- */-/*** Get the clipboard clear timeout in seconds.* @returns Timeout in seconds. Defaults to 10.@@ -289,12 +269,6 @@ export const LocalPreferencesService = {await storage.setItem(KEYS.CUSTOM_USERNAME_HISTORY, history);},- /*- * ============================================- * Utility Methods- * ============================================- */-/*** Clear all UI preferences. Can be called on logout.* Note: This only clears UI preferences, not security-related settings.@@ -330,4 +304,40 @@ export const LocalPreferencesService = {*/]);},++ /**+ * Get the pending redirect URL (used for passkey flows).+ * @returns The pending redirect URL or null if not set.+ */+ async getPendingRedirectUrl(): Promise<string | null> {+ const value = await storage.getItem(KEYS.PENDING_REDIRECT_URL) as string | null;+ return value ?? null;+ },++ /**+ * Set the pending redirect URL.+ */+ async setPendingRedirectUrl(url: string | null): Promise<void> {+ if (url === null) {+ await storage.removeItem(KEYS.PENDING_REDIRECT_URL);+ } else {+ await storage.setItem(KEYS.PENDING_REDIRECT_URL, url);+ }+ },++ /**+ * Get whether form restore should be skipped.+ * @returns Whether to skip form restore. Defaults to false.+ */+ async getSkipFormRestore(): Promise<boolean> {+ const value = await storage.getItem(KEYS.SKIP_FORM_RESTORE) as boolean | null;+ return value ?? false;+ },++ /**+ * Set whether form restore should be skipped.+ */+ async setSkipFormRestore(skip: boolean): Promise<void> {+ await storage.setItem(KEYS.SKIP_FORM_RESTORE, skip);+ },};