From 7c644dd9d296c37080aabfe2e8e130ce3e20a95d Mon Sep 17 00:00:00 2001
From: Yann Amsellem <yann@agnostic.engineering>
Date: Mon, 26 May 2025 20:18:29 +0200
Subject: [PATCH] refactor(auth): update auth.ts

---
 src/lib/auth.ts           | 52 +++++++++++++++++++++------------------
 src/routes/+layout.svelte |  9 +++----
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/src/lib/auth.ts b/src/lib/auth.ts
index 23f7b44..d83f10b 100644
--- a/src/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -1,10 +1,13 @@
 import { type Auth0Client, createAuth0Client } from '@auth0/auth0-spa-js';
 import { onOpenUrl } from '@tauri-apps/plugin-deep-link';
-import { openUrl } from '@tauri-apps/plugin-opener';
+import { openUrl as openUrlWithBrowser } from '@tauri-apps/plugin-opener';
+import mitt from 'mitt';
 
 if (!AUTH0_DOMAIN) throw new Error('AUTH0_DOMAIN is not defined');
 if (!AUTH0_CLIENT_ID) throw new Error('AUTH0_CLIENT_ID is not defined');
 
+const emitter = mitt<{ 'auth:changed': boolean }>();
+
 let client: Auth0Client;
 async function init() {
 	client = await createAuth0Client({
@@ -16,16 +19,18 @@ async function init() {
 		cacheLocation: 'localstorage',
 		useRefreshTokens: true
 	});
+
+	emitter.emit('auth:changed', await client.isAuthenticated());
 }
 
-export async function checkLoginState(onStateChange?: () => void) {
+export async function checkLoginState() {
 	await init();
 
 	if (PLATFORM === 'WEB') {
 		if (window.location.search.includes('code=') && window.location.search.includes('state=')) {
 			await client.handleRedirectCallback();
 			window.history.replaceState({}, document.title, '/');
-			onStateChange?.();
+			emitter.emit('auth:changed', true);
 		}
 	}
 
@@ -37,43 +42,42 @@ export async function checkLoginState(onStateChange?: () => void) {
 
 			if (url) {
 				await client.handleRedirectCallback(url.toString());
-				onStateChange?.();
+				emitter.emit('auth:changed', true);
 			}
 		});
 	}
 }
 
+export function onStateChange(cb: (authenticated: boolean) => unknown) {
+	emitter.on('auth:changed', cb);
+	return () => emitter.off('auth:changed', cb);
+}
+
 export async function isAuthenticated() {
-	if (client) {
-		return await client.isAuthenticated();
-	}
+	if (client) return await client.isAuthenticated();
 	return false;
 }
 
 export async function getToken() {
-	if (client) return await client.getTokenSilently();
+	if (client) {
+		const tokens = await client.getTokenSilently({ detailedResponse: true });
+		return tokens.id_token;
+	}
 }
 
 export async function login() {
-	if (client) {
-		await client.loginWithRedirect({
-			async openUrl(url) {
-				if (PLATFORM === 'WEB') {
-					window.location.assign(url);
-				}
-
-				if (PLATFORM === 'NATIVE') {
-					await openUrl(url);
-				}
-			}
-		});
-	}
+	if (client) await client.loginWithRedirect({ openUrl });
 }
 
 export async function logout() {
-	if (client) {
+	if (client)
 		await client.logout({
-			logoutParams: { returnTo: AUTH0_REDIRECT_URI || window.location.origin }
+			logoutParams: { returnTo: AUTH0_REDIRECT_URI || window.location.origin, federated: false },
+			openUrl
 		});
-	}
+}
+
+async function openUrl(url: string) {
+	if (PLATFORM === 'WEB') window.location.assign(url);
+	if (PLATFORM === 'NATIVE') await openUrlWithBrowser(url);
 }
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index ae5b638..e32bdc5 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -5,7 +5,7 @@
 	import { store } from '$lib/store';
 	import { MigrationManager } from '@agnosticeng/migrate';
 
-	import { checkLoginState, isAuthenticated } from '$lib/auth';
+	import { checkLoginState, onStateChange } from '$lib/auth';
 	import { ContextMenu, ContextMenuState } from '$lib/components/ContextMenu';
 	import { setAppContext } from '$lib/context';
 	import { MIGRATIONS } from '$lib/migrations';
@@ -27,6 +27,8 @@
 		}
 	}
 
+	$effect(() => onStateChange((a) => (authenticated = a)));
+
 	onMount(async () => {
 		const m = new MigrationManager(store);
 		await m.migrate(MIGRATIONS);
@@ -37,10 +39,7 @@
 			await displayOnboarding();
 		}
 
-		await checkLoginState(async () => {
-			authenticated = await isAuthenticated();
-		});
-		authenticated = await isAuthenticated();
+		await checkLoginState();
 
 		mounted = true;
 	});