fix: supabase ssr bug

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

@@ -4,10 +4,15 @@ import { isTokenExpired } from '@repo/mb-lib'
 import { cookies } from 'next/headers'
 import { Chat } from '@/components/routes/c/chat'
 import { getThread } from '@/services/hasura'
-import { getUserProfile } from '@/services/supabase'
+import { createSupabaseServerClient } from '@/services/supabase'
 
 export default async function ChatPage({ params }: ChatPageProps) {
-  const user = await getUserProfile()
+  const supabase = await createSupabaseServerClient()
+  const {
+    data: { user }
+  } = await supabase.auth.getUser()
+  if (!user || !user.email) throw new Error('user not found')
+
   const jwt = cookies().get('hasuraJwt').value || ''
 
   console.log({ jwt, expired: isTokenExpired(jwt), user })

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

@@ -6,8 +6,8 @@ import { redirect } from 'next/navigation'
 import { ChatChatbot } from '@/components/routes/c/chat-chatbot'
 import ThreadPanel from '@/components/routes/c/thread-panel'
 import { botNames } from '@/lib/bots-names'
-import { getChatbot, getThreads } from '@/services/hasura'
-import { getUserProfile } from '@/services/supabase'
+import { getChatbot, getThreads, getUser } from '@/services/hasura'
+import { createSupabaseServerClient } from '@/services/supabase'
 
 export default async function BotThreadsPage({
   params,
@@ -16,7 +16,17 @@ export default async function BotThreadsPage({
   params: { chatbot: string }
   searchParams: Record<string, string | string[] | undefined>
 }) {
-  const user = await getUserProfile()
+  const supabase = await createSupabaseServerClient()
+  const {
+    data: { user }
+  } = await supabase.auth.getUser()
+  if (!user || !user.email) throw new Error('user not found')
+  const userProfile = await getUser({
+    email: user.email,
+    adminSecret: process.env.HASURA_GRAPHQL_ADMIN_SECRET || ''
+  })
+
+  if (!userProfile) throw new Error('user not found')
   const jwt = cookies().get('hasuraJwt').value || ''
 
   // NOTE: maybe we should use same expiration time
@@ -32,7 +42,7 @@ export default async function BotThreadsPage({
   const threads = await getThreads({
     chatbotName: botNames.get(params.chatbot),
     jwt,
-    userId: user.userId
+    userId: userProfile.userId
   })
 
   // format all chatbot prompts as chatgpt 'system' messages

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

@@ -3,19 +3,30 @@ import { redirect } from 'next/navigation'
 import { cookies } from 'next/headers'
 import ChatThreadListPanel from '@/components/routes/c/chat-thread-list-panel'
 import ThreadPanel from '@/components/routes/c/thread-panel'
-import { getThreads } from '@/services/hasura'
-import { getUserProfile } from '@/services/supabase'
+import { getThreads, getUser } from '@/services/hasura'
+import { createSupabaseServerClient } from '@/services/supabase'
 
 export default async function IndexPage() {
-  const user = await getUserProfile()
+  const supabase = await createSupabaseServerClient()
+  const {
+    data: { user }
+  } = await supabase.auth.getUser()
+  if (!user || !user.email) throw new Error('user not found')
+  const dbUserProfile = await getUser({
+    email: user.email,
+    adminSecret: process.env.HASURA_GRAPHQL_ADMIN_SECRET || ''
+  })
+
+  if (!dbUserProfile) throw new Error('user not found')
+
   const jwt = cookies().get('hasuraJwt').value || ''
 
   // NOTE: maybe we should use same expiration time
   if (!jwt || isTokenExpired(jwt) || !user) redirect(`/auth/sign-in`)
 
   const threads = await getThreads({
     jwt,
-    userId: user.userId
+    userId: dbUserProfile.userId
   })
 
   return (

apps/masterbots.ai/components/layout/header.tsx

@@ -5,13 +5,18 @@ import { cookies } from 'next/headers'
 import { Button } from '@/components/ui/button'
 import { IconSeparator } from '@/components/ui/icons'
 import { UserMenu } from '@/components/layout/user-menu'
-import { getUserProfile } from '@/services/supabase'
+import { createSupabaseServerClient } from '@/services/supabase'
 import { SidebarToggle } from '../routes/c/sidebar/sidebar-toggle'
+import { getUser } from '@/services/hasura'
 
 // https://nextjs.org/docs/app/building-your-application/data-fetching/fetching-caching-and-revalidating
 
 export async function Header() {
-  const user = await getUserProfile()
+  const supabase = await createSupabaseServerClient()
+  const {
+    data: { user }
+  } = await supabase.auth.getUser()
+  if (!user || !user.email) throw new Error('user not found')
   const jwt = cookies().get('hasuraJwt')?.value || ''
 
   return (

apps/masterbots.ai/services/supabase/index.ts

@@ -1,3 +1,2 @@
-export * from './supa-browser-client'
+export * from './client'
 export * from './supa-server-client'
-export * from './supa-server.service'