Merge pull request #48 from diggerhq/fix/login-onboarding-session

Use actual user instead of session for onboarding redirect
diggerhq · Sep 13, 2024 · b737be7 · b737be7
2 parents 20153ba + 86c6f33
commit b737be7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/middleware.ts b/src/middleware.ts
@@ -78,9 +78,6 @@ export async function middleware(req: NextRequest) {
   const supabase = createMiddlewareClient<Database>({ req, res });
   const sessionResponse = await supabase.auth.getSession();
   const maybeUser = sessionResponse?.data.session?.user;
-  if (shouldOnboardUser(req.nextUrl.pathname, maybeUser)) {
-    return NextResponse.redirect(toSiteURL('/onboarding'));
-  }
   if (isLandingPage(req.nextUrl.pathname)) {
     if (maybeUser) {
       //user is logged in, lets validate session and redirect on success
@@ -100,6 +97,9 @@ export async function middleware(req: NextRequest) {
     if (user.error) {
       return NextResponse.redirect(toSiteURL('/login'));
     }
+    if (shouldOnboardUser(req.nextUrl.pathname, user.data.user)) {
+      return NextResponse.redirect(toSiteURL('/onboarding'));
+    }
   }
   if (!isUnprotectedPage(req.nextUrl.pathname) && !maybeUser) {
     return NextResponse.redirect(toSiteURL('/login'));