Added zod schema to user composable

composables/user.ts

@@ -1,50 +1,49 @@
-import { AuthError } from '@supabase/gotrue-js'
+import { z } from 'zod'
 
-const returnMain = (): void => {
-	navigateTo('/notes')
+const userSchema = z.object({
+    email: z.string().email(),
+    password: z.string(),
+})
+
+const returnMain = () => {
+    navigateTo('/notes')
 }
 
-const userSignOut = async (): Promise<AuthError | void> => {
-	const supabase = useSupabaseAuthClient()
+const userSignOut = async () => {
+    const supabase = useSupabaseAuthClient()
 
-	const { error } = await supabase.auth.signOut()
+    const { error } = await supabase.auth.signOut()
 
-	if (error) return error
+    if (error) return error
 
-	returnMain()
+    returnMain()
 }
 
-const userSignIn = async (
-	email: string,
-	password: string
-): Promise<AuthError | void> => {
-	const { data: user, error } =
-		await useSupabaseAuthClient().auth.signInWithPassword({
-			email: email,
-			password: password,
-		})
+const userSignIn = async (email: unknown, password: unknown) => {
+    const parsedUser = userSchema.safeParse({ email, password })
+
+    if (!parsedUser.success) return
 
-	console.log('user', user)
+    const { data: user, error } =
+        await useSupabaseAuthClient().auth.signInWithPassword(parsedUser.data)
 
-	if (error) return error
+    if (error) return error
 
-	returnMain()
+    returnMain()
 }
 
-const userSignUp = async (
-	email: string,
-	password: string
-): Promise<AuthError | void> => {
-	const { data: user, error } = await useSupabaseAuthClient().auth.signUp({
-		email: email,
-		password: password,
-	})
+const userSignUp = async (email: unknown, password: unknown) => {
+    const parsedUser = userSchema.safeParse({ email, password })
+
+    if (!parsedUser.success) return
 
-	console.log('user', user)
+    const { data: user, error } = await useSupabaseAuthClient().auth.signUp(
+        parsedUser.data
+    )
 
-	if (error) return error
+    if (error) return error
 
-	returnMain()
+    returnMain()
 }
 
 export { userSignIn, userSignOut, userSignUp }

server/api/note.delete.ts

@@ -1,25 +1,24 @@
 import { serverSupabaseUser, serverSupabaseClient } from '#supabase/server'
-import { Database } from 'types/database.types'
 
 export default defineEventHandler(async (event): Promise<DeleteResponse> => {
-	const user = await serverSupabaseUser(event)
-	const supabase = serverSupabaseClient<Database>(event)
-	const query = getQuery(event)
+    const user = await serverSupabaseUser(event)
+    const supabase = serverSupabaseClient(event)
+    const query = getQuery(event)
 
-	if (!user) {
-		throw createError({ statusCode: 401, message: 'Unauthorized' })
-	}
+    if (!user) {
+        throw createError({ statusCode: 401, message: 'Unauthorized' })
+    }
 
-	const { data: data, error } = await supabase
-		.from('notes')
-		.delete()
-		.eq('uuid', query.id)
-		.eq('user_id', user.id)
+    const { data: data, error } = await supabase
+        .from('notes')
+        .delete()
+        .eq('uuid', query.id)
+        .eq('user_id', user.id)
 
-	return {
-		status: 200,
-		data: data,
-		message: 'Note Deleted',
-		error: error,
-	}
+    return {
+        status: 200,
+        data: data,
+        message: 'Note Deleted',
+        error: error,
+    }
 })

server/api/note.get.ts

@@ -1,26 +1,25 @@
 import { serverSupabaseUser, serverSupabaseClient } from '#supabase/server'
-import { Database } from 'types/database.types'
 
 export default defineEventHandler(async (event) => {
-	const user = await serverSupabaseUser(event)
-	const supabase = serverSupabaseClient<Database>(event)
-	const query = getQuery(event)
+    const user = await serverSupabaseUser(event)
+    const supabase = serverSupabaseClient(event)
+    const query = getQuery(event)
 
-	if (!user) {
-		throw createError({ statusCode: 401, message: 'Unauthorized' })
-	}
+    if (!user) {
+        throw createError({ statusCode: 401, message: 'Unauthorized' })
+    }
 
-	const { data: note, error } = await supabase
-		.from('notes')
-		.select('*')
-		.eq('uuid', query.id)
-		.eq('user_id', user.id)
-		.limit(1)
-		.single()
+    const { data: note, error } = await supabase
+        .from('notes')
+        .select('*')
+        .eq('uuid', query.id)
+        .eq('user_id', user.id)
+        .limit(1)
+        .single()
 
-	if (!note) {
-		throw createError({ statusCode: 500, message: 'No note found' })
-	}
+    if (!note) {
+        throw createError({ statusCode: 500, message: 'No note found' })
+    }
 
-	return { note: note, error: error }
+    return { note: note, error: error }
 })

server/api/note.post.ts

@@ -1,23 +1,22 @@
 import { serverSupabaseUser, serverSupabaseClient } from '#supabase/server'
-import { Database } from 'types/database.types'
 
 export default defineEventHandler(async (event): Promise<ApiResponse> => {
-	const user = await serverSupabaseUser(event)
-	const supabase = serverSupabaseClient<Database>(event)
-	const query = getQuery(event)
-	const body = await readBody(event)
+    const user = await serverSupabaseUser(event)
+    const supabase = serverSupabaseClient(event)
+    const query = getQuery(event)
+    const body = await readBody(event)
 
-	const title: string = body.title
-	const description: string = body.description
+    const title: string = body.title
+    const description: string = body.description
 
-	if (!user) {
-		throw createError({ statusCode: 401, message: 'Unauthorized' })
-	}
+    if (!user) {
+        throw createError({ statusCode: 401, message: 'Unauthorized' })
+    }
 
-	const { data: note, error } = await supabase
-		.from('notes')
-		.update({ title: title, description: description })
-		.eq('uuid', query.id)
+    const { data: note, error } = await supabase
+        .from('notes')
+        .update({ title: title, description: description })
+        .eq('uuid', query.id)
 
-	return { status: 200, message: 'Note Updated', error: error }
+    return { status: 200, message: 'Note Updated', error: error }
 })

server/api/note/new.ts

@@ -1,31 +1,30 @@
 import { serverSupabaseUser, serverSupabaseClient } from '#supabase/server'
-import { Database } from 'types/database.types'
 
 export default defineEventHandler(async (event) => {
-	const user = await serverSupabaseUser(event)
-	const supabase = serverSupabaseClient<Database>(event)
+    const user = await serverSupabaseUser(event)
+    const supabase = serverSupabaseClient(event)
 
-	if (!user) {
-		throw createError({ statusCode: 401, message: 'Unauthorized' })
-	}
+    if (!user) {
+        throw createError({ statusCode: 401, message: 'Unauthorized' })
+    }
 
-	const { data: status, error: insertError } = await supabase
-		.from('notes')
-		.insert({ title: '', description: '', user_id: user.id })
+    const { data: status, error: insertError } = await supabase
+        .from('notes')
+        .insert({ title: '', description: '', user_id: user.id })
 
-	const { data: note, error: fetchError } = await supabase
-		.from('notes')
-		.select('uuid')
-		.eq('user_id', user.id)
-		.order('created_at', { ascending: false })
-		.limit(1)
-		.single()
+    const { data: note, error: fetchError } = await supabase
+        .from('notes')
+        .select('uuid')
+        .eq('user_id', user.id)
+        .order('created_at', { ascending: false })
+        .limit(1)
+        .single()
 
-	return {
-		statusCode: 200,
-		note: note,
-		message: 'Note Created',
-		insertError: insertError,
-		fetchError: fetchError,
-	}
+    return {
+        statusCode: 200,
+        note: note,
+        message: 'Note Created',
+        insertError: insertError,
+        fetchError: fetchError,
+    }
 })

server/api/notes.ts

@@ -1,18 +1,17 @@
 import { serverSupabaseUser, serverSupabaseClient } from '#supabase/server'
-import { Database } from 'types/database.types'
 
 export default defineEventHandler(async (event) => {
-	const user = await serverSupabaseUser(event)
-	const supabase = serverSupabaseClient<Database>(event)
+    const user = await serverSupabaseUser(event)
+    const supabase = serverSupabaseClient(event)
 
-	if (!user) {
-		throw createError({ statusCode: 401, message: 'Unauthorized' })
-	}
+    if (!user) {
+        throw createError({ statusCode: 401, message: 'Unauthorized' })
+    }
 
-	const { data: notes, error } = await supabase
-		.from('notes')
-		.select('*')
-		.eq('user_id', user.id)
+    const { data: notes, error } = await supabase
+        .from('notes')
+        .select('*')
+        .eq('user_id', user.id)
 
-	return { notes: notes, error: error }
+    return { notes: notes, error: error }
 })

server/api/profile.ts

@@ -1,18 +1,17 @@
 import { serverSupabaseUser, serverSupabaseClient } from '#supabase/server'
-import { Database } from 'types/database.types'
 
 export default defineEventHandler(async (event) => {
-	const user = await serverSupabaseUser(event)
-	const supabase = serverSupabaseClient<Database>(event)
+    const user = await serverSupabaseUser(event)
+    const supabase = serverSupabaseClient(event)
 
-	if (!user) {
-		throw createError({ statusCode: 401, message: 'Unauthorized' })
-	}
+    if (!user) {
+        throw createError({ statusCode: 401, message: 'Unauthorized' })
+    }
 
-	const { count, error } = await supabase
-		.from('notes')
-		.select('*', { count: 'exact', head: true })
-		.eq('user_id', user.id)
+    const { count, error } = await supabase
+        .from('notes')
+        .select('*', { count: 'exact', head: true })
+        .eq('user_id', user.id)
 
-	return { count: count, message: 'Profile', error: error }
+    return { count: count, message: 'Profile', error: error }
 })

types/database.types.ts

@@ -1,21 +0,0 @@
-export interface Database {
-	public: {
-		Tables: {
-			notes: {
-				Row: {
-					id: number
-					uuid: string
-					title: string
-					description: string
-					user_id: string
-					created_at: string
-				} // The data expected to be returned from a "select" statement.
-				Insert: {} // The data expected passed to an "insert" statement.
-				Update: {
-					title: string
-					description: string
-				} // The data expected passed to an "update" statement.
-			}
-		}
-	}
-}