Skip to content

feat: Email verification #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Austin616 merged 3 commits into from
Feb 21, 2026
Merged

feat: Email verification #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6c5490
feat: supabase migrations added
Austin616 Feb 20, 2026
16d16d1
feat: email verification flow logic
Austin616 Feb 20, 2026
8c2a9f7
feat: onboarding UI changes
Austin616 Feb 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 86 additions & 74 deletions app/auth/callback/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,95 +15,107 @@ export async function GET(request: NextRequest) {
const type = requestUrl.searchParams.get('type');
const next = requestUrl.searchParams.get('next') || '/';

// If this is an email confirmation, redirect to the confirmation page
if (type === 'signup') {
const email = requestUrl.searchParams.get('email') || '';
// Redirect to the confirmation page with confirmed status
return NextResponse.redirect(
`${requestUrl.origin}/auth/confirmation?confirmed=true&email=${encodeURIComponent(email)}`
);
// If no code is present, fall back to a safe redirect.
if (!code) {
if (type === 'signup') {
const email = requestUrl.searchParams.get('email') || '';
return NextResponse.redirect(
`${requestUrl.origin}/auth/confirmation?email=${encodeURIComponent(email)}`
);
}

return NextResponse.redirect(requestUrl.origin + next);
}

if (code) {
const cookieStore = await cookies();
const supabase = createServerClient(
process.env.NEXT_PUBLIC_SUPABASE_URL!,
process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
{
cookies: {
get(name: string) {
return cookieStore.get(name)?.value;
},
set(name: string, value: string, options: any) {
cookieStore.set(name, value, options);
},
remove(name: string, options: any) {
cookieStore.set(name, '', options);
},
const cookieStore = await cookies();
const supabase = createServerClient(
process.env.NEXT_PUBLIC_SUPABASE_URL!,
process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
{
cookies: {
get(name: string) {
return cookieStore.get(name)?.value;
},
}
);
set(name: string, value: string, options: any) {
cookieStore.set(name, value, options);
},
remove(name: string, options: any) {
cookieStore.set(name, '', options);
},
},
}
);

const { data: { user }, error } = await supabase.auth.exchangeCodeForSession(code);

if (error) {
console.error('Error exchanging code for session:', error);
const { data: { user }, error } = await supabase.auth.exchangeCodeForSession(code);

if (error) {
console.error('Error exchanging code for session:', error);
return NextResponse.redirect(
`${requestUrl.origin}/auth/signin?error=${encodeURIComponent('Could not authenticate user')}`
);
}

if (user) {
// Validate email domain for new users
if (user.email && !validateEmailDomain(user.email)) {
console.error('Invalid email domain for user:', user.email);
return NextResponse.redirect(
`${requestUrl.origin}/auth/signin?error=${encodeURIComponent('Could not authenticate user')}`
`${requestUrl.origin}/auth/signin?error=${encodeURIComponent('Please use your UT Austin email address')}`
);
}

if (user) {
// Validate email domain for new users
if (user.email && !validateEmailDomain(user.email)) {
console.error('Invalid email domain for user:', user.email);
return NextResponse.redirect(
`${requestUrl.origin}/auth/signin?error=${encodeURIComponent('Please use your UT Austin email address')}`
);
}

// Check if this is a new user (first time signing in)
const existingProfile = await UserService.getUserProfile(user.id);

if (!existingProfile) {
// This is a new user - create their profile and redirect to onboarding
await UserService.upsertUserProfile({
id: user.id,
email: user.email || '',
display_name: user.user_metadata?.full_name || user.user_metadata?.name || user.email?.split('@')[0] || 'User',
profile_image_url: user.user_metadata?.avatar_url || user.user_metadata?.picture || null,
bio: null,
phone: null,
location: null,
onboard_complete: false,
notification_preferences: {
email_notifications: true,
browser_notifications: true
}
});

// Redirect to onboarding for new users
return NextResponse.redirect(
`${requestUrl.origin}/auth/confirmation/onboard`
);
}
// Check if this is a new user (first time signing in)
const existingProfile = await UserService.getUserProfile(user.id);

if (!existingProfile) {
// This is a new user - create their profile and redirect to onboarding
await UserService.upsertUserProfile({
id: user.id,
email: user.email || '',
display_name: user.user_metadata?.full_name || user.user_metadata?.name || user.email?.split('@')[0] || 'User',
profile_image_url: user.user_metadata?.avatar_url || user.user_metadata?.picture || null,
bio: null,
phone: null,
location: null,
onboard_complete: false,
status: 'active',
email_verified_at: new Date().toISOString(),
notification_preferences: {
email_notifications: true,
browser_notifications: true
}
});

// Check if existing user has completed onboarding
if (!existingProfile.onboard_complete) {
return NextResponse.redirect(
`${requestUrl.origin}/auth/confirmation/onboard`
);
}
// Redirect to onboarding for new users
return NextResponse.redirect(
`${requestUrl.origin}/auth/confirmation/onboard`
);
}

// If this is an email confirmation, redirect to the confirmation page
if (user?.new_email) {
// If an existing user is still pending, activate them after verification.
if (existingProfile.status && existingProfile.status !== 'active') {
await UserService.updateUserProfile({
id: user.id,
status: 'active',
email_verified_at: new Date().toISOString(),
});
}

// Check if existing user has completed onboarding
if (!existingProfile.onboard_complete) {
return NextResponse.redirect(
`${requestUrl.origin}/auth/confirmation?confirmed=true&email=${encodeURIComponent(user.new_email)}`
`${requestUrl.origin}/auth/confirmation/onboard`
);
}
}

// If this is an email change confirmation, keep existing behavior.
if (user?.new_email) {
return NextResponse.redirect(
`${requestUrl.origin}/auth/confirmation?confirmed=true&email=${encodeURIComponent(user.new_email)}`
);
}

// Default redirect after sign in
return NextResponse.redirect(requestUrl.origin + next);
}
}
Loading
Loading