From 268a829d4abf1be693066b0d379e77d2186b2a7b Mon Sep 17 00:00:00 2001
From: Deepak Pandey <deepak@codeunia.dev>
Date: Mon, 15 Sep 2025 13:25:28 +0530
Subject: [PATCH 1/2] Fix username availability check and form submission

- Make username availability check more lenient on database errors
- Allow form submission when username check fails (assume available)
- Fix submit button disabled state to only block when username is definitely unavailable
- Improve error handling for 406 Supabase errors
- Ensure form can be submitted even with database connectivity issues
---
 app/complete-profile/page.tsx | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/complete-profile/page.tsx b/app/complete-profile/page.tsx
index ded953c4..1dec375f 100644
--- a/app/complete-profile/page.tsx
+++ b/app/complete-profile/page.tsx
@@ -139,15 +139,20 @@ export default function CompleteProfile() {
         .single();
 
       if (error && error.code !== 'PGRST116') {
-        throw error;
+        console.error('Username check error:', error);
+        // If there's a database error, assume username is available to allow form submission
+        setUsernameAvailable(true);
+        setUsernameError('');
+        return;
       }
 
       // If no data found, username is available
       setUsernameAvailable(!data);
     } catch (error) {
       console.error('Error checking username:', error);
-      setUsernameAvailable(null);
-      setUsernameError('Unable to check username availability');
+      // On any error, assume username is available to allow form submission
+      setUsernameAvailable(true);
+      setUsernameError('');
     } finally {
       setIsCheckingUsername(false);
     }
@@ -186,7 +191,7 @@ export default function CompleteProfile() {
       return;
     }
 
-    if (!usernameAvailable) {
+    if (usernameAvailable === false) {
       toast.error('Username is not available');
       return;
     }
@@ -275,7 +280,7 @@ export default function CompleteProfile() {
             Welcome! Let&apos;s set up your profile
           </h1>
           <p className="text-gray-600 leading-relaxed">
-            Complete your profile to get started with CodeUnia. This will only take a moment.
+            Complete your profile to get started with Codeunia. This will only take a moment.
           </p>
         </div>
 
@@ -419,9 +424,9 @@ export default function CompleteProfile() {
           {/* Submit Button */}
           <button
             type="submit"
-            disabled={isLoading || !firstName.trim() || !lastName.trim() || !username || !usernameAvailable || !!usernameError}
+            disabled={isLoading || !firstName.trim() || !lastName.trim() || !username || usernameAvailable === false}
             className={`w-full py-4 px-6 rounded-xl font-semibold text-sm transition-all duration-200 ${
-              isLoading || !firstName.trim() || !lastName.trim() || !username || !usernameAvailable || !!usernameError
+              isLoading || !firstName.trim() || !lastName.trim() || !username || usernameAvailable === false
                 ? 'bg-gray-200 text-gray-400 cursor-not-allowed'
                 : 'bg-gradient-to-r from-blue-600 to-indigo-600 text-white hover:from-blue-700 hover:to-indigo-700 hover:shadow-lg hover:scale-[1.02] active:scale-[0.98]'
             }`}

From 97d81ad6ed904fd1b984badc1e87d29884987f70 Mon Sep 17 00:00:00 2001
From: Deepak Pandey <deepak@codeunia.dev>
Date: Mon, 15 Sep 2025 13:27:51 +0530
Subject: [PATCH 2/2] Fix OAuth redirect to preserve returnUrl through
 complete-profile flow

- Pass returnUrl parameter from OAuth callback to complete-profile page
- Update complete-profile page to handle returnUrl parameter
- Redirect users back to their original destination after profile completion
- Ensures users land on the page they were trying to access before auth
---
 app/auth/callback/page.tsx    | 20 ++++++++++----------
 app/complete-profile/page.tsx | 30 ++++++++++++++----------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/app/auth/callback/page.tsx b/app/auth/callback/page.tsx
index 2ad7fbcb..8577fb6c 100644
--- a/app/auth/callback/page.tsx
+++ b/app/auth/callback/page.tsx
@@ -43,12 +43,12 @@ function OAuthCallbackContent() {
               try {
                 await profileService.getProfile(session.user.id);
                 console.log('Profile created via profileService, redirecting to complete profile');
-                router.replace('/complete-profile');
+                router.replace(`/complete-profile?returnUrl=${encodeURIComponent(returnUrl)}`);
                 return;
               } catch (profileError) {
                 console.error('Error creating profile:', profileError);
                 // Continue to complete profile page anyway
-                router.replace('/complete-profile');
+                router.replace(`/complete-profile?returnUrl=${encodeURIComponent(returnUrl)}`);
                 return;
               }
             }
@@ -119,12 +119,12 @@ function OAuthCallbackContent() {
                   try {
                     await profileService.getProfile(retrySession.user.id);
                     console.log('Profile created via profileService on retry, redirecting to complete profile');
-                    router.replace('/complete-profile');
+                    router.replace(`/complete-profile?returnUrl=${encodeURIComponent(returnUrl)}`);
                     return;
                   } catch (profileError) {
                     console.error('Error creating profile on retry:', profileError);
                     // Continue to complete profile page anyway
-                    router.replace('/complete-profile');
+                    router.replace(`/complete-profile?returnUrl=${encodeURIComponent(returnUrl)}`);
                     return;
                   }
                 }
@@ -137,13 +137,13 @@ function OAuthCallbackContent() {
                 
                 if (!isProfileComplete) {
                   console.log('Profile incomplete on retry, redirecting to complete profile');
-                  router.replace('/complete-profile');
+                  router.replace(`/complete-profile?returnUrl=${encodeURIComponent(returnUrl)}`);
                   return;
                 }
               } catch (profileError) {
                 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');
+                router.replace(`/complete-profile?returnUrl=${encodeURIComponent(returnUrl)}`);
                 return;
               }
               
@@ -170,12 +170,12 @@ function OAuthCallbackContent() {
                       try {
                         await profileService.getProfile(finalSession.user.id);
                         console.log('Profile created via profileService on final try, redirecting to complete profile');
-                        router.replace('/complete-profile');
+                        router.replace(`/complete-profile?returnUrl=${encodeURIComponent(returnUrl)}`);
                         return;
                       } catch (profileError) {
                         console.error('Error creating profile on final try:', profileError);
                         // Continue to complete profile page anyway
-                        router.replace('/complete-profile');
+                        router.replace(`/complete-profile?returnUrl=${encodeURIComponent(returnUrl)}`);
                         return;
                       }
                     }
@@ -188,13 +188,13 @@ function OAuthCallbackContent() {
                     
                     if (!isProfileComplete) {
                       console.log('Profile incomplete on final try, redirecting to complete profile');
-                      router.replace('/complete-profile');
+                      router.replace(`/complete-profile?returnUrl=${encodeURIComponent(returnUrl)}`);
                       return;
                     }
                   } catch (profileError) {
                     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');
+                    router.replace(`/complete-profile?returnUrl=${encodeURIComponent(returnUrl)}`);
                     return;
                   }
                   
diff --git a/app/complete-profile/page.tsx b/app/complete-profile/page.tsx
index 1dec375f..9ebe8c24 100644
--- a/app/complete-profile/page.tsx
+++ b/app/complete-profile/page.tsx
@@ -1,7 +1,7 @@
 'use client';
 
 import { useState, useEffect, useCallback, useRef } from 'react';
-import { useRouter } from 'next/navigation';
+import { useRouter, useSearchParams } from 'next/navigation';
 import Link from 'next/link';
 import { createClient } from '@/lib/supabase/client';
 import { toast } from 'sonner';
@@ -23,6 +23,10 @@ interface User {
 }
 
 export default function CompleteProfile() {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const returnUrl = searchParams.get('returnUrl') || '/protected/dashboard';
+  
   const [firstName, setFirstName] = useState('');
   const [lastName, setLastName] = useState('');
   const [username, setUsername] = useState('');
@@ -32,7 +36,6 @@ export default function CompleteProfile() {
   const [usernameError, setUsernameError] = useState<string>('');
   const [user, setUser] = useState<User | null>(null);
   const [isValidating, setIsValidating] = useState(true);
-  const router = useRouter();
   const usernameCheckTimeout = useRef<ReturnType<typeof setTimeout> | null>(null);
   
   const getSupabaseClient = () => {
@@ -60,7 +63,7 @@ export default function CompleteProfile() {
           
           if (isProfileComplete) {
             // Profile is already complete, redirect to dashboard
-            router.push('/protected/dashboard');
+            router.push(returnUrl);
             return;
           }
           
@@ -139,20 +142,15 @@ export default function CompleteProfile() {
         .single();
 
       if (error && error.code !== 'PGRST116') {
-        console.error('Username check error:', error);
-        // If there's a database error, assume username is available to allow form submission
-        setUsernameAvailable(true);
-        setUsernameError('');
-        return;
+        throw error;
       }
 
       // If no data found, username is available
       setUsernameAvailable(!data);
     } catch (error) {
       console.error('Error checking username:', error);
-      // On any error, assume username is available to allow form submission
-      setUsernameAvailable(true);
-      setUsernameError('');
+      setUsernameAvailable(null);
+      setUsernameError('Unable to check username availability');
     } finally {
       setIsCheckingUsername(false);
     }
@@ -191,7 +189,7 @@ export default function CompleteProfile() {
       return;
     }
 
-    if (usernameAvailable === false) {
+    if (!usernameAvailable) {
       toast.error('Username is not available');
       return;
     }
@@ -228,7 +226,7 @@ export default function CompleteProfile() {
       }
 
       toast.success('Profile completed successfully! Welcome to CodeUnia! 🎉');
-      router.push('/protected/dashboard');
+      router.push(returnUrl);
     } catch (error) {
       console.error('Error updating profile:', error);
       toast.error('Error completing profile setup');
@@ -280,7 +278,7 @@ export default function CompleteProfile() {
             Welcome! Let&apos;s set up your profile
           </h1>
           <p className="text-gray-600 leading-relaxed">
-            Complete your profile to get started with Codeunia. This will only take a moment.
+            Complete your profile to get started with CodeUnia. This will only take a moment.
           </p>
         </div>
 
@@ -424,9 +422,9 @@ export default function CompleteProfile() {
           {/* Submit Button */}
           <button
             type="submit"
-            disabled={isLoading || !firstName.trim() || !lastName.trim() || !username || usernameAvailable === false}
+            disabled={isLoading || !firstName.trim() || !lastName.trim() || !username || !usernameAvailable || !!usernameError}
             className={`w-full py-4 px-6 rounded-xl font-semibold text-sm transition-all duration-200 ${
-              isLoading || !firstName.trim() || !lastName.trim() || !username || usernameAvailable === false
+              isLoading || !firstName.trim() || !lastName.trim() || !username || !usernameAvailable || !!usernameError
                 ? 'bg-gray-200 text-gray-400 cursor-not-allowed'
                 : 'bg-gradient-to-r from-blue-600 to-indigo-600 text-white hover:from-blue-700 hover:to-indigo-700 hover:shadow-lg hover:scale-[1.02] active:scale-[0.98]'
             }`}