Reverted to commit 0091584677

src/components/auth/MFAChallenge.tsx

@@ -5,18 +5,15 @@ import { getErrorMessage } from '@/lib/errorHandler';
 import { Button } from '@/components/ui/button';
 import { Label } from '@/components/ui/label';
 import { InputOTP, InputOTPGroup, InputOTPSlot } from '@/components/ui/input-otp';
-import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
-import { Shield, AlertCircle } from 'lucide-react';
+import { Shield } from 'lucide-react';
 
 interface MFAChallengeProps {
   factorId: string;
-  challengeId?: string | null;
-  userId?: string | null;
   onSuccess: () => void;
   onCancel: () => void;
 }
 
-export function MFAChallenge({ factorId, challengeId, userId, onSuccess, onCancel }: MFAChallengeProps) {
+export function MFAChallenge({ factorId, onSuccess, onCancel }: MFAChallengeProps) {
   const { toast } = useToast();
   const [code, setCode] = useState('');
   const [loading, setLoading] = useState(false);
@@ -26,38 +23,6 @@ export function MFAChallenge({ factorId, challengeId, userId, onSuccess, onCance
 
     setLoading(true);
     try {
-      // NEW SERVER-SIDE FLOW: If we have challengeId and userId, use edge function
-      if (challengeId && userId) {
-        const { data: result, error: verifyError } = await supabase.functions.invoke(
-          'verify-mfa-and-login',
-          {
-            body: {
-              challengeId,
-              factorId,
-              code: code.trim(),
-              userId,
-            },
-          }
-        );
-
-        if (verifyError || result.error) {
-          throw new Error(result?.error || verifyError?.message || 'Verification failed');
-        }
-
-        // Set the session in Supabase client
-        if (result.session) {
-          await supabase.auth.setSession(result.session);
-        }
-
-        toast({
-          title: "Welcome back!",
-          description: "MFA verification successful."
-        });
-        onSuccess();
-        return;
-      }
-
-      // OLD FLOW: For OAuth/Magic Link step-up (existing session)
       // Create fresh challenge for each verification attempt
       const { data: challengeData, error: challengeError } = 
         await supabase.auth.mfa.challenge({ factorId });
@@ -94,14 +59,6 @@ export function MFAChallenge({ factorId, challengeId, userId, onSuccess, onCance
 
   return (
     <div className="space-y-4">
-      <Alert className="border-destructive/50 text-destructive dark:border-destructive dark:text-destructive">
-        <AlertCircle className="h-4 w-4" />
-        <AlertTitle>Security Verification Required</AlertTitle>
-        <AlertDescription>
-          Cancelling will sign you out completely. Two-factor authentication must be completed to access your account.
-        </AlertDescription>
-      </Alert>
-      
       <div className="flex items-center gap-2 text-primary">
         <Shield className="w-5 h-5" />
         <h3 className="font-semibold">Two-Factor Authentication</h3>
@@ -139,7 +96,7 @@ export function MFAChallenge({ factorId, challengeId, userId, onSuccess, onCance
           className="flex-1"
           disabled={loading}
         >
-          Cancel & Sign Out
+          Cancel
         </Button>
         <Button
           onClick={handleVerify}