Fix Firebase import handling in auth endpoints - Ensure firebase_admin is always defined - Fix Firebase initialization checks - Improve error messages

app/main.py

@@ -22,9 +22,13 @@ from app.database import (
     close_connection,
 )
 try:
-    from firebase_admin import auth as firebase_auth
+    import firebase_admin
+    from firebase_admin import auth as firebase_auth, app_check, credentials
 except ImportError:
+    firebase_admin = None
     firebase_auth = None
+    app_check = None
+    credentials = None
 
 # Import CCO colorizers
 try:
@@ -45,22 +49,22 @@ app = FastAPI(title="Text-Guided Image Colorization API")
 # -------------------------------------------------
 # 🔐 Firebase Initialization (ENV-based)
 # -------------------------------------------------
-try:
-    import firebase_admin
-    from firebase_admin import credentials, app_check
-
-    firebase_json = os.getenv("FIREBASE_CREDENTIALS")
+if firebase_admin:
+    try:
+        firebase_json = os.getenv("FIREBASE_CREDENTIALS")
 
-    if firebase_json:
-        print("🔥 Loading Firebase credentials from ENV...")
-        firebase_dict = json.loads(firebase_json)
-        cred = credentials.Certificate(firebase_dict)
-        firebase_admin.initialize_app(cred)
-    else:
-        print("⚠️ No Firebase credentials found. Firebase disabled.")
+        if firebase_json:
+            print("🔥 Loading Firebase credentials from ENV...")
+            firebase_dict = json.loads(firebase_json)
+            cred = credentials.Certificate(firebase_dict)
+            firebase_admin.initialize_app(cred)
+        else:
+            print("⚠️ No Firebase credentials found. Firebase disabled.")
 
-except Exception as e:
-    print("❌ Firebase initialization failed:", e)
+    except Exception as e:
+        print("❌ Firebase initialization failed:", e)
+else:
+    print("⚠️ Firebase Admin SDK not available. Firebase features disabled.")
 
 # -------------------------------------------------
 # 📁 Directories (FIXED FOR HUGGINGFACE SPACES)
@@ -247,7 +251,10 @@ async def verify_request(request: Request):
     1. Firebase App Check token (X-Firebase-AppCheck header) - Primary method
     2. Firebase Auth ID token (Authorization: Bearer header) - Fallback for auth endpoints
     """
-    if not firebase_admin or not hasattr(firebase_admin, '_apps') or not firebase_admin._apps:
+    if not firebase_admin:
+        return True
+    
+    if not hasattr(firebase_admin, '_apps') or not firebase_admin._apps:
         return True
     
     # Primary: Check Firebase App Check token (X-Firebase-AppCheck header)
@@ -294,11 +301,14 @@ async def register_user(user_data: RegisterRequest):
     Register a new user with email and password.
     Returns Firebase ID token for immediate use.
     """
-    if not firebase_admin or not hasattr(firebase_admin, '_apps') or not firebase_admin._apps:
+    if not firebase_admin:
+        raise HTTPException(status_code=503, detail="Firebase Admin SDK not available")
+    
+    if not hasattr(firebase_admin, '_apps') or not firebase_admin._apps:
         raise HTTPException(status_code=503, detail="Firebase not initialized")
     
     if not firebase_auth:
-        raise HTTPException(status_code=503, detail="Firebase Admin SDK not available")
+        raise HTTPException(status_code=503, detail="Firebase Auth not available")
     
     try:
         # Create user using Firebase Admin SDK
@@ -338,11 +348,14 @@ async def login_user(credentials: LoginRequest):
     Login with email and password.
     Uses Firebase REST API to authenticate and get ID token.
     """
-    if not firebase_admin or not hasattr(firebase_admin, '_apps') or not firebase_admin._apps:
+    if not firebase_admin:
+        raise HTTPException(status_code=503, detail="Firebase Admin SDK not available")
+    
+    if not hasattr(firebase_admin, '_apps') or not firebase_admin._apps:
         raise HTTPException(status_code=503, detail="Firebase not initialized")
     
     if not firebase_auth:
-        raise HTTPException(status_code=503, detail="Firebase Admin SDK not available")
+        raise HTTPException(status_code=503, detail="Firebase Auth not available")
     
     # Firebase REST API endpoint for email/password authentication
     from app.config import settings
@@ -421,11 +434,14 @@ async def login_user(credentials: LoginRequest):
 @app.get("/auth/me")
 async def get_current_user(request: Request, verified: bool = Depends(verify_request)):
     """Get current authenticated user information"""
-    if not firebase_admin or not hasattr(firebase_admin, '_apps') or not firebase_admin._apps:
+    if not firebase_admin:
+        raise HTTPException(status_code=503, detail="Firebase Admin SDK not available")
+    
+    if not hasattr(firebase_admin, '_apps') or not firebase_admin._apps:
         raise HTTPException(status_code=503, detail="Firebase not initialized")
     
     if not firebase_auth:
-        raise HTTPException(status_code=503, detail="Firebase Admin SDK not available")
+        raise HTTPException(status_code=503, detail="Firebase Auth not available")
     
     # Get user from request state (set by verify_request)
     if hasattr(request, 'state') and hasattr(request.state, 'user'):