Update main.py

main.py

@@ -11,7 +11,10 @@ import google.generativeai as genai
 import firebase_admin
 from firebase_admin import credentials, db, storage, auth
 import pandas as pd
-import requests  # Needed for calling Firebase REST API
+import requests
+from urllib.parse import urlparse, unquote
+import datetime
+
 
 app = Flask(__name__)
 CORS(app)
@@ -217,6 +220,8 @@ def validate_and_save_transaction(uid, user_data, data, file_hash, image_bytes,
 # Data Endpoints for Visualizations
 # ========================================
 
+
+
 @app.route('/api/user/spending-overview', methods=['GET'])
 def get_spending_overview():
     try:
@@ -390,7 +395,22 @@ def get_user_profile():
     except Exception as e:
         return jsonify({'error': str(e)}), 500
 
-# Receipt endpoints
+# Receipt media endpoints
+def get_blob_from_image_url(image_url):
+    """
+    Given an image_url from Firebase Storage (which typically looks like:
+    https://firebasestorage.googleapis.com/v0/b/<bucket>/o/receipts%2F<uid>%2F<filename>?alt=media&token=...),
+    extract and return the blob path (e.g., receipts/<uid>/<filename>).
+    """
+    parsed = urlparse(image_url)
+    # Construct the expected prefix using your bucket's name.
+    prefix = f"/v0/b/{bucket.name}/o/"
+    if parsed.path.startswith(prefix):
+        encoded_blob_path = parsed.path[len(prefix):]  # e.g., receipts%2Fuid%2Ffilename
+        blob_path = unquote(encoded_blob_path)         # e.g., receipts/uid/filename
+        return blob_path
+    return None
+
 @app.route('/api/admin/receipt/<string:transaction_id>/view', methods=['GET'])
 def view_receipt(transaction_id):
     try:
@@ -404,22 +424,21 @@ def view_receipt(transaction_id):
         if not image_url:
             return jsonify({'error': 'No receipt image found for this transaction'}), 404
 
-        # Fetch the image from the public URL
-        r = requests.get(image_url)
+        blob_path = get_blob_from_image_url(image_url)
+        if not blob_path:
+            return jsonify({'error': 'Could not determine blob path from URL'}), 500
+
+        blob = bucket.blob(blob_path)
+        # Generate a signed URL valid for 10 minutes
+        signed_url = blob.generate_signed_url(expiration=datetime.timedelta(minutes=10))
+        r = requests.get(signed_url)
         if r.status_code != 200:
             return jsonify({'error': 'Unable to fetch image from storage'}), 500
 
         return send_file(io.BytesIO(r.content), mimetype='image/jpeg')
     except Exception as e:
-        verify_admin(request.headers.get('Authorization', ''))
-        transaction_ref = db.reference(f'transactions/{transaction_id}')
-        transaction_data = transaction_ref.get()
-        if not transaction_data:
-            return jsonify({'error': 'Transaction not found'}), 404
-
-        image_url = transaction_data.get('image_url')
-        print(image_url)
-        return jsonify({'error': str(e)+f"image: {image_url}"}), 500
+        print(f"View receipt error: {str(e)}")
+        return jsonify({'error': str(e)}), 500
 
 @app.route('/api/admin/receipt/<string:transaction_id>/download', methods=['GET'])
 def download_receipt(transaction_id):
@@ -434,10 +453,17 @@ def download_receipt(transaction_id):
         if not image_url:
             return jsonify({'error': 'No receipt image found for this transaction'}), 404
 
-        r = requests.get(image_url)
+        blob_path = get_blob_from_image_url(image_url)
+        if not blob_path:
+            return jsonify({'error': 'Could not determine blob path from URL'}), 500
+
+        blob = bucket.blob(blob_path)
+        signed_url = blob.generate_signed_url(expiration=datetime.timedelta(minutes=10))
+        r = requests.get(signed_url)
         if r.status_code != 200:
             return jsonify({'error': 'Unable to fetch image from storage'}), 500
 
+        # Use attachment_filename if you're on Flask 1.x; if using Flask 2.x, you can replace it with download_name.
         return send_file(
             io.BytesIO(r.content),
             mimetype='image/jpeg',
@@ -445,10 +471,11 @@ def download_receipt(transaction_id):
             attachment_filename='receipt.jpg'
         )
     except Exception as e:
-        print(f"Error in view_receipt/download_receipt: {e}") # Print the exception to your server logs
+        print(f"Download receipt error: {str(e)}")
         return jsonify({'error': str(e)}), 500
 
 
+
 # delete users
 
 @app.route('/api/admin/users/<string:uid>', methods=['DELETE'])