From 13d61c052b52e288b48dde40089218b8a3663120 Mon Sep 17 00:00:00 2001
From: marlon-erler <viridian035@gmail.com>
Date: Wed, 10 Jul 2024 16:47:29 +0200
Subject: [PATCH] fix bug with outbox encryption

---
 dist/index.js          |  5 +++--
 src/Model/chatModel.ts | 17 +++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 6539eb70..d119c1de 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -478,17 +478,18 @@
         this.primaryChannel.value,
         ...secondaryChannelNames
       ];
-      const encrypted = this.encryptionKey.value == "" ? messageText : await encryptString(messageText, this.encryptionKey.value);
       const joinedChannelName = allChannelNames.join("/");
       return {
         channel: joinedChannelName,
         sender: senderName.value,
-        body: encrypted,
+        body: messageText,
         isoDate: (/* @__PURE__ */ new Date()).toISOString()
       };
     };
     sendExistingMessage = async (chatMessage) => {
       if (isConnected.value == true && this.isSubscribed.value == true) {
+        const encrypted = this.encryptionKey.value == "" ? chatMessage.body : await encryptString(chatMessage.body, this.encryptionKey.value);
+        chatMessage.body = encrypted;
         const messageString = JSON.stringify(chatMessage);
         UDN.sendMessage(chatMessage.channel, messageString);
       } else {
diff --git a/src/Model/chatModel.ts b/src/Model/chatModel.ts
index 6fc7f49c..ab3658bf 100644
--- a/src/Model/chatModel.ts
+++ b/src/Model/chatModel.ts
@@ -179,24 +179,25 @@ export class Chat {
       ...secondaryChannelNames,
     ];
 
-    // encrypt
-    const encrypted =
-      this.encryptionKey.value == ""
-        ? messageText
-        : await encryptString(messageText, this.encryptionKey.value);
-
     // create object
     const joinedChannelName = allChannelNames.join("/");
     return {
       channel: joinedChannelName,
       sender: senderName.value,
-      body: encrypted,
+      body: messageText,
       isoDate: new Date().toISOString(),
     };
   };
 
   sendExistingMessage = async (chatMessage: ChatMessage): Promise<void> => {
     if (isConnected.value == true && this.isSubscribed.value == true) {
+      const encrypted =
+        this.encryptionKey.value == ""
+          ? chatMessage.body
+          : await encryptString(chatMessage.body, this.encryptionKey.value);
+
+      chatMessage.body = encrypted;
+
       const messageString = JSON.stringify(chatMessage);
       UDN.sendMessage(chatMessage.channel, messageString);
     } else {
@@ -206,7 +207,7 @@ export class Chat {
 
   sendMessagesInOutbox = () => {
     this.outbox.value.forEach((message) => {
-      this.sendExistingMessage(message)
+      this.sendExistingMessage(message);
       this.outbox.remove(message);
     });
   };