From dbf3a95bbb08199d4fcf013ce9e8c6aab5503391 Mon Sep 17 00:00:00 2001
From: Darren Clarke <darren@redaranj.com>
Date: Fri, 28 Jun 2024 12:28:11 +0200
Subject: [PATCH] Signal and Docker updates

---
 apps/bridge-worker/tasks/fetch-signal-messages.ts   |  8 ++++++--
 .../tasks/signal/receive-signal-message.ts          | 13 ++++++++++---
 apps/link/middleware.ts                             |  3 ++-
 docker/zammad/Dockerfile                            | 10 +++++-----
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/apps/bridge-worker/tasks/fetch-signal-messages.ts b/apps/bridge-worker/tasks/fetch-signal-messages.ts
index 4b3a95c..aa2bae7 100644
--- a/apps/bridge-worker/tasks/fetch-signal-messages.ts
+++ b/apps/bridge-worker/tasks/fetch-signal-messages.ts
@@ -16,13 +16,17 @@ const fetchSignalMessagesTask = async (): Promise<void> => {
 
     for (const msg of messages) {
       const { envelope } = msg as any;
-      const { source } = envelope;
-      const message = envelope?.dataMessage?.message;
+      const { source, sourceUuid, dataMessage } = envelope;
+      const messageID = sourceUuid;
+      const message = dataMessage?.message;
+      const timestamp = new Date(dataMessage?.timestamp);
       if (source !== number && message) {
         await worker.addJob("signal/receive-signal-message", {
           token: id,
           sender: source,
+          messageID,
           message,
+          timestamp: timestamp.toISOString(),
         });
       }
     }
diff --git a/apps/bridge-worker/tasks/signal/receive-signal-message.ts b/apps/bridge-worker/tasks/signal/receive-signal-message.ts
index 9e87b84..d527c4c 100644
--- a/apps/bridge-worker/tasks/signal/receive-signal-message.ts
+++ b/apps/bridge-worker/tasks/signal/receive-signal-message.ts
@@ -4,14 +4,18 @@ interface ReceiveSignalMessageTaskOptions {
   token: string;
   sender: string;
   message: string;
+  messageID: string;
+  timestamp: string;
 }
 
 const receiveSignalMessageTask = async ({
   token,
   sender,
   message,
+  messageID,
+  timestamp,
 }: ReceiveSignalMessageTaskOptions): Promise<void> => {
-  console.log({ token, sender, message });
+  console.log({ token, sender, message, messageID, timestamp });
   const worker = await getWorkerUtils();
   const row = await db
     .selectFrom("SignalBot")
@@ -20,11 +24,14 @@ const receiveSignalMessageTask = async ({
     .executeTakeFirstOrThrow();
 
   console.log(row);
-
+  console.log(message);
   const backendId = row.id;
   const payload = {
+    to: row.phoneNumber,
+    from: sender,
+    sent_at: timestamp,
     message,
-    recipient: sender,
+    message_id: messageID,
   };
 
   await worker.addJob("common/notify-webhooks", { backendId, payload });
diff --git a/apps/link/middleware.ts b/apps/link/middleware.ts
index c1d8416..e67133b 100644
--- a/apps/link/middleware.ts
+++ b/apps/link/middleware.ts
@@ -60,7 +60,8 @@ export default withAuth(checkRewrites, {
   },
   callbacks: {
     authorized: ({ token, req }) => {
-      if (req.nextUrl.pathname === "/api/v1") {
+      console.log({ p: req.nextUrl.pathname });
+      if (req.nextUrl.pathname.startsWith("/api/v1/")) {
         return true;
       }
 
diff --git a/docker/zammad/Dockerfile b/docker/zammad/Dockerfile
index 15b7085..70a46e9 100644
--- a/docker/zammad/Dockerfile
+++ b/docker/zammad/Dockerfile
@@ -19,11 +19,11 @@ RUN sed -i '/script\/build\/cleanup\.sh/d' contrib/docker/setup.sh
 RUN contrib/docker/setup.sh builder
 ARG EMBEDDED=false
 RUN if [ "$EMBEDDED" = "true" ] ; then sed -i '/proxy_set_header X-Forwarded-User "";/d' ${ZAMMAD_DIR}/contrib/nginx/zammad.conf; fi
-RUN sed -i '/^[[:space:]]*# es config/ i\
-echo "about to reinstall..."\n\
-bundle exec rails runner /opt/zammad/contrib/link/setup.rb\n\
-bundle exec rake zammad:package:migrate\n\
-' /docker-entrypoint.sh
+RUN sed -i '/^[[:space:]]*# es config/a\
+echo "about to reinstall..."\
+bundle exec rails runner /opt/zammad/contrib/link/setup.rb\
+bundle exec rake zammad:package:migrate\
+bundle exec rails r "Setting.set(\"es_ssl_verify\", \"${ELASTICSEARCH_SSL_VERIFY}\")"'\ /docker-entrypoint.sh
 RUN ZAMMAD_SAFE_MODE=1 DATABASE_URL=postgresql://zammad:/zammad bundle exec rails runner /opt/zammad/contrib/link/install.rb
 RUN ZAMMAD_SAFE_MODE=1 DATABASE_URL=postgresql://zammad:/zammad bundle exec rake assets:precompile