Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions src/routes/+layout.server.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
import type{LayoutServerLoad } from './$types'

export const load: LayoutServerLoad = async (event) =>{
// Avoid fetching the session during the logout callback.
// This prevents Auth.js from attempting to refresh the session token
// while we are trying to delete it.
if (event.url.pathname.includes('/auth/logout/callback')){
return{session: null };
}

return{
session: await event.locals.auth(),
};
Expand Down
12 changes: 9 additions & 3 deletions src/routes/auth/logout/callback/+page.server.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import{redirect } from '@sveltejs/kit'
import type{PageServerLoad } from './$types'
import{dev } from '$app/environment'

/**
* Handles the callback from an external Identity Provider (IdP) after a user
Expand All@@ -19,10 +20,15 @@ export const load: PageServerLoad = async (event) =>{
const logoutStateCookie = event.cookies.get('logout_state');

if (state && logoutStateCookie && state === logoutStateCookie){
event.setHeaders({
'Clear-Site-Data': '"cookies"',
});
const cookieName = dev ? 'authjs.session-token' : '__Secure-authjs.session-token'

const cookieOptions ={
path: '/',
secure: !dev
};

event.cookies.delete(cookieName, cookieOptions);

const successUrl = new URL('/auth/logout/success', event.url);
throw redirect(302, successUrl.toString());
} else{
Expand Down