Skip to content

fix: Update rollback mechanism to use consistent profileService approach #245

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 1 commit into from
Sep 15, 2025
Merged

fix: Update rollback mechanism to use consistent profileService approach #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
137 changes: 0 additions & 137 deletions .env.example
View file
Open in desktop

This file was deleted.

76 changes: 37 additions & 39 deletions app/auth/callback/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useEffect, Suspense } from "react";
import { useRouter, useSearchParams } from "next/navigation";
import { createClient } from "@/lib/supabase/client";
import { toast } from "sonner";
import { profileService } from "@/lib/services/profile";

function OAuthCallbackContent() {
const router = useRouter();
Expand Down Expand Up @@ -38,19 +39,18 @@ function OAuthCallbackContent() {
.single();

if (!profile) {
// Create profile for OAuth user
const provider = session.user.app_metadata?.provider || 'google';
await supabase.rpc('create_oauth_profile', {
user_id: session.user.id,
email: session.user.email || '',
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;
// Create profile for OAuth user using profileService
try {
await profileService.getProfile(session.user.id);
console.log('Profile created via profileService, redirecting to complete profile');
router.replace('/complete-profile');
return;
} catch (profileError) {
console.error('Error creating profile:', profileError);
// Continue to complete profile page anyway
router.replace('/complete-profile');
return;
}
}

// Check if profile is complete (has first_name, last_name, and username)
Expand Down Expand Up @@ -115,19 +115,18 @@ function OAuthCallbackContent() {
.single();

if (!profile) {
// Create profile for OAuth user
const provider = retrySession.user.app_metadata?.provider || 'google';
await supabase.rpc('create_oauth_profile', {
user_id: retrySession.user.id,
email: retrySession.user.email || '',
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;
// Create profile for OAuth user using profileService
try {
await profileService.getProfile(retrySession.user.id);
console.log('Profile created via profileService on retry, redirecting to complete profile');
router.replace('/complete-profile');
return;
} catch (profileError) {
console.error('Error creating profile on retry:', profileError);
// Continue to complete profile page anyway
router.replace('/complete-profile');
return;
}
}

// Check if profile is complete (has first_name, last_name, and username)
Expand Down Expand Up @@ -167,19 +166,18 @@ function OAuthCallbackContent() {
.single();

if (!profile) {
// Create profile for OAuth user
const provider = finalSession.user.app_metadata?.provider || 'google';
await supabase.rpc('create_oauth_profile', {
user_id: finalSession.user.id,
email: finalSession.user.email || '',
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;
// Create profile for OAuth user using profileService
try {
await profileService.getProfile(finalSession.user.id);
console.log('Profile created via profileService on final try, redirecting to complete profile');
router.replace('/complete-profile');
return;
} catch (profileError) {
console.error('Error creating profile on final try:', profileError);
// Continue to complete profile page anyway
router.replace('/complete-profile');
return;
}
}

// Check if profile is complete (has first_name, last_name, and username)
Expand Down
Loading