Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle better AuthProvider logout #273

Merged
merged 1 commit into from
Oct 25, 2024
Merged

Handle better AuthProvider logout #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions src/lib/stores/User.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,25 +150,31 @@ export async function logout(authProvider?: AuthProvider, redirect = false) {
if (authProvider) {
authProvider
.logout()
.then((redirect) => {
user.set({});
if (typeof redirect === 'string') {
location.replace(redirect);
.then((redirectURL) => {
if (typeof redirectURL === 'string') {
user.set({});
location.replace(redirectURL);
} else {
// If no redirect is provided, go to the login page
console.error('Error logging out: ' + redirect);
goto('/login');
console.error('Error logging out: ' + redirectURL);
handleLogout(redirect);
}
})
.catch((error) => {
console.error('Error logging out: ' + error);
goto('/login');
handleLogout(redirect);
});
} else {
user.set({});
redirect
? goto(`/login?redirectTo=${encodeURIComponent(get(page).url.pathname)}`)
: goto('/login');
handleLogout(redirect);
}
}

function handleLogout(redirect: boolean) {
user.set({});
if (redirect) {
goto(`/login?redirectTo=${encodeURIComponent(get(page).url.pathname)}`);
} else {
goto('/login');
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/routes/(picsure)/+layout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { LayoutLoad } from './$types';
import { redirect } from '@sveltejs/kit';
import { features } from '$lib/configuration';
import { isTokenExpired } from '$lib/stores/User';
import { isTokenExpired, user } from '$lib/stores/User';
import { browser } from '$app/environment';

export const load: LayoutLoad = ({ url }) => {
Expand All @@ -10,6 +10,7 @@ export const load: LayoutLoad = ({ url }) => {
browser &&
(!localStorage.getItem('token') || isTokenExpired(localStorage.getItem('token') || ''))
) {
user.set({});
throw redirect(302, `/login?redirectTo=${url.pathname}`);
}
};
Loading