Reverted to commit 06ed528d76

src/components/auth/AuthModal.tsx

@@ -10,6 +10,7 @@ import { supabase } from '@/integrations/supabase/client';
 import { useToast } from '@/hooks/use-toast';
 import { TurnstileCaptcha } from './TurnstileCaptcha';
 import { notificationService } from '@/lib/notificationService';
+import { useCaptchaBypass } from '@/hooks/useCaptchaBypass';
 
 interface AuthModalProps {
   open: boolean;
@@ -34,6 +35,8 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
     displayName: ''
   });
 
+  const { requireCaptcha } = useCaptchaBypass();
+
   const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setFormData(prev => ({
       ...prev,
@@ -45,7 +48,7 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
     e.preventDefault();
     setLoading(true);
 
-    if (!signInCaptchaToken) {
+    if (requireCaptcha && !signInCaptchaToken) {
       toast({
         variant: "destructive",
         title: "CAPTCHA required",
@@ -59,19 +62,26 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
     setSignInCaptchaToken(null);
 
     try {
-      const { error } = await supabase.auth.signInWithPassword({
+      const signInOptions: any = {
         email: formData.email,
         password: formData.password,
-        options: {
-          captchaToken: tokenToUse
-        }
-      });
+      };
+      
+      if (tokenToUse) {
+        signInOptions.options = { captchaToken: tokenToUse };
+      }
+
+      const { error } = await supabase.auth.signInWithPassword(signInOptions);
       if (error) throw error;
       
       toast({
         title: "Welcome back!",
         description: "You've been signed in successfully."
       });
+      
+      // Wait for auth state to propagate before closing
+      await new Promise(resolve => setTimeout(resolve, 100));
+      
       onOpenChange(false);
     } catch (error: any) {
       setSignInCaptchaKey(prev => prev + 1);
@@ -109,7 +119,7 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
       return;
     }
 
-    if (!captchaToken) {
+    if (requireCaptcha && !captchaToken) {
       toast({
         variant: "destructive",
         title: "CAPTCHA required",
@@ -123,17 +133,22 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
     setCaptchaToken(null);
 
     try {
-      const { data, error } = await supabase.auth.signUp({
+      const signUpOptions: any = {
         email: formData.email,
         password: formData.password,
         options: {
-          captchaToken: tokenToUse,
           data: {
             username: formData.username,
             display_name: formData.displayName
           }
         }
-      });
+      };
+
+      if (tokenToUse) {
+        signUpOptions.options.captchaToken = tokenToUse;
+      }
+
+      const { data, error } = await supabase.auth.signUp(signUpOptions);
       
       if (error) throw error;
 
@@ -288,21 +303,23 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
                 </div>
               </div>
 
-              <div>
-                <TurnstileCaptcha
-                  key={signInCaptchaKey}
-                  onSuccess={setSignInCaptchaToken}
-                  onError={() => setSignInCaptchaToken(null)}
-                  onExpire={() => setSignInCaptchaToken(null)}
-                  siteKey={import.meta.env.VITE_TURNSTILE_SITE_KEY}
-                  theme="auto"
-                />
-              </div>
+              {requireCaptcha && (
+                <div>
+                  <TurnstileCaptcha
+                    key={signInCaptchaKey}
+                    onSuccess={setSignInCaptchaToken}
+                    onError={() => setSignInCaptchaToken(null)}
+                    onExpire={() => setSignInCaptchaToken(null)}
+                    siteKey={import.meta.env.VITE_TURNSTILE_SITE_KEY}
+                    theme="auto"
+                  />
+                </div>
+              )}
 
               <Button 
                 type="submit" 
                 className="w-full" 
-                disabled={loading || !signInCaptchaToken}
+                disabled={loading || (requireCaptcha && !signInCaptchaToken)}
               >
                 {loading ? "Signing in..." : "Sign In"}
               </Button>
@@ -448,21 +465,23 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
                 </div>
               </div>
 
-              <div>
-                <TurnstileCaptcha
-                  key={captchaKey}
-                  onSuccess={setCaptchaToken}
-                  onError={() => setCaptchaToken(null)}
-                  onExpire={() => setCaptchaToken(null)}
-                  siteKey={import.meta.env.VITE_TURNSTILE_SITE_KEY}
-                  theme="auto"
-                />
-              </div>
+              {requireCaptcha && (
+                <div>
+                  <TurnstileCaptcha
+                    key={captchaKey}
+                    onSuccess={setCaptchaToken}
+                    onError={() => setCaptchaToken(null)}
+                    onExpire={() => setCaptchaToken(null)}
+                    siteKey={import.meta.env.VITE_TURNSTILE_SITE_KEY}
+                    theme="auto"
+                  />
+                </div>
+              )}
 
               <Button 
                 type="submit" 
                 className="w-full" 
-                disabled={loading || !captchaToken}
+                disabled={loading || (requireCaptcha && !captchaToken)}
               >
                 {loading ? "Creating account..." : "Create Account"}
               </Button>