Skip to content

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

Fix vault unlock sequence from content script (#1338)

Leendert de Borst93adb6d60f32
diff --git a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
index 199f4a218..566b5363e 100644
--- a/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
+++ b/apps/browser-extension/src/entrypoints/background/VaultMessageHandler.ts
@@ -25,9 +25,10 @@ export async function handleCheckAuthStatus() : Promise<{ isLoggedIn: boolean, i
const username = await storage.getItem('local:username');
const accessToken = await storage.getItem('local:accessToken');
const vaultData = await storage.getItem('session:encryptedVault');
+ const encryptionKey = await handleGetEncryptionKey();
const isLoggedIn = username !== null && accessToken !== null;
- const isVaultLocked = isLoggedIn && vaultData === null;
+ const isVaultLocked = isLoggedIn && (vaultData === null || encryptionKey === null);
// If vault is locked, we can't check for pending migrations
if (isVaultLocked) {
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx b/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx
index e8300f0ed..061d0fa12 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx
@@ -428,7 +428,7 @@ const Unlock: React.FC = () => {
/>
{/* On-Screen Numpad */}
- <div className="mb-4">
+ <div>
<div className="grid grid-cols-3 gap-2">
{/* Numbers 1-9 */}
{[1, 2, 3, 4, 5, 6, 7, 8, 9].map((num) => (