Skip to content

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

Call clearAuthUserInitiated for explicit logout buttons (#1473)

Leendert de Borst99ab78c4fa6e
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 ff66b3205..53ae40a5d 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/Unlock.tsx
@@ -430,10 +430,16 @@ const Unlock: React.FC = () => {
/**
* Handle logout (after confirmation).
+ * Uses clearAuthUserInitiated to fully clear vault data since user explicitly chose to logout.
*/
- const handleLogout = () : void => {
+ const handleLogout = async () : Promise<void> => {
setShowLogoutConfirm(false);
- app.logout();
+ try {
+ await webApi.revokeTokens();
+ await authContext.clearAuthUserInitiated();
+ } catch (error) {
+ console.error('Error during logout:', error);
+ }
};
/**
diff --git a/apps/browser-extension/src/entrypoints/popup/pages/auth/Upgrade.tsx b/apps/browser-extension/src/entrypoints/popup/pages/auth/Upgrade.tsx
index 7fa7543b7..9ad1895db 100644
--- a/apps/browser-extension/src/entrypoints/popup/pages/auth/Upgrade.tsx
+++ b/apps/browser-extension/src/entrypoints/popup/pages/auth/Upgrade.tsx
@@ -9,6 +9,7 @@ import HeaderButton from '@/entrypoints/popup/components/HeaderButton';
import { HeaderIconType } from '@/entrypoints/popup/components/Icons/HeaderIcons';
import LoadingSpinner from '@/entrypoints/popup/components/LoadingSpinner';
import { useApp } from '@/entrypoints/popup/context/AppContext';
+import { useAuth } from '@/entrypoints/popup/context/AuthContext';
import { useDb } from '@/entrypoints/popup/context/DbContext';
import { useHeaderButtons } from '@/entrypoints/popup/context/HeaderButtonsContext';
import { useLoading } from '@/entrypoints/popup/context/LoadingContext';
@@ -25,7 +26,8 @@ import { VaultSqlGenerator } from '@/utils/dist/core/vault';
*/
const Upgrade: React.FC = () => {
const { t } = useTranslation();
- const { username, logout } = useApp();
+ const { username } = useApp();
+ const auth = useAuth();
const dbContext = useDb();
const { sqliteClient } = dbContext;
const { setHeaderButtons } = useHeaderButtons();
@@ -200,10 +202,16 @@ const Upgrade: React.FC = () => {
/**
* Handle the logout (after confirmation).
+ * Uses clearAuthUserInitiated to fully clear vault data since user explicitly chose to logout.
*/
- const handleLogout = (): void => {
+ const handleLogout = async (): Promise<void> => {
setShowLogoutConfirm(false);
- logout();
+ try {
+ await webApi.revokeTokens();
+ await auth.clearAuthUserInitiated();
+ } catch (error) {
+ console.error('Error during logout:', error);
+ }
};
/**