Merge branch 'main' into set-up-dashboard-db-migrations-e2b-1753

Author: ben-fornefeld

src/app/dashboard/route.ts

@@ -0,0 +1,76 @@
+import { NextRequest, NextResponse } from 'next/server'
+import { PROTECTED_URLS } from '@/configs/urls'
+import { cookies } from 'next/headers'
+import { COOKIE_KEYS } from '@/configs/keys'
+import { supabaseAdmin } from '@/lib/clients/supabase/admin'
+import { createRouteClient } from '@/lib/clients/supabase/server'
+
+const TAB_URL_MAP: Record<string, (teamId: string) => string> = {
+  sandboxes: (teamId) => PROTECTED_URLS.SANDBOXES(teamId),
+  templates: (teamId) => PROTECTED_URLS.TEMPLATES(teamId),
+  usage: (teamId) => PROTECTED_URLS.USAGE(teamId),
+  billing: (teamId) => PROTECTED_URLS.BILLING(teamId),
+  budget: (teamId) => PROTECTED_URLS.BUDGET(teamId),
+  keys: (teamId) => PROTECTED_URLS.KEYS(teamId),
+  team: (teamId) => PROTECTED_URLS.TEAM(teamId),
+  account: (_) => PROTECTED_URLS.ACCOUNT_SETTINGS,
+}
+
+export async function GET(request: NextRequest) {
+  // 1. Get the tab parameter
+  const searchParams = request.nextUrl.searchParams
+  const tab = searchParams.get('tab')
+
+  if (!tab || !TAB_URL_MAP[tab]) {
+    // Default to dashboard if no valid tab
+    return NextResponse.redirect(new URL(PROTECTED_URLS.DASHBOARD, request.url))
+  }
+
+  // 2. Create Supabase client and get user
+  const supabase = createRouteClient(request)
+
+  const { data, error } = await supabase.auth.getUser()
+
+  if (error || !data.user) {
+    // Redirect to sign-in if not authenticated
+    return NextResponse.redirect(new URL('/sign-in', request.url))
+  }
+  const cookieStore = await cookies()
+
+  // 3. Resolve team ID (first try cookie, then fetch default)
+  let teamId = cookieStore.get(COOKIE_KEYS.SELECTED_TEAM_ID)?.value
+  let teamSlug = cookieStore.get(COOKIE_KEYS.SELECTED_TEAM_SLUG)?.value
+
+  if (!teamId) {
+    // No team in cookie, fetch user's default team
+    const { data: teamsData } = await supabaseAdmin
+      .from('users_teams')
+      .select(
+        `
+        team_id,
+        is_default,
+        team:teams(*)
+      `
+      )
+      .eq('user_id', data.user.id)
+
+    if (!teamsData?.length) {
+      // No teams, redirect to new team creation
+      return NextResponse.redirect(
+        new URL(PROTECTED_URLS.NEW_TEAM, request.url)
+      )
+    }
+
+    // Use default team or first team
+    const defaultTeam = teamsData.find((t) => t.is_default) || teamsData[0]
+    teamId = defaultTeam.team_id
+    teamSlug = defaultTeam.team?.slug || defaultTeam.team_id
+  }
+
+  // 4. Build the redirect URL using the tab mapping
+  const urlGenerator = TAB_URL_MAP[tab]
+  const redirectPath = urlGenerator(teamSlug || teamId)
+
+  // 5. Redirect to the appropriate dashboard section
+  return NextResponse.redirect(new URL(redirectPath, request.url))
+}

src/configs/urls.ts

@@ -16,6 +16,9 @@ export const PROTECTED_URLS = {
   SANDBOXES: (teamId: string) => `/dashboard/${teamId}/sandboxes`,
   TEMPLATES: (teamId: string) => `/dashboard/${teamId}/templates`,
   USAGE: (teamId: string) => `/dashboard/${teamId}/usage`,
+  BILLING: (teamId: string) => `/dashboard/${teamId}/billing`,
+  BUDGET: (teamId: string) => `/dashboard/${teamId}/budget`,
+  KEYS: (teamId: string) => `/dashboard/${teamId}/keys`,
 }
 
 export const BASE_URL = process.env.VERCEL_URL

src/server/middleware.ts

@@ -22,6 +22,9 @@ export async function resolveTeamForDashboard(
   redirect?: string
   allowAccess?: boolean
 }> {
+  // Check for tab query parameter - skip default redirects if present
+  const hasTabParam = request.nextUrl.searchParams.has('tab')
+
   if (request.nextUrl.pathname === PROTECTED_URLS.NEW_TEAM) {
     return { allowAccess: true }
   }
@@ -62,6 +65,19 @@ export async function resolveTeamForDashboard(
         (await kv.get<string>(KV_KEYS.TEAM_ID_TO_SLUG(currentTeamId))) ||
         undefined
 
+      // Skip redirect if we're at /dashboard with a tab parameter
+      if (
+        hasTabParam &&
+        request.nextUrl.pathname === PROTECTED_URLS.DASHBOARD
+      ) {
+        return {
+          teamId: currentTeamId,
+          teamSlug,
+          // No redirect here - we'll let the page handle the tab parameter
+          // This case is handled by @/app/dashboard/route.ts
+        }
+      }
+
       return {
         teamId: currentTeamId,
         teamSlug,
@@ -96,6 +112,15 @@ export async function resolveTeamForDashboard(
 
   const defaultTeam = teamsData.find((t) => t.is_default) || teamsData[0]
 
+  // Skip redirect if we're at /dashboard with a tab parameter
+  if (hasTabParam && request.nextUrl.pathname === PROTECTED_URLS.DASHBOARD) {
+    return {
+      teamId: defaultTeam.team_id,
+      teamSlug: defaultTeam.team?.slug || undefined,
+      // No redirect here - we'll let the page handle the tab parameter
+    }
+  }
+
   return {
     teamId: defaultTeam.team_id,
     teamSlug: defaultTeam.team?.slug || undefined,

src/server/team/team-actions.ts

@@ -272,7 +272,7 @@ export const uploadTeamProfilePictureAction = guard(
           const currentFileName = fileName
 
           // List all files in the team's folder from Supabase Storage
-          const folderPath = `profile-pictures/teams/${teamId}`
+          const folderPath = `teams/${teamId}`
           const files = await getFiles(folderPath)
 
           // Delete all old profile pictures except the one we just uploaded