revops + onboarding

src/app/(main)/(auth)/login/LoginClient.tsx

@@ -5,9 +5,10 @@ import { useRouter, useSearchParams } from 'next/navigation';
 import Link from 'next/link';
 import { Card, CardContent } from '@/components/ui/Card';
 import { Input } from '@/components/ui/Input';
-import { Button } from '@/components/ui/Button';
-import { useTranslation } from '@/hooks/useTranslation';
-import { useCsrf } from '@/hooks/useCsrf';
+import { Button } from '@/components/ui/Button';
+import { useTranslation } from '@/hooks/useTranslation';
+import { useCsrf } from '@/hooks/useCsrf';
+import { appendRedirectParam, sanitizeRedirectPath } from '@/lib/auth-flow';
 
 type LoginClientProps = {
     showPageHeading?: boolean;
@@ -20,9 +21,10 @@ export default function LoginClient({ showPageHeading = true }: LoginClientProps
     const { fetchWithCsrf, loading: csrfLoading } = useCsrf();
     const [email, setEmail] = useState('');
     const [password, setPassword] = useState('');
-    const [loading, setLoading] = useState(false);
-    const [error, setError] = useState('');
-    const [showPassword, setShowPassword] = useState(false);
+    const [loading, setLoading] = useState(false);
+    const [error, setError] = useState('');
+    const [showPassword, setShowPassword] = useState(false);
+    const redirectTarget = sanitizeRedirectPath(searchParams.get('redirect'));
 
     const handleSubmit = async (e: React.FormEvent) => {
         e.preventDefault();
@@ -57,10 +59,12 @@ export default function LoginClient({ showPageHeading = true }: LoginClientProps
                     console.error('PostHog tracking error:', error);
                 }
 
-                // Check for redirect parameter
-                const redirectUrl = searchParams.get('redirect') || '/dashboard';
-                router.push(redirectUrl);
-                router.refresh();
+                // Check for redirect parameter
+                const redirectUrl = data.needsOnboarding
+                    ? appendRedirectParam('/onboarding', redirectTarget)
+                    : (redirectTarget || '/dashboard');
+                router.push(redirectUrl);
+                router.refresh();
             } else {
                 setError(data.error || 'Invalid email or password');
             }
@@ -71,10 +75,10 @@ export default function LoginClient({ showPageHeading = true }: LoginClientProps
         }
     };
 
-    const handleGoogleSignIn = () => {
-        // Redirect to Google OAuth API route
-        window.location.href = '/api/auth/google';
-    };
+    const handleGoogleSignIn = () => {
+        // Redirect to Google OAuth API route
+        window.location.href = appendRedirectParam('/api/auth/google', redirectTarget);
+    };
 
     return (
         <div className="min-h-screen bg-gradient-to-br from-primary-50 to-white flex items-center justify-center p-4">
@@ -199,9 +203,9 @@ export default function LoginClient({ showPageHeading = true }: LoginClientProps
                         <div className="mt-6 text-center">
                             <p className="text-sm text-gray-600">
                                 Don't have an account?{' '}
-                                <Link href="/signup" className="text-primary-600 hover:text-primary-700 font-medium">
-                                    Sign up
-                                </Link>
+                                <Link href={appendRedirectParam('/signup', redirectTarget)} className="text-primary-600 hover:text-primary-700 font-medium">
+                                    Sign up
+                                </Link>
                             </p>
                         </div>
                     </CardContent>

src/app/(main)/(auth)/signup/SignupClient.tsx

@@ -1,26 +1,29 @@
 'use client';
 
-import React, { useState } from 'react';
-import { useRouter } from 'next/navigation';
-import Link from 'next/link';
-import { Card, CardHeader, CardTitle, CardContent } from '@/components/ui/Card';
-import { Input } from '@/components/ui/Input';
-import { Button } from '@/components/ui/Button';
-import { useTranslation } from '@/hooks/useTranslation';
-import { useCsrf } from '@/hooks/useCsrf';
-
-export default function SignupClient() {
-    const router = useRouter();
-    const { t } = useTranslation();
-    const { fetchWithCsrf } = useCsrf();
+import React, { useState } from 'react';
+import { useRouter, useSearchParams } from 'next/navigation';
+import Link from 'next/link';
+import { Card, CardHeader, CardTitle, CardContent } from '@/components/ui/Card';
+import { Input } from '@/components/ui/Input';
+import { Button } from '@/components/ui/Button';
+import { useTranslation } from '@/hooks/useTranslation';
+import { useCsrf } from '@/hooks/useCsrf';
+import { appendRedirectParam, sanitizeRedirectPath } from '@/lib/auth-flow';
+
+export default function SignupClient() {
+    const router = useRouter();
+    const searchParams = useSearchParams();
+    const { t } = useTranslation();
+    const { fetchWithCsrf } = useCsrf();
     const [name, setName] = useState('');
     const [email, setEmail] = useState('');
     const [password, setPassword] = useState('');
     const [confirmPassword, setConfirmPassword] = useState('');
     const [loading, setLoading] = useState(false);
-    const [error, setError] = useState('');
-    const [showPassword, setShowPassword] = useState(false);
-    const [showConfirmPassword, setShowConfirmPassword] = useState(false);
+    const [error, setError] = useState('');
+    const [showPassword, setShowPassword] = useState(false);
+    const [showConfirmPassword, setShowConfirmPassword] = useState(false);
+    const redirectTarget = sanitizeRedirectPath(searchParams.get('redirect'));
 
     const handleSubmit = async (e: React.FormEvent) => {
         e.preventDefault();
@@ -68,9 +71,9 @@ export default function SignupClient() {
                     console.error('PostHog tracking error:', error);
                 }
 
-                // Redirect to dashboard
-                router.push('/dashboard');
-                router.refresh();
+                // Redirect to onboarding
+                router.push(appendRedirectParam('/onboarding', redirectTarget));
+                router.refresh();
             } else {
                 setError(data.error || 'Failed to create account');
             }
@@ -81,10 +84,10 @@ export default function SignupClient() {
         }
     };
 
-    const handleGoogleSignIn = () => {
-        // Redirect to Google OAuth API route
-        window.location.href = '/api/auth/google';
-    };
+    const handleGoogleSignIn = () => {
+        // Redirect to Google OAuth API route
+        window.location.href = appendRedirectParam('/api/auth/google', redirectTarget);
+    };
 
     return (
         <div className="min-h-screen bg-gradient-to-br from-primary-50 to-white flex items-center justify-center p-4">
@@ -234,11 +237,11 @@ export default function SignupClient() {
                         </form>
 
                         <div className="mt-6 text-center">
-                            <p className="text-sm text-gray-600">
-                                Already have an account?{' '}
-                                <Link href="/login" className="text-primary-600 hover:text-primary-700 font-medium">
-                                    Sign in
-                                </Link>
+                            <p className="text-sm text-gray-600">
+                                Already have an account?{' '}
+                                <Link href={appendRedirectParam('/login', redirectTarget)} className="text-primary-600 hover:text-primary-700 font-medium">
+                                    Sign in
+                                </Link>
                             </p>
                         </div>
                     </CardContent>