fix: use session.id instead of session.data.id

Author: atinux

routes/api/chats.get.ts

@@ -3,7 +3,7 @@ import { useUserSession } from '../../utils/session'
 import { useDrizzle, tables, eq } from '../../utils/drizzle'
 
 export default defineEventHandler(async (event) => {
-  const { data: session } = await useUserSession(event)
+  const session = await useUserSession(event)
 
-  return (await useDrizzle().select().from(tables.chats).where(eq(tables.chats.userId, session.user?.id || session.id!))).sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime())
+  return (await useDrizzle().select().from(tables.chats).where(eq(tables.chats.userId, session.data.user?.id || session.id!))).sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime())
 })

routes/api/chats.post.ts

@@ -4,17 +4,16 @@ import { useUserSession } from '../../utils/session'
 import { useDrizzle, tables } from '../../utils/drizzle'
 
 export default defineEventHandler(async (event) => {
-  const { data: session } = await useUserSession(event)
+  const session = await useUserSession(event)
 
   const { input } = await readValidatedBody(event, z.object({
     input: z.string()
   }).parse)
   const db = useDrizzle()
 
-  console.log('userId', session.user?.id || session.id!)
   const [chat] = await db.insert(tables.chats).values({
     title: '',
-    userId: session.user?.id || session.id!
+    userId: session.data.user?.id || session.id!
   }).returning()
   if (!chat) {
     throw new HTTPError({ statusCode: 500, statusMessage: 'Failed to create chat' })

routes/api/chats/[id].delete.ts

@@ -5,7 +5,7 @@ import { z } from 'zod'
 
 
 export default defineEventHandler(async (event) => {
-  const { data: session } = await useUserSession(event)
+  const session = await useUserSession(event)
 
   const { id } = await getValidatedRouterParams(event, z.object({
     id: z.string()
@@ -14,6 +14,6 @@ export default defineEventHandler(async (event) => {
   const db = useDrizzle()
 
   return await db.delete(tables.chats)
-    .where(and(eq(tables.chats.id, id as string), eq(tables.chats.userId, session.user?.id || session.id!)))
+    .where(and(eq(tables.chats.id, id as string), eq(tables.chats.userId, session.data.user?.id || session.id!)))
     .returning()
 })

routes/api/chats/[id].get.ts

@@ -5,14 +5,14 @@ import { z } from 'zod'
 
 
 export default defineEventHandler(async (event) => {
-  const { data: session } = await useUserSession(event)
+  const session = await useUserSession(event)
 
   const { id } = await getValidatedRouterParams(event, z.object({
     id: z.string()
   }).parse)
 
   const chat = await useDrizzle().query.chats.findFirst({
-    where: (chat, { eq }) => and(eq(chat.id, id as string), eq(chat.userId, session.user?.id || session.id!)),
+    where: (chat, { eq }) => and(eq(chat.id, id as string), eq(chat.userId, session.data.user?.id || session.id!)),
     with: {
       messages: true
     }

routes/api/chats/[id].post.ts

@@ -7,7 +7,7 @@ import { useDrizzle, tables, eq, and } from '../../../utils/drizzle'
 import { defineEventHandler, getValidatedRouterParams, readValidatedBody, HTTPError } from 'h3'
 
 export default defineEventHandler(async (event) => {
-  const { data: session } = await useUserSession(event)
+  const session = await useUserSession(event)
 
   const { id } = await getValidatedRouterParams(event, z.object({
     id: z.string()
@@ -21,7 +21,7 @@ export default defineEventHandler(async (event) => {
   const db = useDrizzle()
 
   const chat = await db.query.chats.findFirst({
-    where: (chat, { eq }) => and(eq(chat.id, id as string), eq(chat.userId, session.user?.id || session.id!)),
+    where: (chat, { eq }) => and(eq(chat.id, id as string), eq(chat.userId, session.data.user?.id || session.id)),
     with: {
       messages: true
     }