Reverted to commit 96a961d95c

src/components/auth/AuthModal.tsx

@@ -10,7 +10,6 @@ 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;
@@ -35,8 +34,6 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
     displayName: ''
   });
 
-  const { requireCaptcha } = useCaptchaBypass();
-
   const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setFormData(prev => ({
       ...prev,
@@ -48,7 +45,7 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
     e.preventDefault();
     setLoading(true);
 
-    if (requireCaptcha && !signInCaptchaToken) {
+    if (!signInCaptchaToken) {
       toast({
         variant: "destructive",
         title: "CAPTCHA required",
@@ -62,26 +59,19 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
     setSignInCaptchaToken(null);
 
     try {
-      const signInOptions: any = {
+      const { error } = await supabase.auth.signInWithPassword({
         email: formData.email,
         password: formData.password,
-      };
-      
-      if (tokenToUse) {
-        signInOptions.options = { captchaToken: tokenToUse };
-      }
-
-      const { error } = await supabase.auth.signInWithPassword(signInOptions);
+        options: {
+          captchaToken: tokenToUse
+        }
+      });
       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);
@@ -119,7 +109,7 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
       return;
     }
 
-    if (requireCaptcha && !captchaToken) {
+    if (!captchaToken) {
       toast({
         variant: "destructive",
         title: "CAPTCHA required",
@@ -133,22 +123,17 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
     setCaptchaToken(null);
 
     try {
-      const signUpOptions: any = {
+      const { data, error } = await supabase.auth.signUp({
         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;
 
@@ -303,23 +288,21 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
                 </div>
               </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>
-              )}
+              <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 || (requireCaptcha && !signInCaptchaToken)}
+                disabled={loading || !signInCaptchaToken}
               >
                 {loading ? "Signing in..." : "Sign In"}
               </Button>
@@ -465,23 +448,21 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
                 </div>
               </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>
-              )}
+              <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 || (requireCaptcha && !captchaToken)}
+                disabled={loading || !captchaToken}
               >
                 {loading ? "Creating account..." : "Create Account"}
               </Button>