Update app.py

app.py

@@ -163,33 +163,48 @@ def index():
 
 @app.route("/api/store", methods=["POST"])
 def store():
-    """Store encrypted secret with enhanced features - FIXED FOR JSON REQUEST"""
+    """Store encrypted secret with enhanced features"""
     try:
-        # Check if request is JSON or form data
-        if request.is_json:
-            # Handle JSON request (from frontend)
-            json_data = request.get_json()
-            data = json_data.get("data")
-            ttl = int(json_data.get("ttl", 300))
-            view_once = json_data.get("view_once", False)
-            delay_seconds = int(json_data.get("delay_seconds", 0))
-            theme = json_data.get("theme", "default")
-            password_hint = json_data.get("password_hint", "")
-            has_file = json_data.get("has_file", False)
-        else:
-            # Handle form data (backward compatibility)
-            form = request.form
-            data = form.get("data")
-            ttl = int(form.get("ttl", 300))
-            view_once = form.get("view_once", "false").lower() == "true"
-            delay_seconds = int(form.get("delay_seconds", 0))
-            theme = form.get("theme", "default")
-            password_hint = form.get("password_hint", "")
-            has_file = form.get("has_file", "false").lower() == "true"
+        form = request.form
+        data = form.get("data")
         
         if not data:
             return jsonify({"error": "Data is required"}), 400
         
+        # Parse parameters
+        ttl = int(form.get("ttl", 300))
+        view_once = form.get("view_once", "false").lower() == "true"
+        delay_seconds = int(form.get("delay_seconds", 0))
+        theme = form.get("theme", "default")
+        password_hint = form.get("password_hint", "")
+        
+        # Handle file upload
+        file_data = None
+        file_type = None
+        file_name = None
+        
+        if 'file' in request.files:
+            file = request.files['file']
+            if file and file.filename:
+                # Check file size
+                file.seek(0, os.SEEK_END)
+                file_size = file.tell()
+                file.seek(0)
+                
+                if file_size > MAX_FILE_SIZE:
+                    return jsonify({"error": f"File too large. Max size: {MAX_FILE_SIZE/1024/1024:.1f}MB"}), 400
+                
+                # Process file
+                file_name = secure_filename(file.filename)
+                file_type = get_file_type(file_name)
+                
+                if file_type == 'unknown':
+                    return jsonify({"error": "File type not supported"}), 400
+                
+                # Read and encode file
+                file_content = file.read()
+                file_data = base64.b64encode(file_content).decode('utf-8')
+        
         # Generate IDs
         secret_id = str(uuid.uuid4())
         short_id = generate_short_id()
@@ -200,13 +215,15 @@ def store():
         
         # Store secret
         SECRETS[secret_id] = {
-            "data": data,  # Contains encrypted message + file data
+            "data": data,
+            "file_data": file_data,
+            "file_type": file_type,
+            "file_name": file_name,
             "expire_at": time.time() + ttl,
             "view_once": view_once,
             "delay_seconds": delay_seconds,
             "theme": theme,
             "password_hint": password_hint,
-            "has_file": has_file,
             "created_at": time.time(),
             "creator_ip": get_client_ip(request),
             "access_count": 0
@@ -226,16 +243,15 @@ def store():
             "short_url": f"{base_url}/s/{short_id}",
             "qr_code": qr_code,
             "expires_at": SECRETS[secret_id]["expire_at"],
-            "has_file": has_file
+            "has_file": file_data is not None
         })
         
     except Exception as e:
-        print(f"Error in store endpoint: {str(e)}")  # Add logging
         return jsonify({"error": str(e)}), 500
 
 @app.route("/api/fetch/<secret_id>")
 def fetch(secret_id):
-    """Fetch and decrypt secret with analytics - SIMPLIFIED FOR FRONTEND DECRYPTION"""
+    """Fetch and decrypt secret with analytics - MODIFIED TO HANDLE verify_only"""
     try:
         # Check if it's a short link
         if secret_id in SHORT_LINKS:
@@ -256,7 +272,7 @@ def fetch(secret_id):
                     del SHORT_LINKS[short_id]
             return jsonify({"error": "Secret has expired"}), 410
         
-        # Check for verify_only parameter
+        # CHECK FOR verify_only PARAMETER
         verify_only = request.args.get('verify_only', 'false').lower() == 'true'
         
         # Only record access and increment count if NOT verify_only
@@ -267,16 +283,21 @@ def fetch(secret_id):
             # Increment access count
             secret["access_count"] += 1
         
-        # SIMPLIFIED RESPONSE - No separate file handling
+        # Prepare response
         response = {
-            "data": secret["data"],  # Encrypted data (contains message + file)
+            "data": secret["data"],
             "theme": secret.get("theme", "default"),
             "delay_seconds": secret.get("delay_seconds", 0),
             "password_hint": secret.get("password_hint", ""),
-            "has_file": secret.get("has_file", False),  # File flag for frontend
             "access_count": secret["access_count"]
         }
         
+        # Include file data if present
+        if secret.get("file_data"):
+            response["file_data"] = secret["file_data"]
+            response["file_type"] = secret.get("file_type", "unknown")
+            response["file_name"] = secret.get("file_name", "unknown")
+        
         # Handle view-once deletion (only if not verify_only)
         if secret["view_once"] and not verify_only:
             # Delete the secret
@@ -334,7 +355,7 @@ def get_analytics(secret_id):
 
 @app.route("/api/secrets")
 def list_secrets():
-    """List all active secrets (for dashboard) - UPDATED FOR FRONTEND FILE ENCRYPTION"""
+    """List all active secrets (for dashboard)"""
     try:
         current_time = time.time()
         active_secrets = []
@@ -354,10 +375,11 @@ def list_secrets():
                     "created_at": secret["created_at"],
                     "expires_at": secret["expire_at"],
                     "view_once": secret["view_once"],
-                    "has_file": secret.get("has_file", False),  # UPDATED: Use file flag
+                    "has_file": secret.get("file_data") is not None,
+                    "file_type": secret.get("file_type"),
                     "theme": secret.get("theme", "default"),
                     "access_count": secret.get("access_count", 0),
-                    "preview": "Encrypted data"  # UPDATED: Can't preview encrypted data
+                    "preview": secret["data"][:100] + "..." if len(secret["data"]) > 100 else secret["data"]
                 })
         
         return jsonify({
@@ -435,16 +457,18 @@ def get_qr_code(secret_id):
     except Exception as e:
         return jsonify({"error": str(e)}), 500
 
-# 5. UPDATE THE STATS ENDPOINT
 @app.route("/api/stats")
 def get_stats():
-    """Get overall statistics - UPDATED FOR FRONTEND FILE ENCRYPTION"""
+    """Get overall statistics"""
     try:
         total_secrets = len(SECRETS)
         total_accesses = sum(len(analytics) for analytics in ANALYTICS.values())
         
-        # Count secrets with files
-        secrets_with_files = sum(1 for secret in SECRETS.values() if secret.get("has_file", False))
+        # Count by file type
+        file_types = {}
+        for secret in SECRETS.values():
+            file_type = secret.get("file_type", "text")
+            file_types[file_type] = file_types.get(file_type, 0) + 1
         
         # Count by theme
         themes = {}
@@ -455,7 +479,7 @@ def get_stats():
         return jsonify({
             "total_secrets": total_secrets,
             "total_accesses": total_accesses,
-            "secrets_with_files": secrets_with_files,  # UPDATED: File count
+            "file_types": file_types,
             "themes": themes,
             "active_short_links": len(SHORT_LINKS)
         })
@@ -508,7 +532,6 @@ if __name__ == "__main__":
     print("🔐 Sharelock Backend Starting...")
     print("📊 Features enabled:")
     print("   ✅ End-to-end encryption")
-    print("   ✅ Frontend file encryption")
     print("   ✅ File uploads (5MB max)")
     print("   ✅ QR code generation")
     print("   ✅ Analytics tracking")