Skip to content

feat: Add OAuth profile completion flow #241

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
codeunia-dev merged 2 commits into from
Sep 14, 2025
Merged

feat: Add OAuth profile completion flow #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e9aa97
feat: Add OAuth profile completion flow
Sep 14, 2025
a9fed5c
fix: Address CodeRabbit feedback for OAuth profile completion
Sep 14, 2025
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
89 changes: 73 additions & 16 deletions app/auth/callback/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ function OAuthCallbackContent() {
}

if (session?.user) {
// User is authenticated, ensure profile exists
// User is authenticated, check profile completeness
try {
const { data: profile } = await supabase
.from('profiles')
.select('id')
.select('id, first_name, last_name, username, profile_complete')
.eq('id', session.user.id)
.single();

Expand All @@ -46,14 +46,33 @@ function OAuthCallbackContent() {
auth_provider: provider,
user_metadata: session.user.user_metadata || {}
});

// After creating profile, redirect to complete profile
console.log('Profile created, redirecting to complete profile');
router.replace('/complete-profile');
return;
}

// Check if profile is complete (has first_name, last_name, and username)
const isProfileComplete = profile.first_name &&
profile.last_name &&
profile.username &&
profile.profile_complete;

if (!isProfileComplete) {
console.log('Profile incomplete, redirecting to complete profile');
router.replace('/complete-profile');
return;
}
} catch (profileError) {
console.error('Error creating profile for OAuth user:', profileError);
// Continue anyway, the user can still proceed
console.error('Error checking profile for OAuth user:', profileError);
// If there's an error, redirect to complete profile to be safe
router.replace('/complete-profile');
return;
}

// User is authenticated, redirect to return URL
console.log('User authenticated, redirecting to:', returnUrl);
// User is authenticated and profile is complete, redirect to return URL
console.log('User authenticated with complete profile, redirecting to:', returnUrl);
toast.success("Signed in successfully!");
router.replace(returnUrl);
return;
Expand Down Expand Up @@ -87,11 +106,11 @@ function OAuthCallbackContent() {
}

if (retrySession?.user) {
// User is authenticated, ensure profile exists
// User is authenticated, check profile completeness
try {
const { data: profile } = await supabase
.from('profiles')
.select('id')
.select('id, first_name, last_name, username, profile_complete')
.eq('id', retrySession.user.id)
.single();

Expand All @@ -104,13 +123,32 @@ function OAuthCallbackContent() {
auth_provider: provider,
user_metadata: retrySession.user.user_metadata || {}
});

// After creating profile, redirect to complete profile
console.log('Profile created on retry, redirecting to complete profile');
router.replace('/complete-profile');
return;
}

// Check if profile is complete (has first_name, last_name, and username)
const isProfileComplete = profile.first_name &&
profile.last_name &&
profile.username &&
profile.profile_complete;

if (!isProfileComplete) {
console.log('Profile incomplete on retry, redirecting to complete profile');
router.replace('/complete-profile');
return;
}
} catch (profileError) {
console.error('Error creating profile for OAuth user:', profileError);
// Continue anyway, the user can still proceed
console.error('Error checking profile for OAuth user on retry:', profileError);
// If there's an error, redirect to complete profile to be safe
router.replace('/complete-profile');
return;
}

console.log('User authenticated on retry, redirecting to:', returnUrl);
console.log('User authenticated with complete profile on retry, redirecting to:', returnUrl);
toast.success("Signed in successfully!");
router.replace(returnUrl);
} else {
Expand All @@ -120,11 +158,11 @@ function OAuthCallbackContent() {
const { data: { session: finalSession } } = await supabase.auth.getSession();
console.log('Final session check:', { session: !!finalSession });
if (finalSession?.user) {
// User is authenticated, ensure profile exists
// User is authenticated, check profile completeness
try {
const { data: profile } = await supabase
.from('profiles')
.select('id')
.select('id, first_name, last_name, username, profile_complete')
.eq('id', finalSession.user.id)
.single();

Expand All @@ -137,13 +175,32 @@ function OAuthCallbackContent() {
auth_provider: provider,
user_metadata: finalSession.user.user_metadata || {}
});

// After creating profile, redirect to complete profile
console.log('Profile created on final try, redirecting to complete profile');
router.replace('/complete-profile');
return;
}

// Check if profile is complete (has first_name, last_name, and username)
const isProfileComplete = profile.first_name &&
profile.last_name &&
profile.username &&
profile.profile_complete;

if (!isProfileComplete) {
console.log('Profile incomplete on final try, redirecting to complete profile');
router.replace('/complete-profile');
return;
}
} catch (profileError) {
console.error('Error creating profile for OAuth user:', profileError);
// Continue anyway, the user can still proceed
console.error('Error checking profile for OAuth user on final try:', profileError);
// If there's an error, redirect to complete profile to be safe
router.replace('/complete-profile');
return;
}

console.log('User authenticated on final try, redirecting to:', returnUrl);
console.log('User authenticated with complete profile on final try, redirecting to:', returnUrl);
toast.success("Signed in successfully!");
router.replace(returnUrl);
} else {
Expand Down
Loading
Loading