Update app.py

app.py

@@ -170,7 +170,10 @@ def create_app_build_gradle(app_dir, config):
     version_name = config.get("version_name", "1.0.0")
     version_code = config.get("version_code", "1")
     minify_enabled = "true" if config.get("proguard_enabled") else "false"
-    use_firebase = config.get("firebase_enabled", False)
+    
+    # 🔥 Use the securely validated flag from config
+    use_firebase = config.get("actual_firebase_enabled", False) 
+    
     use_onesignal = config.get("onesignal_enabled", False)
     onesignal_id = config.get("onesignal_app_id", "")
     use_admob = config.get("admob_enabled", False)
@@ -1175,13 +1178,38 @@ def setup_project(build_id, config):
     os.makedirs(assets_dir, exist_ok=True)
     os.makedirs(os.path.join(res_dir, "values"), exist_ok=True)
 
-    create_build_gradle_root(project_dir, config.get("firebase_enabled", False), config.get("onesignal_enabled", False))
+    # 🔥 FIREBASE VALIDATION LOGIC 🔥
+    use_firebase = config.get("firebase_enabled", False)
+    use_onesignal = config.get("onesignal_enabled", False)
+    firebase_json = config.get("firebase_json", "")
+    
+    actual_firebase_enabled = False
+    
+    if use_firebase and firebase_json.strip():
+        try:
+            # Check if it's valid JSON AND contains the crucial "project_info" key
+            parsed = json.loads(firebase_json)
+            if "project_info" in parsed:
+                # Only write the file and enable the plugin if it's perfectly valid
+                os.makedirs(app_dir, exist_ok=True)
+                with open(os.path.join(app_dir, "google-services.json"), "w") as f:
+                    json.dump(parsed, f, indent=2)
+                actual_firebase_enabled = True
+            else:
+                LOG_STORE[build_id].append("⚠️ WARNING: Firebase JSON is missing 'project_info'. Firebase integration skipped to prevent build failure.")
+        except json.JSONDecodeError:
+            LOG_STORE[build_id].append("⚠️ WARNING: Firebase JSON is invalid. Firebase integration skipped to prevent build failure.")
+    elif use_firebase:
+        LOG_STORE[build_id].append("⚠️ WARNING: Firebase was enabled but no JSON was provided. Integration skipped.")
+
+    # Save actual state to config so create_app_build_gradle knows what to do
+    config["actual_firebase_enabled"] = actual_firebase_enabled
+
+    create_build_gradle_root(project_dir, actual_firebase_enabled, use_onesignal)
     create_settings_gradle(project_dir, config.get("app_name", "WebApp"))
     create_gradle_properties(project_dir)
     create_gradle_wrapper(project_dir)
 
-    use_firebase = config.get("firebase_enabled", False)
-    use_onesignal = config.get("onesignal_enabled", False)
     create_app_build_gradle(app_dir, config)
     create_proguard_rules(app_dir, config)
 
@@ -1218,17 +1246,6 @@ def setup_project(build_id, config):
         with open(os.path.join(assets_dir, "offline.html"), "w") as f:
             f.write(generate_offline_html())
 
-    firebase_json = config.get("firebase_json", "")
-    if firebase_json and use_firebase:
-        try:
-            parsed = json.loads(firebase_json)
-            with open(os.path.join(app_dir, "google-services.json"), "w") as f:
-                json.dump(parsed, f, indent=2)
-        except json.JSONDecodeError:
-            config["firebase_enabled"] = False
-            create_build_gradle_root(project_dir, False, use_onesignal)
-            create_app_build_gradle(app_dir, config)
-
     strings_xml = """<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">{app_name}</string>