Merge pull request #478 from trycompai/mariano/middleware

Add auth redirect logic and clean up middleware path handling

Author: Marfuen

apps/app/src/app/[locale]/page.tsx

@@ -1,3 +1,21 @@
+import { auth } from "@/utils/auth";
+import { headers } from "next/headers";
+import { redirect } from "next/navigation";
+
 export default async function RootPage() {
-	return null;
+	const session = await auth.api.getSession({
+		headers: await headers(),
+	});
+
+	if (!session) {
+		return redirect("/auth");
+	}
+
+	const orgId = session.session.activeOrganizationId;
+
+	if (!orgId) {
+		return redirect("/setup");
+	}
+
+	return redirect(`/${orgId}/implementation`);
 }

apps/app/src/middleware.ts

@@ -21,9 +21,11 @@ export async function middleware(request: NextRequest) {
 	const nextUrl = request.nextUrl;
 
 	const pathnameLocale = nextUrl.pathname.split("/", 2)?.[1];
+
 	const pathnameWithoutLocale = pathnameLocale
 		? nextUrl.pathname.slice(pathnameLocale.length + 1)
 		: nextUrl.pathname;
+
 	const newUrl = new URL(pathnameWithoutLocale || "/", request.url);
 
 	response.headers.set("x-pathname", request.nextUrl.pathname);
@@ -32,9 +34,5 @@ export async function middleware(request: NextRequest) {
 		return NextResponse.redirect(new URL("/auth", request.url));
 	}
 
-	if (sessionCookie && newUrl.pathname === "/auth") {
-		return NextResponse.redirect(new URL("/", request.url));
-	}
-
 	return response;
 }