Update main.py

main.py

@@ -408,22 +408,32 @@ def get_user_profile():
         return jsonify({'error': str(e)}), 500
 
 # 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>).
+    Extracts and returns the blob path from a Firebase Storage URL.
+    Supports URLs of the form:
+      https://storage.googleapis.com/<bucket>/<blob_path>
+    or the default Firebase URL format.
     """
     parsed = urlparse(image_url)
-    # Construct the expected prefix using your bucket's name.
+    # If URL is in the storage.googleapis.com format:
+    if parsed.netloc == "storage.googleapis.com":
+        # Expected path: /<bucket>/<blob_path>
+        parts = parsed.path.strip("/").split("/", 1)
+        if len(parts) == 2:
+            bucket_name, blob_path = parts
+            # (Optionally, check if bucket_name matches our bucket.name)
+            return blob_path
+    # Otherwise, try the default format:
     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
+        encoded_blob_path = parsed.path[len(prefix):]
+        blob_path = unquote(encoded_blob_path)
         return blob_path
     return None
 
-
 @app.route('/api/admin/receipt/<string:transaction_id>/view', methods=['GET'])
 def view_receipt(transaction_id):
     try:
@@ -438,19 +448,18 @@ def view_receipt(transaction_id):
             return jsonify({'error': 'No receipt image found for this transaction'}), 404
 
         blob_path = get_blob_from_image_url(image_url)
-
         if not blob_path:
             return jsonify({'error': 'Could not determine blob path from URL'}), 500
 
-        print(f"**DEBUG: Blob path being used: {blob_path}**")  # ADD THIS LINE
-        blob = bucket.blob(blob_path)
+        print(f"Blob path for view: {blob_path}")  # Debug log
 
+        blob = bucket.blob(blob_path)
         if not blob.exists():
             print("Blob does not exist at path:", blob_path)
             return jsonify({'error': 'Blob not found'}), 404
 
         signed_url = blob.generate_signed_url(expiration=timedelta(minutes=10))
-        print(f"Signed URL for view: {signed_url}")   # Debug log
+        print(f"Signed URL for view: {signed_url}")  # Debug log
         r = requests.get(signed_url)
         print(f"View endpoint response status: {r.status_code}")  # Debug log
         if r.status_code != 200:
@@ -478,15 +487,15 @@ def download_receipt(transaction_id):
         if not blob_path:
             return jsonify({'error': 'Could not determine blob path from URL'}), 500
 
-        print(f"**DEBUG: Blob path being used: {blob_path}**")  # ADD THIS LINE
-        blob = bucket.blob(blob_path)   # Debug log
+        print(f"Blob path for download: {blob_path}")  # Debug log
 
+        blob = bucket.blob(blob_path)
         if not blob.exists():
             print("Blob does not exist at path:", blob_path)
             return jsonify({'error': 'Blob not found'}), 404
 
         signed_url = blob.generate_signed_url(expiration=timedelta(minutes=10))
-        print(f"Signed URL for download: {signed_url}")   # Debug log
+        print(f"Signed URL for download: {signed_url}")  # Debug log
         r = requests.get(signed_url)
         print(f"Download endpoint response status: {r.status_code}")  # Debug log
         if r.status_code != 200:
@@ -496,7 +505,7 @@ def download_receipt(transaction_id):
             io.BytesIO(r.content),
             mimetype='image/jpeg',
             as_attachment=True,
-            attachment_file='receipt.jpg'
+            attachment_filename='receipt.jpg'  # Use download_name if using Flask 2.x
         )
     except Exception as e:
         print(f"Download receipt error: {str(e)}")
@@ -504,7 +513,6 @@ def download_receipt(transaction_id):
 
 
 
-
 # delete users
 
 @app.route('/api/admin/users/<string:uid>', methods=['DELETE'])