Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Make lock vault reuse clear vault logic (#1338)
Leendert de Borstec90890870ba
diff --git a/apps/browser-extension/src/entrypoints/background.ts b/apps/browser-extension/src/entrypoints/background.tsindex f42773163..0cde44cf7 100644--- a/apps/browser-extension/src/entrypoints/background.ts+++ b/apps/browser-extension/src/entrypoints/background.ts@@ -9,7 +9,7 @@ import { handleClipboardCopied, handleCancelClipboardClear, handleGetClipboardClimport { setupContextMenus } from '@/entrypoints/background/ContextMenu';import { handleGetWebAuthnSettings, handleWebAuthnCreate, handleWebAuthnGet, handlePasskeyPopupResponse, handleGetRequestData } from '@/entrypoints/background/PasskeyHandler';import { handleOpenPopup, handlePopupWithCredential, handleOpenPopupCreateCredential, handleToggleContextMenu } from '@/entrypoints/background/PopupMessageHandler';-import { handleCheckAuthStatus, handleClearPersistedFormValues, handleClearVault, handleCreateIdentity, handleGetCredentials, handleGetDefaultEmailDomain, handleGetDefaultIdentitySettings, handleGetEncryptionKey, handleGetEncryptionKeyDerivationParams, handleGetPasswordSettings, handleGetPersistedFormValues, handleGetVault, handleLockVault, handlePersistFormValues, handleStoreEncryptionKey, handleStoreEncryptionKeyDerivationParams, handleStoreVault, handleSyncVault, handleUploadVault } from '@/entrypoints/background/VaultMessageHandler';+import { handleCheckAuthStatus, handleClearPersistedFormValues, handleClearVault, handleCreateIdentity, handleGetCredentials, handleGetDefaultEmailDomain, handleGetDefaultIdentitySettings, handleGetEncryptionKey, handleGetEncryptionKeyDerivationParams, handleGetPasswordSettings, handleGetPersistedFormValues, handleGetVault, handlePersistFormValues, handleStoreEncryptionKey, handleStoreEncryptionKeyDerivationParams, handleStoreVault, handleSyncVault, handleUploadVault } from '@/entrypoints/background/VaultMessageHandler';import { GLOBAL_CONTEXT_MENU_ENABLED_KEY } from '@/utils/Constants';import { EncryptionKeyDerivationParams } from "@/utils/dist/shared/models/metadata";@@ -40,8 +40,6 @@ export default defineBackground({onMessage('CREATE_IDENTITY', ({ data }) => handleCreateIdentity(data));onMessage('UPLOAD_VAULT', ({ data }) => handleUploadVault(data));onMessage('SYNC_VAULT', () => handleSyncVault());-- onMessage('LOCK_VAULT', () => handleLockVault());onMessage('CLEAR_VAULT', () => handleClearVault());onMessage('OPEN_POPUP', () => handleOpenPopup());diff --git a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.tsindex 566b5363e..10327f068 100644--- a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts+++ b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts@@ -235,13 +235,6 @@ export function handleClearVault(return { success: true };}-/**- * Lock the vault by clearing the encryption key from browser storage. This will force the user to unlock the vault again.- */-export function handleLockVault(): void {- storage.removeItem('session:encryptionKey');-}-/*** Get all credentials.*/diff --git a/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx b/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsxindex 66295710d..854b97226 100644--- a/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx+++ b/apps/browser-extension/src/entrypoints/popup/pages/settings/Settings.tsx@@ -119,8 +119,8 @@ const Settings: React.FC = () => {* Handle lock vault.*/const handleLock = async () : Promise<void> => {- // Lock the vault- await sendMessage('LOCK_VAULT', {}, 'background');+ // Clear the vault which will lock it and require user to login again+ await sendMessage('CLEAR_VAULT', {}, 'background');// Navigate to unlock pagenavigate('/unlock');