diff --git a/materialious/src/lib/components/settings/Interface.svelte b/materialious/src/lib/components/settings/Interface.svelte index 5ed90282..393870d3 100644 --- a/materialious/src/lib/components/settings/Interface.svelte +++ b/materialious/src/lib/components/settings/Interface.svelte @@ -11,7 +11,12 @@ import type { RgbaColor, HsvaColor, Colord } from 'colord'; import { _ } from '$lib/i18n'; import { get } from 'svelte/store'; - import { isUnrestrictedPlatform, setInvidiousInstance, goToInvidiousLogin } from '../../misc'; + import { + isUnrestrictedPlatform, + setInvidiousInstance, + goToInvidiousLogin, + invidiousLogout + } from '../../misc'; import { getPages, type Pages } from '../../navPages'; import ColorPicker from 'svelte-awesome-color-picker'; import { @@ -158,12 +163,7 @@ {$_('linkInvidious')} {:else} - diff --git a/materialious/src/lib/components/settings/InternalAccount.svelte b/materialious/src/lib/components/settings/InternalAccount.svelte index 7e8e9bc3..d9e28c80 100644 --- a/materialious/src/lib/components/settings/InternalAccount.svelte +++ b/materialious/src/lib/components/settings/InternalAccount.svelte @@ -1,6 +1,6 @@ diff --git a/materialious/src/lib/misc.ts b/materialious/src/lib/misc.ts index 170ab451..aeab6717 100644 --- a/materialious/src/lib/misc.ts +++ b/materialious/src/lib/misc.ts @@ -312,7 +312,12 @@ export async function goToInvidiousLogin() { } } -export async function logout() { +export async function invidiousLogout() { + invidiousAuthStore.set(null); + goto(resolve('/', {})); +} + +export async function materialiousLogout() { if (isYTBackend()) { await clearFeedYTjs(); } @@ -320,8 +325,6 @@ export async function logout() { if (isOwnBackend()?.internalAuth) { fetch('/api/user/logout', { method: 'DELETE' }); rawMasterKeyStore.set(undefined); - } else { - invidiousAuthStore.set(null); } goto(resolve('/', {})); diff --git a/materialious/src/routes/(app)/+layout.svelte b/materialious/src/routes/(app)/+layout.svelte index 7e425e50..2ddc7927 100644 --- a/materialious/src/routes/(app)/+layout.svelte +++ b/materialious/src/routes/(app)/+layout.svelte @@ -32,7 +32,13 @@ import 'material-dynamic-colors'; import { onMount } from 'svelte'; import { _ } from '$lib/i18n'; - import { goToInvidiousLogin, isYTBackend, logout, truncate } from '$lib/misc'; + import { + goToInvidiousLogin, + invidiousLogout, + isYTBackend, + materialiousLogout, + truncate + } from '$lib/misc'; import Author from '$lib/components/Author.svelte'; import Toast from '$lib/components/Toast.svelte'; import { isOwnBackend } from '$lib/shared'; @@ -141,15 +147,15 @@ onMount(async () => { if ($invidiousAuthStore && !isYTBackend()) { - loadNotifications().catch(() => logout()); + loadNotifications().catch(() => invidiousLogout()); } if ($rawMasterKeyStore) { fetch('/api/user/isLoggedIn', { method: 'GET', credentials: 'same-origin' }) .then((resp) => { - if (!resp.ok) logout(); + if (!resp.ok) materialiousLogout(); }) - .catch(logout); + .catch(materialiousLogout); } resetScroll();