Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Fix fetch members
Jakub Novakf46b9433982e
diff --git a/apps/docs/src/app/(dashboard)/api/get-user-info/route.ts b/apps/docs/src/app/(dashboard)/api/get-user-info/route.tsdeleted file mode 100644index aaf93520b..000000000--- a/apps/docs/src/app/(dashboard)/api/get-user-info/route.ts+++ /dev/null@@ -1,48 +0,0 @@-export const dynamic = 'force-dynamic' // static by default, unless reading the request-export const runtime = 'nodejs'--import { createClient } from '@supabase/supabase-js'--const supabase = createClient(- process.env.NEXT_PUBLIC_SUPABASE_URL!,- process.env.SUPABASE_SERVICE_ROLE_KEY!,-)--export async function POST(request: Request) {- await supabase.auth.api.getUserByCookie(request)- const { data: { session }, error } = await supabase.auth.getSession()- if (error) {- console.log(error)- return new Response(error.message, { status: 500 })- }- if (!session) {- return new Response('Not logged in', { status: 401 })- }--- const { userIds } = await request.json() // Expecting an array of user IDs-- const userPromises = userIds.map((userId: string) =>- supabase.auth.admin.getUserById(userId)- )-- const usersResults = await Promise.all(userPromises)-- if (!usersResults.some(({data}) => data.user.id === session.user.id)) {- return new Response('Unauthorized', { status: 401 })- }-- const userInfos = usersResults.map(({ data, error }) => {- if (error) {- console.log(error)- return { error: 'Failed getting user data', details: error.message }- }- const userInfo = {- id: data.user.id,- email: data.user.email,- }- return userInfo- })-- return new Response(JSON.stringify(userInfos), { status: 200 })-}diff --git a/apps/docs/src/app/(dashboard)/dashboard/page.tsx b/apps/docs/src/app/(dashboard)/dashboard/page.tsxindex cc768df93..4b9c3655a 100644--- a/apps/docs/src/app/(dashboard)/dashboard/page.tsx+++ b/apps/docs/src/app/(dashboard)/dashboard/page.tsx@@ -182,7 +182,7 @@ const MainContent = ({ selectedItem, user, team, accessToken, currentApiKey, teacase 'billing':return <BillingContent currentApiKey={currentApiKey} team={team} />case 'team':- return <TeamContent team={team} user={user} teams={teams} setTeams={setTeams} setCurrentTeam={setCurrentTeam} />+ return <TeamContent team={team} user={user} teams={teams} currentApiKey={currentApiKey} setTeams={setTeams} setCurrentTeam={setCurrentTeam} />default:return <ErrorContent />}diff --git a/apps/docs/src/components/Dashboard/Team.tsx b/apps/docs/src/components/Dashboard/Team.tsxindex f18a7ae89..dc2a4358f 100644--- a/apps/docs/src/components/Dashboard/Team.tsx+++ b/apps/docs/src/components/Dashboard/Team.tsx@@ -8,16 +8,15 @@ import { toast } from '../ui/use-toast'import { Copy } from 'lucide-react'import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '../ui/table'import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, AlertDialogTrigger } from '../ui/alert-dialog'-import {Simulate} from "react-dom/test-utils";-import error = Simulate.error;interface TeamMember {id: stringemail: string}+const teamUsersUrl = `${process.env.NEXT_PUBLIC_BILLING_API_URL}/teams/users`-export const TeamContent = ({ team, user, teams, setTeams, setCurrentTeam }: { team: Team, user: User, teams: Team[] ,setTeams: (teams: Team[]) => void, setCurrentTeam: (team: Team) => void }) => {+export const TeamContent = ({ team, user, teams, currentApiKey, setTeams, setCurrentTeam }: { team: Team, user: User, teams: Team[] ,currentApiKey: string | null, setTeams: (teams: Team[]) => void, setCurrentTeam: (team: Team) => void }) => {const supabase = createPagesBrowserClient()const [isDialogOpen, setIsDialogOpen] = useState(false)@@ -29,38 +28,29 @@ export const TeamContent = ({ team, user, teams, setTeams, setCurrentTeam }: { tuseEffect(() => {const getTeamMembers = async () => {- const { data: teamData, error: getTeamError } = await supabase- .from('users_teams')- .select('user_id')- .eq('team_id', team.id)-- if (getTeamError) {- console.log(getTeamError)- return- }-- const userIds = teamData.map(({ user_id }) => user_id).filter(id => id !== user.id)-- const { data, error } = await supabase.auth.getSession()- if (error) {- console.log(error)- return- }- const res = await fetch('/api/get-user-info', {- method: 'POST',- body: JSON.stringify({ userIds }),+ const res = await fetch(teamUsersUrl, {headers: {- 'Supabase-Auth-Token': data.session!.access_token,- 'Supabase-Refresh-Token': data.session!.refresh_token,- 'Content-Type': 'application/json',+ 'X-Team-API-Key': currentApiKey!,},})- const members = await res.json()++ if (!res.ok) {+ toast({+ title: 'An error occurred',+ description: 'We were unable to fetch the team members',+ })+ console.log(res.statusText)++ return+ }+ const members = (await res.json()).filter((member: TeamMember) => member.id !== user.id)setMembers(members)}- getTeamMembers()- }, [supabase, team.id, user.id, userAdded])+ if (currentApiKey) {+ getTeamMembers()+ }+ }, [currentApiKey, userAdded])const closeDialog = () => setIsDialogOpen(false)const openDialog = (id: string) => {