Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Move creating team to settings page

Jakub Novakb8d7626d8a2a
diff --git a/apps/dashboard/pages/index.tsx b/apps/dashboard/pages/index.tsx
deleted file mode 100644
index 065b8f46e..000000000
--- a/apps/dashboard/pages/index.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-import type { GetServerSideProps } from 'next'
-import { createServerSupabaseClient } from '@supabase/auth-helpers-nextjs'
-import { nanoid } from 'nanoid'
-
-import { prisma } from 'db/prisma'
-import { serverCreds } from 'db/credentials'
-
-export interface Props {
- defaultProjectID: string
-}
-
-export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {
- const defaultNewTeamID = process.env.DEFAULT_NEW_TEAM_ID as string | undefined
-
- const supabase = createServerSupabaseClient(ctx, serverCreds)
- const {
- data: { session },
- } = await supabase.auth.getSession()
-
- if (!session) {
- return {
- redirect: {
- destination: '/sign',
- permanent: false,
- },
- }
- }
-
- const teams = await prisma.teams.findMany({
- where: {
- users_teams: {
- some: {
- user_id: session.user.id,
- }
- }
- },
- select: {
- id: true,
- is_default: true,
- projects: {
- include: {
- log_uploads: true,
- deployments: {
- include: {
- log_files: {
- orderBy: [
- { created_at: 'desc' },
- { id: 'desc', },
- ],
- select: {
- id: true,
- relativePath: true,
- filename: true,
- created_at: true,
- log_upload_id: true,
- },
- },
- projects: {
- select: {
- slug: true,
- name: true,
- },
- },
- },
- },
- },
- },
- },
- })
-
- const defaultTeam =
- teams.find(t => t.is_default) ||
- (defaultNewTeamID && await prisma.teams.update({
- where: {
- id: defaultNewTeamID,
- },
- data: {
- users_teams: {
- connectOrCreate: {
- where: {
- user_id_team_id: {
- team_id: defaultNewTeamID,
- user_id: session.user.id,
- },
- },
- create: {
- user_id: session.user.id,
- },
- },
- },
- },
- include: {
- projects: {
- include: {
- log_uploads: true,
- deployments: {
- include: {
- log_files: {
- orderBy: [
- { created_at: 'desc' },
- { id: 'desc', },
- ],
- select: {
- id: true,
- relativePath: true,
- filename: true,
- created_at: true,
- log_upload_id: true,
- },
- },
- projects: {
- select: {
- slug: true,
- name: true,
- },
- },
- },
- },
- },
- },
- },
- })) ||
- await prisma.teams.create({
- include: {
- projects: {
- include: {
- log_uploads: true,
- deployments: {
- include: {
- log_files: {
- orderBy: [
- { created_at: 'desc' },
- { id: 'desc', },
- ],
- select: {
- id: true,
- relativePath: true,
- filename: true,
- created_at: true,
- log_upload_id: true,
- },
- },
- projects: {
- select: {
- slug: true,
- name: true,
- },
- },
- },
- },
- },
- },
- },
- data: {
- name: session.user.email || session.user.id,
- is_default: true,
- projects: {
- create: {
- id: nanoid(),
- name: 'Default Project',
- is_default: true,
- },
- },
- users_teams: {
- create: {
- users: {
- connect: {
- id: session.user.id,
- },
- },
- },
- },
- },
- })
-
- const defaultProject =
- teams.flatMap(t => t.projects).find(p => p.is_default) ||
- defaultTeam.projects.find(p => p.is_default) ||
- await prisma.projects.create({
- data: {
- id: nanoid(),
- is_default: true,
- name: 'Default Project',
- teams: {
- connect: {
- id: defaultTeam.id,
- },
- },
- },
- include: {
- log_uploads: true,
- deployments: {
- include: {
- log_files: {
- orderBy: [
- { created_at: 'desc' },
- { id: 'desc', },
- ],
- select: {
- id: true,
- relativePath: true,
- filename: true,
- created_at: true,
- log_upload_id: true,
- },
- },
- projects: {
- select: {
- slug: true,
- name: true,
- },
- },
- },
- },
- },
- })
-
- return {
- redirect: {
- destination: '/settings',
- permanent: false,
- },
- }
-}
-
-function Home({ }: Props) {
- return <></>
-}
-
-export default Home
diff --git a/apps/dashboard/pages/settings/index.tsx b/apps/dashboard/pages/settings/index.tsx
index 7aaa8970d..61679c107 100644
--- a/apps/dashboard/pages/settings/index.tsx
+++ b/apps/dashboard/pages/settings/index.tsx
@@ -23,7 +23,7 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {
}
let apiKeyValue: string | undefined
- const apiKey = await prisma.team_api_keys.findFirst({
+ let apiKey = await prisma.team_api_keys.findFirst({
include: {
teams: {
include: {
@@ -55,22 +55,35 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {
},
},
})
- const defaultTeam = user.users_teams.find((t) => t.teams.is_default)
+ let defaultTeam = user.users_teams.find((t) => t.teams.is_default)?.teams
if (!defaultTeam) {
- return {
- redirect: {
- destination: '/',
- permanent: false,
- },
- }
- }
+ defaultTeam = await prisma.teams.create({
+ data: {
+ name: session.user.email || session.user.id,
+ is_default: true,
+ }
+ })
+
for (let i = 0; i < 5; i++) {
apiKeyValue = generateApiKey()
try {
- await prisma.team_api_keys.create({
+ apiKey = await prisma.team_api_keys.create({
+ include: {
+ teams: {
+ include: {
+ users_teams: {
+ where: {
+ user_id: {
+ equals: session.user.id,
+ },
+ },
+ },
+ },
+ },
+ },
data: {
- team_id: defaultTeam.teams.id,
+ team_id: defaultTeam.id,
api_key: apiKeyValue,
},
})
@@ -82,27 +95,19 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {
throw e
}
}
- }
+ }}
posthog?.capture({
distinctId: user.id,
event: 'created API key',
- groups: { team: defaultTeam.teams.id },
+ groups: { team: defaultTeam.id },
})
}
-
- if (!apiKeyValue) {
- return {
- redirect: {
- destination: '/',
- permanent: false,
- },
- }
- }
+
return {
props: {
- apiKey: apiKeyValue,
+ apiKey: apiKey!.api_key,
}
}
}