fix: chat auth bug (#109)

* fix: chat auth bug

* fix: chat auth bug

* fix: chat auth bug

apps/masterbots.ai/app/auth/callback/route.ts

@@ -4,6 +4,7 @@ import { type CookieOptions, createServerClient } from '@supabase/ssr'
 import { getToken, validateJwtSecret } from '@repo/mb-lib'
 import { upsertUser } from '@/services/hasura'
 import { nanoid } from '@/lib/utils'
+import { createSupabaseServerClient } from '@/services/supabase'
 
 export async function GET(request: Request) {
   const { searchParams, origin } = new URL(request.url)
@@ -12,24 +13,7 @@ export async function GET(request: Request) {
   // if "next" is in param, use it as the redirect URL
   const next = searchParams.get('next') ?? '/'
 
-  const cookieStore = cookies()
-  const supabase = createServerClient(
-    process.env.NEXT_PUBLIC_SUPABASE_URL,
-    process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY,
-    {
-      cookies: {
-        get(name: string) {
-          return cookieStore.get(name).value
-        },
-        set(name: string, value: string, options: CookieOptions) {
-          cookieStore.set({ name, value, ...options })
-        },
-        remove(name: string, options: CookieOptions) {
-          cookieStore.delete({ name, ...options })
-        }
-      }
-    }
-  )
+  const supabase = await createSupabaseServerClient()
 
   const {
     data: { user },

apps/masterbots.ai/app/c/[chatbot]/[threadId]/page.tsx

@@ -11,14 +11,15 @@ export default async function ChatPage({ params }: ChatPageProps) {
   const {
     data: { user }
   } = await supabase.auth.getUser()
-  if (!user || !user.email) throw new Error('user not found')
-
+  if (!user || !user.email)
+    redirect(`/auth/sign-in?next=/${params.chatbot}/${params.threadId}`)
   const jwt = cookies().get('hasuraJwt')?.value || ''
 
   console.log({ jwt, expired: isTokenExpired(jwt), user })
   // NOTE: maybe we should use same expiration time
   if (!jwt || isTokenExpired(jwt) || !user)
-    redirect(`/auth/sign-in?next=/${params.threadId}/${params.threadId}`)
+    redirect(`/auth/sign-in?next=/${params.chatbot}/${params.threadId}`)
+
   const thread = await getThread({
     threadId: params.threadId
   })

apps/masterbots.ai/app/c/[chatbot]/page.tsx

@@ -20,17 +20,18 @@ export default async function BotThreadsPage({
   const {
     data: { user }
   } = await supabase.auth.getUser()
-  if (!user || !user.email) throw new Error('user not found')
+  if (!user || !user.email) redirect(`/auth/sign-in?next=/${params.chatbot}`)
   const userProfile = await getUser({
     email: user.email,
     adminSecret: process.env.HASURA_GRAPHQL_ADMIN_SECRET || ''
   })
 
-  if (!userProfile) throw new Error('user not found')
+  if (!userProfile) redirect(`/auth/sign-in?next=/${params.chatbot}`)
   const jwt = cookies().get('hasuraJwt')?.value || ''
 
   // NOTE: maybe we should use same expiration time
-  if (!jwt || isTokenExpired(jwt) || !user) redirect(`/auth/sign-in?next=/c`)
+  if (!jwt || isTokenExpired(jwt))
+    redirect(`/auth/sign-in?next=/${params.chatbot}`)
   const chatbot = await getChatbot({
     chatbotName: botNames.get(params.chatbot),
     jwt

apps/masterbots.ai/app/c/page.tsx

@@ -11,13 +11,14 @@ export default async function IndexPage() {
   const {
     data: { user }
   } = await supabase.auth.getUser()
-  if (!user || !user.email) throw new Error('user not found')
+  if (!user || !user.email) redirect(`/auth/sign-in`)
+
   const dbUserProfile = await getUser({
     email: user.email,
     adminSecret: process.env.HASURA_GRAPHQL_ADMIN_SECRET || ''
   })
 
-  if (!dbUserProfile) throw new Error('user not found')
+  if (!dbUserProfile) redirect(`/auth/sign-in`)
 
   const jwt = cookies().get('hasuraJwt').value || ''