From a230ee58908fd000e7bcada67ed42c8f1d985b7d Mon Sep 17 00:00:00 2001
From: dyzulk <66510723+dyzulk@users.noreply.github.com>
Date: Sun, 4 Jan 2026 19:29:46 +0700
Subject: [PATCH] fix: handle secure attachment downloads and fix invalid
 storage URLs

---
 src/app/dashboard/admin/tickets/AdminTicketDetailsClient.tsx | 2 +-
 src/app/dashboard/support/TicketDetailsClient.tsx            | 2 +-
 src/lib/utils.ts                                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/dashboard/admin/tickets/AdminTicketDetailsClient.tsx b/src/app/dashboard/admin/tickets/AdminTicketDetailsClient.tsx
index 58584f5..fe2490d 100644
--- a/src/app/dashboard/admin/tickets/AdminTicketDetailsClient.tsx
+++ b/src/app/dashboard/admin/tickets/AdminTicketDetailsClient.tsx
@@ -216,7 +216,7 @@ export default function AdminTicketDetailsClient() {
                                           {reply.attachments.map((att: any) => (
                                              <a 
                                                key={att.id} 
-                                               href={getAttachmentUrl(att.file_path)} 
+                                               href={att.download_url || getAttachmentUrl(att.file_path)} 
                                                target="_blank" 
                                                rel="noopener noreferrer"
                                                className={`flex items-center gap-2 p-2 rounded-lg text-xs transition-colors ${
diff --git a/src/app/dashboard/support/TicketDetailsClient.tsx b/src/app/dashboard/support/TicketDetailsClient.tsx
index fa0d787..3dad8ac 100644
--- a/src/app/dashboard/support/TicketDetailsClient.tsx
+++ b/src/app/dashboard/support/TicketDetailsClient.tsx
@@ -230,7 +230,7 @@ export default function TicketDetailsClient() {
                           {reply.attachments.map((att: any) => (
                              <a 
                                key={att.id} 
-                               href={getAttachmentUrl(att.file_path)} 
+                               href={att.download_url || getAttachmentUrl(att.file_path)} 
                                target="_blank" 
                                rel="noopener noreferrer"
                                className={`flex items-center gap-2 p-2 rounded-lg text-xs transition-colors ${
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index dd3f917..0c8e5bb 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -76,7 +76,7 @@ export const parseApiError = (error: any, defaultMessage: string = "An error occ
  * Handles both old relative paths and new absolute R2 URLs.
  */
 export const getAttachmentUrl = (filePath: string) => {
-  if (!filePath) return "#";
+  if (!filePath || filePath === "0" || filePath === "null") return "#";
   
   // If it's already a full URL (R2), return it as is
   if (filePath.startsWith("http://") || filePath.startsWith("https://")) {