src/auth.ts

@@ -9,21 +9,4 @@ export const { handle, signIn, signOut } = SvelteKitAuth({
 			clientSecret: AUTHENTIK_SECRET,
 			issuer: AUTHENTIK_ISSUER,
 		})],
-	callbacks: {
-		// this feels like an extremely hacky way to get nickname and groups into the session object
-		// TODO: investigate if there's a better way to do this
-		jwt: async ({token, profile}) => {
-			if(profile){
-				token.nickname = profile.nickname;
-				token.groups = profile.groups;
-			}
-			return token;
-		},
-		session: async ({session, token}) => {
-			session.user.nickname = token.nickname;
-			session.user.groups = token.groups;
-			return session;
-		},
-
-	}
 })

src/hooks.server.ts

@@ -2,32 +2,28 @@ import { authenticateUser } from "$lib/js/authenticate"
 import type { Handle } from "@sveltejs/kit"
 import { redirect } from "@sveltejs/kit"
 import { error } from "@sveltejs/kit"
-import { SvelteKitAuth } from "@auth/sveltekit"
-import Authentik from "@auth/core/providers/authentik"
-import { AUTHENTIK_ID, AUTHENTIK_SECRET, AUTHENTIK_ISSUER } from "$env/static/private";
-import { sequence } from "@sveltejs/kit/hooks"
-import * as auth from "./auth"
+export { handle } from "./auth"
 
-async function authorization({ event, resolve }) {
-	// Protect any routes under /authenticated
-	if (event.url.pathname.startsWith('/rezepte/edit') || event.url.pathname.startsWith('/rezepte/add')) {
-   const session = await event.locals.getSession();
-		if (!session) {
-			throw redirect(303, '/auth/signin');
-		}
-		else if (! session.user.groups.includes('rezepte_users')) {
-			// strip last dir from url
-			// TODO: give indication of why access failed
-			const new_url = event.url.pathname.split('/').slice(0, -1).join('/');
-			throw redirect(303, new_url);
-		}
-	}
-
-	// If the request is still here, just proceed as normally
-	return resolve(event);
-}
-
-export const handle: Handle = sequence(
-	auth.handle,
-	authorization
-);
+//export const handle : Handle = async({event, resolve}) => {
+//	if(event.url.pathname.startsWith('/rezepte/edit') || event.url.pathname.startsWith('/rezepte/add')){
+//		event.locals.user = await authenticateUser(event.cookies)
+//		if(!event.locals.user){
+//				throw redirect(303, "/login")
+//		}
+//		else if(!event.locals.user.access.includes("rezepte")){
+//			throw error(401, "Your user does not have access to this page")
+//		}
+//	}
+//	else if(event.url.pathname.startsWith('/abrechnung')){
+//		event.locals.user = await authenticateUser(event.cookies)
+//		if(!event.locals.user){
+//				throw redirect(303, "/login")
+//		}
+//		else if(!event.locals.user.access.includes("abrechnung")){
+//				throw error(401, "Your User does not have access to this page")
+//		}
+//	}
+//
+//	const response = await resolve(event)
+//	return response
+//}