Merge pull request #1176 from dm3-org/hotfix-1174.1

Hotfix 1174.1

Author: AlexNi245

packages/backend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dm3-org/dm3-backend",
   "license": "BSD-2-Clause",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {

packages/backend/src/persistence/storage/postgres/addMessageBatch.ts

@@ -19,8 +19,15 @@ export const addMessageBatch =
                 account.id,
                 encryptedContactName,
             );
+
+            const uniqueMessageBatch = messageBatch.filter(
+                (message, index, self) =>
+                    index ===
+                    self.findIndex((m) => m.messageId === message.messageId),
+            );
+
             //store each message in the db
-            const createMessagePromises = messageBatch.map(
+            const createMessagePromises = uniqueMessageBatch.map(
                 ({
                     messageId,
                     createdAt,

packages/backend/src/storage.test.ts

@@ -1007,7 +1007,7 @@ describe('Storage', () => {
                 .send({
                     encryptedEnvelopContainer: JSON.stringify(envelop1),
                     encryptedContactName: sha256(receiver.account.ensName),
-                    messageId: envelop1.metadata.encryptedMessageHash,
+                    messageId: envelop1.metadata.messageHash,
                     createdAt: 1,
                     isHalted: true,
                 });
@@ -1146,6 +1146,75 @@ describe('Storage', () => {
             expect(body[0].contact).toEqual(sha256(receiver.account.ensName));
             expect(body.length).toBe(1);
 
+            const { status: getMessagesStatus, body: messages } = await request(
+                app,
+            )
+                .get(
+                    `/new/bob.eth/getMessages/${sha256(
+                        receiver.account.ensName,
+                    )}`,
+                )
+                .set({
+                    authorization: 'Bearer ' + token,
+                })
+                .send();
+
+            expect(getMessagesStatus).toBe(200);
+            expect(messages.length).toBe(2);
+            expect(
+                JSON.parse(JSON.parse(messages[0]).encryptedEnvelopContainer),
+            ).toStrictEqual(envelop);
+        });
+        it('if batch contains duplicates it only creates the message once', async () => {
+            const messageFactory = MockMessageFactory(
+                sender,
+                receiver,
+                deliveryService,
+            );
+            const envelop = await messageFactory.createEncryptedEnvelop(
+                'Hello1',
+            );
+            const { status } = await request(app)
+                .post(`/new/bob.eth/addMessageBatch`)
+                .set({
+                    authorization: 'Bearer ' + token,
+                })
+                .send({
+                    encryptedContactName: sha256(receiver.account.ensName),
+                    messageBatch: [
+                        {
+                            encryptedEnvelopContainer: JSON.stringify(envelop),
+                            messageId: '123',
+                            createdAt: 1,
+                            isHalted: false,
+                        },
+                        {
+                            encryptedEnvelopContainer: JSON.stringify(envelop),
+                            messageId: '123',
+                            createdAt: 1,
+                            isHalted: false,
+                        },
+                        {
+                            encryptedEnvelopContainer: JSON.stringify(envelop),
+                            messageId: '456',
+                            createdAt: 2,
+                            isHalted: false,
+                        },
+                    ],
+                });
+            expect(status).toBe(200);
+
+            const { body } = await request(app)
+                .get(`/new/bob.eth/getConversations`)
+                .set({
+                    authorization: 'Bearer ' + token,
+                })
+                .send();
+
+            expect(status).toBe(200);
+            expect(body[0].contact).toEqual(sha256(receiver.account.ensName));
+            expect(body.length).toBe(1);
+
             const { status: getMessagesStatus, body: messages } = await request(
                 app,
             )

packages/billboard-client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dm3-org/dm3-billboard-client",
   "license": "BSD-2-Clause",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "private": true,
   "main": "dist/index.js",
   "types": "dist/ined.d.ts",

packages/billboard-widget/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dm3-org/dm3-billboard-widget",
   "license": "BSD-2-Clause",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "files": [
     "dist"
   ],

packages/delivery-service/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dm3-org/delivery-service",
   "license": "BSD-2-Clause",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "dependencies": {

packages/delivery-service/src/persistence/messages/createMessage.test.ts

@@ -36,7 +36,7 @@ describe('Create Message', () => {
             metadata: {
                 deliveryInformation: '',
                 signature: '',
-                encryptedMessageHash: '',
+                messageHash: '',
                 version: '',
                 encryptionScheme: 'x25519-chacha20-poly1305',
             },
@@ -64,7 +64,7 @@ describe('Create Message', () => {
                     deliveryInstruction: '',
                 },
                 signature: '',
-                encryptedMessageHash: '',
+                messageHash: '',
                 version: '',
                 encryptionScheme: 'x25519-chacha20-poly1305',
             },

packages/delivery-service/src/persistence/messages/deleteExpiredMessages.test.ts

@@ -29,7 +29,7 @@ describe('Delete Expired messages', () => {
                 metadata: {
                     deliveryInformation: '',
                     signature: '',
-                    encryptedMessageHash: '',
+                    messageHash: '',
                     version: '',
                     encryptionScheme: 'x25519-chacha20-poly1305',
                 },
@@ -44,7 +44,7 @@ describe('Delete Expired messages', () => {
                 metadata: {
                     deliveryInformation: '',
                     signature: '',
-                    encryptedMessageHash: '',
+                    messageHash: '',
                     version: '',
                     encryptionScheme: 'x25519-chacha20-poly1305',
                 },
@@ -60,7 +60,7 @@ describe('Delete Expired messages', () => {
                 metadata: {
                     deliveryInformation: '',
                     signature: '',
-                    encryptedMessageHash: '',
+                    messageHash: '',
                     version: '',
                     encryptionScheme: 'x25519-chacha20-poly1305',
                 },

packages/delivery-service/src/persistence/messages/syncAcknowledge.test.ts

@@ -36,7 +36,7 @@ describe('Sync Acknowledge', () => {
                     from: SENDER_ADDRESS,
                 },
                 signature: '',
-                encryptedMessageHash: '0x123',
+                messageHash: '0x123',
                 version: '',
                 encryptionScheme: 'x25519-chacha20-poly1305',
             },
@@ -49,7 +49,7 @@ describe('Sync Acknowledge', () => {
                     from: SENDER_ADDRESS,
                 },
                 signature: '',
-                encryptedMessageHash: '0x456',
+                messageHash: '0x456',
                 version: '',
                 encryptionScheme: 'x25519-chacha20-poly1305',
             },
@@ -84,9 +84,7 @@ describe('Sync Acknowledge', () => {
         );
 
         expect(afterSyncAcknowledge.length).toBe(1);
-        expect(afterSyncAcknowledge[0].metadata.encryptedMessageHash).toBe(
-            '0x456',
-        );
+        expect(afterSyncAcknowledge[0].metadata.messageHash).toBe('0x456');
     });
     it('returns false if message is not found', async () => {
         const envelop1: EncryptionEnvelop = {
@@ -97,7 +95,7 @@ describe('Sync Acknowledge', () => {
                     from: SENDER_ADDRESS,
                 },
                 signature: '',
-                encryptedMessageHash: '0x123',
+                messageHash: '0x123',
                 version: '',
                 encryptionScheme: 'x25519-chacha20-poly1305',
             },

packages/delivery-service/src/persistence/messages/syncAcknowledge.ts

@@ -22,7 +22,7 @@ export function syncAcknowledge(redis: Redis) {
 
         //find the message with the given hash
         const message = messages.find(
-            (m) => m.metadata.encryptedMessageHash === messageHash,
+            (m) => m.metadata.messageHash === messageHash,
         );
 
         //return if the message is not found