add object encryption

This commit is contained in:
marlon-erler
2024-07-11 12:25:45 +02:00
parent e45f9730d6
commit 1596e41b00
3 changed files with 61 additions and 37 deletions
+31 -19
View File
@@ -22,7 +22,7 @@ export interface ChatMessage {
body: string;
isoDate: string;
messageObject?: MessageObject;
messageObject?: string;
}
// object
@@ -154,8 +154,13 @@ export class Chat {
data.messageBody
);
if (messageObject && messageObject.id && messageObject.title) {
return this.handleMessageObject(messageObject);
if (messageObject) {
const decrypted = await decryptString(
messageObject,
this.encryptionKey.value
);
const object = JSON.parse(decrypted);
if (object.id && object.title) return this.handleMessageObject(object);
}
this.handleMessage({
@@ -183,6 +188,20 @@ export class Chat {
this.objects.set(messageObject.id, messageObject);
};
// sending
sendMessagesInOutbox = () => {
this.outbox.value.forEach(async (message) => {
const isSent = await this.sendMessage(message);
if (isSent == true) this.outbox.remove(message);
});
this.objectOutbox.value.forEach(async (object) => {
const chatMessage = await this.createChatMessage("", object);
const isSent = await this.sendMessage(chatMessage);
if (isSent == true) this.objectOutbox.remove(object.id);
});
};
// messages
createChatMessage = async (
messageText: string,
@@ -206,7 +225,11 @@ export class Chat {
isoDate: new Date().toISOString(),
};
if (messageObject) chatMessage.messageObject = messageObject;
if (messageObject)
chatMessage.messageObject = await encryptString(
JSON.stringify(messageObject),
this.encryptionKey.value
);
return chatMessage;
};
@@ -228,16 +251,6 @@ export class Chat {
this.sendMessageFromText(chatMessage.body);
};
sendMessagesInOutbox = () => {
this.outbox.value.forEach((message) => {
this.sendMessage(message);
});
this.objectOutbox.value.forEach(async (object) => {
const chatMessage = await this.createChatMessage("", object);
this.sendMessage(chatMessage);
});
};
clearMessages = (): void => {
this.messages.clear();
};
@@ -258,8 +271,9 @@ export class Chat {
this.messages.callSubscriptions();
};
sendMessage = async (chatMessage: ChatMessage): Promise<void> => {
if (isConnected.value == false || this.isSubscribed.value == false) return;
sendMessage = async (chatMessage: ChatMessage): Promise<boolean> => {
if (isConnected.value == false || this.isSubscribed.value == false)
return false;
const encryptedBody =
this.encryptionKey.value == ""
@@ -271,9 +285,7 @@ export class Chat {
const messageString = JSON.stringify(chatMessage);
UDN.sendMessage(chatMessage.channel, messageString);
this.outbox.remove(chatMessage);
if (chatMessage.messageObject)
this.objectOutbox.remove(chatMessage.messageObject.id);
return true;
};
// objects
+1 -1
View File
@@ -147,7 +147,7 @@ export function ChatOptionModal(chat: Chat, isPresented: React.State<boolean>) {
toggle:disabled={chat.cannotClearObjects}
>
{translation.clearObjects}
<span class="icon">delete_sweep</span>
<span class="icon">deployed_code</span>
</button>
<button