fix: chat auth bug

bitcashorg · Apr 8, 2024 · 7caa6e2 · 7caa6e2
1 parent f127889
commit 7caa6e2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/apps/masterbots.ai/app/c/[chatbot]/[threadId]/page.tsx b/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) redirect(`/auth/sign-in`)
-
+  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
   })

diff --git a/apps/masterbots.ai/app/c/[chatbot]/page.tsx b/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) redirect(`/auth/sign-in`)
+  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) redirect(`/auth/sign-in`)
+  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