From 502069903381ecb83e1da81a34b832dc27989469 Mon Sep 17 00:00:00 2001
From: Darren Clarke <darren@redaranj.com>
Date: Thu, 17 Oct 2024 21:25:12 +0200
Subject: [PATCH 1/2] Fix for plain text messages displayed as HTML

---
 .../(main)/tickets/[id]/@detail/_components/TicketDetail.tsx   | 2 ++
 apps/link/app/_graphql/getTicketArticlesQuery.ts               | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/link/app/(main)/tickets/[id]/@detail/_components/TicketDetail.tsx b/apps/link/app/(main)/tickets/[id]/@detail/_components/TicketDetail.tsx
index d24d34a..bee6548 100644
--- a/apps/link/app/(main)/tickets/[id]/@detail/_components/TicketDetail.tsx
+++ b/apps/link/app/(main)/tickets/[id]/@detail/_components/TicketDetail.tsx
@@ -109,6 +109,8 @@ export const TicketDetail: FC<TicketDetailProps> = ({ id }) => {
                     }
                     model={{
                       message: article.bodyWithUrls,
+                      type:
+                        article.contentType === "text/html" ? "html" : "text",
                       sentTime: article.updated_at,
                       sender: article.from,
                       direction:
diff --git a/apps/link/app/_graphql/getTicketArticlesQuery.ts b/apps/link/app/_graphql/getTicketArticlesQuery.ts
index c652135..6ef86fd 100644
--- a/apps/link/app/_graphql/getTicketArticlesQuery.ts
+++ b/apps/link/app/_graphql/getTicketArticlesQuery.ts
@@ -1,4 +1,4 @@
-import { gql } from 'graphql-request';
+import { gql } from "graphql-request";
 
 export const getTicketArticlesQuery = gql`
 query getTicketArticles($ticketId: ID!) {
@@ -7,6 +7,7 @@ query getTicketArticles($ticketId: ID!) {
       node {
         id
         bodyWithUrls
+        contentType
         internal
         type {
           name

From d80c4d6dc839e1c8d9b8a3b68b4b06c5411e38c5 Mon Sep 17 00:00:00 2001
From: Darren Clarke <darren@redaranj.com>
Date: Thu, 17 Oct 2024 22:39:08 +0200
Subject: [PATCH 2/2] Force '/' in Zammad rewrites to prevent redirection

---
 apps/link/middleware.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/link/middleware.ts b/apps/link/middleware.ts
index 6926d0c..e5e37f6 100644
--- a/apps/link/middleware.ts
+++ b/apps/link/middleware.ts
@@ -7,7 +7,11 @@ const rewriteURL = (
   destinationBaseURL: string,
   headers: any = {},
 ) => {
-  const destinationURL = request.url.replace(originBaseURL, destinationBaseURL);
+  let path = request.url.replace(originBaseURL, "");
+  if (path.startsWith("/")) {
+    path = path.slice(1);
+  }
+  const destinationURL = `${destinationBaseURL}/${path}`;
   console.log(`Rewriting ${request.url} to ${destinationURL}`);
   const requestHeaders = new Headers(request.headers);
   requestHeaders.delete("x-forwarded-user");