reafactor: Supabase data

Author: Aleksander Grygier

apps/web/src/app.d.ts

@@ -7,16 +7,10 @@ declare global {
 	namespace App {
 		// interface Error {}
 		interface Locals {
-			safeGetSession: () => Promise<{ session: Session | null; user: User | null }>;
 			supabase: SupabaseClient;
-			session: Session | null;
 			user: User | null;
 		}
 
-		interface PageData {
-			session: Session | null;
-		}
-
 		// interface PageState {}
 		// interface Platform {}
 	}

apps/web/src/handle-auth-guard.ts

@@ -5,8 +5,8 @@ import type { Handle } from '@sveltejs/kit';
 
 const handleSupabase: Handle = async ({ event, resolve }) => {
 	event.locals.supabase = createServerClient(
-		envPublic.PUBLIC_SUPABASE_URL,
-		envPrivate.SUPABASE_SERVICE_KEY ?? envPublic.PUBLIC_SUPABASE_ANON_KEY,
+		`${envPublic.PUBLIC_SUPABASE_URL}`,
+		`${envPrivate.SUPABASE_SERVICE_KEY ?? envPublic.PUBLIC_SUPABASE_ANON_KEY}`,
 		{
 			cookies: {
 				getAll() {
@@ -21,27 +21,6 @@ const handleSupabase: Handle = async ({ event, resolve }) => {
 		}
 	);
 
-	event.locals.safeGetSession = async () => {
-		const {
-			data: { session }
-		} = await event.locals.supabase.auth.getSession();
-
-		if (!session) {
-			return { session: null, user: null };
-		}
-
-		const {
-			data: { user },
-			error
-		} = await event.locals.supabase.auth.getUser();
-		if (error) {
-			// JWT validation has failed
-			return { session: null, user: null };
-		}
-
-		return { session, user };
-	};
-
 	return resolve(event, {
 		filterSerializedResponseHeaders(name: string) {
 			return name === 'content-range' || name === 'x-supabase-api-version';

apps/web/src/handle-supabase.ts

@@ -1,9 +1,8 @@
 import { sequence } from '@sveltejs/kit/hooks';
 import handleSupabase from './handle-supabase';
-import handleAuthGuard from './handle-auth-guard';
 import type { HandleServerError } from '@sveltejs/kit';
 
-export const handle = sequence(handleSupabase, handleAuthGuard);
+export const handle = sequence(handleSupabase);
 
 export const handleError: HandleServerError = async ({ error }) => {
 	return {

apps/web/src/hooks.server.ts

@@ -1,11 +1,11 @@
 import type { LayoutServerLoad } from './$types';
 
-export const load: LayoutServerLoad = async ({
-	depends,
-	locals: { safeGetSession, supabase },
-	cookies
-}) => {
-	const { session, user } = await safeGetSession();
+export const load: LayoutServerLoad = async ({ depends, locals: { supabase }, cookies }) => {
+	const {
+		data: { user }
+	} = await supabase.auth.getUser();
+
+	if (!user) return { cookies: cookies.getAll() };
 
 	depends('get_user_recordings');
 
@@ -42,7 +42,6 @@ export const load: LayoutServerLoad = async ({
 	return {
 		cookies: cookies.getAll(),
 		recordings: recordingsWithSignedUrls,
-		session,
 		user
 	};
 };

apps/web/src/routes/+layout.server.ts

@@ -1,6 +1,9 @@
 import type { ServerLoad } from '@sveltejs/kit';
+import { redirect } from '@sveltejs/kit';
 
 export const load: ServerLoad = async ({ locals }) => {
+	if (!locals.user) redirect(303, '/sign-in-with-google');
+
 	return {
 		recordings: []
 	};