fix: smoother onboarding

Author: izadoesdev

apps/dashboard/app/(auth)/login/page.tsx

@@ -28,14 +28,10 @@ function LoginPage() {
 	const [lastUsed, setLastUsed] = useState<string | null>(null);
 
 	const defaultCallbackUrl = searchParams.get('callback') || '/websites';
-	const prefilledEmail = searchParams.get('email');
 
 	useEffect(() => {
 		setLastUsed(localStorage.getItem('lastUsedLogin'));
-		if (prefilledEmail) {
-			setEmail(prefilledEmail);
-		}
-	}, [prefilledEmail]);
+	}, []);
 
 	const handlePostAuthCallback = () => {
 		const callbackUrl = searchParams.get('callback');

apps/dashboard/app/(auth)/register/page.tsx

@@ -34,12 +34,10 @@ function RegisterPageContent() {
 	const searchParams = useSearchParams();
 	const selectedPlan = searchParams.get('plan');
 	const callbackUrl = searchParams.get('callback');
-	const prefilledEmail = searchParams.get('email');
-	const prefilledName = searchParams.get('name');
 	const [isLoading, setIsLoading] = useState(false);
 	const [formData, setFormData] = useState({
-		name: prefilledName || '',
-		email: prefilledEmail || '',
+		name: '',
+		email: '',
 		password: '',
 		confirmPassword: '',
 	});
@@ -569,7 +567,7 @@ function RegisterPageContent() {
 							className="font-medium text-primary hover:text-primary/80"
 							href={
 								callbackUrl
-									? `/login?email=${encodeURIComponent(formData.email)}&callback=${encodeURIComponent(callbackUrl)}`
+									? `/login?callback=${encodeURIComponent(callbackUrl)}`
 									: '/login'
 							}
 						>

apps/dashboard/app/api/integrations/vercel/callback/route.ts

@@ -1,5 +1,7 @@
 import { randomUUID } from 'node:crypto';
-import { account, and, db, eq, user } from '@databuddy/db';
+import { auth } from '@databuddy/auth';
+import { account, and, db, eq } from '@databuddy/db';
+import { headers } from 'next/headers';
 import { type NextRequest, NextResponse } from 'next/server';
 
 interface VercelTokenResponse {
@@ -29,6 +31,19 @@ export async function GET(request: NextRequest) {
 			);
 		}
 
+		// Check if user is authenticated
+		const session = await auth.api.getSession({ headers: await headers() });
+
+		// If no session, redirect to auth pages with the callback URL
+		if (!session?.user) {
+			const callbackUrl = new URL(request.url);
+			const completeIntegrationUrl = `${process.env.BETTER_AUTH_URL}${callbackUrl.pathname}${callbackUrl.search}`;
+
+			return NextResponse.redirect(
+				`${process.env.BETTER_AUTH_URL}/register?callback=${encodeURIComponent(completeIntegrationUrl)}`
+			);
+		}
+
 		const redirectUri = `${process.env.BETTER_AUTH_URL}/api/integrations/vercel/callback`;
 
 		const tokenResponse = await fetch(
@@ -76,21 +91,7 @@ export async function GET(request: NextRequest) {
 			);
 		}
 
-		const existingUser = await db.query.user.findFirst({
-			where: eq(user.email, userInfo.email),
-		});
-
-		if (!existingUser) {
-			// Create the callback URL that will complete the integration after auth
-			const callbackUrl = new URL(request.url);
-			const completeIntegrationUrl = `${process.env.BETTER_AUTH_URL}${callbackUrl.pathname}${callbackUrl.search}`;
-
-			return NextResponse.redirect(
-				`${process.env.BETTER_AUTH_URL}/register?email=${encodeURIComponent(userInfo.email)}&name=${encodeURIComponent(userInfo.name || '')}&callback=${encodeURIComponent(completeIntegrationUrl)}`
-			);
-		}
-
-		const userId = existingUser.id;
+		const userId = session.user.id;
 
 		const existingAccount = await db.query.account.findFirst({
 			where: and(eq(account.userId, userId), eq(account.providerId, 'vercel')),