diff --git a/Dockerfile b/Dockerfile index e48c8731..759bc9fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,6 @@ RUN npm install --legacy-peer-deps COPY . . RUN npx drizzle-kit generate --dialect sqlite --schema ./server/db/schema.ts --out migrations -RUN ls migrations RUN npm run build diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 3107fad3..44fd7068 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -22,25 +22,6 @@ export default async function RootLayout({ }: Readonly<{ children: React.ReactNode; }>) { - const user = await verifySession(); - - let orgs: ListOrgsResponse["orgs"] = []; - if (user) { - try { - const res = await internal.get>( - `/orgs`, - await authCookieHeader() - ); - if (res && res.data.data.orgs) { - orgs = res.data.data.orgs; - } - } catch {} - - if (!orgs.length) { - redirect(`/setup`); - } - } - return ( diff --git a/src/app/page.tsx b/src/app/page.tsx index cb3ea007..f20dfefe 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -16,7 +16,6 @@ export default async function Page(props: { if (!user) { redirect("/auth/login"); - return; } let orgs: ListOrgsResponse["orgs"] = []; @@ -25,12 +24,18 @@ export default async function Page(props: { `/orgs`, await authCookieHeader() ); + if (res && res.data.data.orgs) { orgs = res.data.data.orgs; } + } catch (e) { console.error(e); } + + if (!orgs.length) { + redirect("/setup"); + } return ( <>