fix bug with outbox encryption
This commit is contained in:
Vendored
+3
-2
@@ -478,17 +478,18 @@
|
|||||||
this.primaryChannel.value,
|
this.primaryChannel.value,
|
||||||
...secondaryChannelNames
|
...secondaryChannelNames
|
||||||
];
|
];
|
||||||
const encrypted = this.encryptionKey.value == "" ? messageText : await encryptString(messageText, this.encryptionKey.value);
|
|
||||||
const joinedChannelName = allChannelNames.join("/");
|
const joinedChannelName = allChannelNames.join("/");
|
||||||
return {
|
return {
|
||||||
channel: joinedChannelName,
|
channel: joinedChannelName,
|
||||||
sender: senderName.value,
|
sender: senderName.value,
|
||||||
body: encrypted,
|
body: messageText,
|
||||||
isoDate: (/* @__PURE__ */ new Date()).toISOString()
|
isoDate: (/* @__PURE__ */ new Date()).toISOString()
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
sendExistingMessage = async (chatMessage) => {
|
sendExistingMessage = async (chatMessage) => {
|
||||||
if (isConnected.value == true && this.isSubscribed.value == true) {
|
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);
|
const messageString = JSON.stringify(chatMessage);
|
||||||
UDN.sendMessage(chatMessage.channel, messageString);
|
UDN.sendMessage(chatMessage.channel, messageString);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -179,24 +179,25 @@ export class Chat {
|
|||||||
...secondaryChannelNames,
|
...secondaryChannelNames,
|
||||||
];
|
];
|
||||||
|
|
||||||
// encrypt
|
|
||||||
const encrypted =
|
|
||||||
this.encryptionKey.value == ""
|
|
||||||
? messageText
|
|
||||||
: await encryptString(messageText, this.encryptionKey.value);
|
|
||||||
|
|
||||||
// create object
|
// create object
|
||||||
const joinedChannelName = allChannelNames.join("/");
|
const joinedChannelName = allChannelNames.join("/");
|
||||||
return {
|
return {
|
||||||
channel: joinedChannelName,
|
channel: joinedChannelName,
|
||||||
sender: senderName.value,
|
sender: senderName.value,
|
||||||
body: encrypted,
|
body: messageText,
|
||||||
isoDate: new Date().toISOString(),
|
isoDate: new Date().toISOString(),
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
sendExistingMessage = async (chatMessage: ChatMessage): Promise<void> => {
|
sendExistingMessage = async (chatMessage: ChatMessage): Promise<void> => {
|
||||||
if (isConnected.value == true && this.isSubscribed.value == true) {
|
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);
|
const messageString = JSON.stringify(chatMessage);
|
||||||
UDN.sendMessage(chatMessage.channel, messageString);
|
UDN.sendMessage(chatMessage.channel, messageString);
|
||||||
} else {
|
} else {
|
||||||
@@ -206,7 +207,7 @@ export class Chat {
|
|||||||
|
|
||||||
sendMessagesInOutbox = () => {
|
sendMessagesInOutbox = () => {
|
||||||
this.outbox.value.forEach((message) => {
|
this.outbox.value.forEach((message) => {
|
||||||
this.sendExistingMessage(message)
|
this.sendExistingMessage(message);
|
||||||
this.outbox.remove(message);
|
this.outbox.remove(message);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user