Merge branch 'josh/vercel' into staging

Author: izadoesdev

.github/workflows/osv-scanner.yml

@@ -27,43 +27,34 @@ function LoginPage() {
 	const [showPassword, setShowPassword] = useState(false);
 	const [lastUsed, setLastUsed] = useState<string | null>(null);
 
-	const callbackUrl = searchParams.get('callback') || '/websites';
+	const defaultCallbackUrl = searchParams.get('callback') || '/websites';
 
 	useEffect(() => {
 		setLastUsed(localStorage.getItem('lastUsedLogin'));
 	}, []);
 
-	const handleGoogleLogin = () => {
+	const handleSocialLogin = (provider: 'github' | 'google') => {
 		setIsLoading(true);
-		signIn.social({
-			provider: 'google',
-			callbackURL: callbackUrl,
-			newUserCallbackURL: '/onboarding',
-			fetchOptions: {
-				onSuccess: () => {
-					localStorage.setItem('lastUsedLogin', 'google');
-				},
-				onError: () => {
-					setIsLoading(false);
-					toast.error('Google login failed. Please try again.');
-				},
-			},
-		});
-	};
 
-	const handleGithubLogin = () => {
-		setIsLoading(true);
+		const callbackUrl = searchParams.get('callback');
+		const finalCallbackUrl = callbackUrl || defaultCallbackUrl;
+
 		signIn.social({
-			provider: 'github',
-			callbackURL: callbackUrl,
+			provider,
+			callbackURL: finalCallbackUrl,
 			newUserCallbackURL: '/onboarding',
 			fetchOptions: {
 				onSuccess: () => {
-					localStorage.setItem('lastUsedLogin', 'github');
+					localStorage.setItem('lastUsedLogin', provider);
+					if (callbackUrl) {
+						router.push(callbackUrl);
+					}
 				},
 				onError: () => {
 					setIsLoading(false);
-					toast.error('GitHub login failed. Please try again.');
+					toast.error(
+						`${provider === 'github' ? 'GitHub' : 'Google'} login failed. Please try again.`
+					);
 				},
 			},
 		});
@@ -81,10 +72,14 @@ function LoginPage() {
 		await signIn.email({
 			email,
 			password,
-			callbackURL: callbackUrl,
+			callbackURL: defaultCallbackUrl,
 			fetchOptions: {
 				onSuccess: () => {
 					localStorage.setItem('lastUsedLogin', 'email');
+					const callbackUrl = searchParams.get('callback');
+					if (callbackUrl) {
+						router.push(callbackUrl);
+					}
 				},
 				onError: (error) => {
 					setIsLoading(false);
@@ -125,7 +120,7 @@ function LoginPage() {
 							<Button
 								className="relative flex h-11 w-full cursor-pointer items-center justify-center transition-all duration-200 hover:bg-primary/5"
 								disabled={isLoading}
-								onClick={handleGithubLogin}
+								onClick={() => handleSocialLogin('github')}
 								type="button"
 								variant="outline"
 							>
@@ -140,7 +135,7 @@ function LoginPage() {
 							<Button
 								className="relative flex h-11 w-full cursor-pointer items-center justify-center transition-all duration-200 hover:bg-primary/5"
 								disabled={isLoading}
-								onClick={handleGoogleLogin}
+								onClick={() => handleSocialLogin('google')}
 								type="button"
 								variant="outline"
 							>

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

@@ -33,6 +33,7 @@ function RegisterPageContent() {
 	const router = useRouter();
 	const searchParams = useSearchParams();
 	const selectedPlan = searchParams.get('plan');
+	const callbackUrl = searchParams.get('callback');
 	const [isLoading, setIsLoading] = useState(false);
 	const [formData, setFormData] = useState({
 		name: '',
@@ -53,6 +54,18 @@ function RegisterPageContent() {
 		setFormData((prev) => ({ ...prev, [name]: value }));
 	};
 
+	const handleAuthSuccess = () => {
+		if (callbackUrl) {
+			toast.success('Account created! Completing integration...');
+			router.push(callbackUrl);
+		} else if (selectedPlan) {
+			localStorage.setItem('pendingPlanSelection', selectedPlan);
+			router.push(`/billing?tab=plans&plan=${selectedPlan}`);
+		} else {
+			router.push('/websites');
+		}
+	};
+
 	const handleSubmit = async (e: React.FormEvent) => {
 		e.preventDefault();
 
@@ -78,21 +91,18 @@ function RegisterPageContent() {
 			password: formData.password,
 			name: formData.name,
 			fetchOptions: {
-				onSuccess: (ctx) => {
-					const authToken = ctx.response.headers.get('set-auth-token');
-					if (authToken) {
-						localStorage.setItem('authToken', authToken);
-					}
-					toast.success(
-						'Account created! Please check your email to verify your account.'
-					);
-					setRegistrationStep('verification-needed');
-
-					// Store plan selection for post-verification redirect
-					if (selectedPlan) {
-						localStorage.setItem('pendingPlanSelection', selectedPlan);
+				onSuccess: () => {
+					if (callbackUrl) {
+						handleAuthSuccess();
+					} else {
+						toast.success(
+							'Account created! Please check your email to verify your account.'
+						);
+						setRegistrationStep('verification-needed');
+						if (selectedPlan) {
+							localStorage.setItem('pendingPlanSelection', selectedPlan);
+						}
 					}
-					// router.push(`/verify?email=${encodeURIComponent(formData.email)}`);
 				},
 			},
 		});
@@ -128,31 +138,27 @@ function RegisterPageContent() {
 	const handleSocialLogin = async (provider: 'github' | 'google') => {
 		setIsLoading(true);
 
-		await authClient.signIn.social({
-			provider,
-			fetchOptions: {
-				onSuccess: (ctx) => {
-					const authToken = ctx.response.headers.get('set-auth-token');
-					if (authToken) {
-						localStorage.setItem('authToken', authToken);
-					}
-					toast.success('Registration successful!');
-
-					// Redirect to billing with plan selection if plan was specified
-					if (selectedPlan) {
-						localStorage.setItem('pendingPlanSelection', selectedPlan);
-						router.push(`/billing?tab=plans&plan=${selectedPlan}`);
-					} else {
-						router.push('/home');
-					}
-				},
-				onError: () => {
-					toast.error('Login failed. Please try again.');
+		try {
+			await authClient.signIn.social({
+				provider,
+				callbackURL: callbackUrl || '/websites',
+				fetchOptions: {
+					onSuccess: () => {
+						toast.success('Registration successful!');
+						handleAuthSuccess();
+					},
+					onError: () => {
+						toast.error(
+							`${provider === 'github' ? 'GitHub' : 'Google'} login failed. Please try again.`
+						);
+						setIsLoading(false);
+					},
 				},
-			},
-		});
-
-		setIsLoading(false);
+			});
+		} catch (error) {
+			toast.error('Login failed. Please try again.');
+			setIsLoading(false);
+		}
 	};
 
 	// Render header content based on current registration step
@@ -549,7 +555,11 @@ function RegisterPageContent() {
 						Already have an account?{' '}
 						<Link
 							className="font-medium text-primary hover:text-primary/80"
-							href="/login"
+							href={
+								callbackUrl
+									? `/login?callback=${encodeURIComponent(callbackUrl)}`
+									: '/login'
+							}
 						>
 							Sign in
 						</Link>