fix: use popup auth (redirect needs Firebase Hosting), fix BGR/RGB bug in InsightFace calls

core/detector.py

@@ -41,8 +41,7 @@ def detect_faces(image: np.ndarray) -> list:
     app = _get_insightface()
     if app is not None:
         try:
-            rgb = cv2.cvtColor(image, cv2.COLOR_BGR2RGB)
-            faces = app.get(rgb)
+            faces = app.get(image)  # InsightFace expects BGR (OpenCV native)
             if faces:
                 bboxes = []
                 for face in faces:
@@ -76,7 +75,6 @@ def get_insightface_faces(image: np.ndarray):
     if app is None:
         return []
     try:
-        rgb = cv2.cvtColor(image, cv2.COLOR_BGR2RGB)
-        return app.get(rgb)
+        return app.get(image)  # InsightFace expects BGR
     except Exception:
         return []

core/swapper.py

@@ -57,13 +57,12 @@ def swap_face_insightface(source: np.ndarray, target: np.ndarray) -> np.ndarray:
         return _fallback_swap(source, target)
 
     try:
-        src_rgb = cv2.cvtColor(source, cv2.COLOR_BGR2RGB)
-        tgt_rgb = cv2.cvtColor(target, cv2.COLOR_BGR2RGB)
-
-        src_faces = app.get(src_rgb)
-        tgt_faces = app.get(tgt_rgb)
+        # InsightFace expects BGR (OpenCV native) — do NOT convert to RGB
+        src_faces = app.get(source)
+        tgt_faces = app.get(target)
 
         if not src_faces or not tgt_faces:
+            print(f"[swapper] face detection failed: src={len(src_faces)} tgt={len(tgt_faces)}")
             return _fallback_swap(source, target)
 
         result = target.copy()
@@ -72,7 +71,8 @@ def swap_face_insightface(source: np.ndarray, target: np.ndarray) -> np.ndarray:
             result = swapper.get(result, tgt_face, src_face, paste_back=True)
 
         return result
-    except Exception:
+    except Exception as e:
+        print(f"[swapper] swap failed: {e}")
         return _fallback_swap(source, target)
 
 

frontend/src/pages/LandingPage.jsx

@@ -1,7 +1,7 @@
-import { useState, useEffect } from 'react';
+import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { motion } from 'framer-motion';
-import { auth, googleProvider, signInWithRedirect, getRedirectResult } from '../firebase';
+import { auth, googleProvider, signInWithPopup } from '../firebase';
 import useAuth, { saveSession, daysLeft } from '../hooks/useAuth';
 import Aurora          from '../components/ui/Aurora';
 import SplitText       from '../components/ui/SplitText';
@@ -49,33 +49,22 @@ export default function LandingPage() {
   const isSignedIn = !!user;
   const days       = isSignedIn ? daysLeft() : 0;
 
-  // Handle redirect result when returning from Google sign-in redirect
-  useEffect(() => {
-    if (typeof getRedirectResult !== 'function') return;
-    getRedirectResult(auth).then(result => {
-      if (!result) return;
-      saveSession(result.user, '');
-      result.user.getIdToken(false).then(t => localStorage.setItem('df_token', t)).catch(() => {});
-      navigate('/app');
-    }).catch(err => {
-      if (err?.code && err.code !== 'auth/popup-closed-by-user') {
-        setError(`Sign in failed: ${err.code}`);
-      }
-    });
-  }, [navigate]);
-
   const doGoogleSignIn = async () => {
     setSigningIn(true);
     setError('');
     try {
-      await signInWithRedirect(auth, googleProvider);
-      // Page will redirect to Google — code below won't run until user returns
+      const result = await signInWithPopup(auth, googleProvider);
+      saveSession(result.user, '');
+      result.user.getIdToken(false).then(t => localStorage.setItem('df_token', t)).catch(() => {});
+      navigate('/app');
     } catch (err) {
       console.error('[Firebase Auth Error]', err?.code, err?.message);
-      if (err?.code === 'auth/unauthorized-domain') {
-        setError('This domain is not authorised in Firebase. Add it to Authorised Domains in Firebase Console.');
-      } else if (err?.code === 'auth/operation-not-allowed') {
-        setError('Google sign-in is not enabled. Enable it in Firebase Console → Authentication → Sign-in method.');
+      if (err?.code === 'auth/popup-closed-by-user' || err?.code === 'auth/cancelled-popup-request') {
+        // user dismissed — no message needed
+      } else if (err?.code === 'auth/popup-blocked') {
+        setError('Popup blocked — please allow popups for this site in your browser, then try again.');
+      } else if (err?.code === 'auth/unauthorized-domain') {
+        setError('Domain not authorised in Firebase. Contact the app owner.');
       } else {
         setError(`Sign in failed: ${err?.code || err?.message || 'unknown error'}`);
       }