update auth flow & database schema

apps/privelte/src/lib/server/auth.ts

@@ -25,10 +25,8 @@ export const createToken = async (payload: JWTPayload) => {
 	return { jwt, expires }
 }
 
-export const verifyToken = async (token: string | undefined) => {
+export const verifyToken = async (token: string) => {
 	try {
-		if (!token) throw Error('No token provided.')
-
 		const { payload } = await jwtVerify<User>(token, secret, {
 			algorithms: [algorithm]
 		})

apps/privelte/src/lib/types/supabase.ts

@@ -27,18 +27,21 @@ export interface Database {
 			users: {
 				Row: {
 					id: string
-					last_heartbeat: string
+					last_active: string
 					room_id: string
+					username: string
 				}
 				Insert: {
 					id?: string
-					last_heartbeat?: string
+					last_active?: string
 					room_id: string
+					username: string
 				}
 				Update: {
 					id?: string
-					last_heartbeat?: string
+					last_active?: string
 					room_id?: string
+					username?: string
 				}
 				Relationships: [
 					{
@@ -130,8 +133,9 @@ export type TablesUpdate<
 		: never
 
 export type Enums<
-	// eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
-	PublicEnumNameOrOptions extends keyof PublicSchema['Enums'] | { schema: keyof Database },
+	PublicEnumNameOrOptions extends
+		// eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
+		keyof PublicSchema['Enums'] | { schema: keyof Database },
 	EnumName extends PublicEnumNameOrOptions extends { schema: keyof Database }
 		? keyof Database[PublicEnumNameOrOptions['schema']]['Enums']
 		: never = never

apps/privelte/src/routes/room/[id]/+layout.server.ts

@@ -13,6 +13,10 @@ export const load: LayoutServerLoad = async ({ params, cookies }) => {
 	if (room.data.participants === room.data.slots) {
 		const session = cookies.get('session')
 
+		if (!session) {
+			error(403, { message: 'This room is full.' })
+		}
+
 		try {
 			const { userId } = await verifyToken(session)
 

apps/privelte/src/routes/room/[id]/+page.server.ts

@@ -6,6 +6,10 @@ import type { PageServerLoad } from './$types'
 export const load: PageServerLoad = async ({ params, cookies }) => {
 	const session = cookies.get('session')
 
+	if (!session) {
+		return redirect(302, `/room/${params.id}/join`)
+	}
+
 	try {
 		const { userId, username } = await verifyToken(session)
 

apps/privelte/src/routes/room/[id]/+page.svelte

@@ -1,10 +1,10 @@
 <script lang="ts">
 	import { onMount } from 'svelte'
+	import { supabase } from '$lib/supabaseClient'
 	// import { nanoid } from 'nanoid'
 	import { pendingMessages } from '$lib/stores'
 	import type { Payload, Presence } from '$lib/types/types'
 	import type { PageData } from './$types'
-	import { supabase } from '$lib/supabaseClient'
 	import Chat from '$lib/components/Chat.svelte'
 	import NewMessageForm from '$lib/components/NewMessageForm.svelte'
 
@@ -71,7 +71,7 @@
 			await fetch(data.roomId, {
 				method: 'PATCH'
 			})
-		}, 10000)
+		}, 12000)
 
 		channel
 			.on('broadcast', { event: 'message' }, ({ payload }: { payload: Payload }) => {

apps/privelte/src/routes/room/[id]/+server.ts

@@ -7,6 +7,11 @@ import type { RequestHandler } from './$types'
 
 export const POST: RequestHandler = async ({ request, cookies, params }) => {
 	const session = cookies.get('session')
+
+	if (!session) {
+		error(401, 'Unauthorized.')
+	}
+
 	let userId: string
 	let username: string
 
@@ -66,12 +71,16 @@ export const POST: RequestHandler = async ({ request, cookies, params }) => {
 export const PATCH: RequestHandler = async ({ cookies, params }) => {
 	const session = cookies.get('session')
 
+	if (!session) {
+		error(401, 'Unauthorized.')
+	}
+
 	try {
 		const { userId, username } = await verifyToken(session)
 
 		await supabase
 			.from('users')
-			.update({ last_heartbeat: new Date().toISOString() })
+			.update({ last_active: new Date().toISOString() })
 			.eq('id', userId)
 			.eq('room_id', params.id)
 			.select()

apps/privelte/src/routes/room/[id]/join/+page.server.ts

@@ -7,6 +7,10 @@ import type { PageServerLoad } from './$types'
 export const load: PageServerLoad = async ({ params, cookies }) => {
 	const session = cookies.get('session')
 
+	if (!session) {
+		return { title: 'Join - Privelte' }
+	}
+
 	try {
 		const { userId } = await verifyToken(session)
 
@@ -47,7 +51,7 @@ export const actions: Actions = {
 
 			const user = await supabase
 				.from('users')
-				.insert({ room_id: room.data.id })
+				.insert({ room_id: room.data.id, username })
 				.select()
 				.single()
 				.throwOnError()