@wireapp/core 40.5.3-draft-20-cc.3 → 40.5.3-draft-20-cc.0

package/lib/conversation/message/MessageService.test.js

@@ -51,12 +51,14 @@ function generateQualifiedRecipients(users) {
     return payload;
 }
 function generateRecipients(users) {
-    return users.reduce((acc, { id, clients }) => {
-        acc[id] = clients;
+    return users.reduce((acc, { id, domain, clients }) => {
+        const domainUsers = acc[domain] || {};
+        domainUsers[id] = clients;
+        acc[domain] = domainUsers;
         return acc;
     }, {});
 }
-function fakeEncryptQualified(_, recipients) {
+function fakeEncrypt(_, recipients) {
     const encryptedPayload = Object.entries(recipients).reduce((acc, [domain, users]) => {
         acc[domain] = Object.entries(users).reduce((userClients, [userId, clients]) => {
             userClients[userId] = clients.reduce((payloads, client) => {
@@ -67,44 +69,102 @@ function fakeEncryptQualified(_, recipients) {
         }, {});
         return acc;
     }, {});
-    return Promise.resolve(encryptedPayload);
-}
-function fakeEncrypt(_, recipients) {
-    const encryptedPayload = Object.entries(recipients).reduce((userClients, [userId, clients]) => {
-        userClients[userId] || (userClients[userId] = clients.reduce((acc, clientId) => {
-            acc[clientId] = new Uint8Array();
-            return acc;
-        }, {}));
-        return userClients;
-    }, {});
-    return Promise.resolve(encryptedPayload);
+    return Promise.resolve({ payloads: encryptedPayload });
 }
 const buildMessageService = async () => {
     const apiClient = new api_client_1.APIClient();
-    const [proteusService] = await (0, ProteusService_mocks_1.buildProteusService)(true);
+    const [proteusService] = await (0, ProteusService_mocks_1.buildProteusService)();
     const messageService = new MessageService_1.MessageService(apiClient, proteusService);
-    jest.spyOn(proteusService, 'encryptQualified').mockImplementation(fakeEncryptQualified);
     jest.spyOn(proteusService, 'encrypt').mockImplementation(fakeEncrypt);
-    return [messageService, { apiClient }];
+    return [messageService, { apiClient, proteusService }];
 };
 describe('MessageService', () => {
-    describe('sendFederatedMessage', () => {
+    describe('sendMessage', () => {
+        const generateUsers = (userCount, clientsPerUser) => {
+            return Array.from(Array(userCount)).map((_, i) => ({
+                id: `user${i}`,
+                domain: `${i}.domain`,
+                clients: Array.from(Array(clientsPerUser)).map((_, j) => `client${i}${j}`),
+            }));
+        };
+        const clientId = 'sendingClient';
+        const conversationId = { id: 'conv1', domain: '' };
+        const createMessage = (content) => {
+            const customTextMessage = protocol_messaging_1.GenericMessage.create({
+                messageId: (0, PayloadHelper_1.getUUID)(),
+                text: protocol_messaging_1.Text.create({ content }),
+            });
+            return protocol_messaging_1.GenericMessage.encode(customTextMessage).finish();
+        };
         it('sends a message and forwards backend response', async () => {
             const [messageService, { apiClient }] = await buildMessageService();
-            jest.spyOn(apiClient.api.conversation, 'postOTRMessageV2').mockResolvedValue(baseMessageSendingStatus);
+            jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockResolvedValue(baseMessageSendingStatus);
             const recipients = generateQualifiedRecipients([user1, user2]);
-            const result = await messageService.sendFederatedMessage('senderclientid', recipients, new Uint8Array(), {
-                conversationId: { id: 'convid', domain: '' },
+            const result = await messageService.sendMessage('senderclientid', recipients, new Uint8Array(), {
+                conversationId: { id: 'convid', domain: 'domain' },
+            });
+            expect(apiClient.api.conversation.postOTRMessage).toHaveBeenCalled();
+            expect(result).toEqual(Object.assign(Object.assign({}, baseMessageSendingStatus), { failed: undefined }));
+        });
+        it('should send regular to conversation', async () => {
+            const [messageService, { apiClient }] = await buildMessageService();
+            const message = 'Lorem ipsum dolor sit amet';
+            jest
+                .spyOn(apiClient.api.conversation, 'postOTRMessage')
+                .mockReturnValue(Promise.resolve({}));
+            await messageService.sendMessage(clientId, generateRecipients(generateUsers(3, 3)), createMessage(message), {
+                conversationId,
             });
-            expect(apiClient.api.conversation.postOTRMessageV2).toHaveBeenCalled();
-            expect(result).toEqual(baseMessageSendingStatus);
+            expect(apiClient.api.conversation.postOTRMessage).toHaveBeenCalledWith(conversationId.id, conversationId.domain, expect.any(Object));
+        });
+        it('should broadcast regular message if no conversationId is given', async () => {
+            const [messageService, { apiClient }] = await buildMessageService();
+            const message = 'Lorem ipsum dolor sit amet';
+            jest
+                .spyOn(apiClient.api.broadcast, 'postBroadcastMessage')
+                .mockReturnValue(Promise.resolve({}));
+            await messageService.sendMessage(clientId, generateRecipients(generateUsers(3, 3)), createMessage(message));
+            expect(apiClient.api.broadcast.postBroadcastMessage).toHaveBeenCalledWith(clientId, expect.any(Object));
         });
         describe('client mismatch', () => {
+            const baseClientMismatch = {
+                deleted: {},
+                missing: {},
+                redundant: {},
+                failed_to_send: {},
+                time: new Date().toISOString(),
+            };
+            it('handles client mismatch when no other clients from that domain are known', async () => {
+                const [messageService, { apiClient }] = await buildMessageService();
+                let spyCounter = 0;
+                const clientMismatch = Object.assign(Object.assign({}, baseClientMismatch), { missing: { [user1.domain]: { [user1.id]: ['client'] } } });
+                jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockImplementation(() => {
+                    spyCounter++;
+                    if (spyCounter === 1) {
+                        const error = new Error();
+                        error.response = {
+                            status: http_status_codes_1.StatusCodes.PRECONDITION_FAILED,
+                            data: clientMismatch,
+                        };
+                        return Promise.reject(error);
+                    }
+                    return Promise.resolve(baseClientMismatch);
+                });
+                jest
+                    .spyOn(apiClient.api.user, 'postMultiPreKeyBundles')
+                    .mockReturnValue(Promise.resolve({ qualified_user_client_prekeys: {} }));
+                const recipients = generateRecipients([]);
+                await messageService.sendMessage('senderclientid', recipients, new Uint8Array(), {
+                    reportMissing: true,
+                    conversationId: { id: 'convid', domain: '' },
+                });
+                expect(apiClient.api.conversation.postOTRMessage).toHaveBeenCalledTimes(2);
+            });
             it('handles client mismatch internally if no onClientMismatch is given', async () => {
                 const [messageService, { apiClient }] = await buildMessageService();
                 let spyCounter = 0;
-                const clientMismatch = Object.assign(Object.assign({}, baseMessageSendingStatus), { deleted: { [user1.domain]: { [user1.id]: [user1.clients[0]] } }, missing: { '2.wire.test': { [user2.id]: ['client22'] } } });
-                jest.spyOn(apiClient.api.conversation, 'postOTRMessageV2').mockImplementation(() => {
+                const clientMismatch = Object.assign(Object.assign({}, baseClientMismatch), { deleted: { [user1.domain]: { [user1.id]: [user1.clients[0]] } }, missing: { [user2.domain]: { [user2.id]: ['client22'] } } });
+                jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockImplementation(() => {
                     spyCounter++;
                     if (spyCounter === 1) {
                         const error = new Error();
@@ -114,22 +174,24 @@ describe('MessageService', () => {
                         };
                         return Promise.reject(error);
                     }
-                    return Promise.resolve(baseMessageSendingStatus);
+                    return Promise.resolve(baseClientMismatch);
                 });
-                jest.spyOn(apiClient.api.user, 'postQualifiedMultiPreKeyBundles').mockReturnValue(Promise.resolve({}));
-                const recipients = generateQualifiedRecipients([user1, user2]);
-                await messageService.sendFederatedMessage('senderclientid', recipients, new Uint8Array(), {
+                jest
+                    .spyOn(apiClient.api.user, 'postMultiPreKeyBundles')
+                    .mockReturnValue(Promise.resolve({ qualified_user_client_prekeys: {} }));
+                const recipients = generateRecipients([user1, user2]);
+                await messageService.sendMessage('senderclientid', recipients, new Uint8Array(), {
                     reportMissing: true,
                     conversationId: { id: 'convid', domain: '' },
                 });
-                expect(apiClient.api.conversation.postOTRMessageV2).toHaveBeenCalledTimes(2);
+                expect(apiClient.api.conversation.postOTRMessage).toHaveBeenCalledTimes(2);
             });
             it('continues message sending if onClientMismatch returns true', async () => {
                 const [messageService, { apiClient }] = await buildMessageService();
-                const onClientMismatch = jest.fn().mockReturnValue(true);
-                const clientMismatch = Object.assign(Object.assign({}, baseMessageSendingStatus), { missing: { '2.wire.test': { [user2.id]: ['client22'] } } });
+                const onClientMismatch = jest.fn().mockReturnValue(Promise.resolve(true));
+                const clientMismatch = Object.assign(Object.assign({}, baseClientMismatch), { missing: { [user2.domain]: { [user2.id]: ['client22'] } } });
                 let spyCounter = 0;
-                jest.spyOn(apiClient.api.conversation, 'postOTRMessageV2').mockImplementation(() => {
+                jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockImplementation(() => {
                     spyCounter++;
                     if (spyCounter === 1) {
                         const error = new Error();
@@ -139,23 +201,25 @@ describe('MessageService', () => {
                         };
                         return Promise.reject(error);
                     }
-                    return Promise.resolve(baseMessageSendingStatus);
+                    return Promise.resolve(baseClientMismatch);
                 });
-                jest.spyOn(apiClient.api.user, 'postQualifiedMultiPreKeyBundles').mockReturnValue(Promise.resolve({}));
-                const recipients = generateQualifiedRecipients([user1, user2]);
-                await messageService.sendFederatedMessage('senderclientid', recipients, new Uint8Array(), {
+                jest
+                    .spyOn(apiClient.api.user, 'postMultiPreKeyBundles')
+                    .mockReturnValue(Promise.resolve({ qualified_user_client_prekeys: {} }));
+                const recipients = generateRecipients([user1, user2]);
+                await messageService.sendMessage('senderclientid', recipients, new Uint8Array(), {
                     reportMissing: true,
                     onClientMismatch,
                     conversationId: { id: 'convid', domain: '' },
                 });
-                expect(apiClient.api.conversation.postOTRMessageV2).toHaveBeenCalledTimes(2);
+                expect(apiClient.api.conversation.postOTRMessage).toHaveBeenCalledTimes(2);
                 expect(onClientMismatch).toHaveBeenCalledWith(clientMismatch);
             });
             it('stops message sending if onClientMismatch returns false', async () => {
                 const [messageService, { apiClient }] = await buildMessageService();
-                const onClientMismatch = jest.fn().mockReturnValue(false);
-                const clientMismatch = Object.assign(Object.assign({}, baseMessageSendingStatus), { missing: { '2.wire.test': { [user2.id]: ['client22'] } } });
-                jest.spyOn(apiClient.api.conversation, 'postOTRMessageV2').mockImplementation(() => {
+                const onClientMismatch = jest.fn().mockReturnValue(Promise.resolve(false));
+                const clientMismatch = Object.assign(Object.assign({}, baseMessageSendingStatus), { missing: { [user2.id]: ['client22'] } });
+                jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockImplementation(() => {
                     const error = new Error();
                     error.response = {
                         status: http_status_codes_1.StatusCodes.PRECONDITION_FAILED,
@@ -163,105 +227,24 @@ describe('MessageService', () => {
                     };
                     return Promise.reject(error);
                 });
-                jest.spyOn(apiClient.api.user, 'postQualifiedMultiPreKeyBundles').mockReturnValue(Promise.resolve({}));
-                const recipients = generateQualifiedRecipients([user1, user2]);
-                await messageService.sendFederatedMessage('senderclientid', recipients, new Uint8Array(), {
+                jest
+                    .spyOn(apiClient.api.user, 'postMultiPreKeyBundles')
+                    .mockReturnValue(Promise.resolve({ qualified_user_client_prekeys: {} }));
+                const recipients = generateRecipients([user1, user2]);
+                await messageService.sendMessage('senderclientid', recipients, new Uint8Array(), {
                     reportMissing: true,
                     onClientMismatch,
                     conversationId: { id: 'convid', domain: '' },
                 });
-                expect(apiClient.api.conversation.postOTRMessageV2).toHaveBeenCalledTimes(1);
+                expect(apiClient.api.conversation.postOTRMessage).toHaveBeenCalledTimes(1);
                 expect(onClientMismatch).toHaveBeenCalledWith(clientMismatch);
             });
         });
-    });
-    describe('sendMessage', () => {
-        const generateUsers = (userCount, clientsPerUser) => {
-            return Array.from(Array(userCount)).map((_, i) => ({
-                id: `user${i}`,
-                domain: `${i}.domain`,
-                clients: Array.from(Array(clientsPerUser)).map((_, j) => `client${i}${j}`),
-            }));
-        };
-        const clientId = 'sendingClient';
-        const conversationId = { id: 'conv1', domain: '' };
-        const createMessage = (content) => {
-            const customTextMessage = protocol_messaging_1.GenericMessage.create({
-                messageId: (0, PayloadHelper_1.getUUID)(),
-                text: protocol_messaging_1.Text.create({ content }),
-            });
-            return protocol_messaging_1.GenericMessage.encode(customTextMessage).finish();
-        };
-        it('should send regular to conversation', async () => {
-            const [messageService, { apiClient }] = await buildMessageService();
-            const message = 'Lorem ipsum dolor sit amet';
-            jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockReturnValue(Promise.resolve({}));
-            await messageService.sendMessage(clientId, generateRecipients(generateUsers(3, 3)), createMessage(message), {
-                conversationId,
-            });
-            expect(apiClient.api.conversation.postOTRMessage).toHaveBeenCalledWith(clientId, conversationId.id, expect.any(Object), false);
-        });
-        it('should send protobuf message to conversation', async () => {
-            const [messageService, { apiClient }] = await buildMessageService();
-            const message = 'Lorem ipsum dolor sit amet';
-            jest
-                .spyOn(apiClient.api.conversation, 'postOTRProtobufMessage')
-                .mockReturnValue(Promise.resolve({}));
-            await messageService.sendMessage(clientId, generateRecipients(generateUsers(3, 3)), createMessage(message), {
-                conversationId,
-                sendAsProtobuf: true,
-            });
-            expect(apiClient.api.conversation.postOTRProtobufMessage).toHaveBeenCalledWith(clientId, conversationId.id, expect.any(Object), false);
-        });
-        it('should broadcast regular message if no conversationId is given', async () => {
-            const [messageService, { apiClient }] = await buildMessageService();
-            const message = 'Lorem ipsum dolor sit amet';
-            jest
-                .spyOn(apiClient.api.broadcast, 'postBroadcastMessage')
-                .mockReturnValue(Promise.resolve({}));
-            await messageService.sendMessage(clientId, generateRecipients(generateUsers(3, 3)), createMessage(message));
-            expect(apiClient.api.broadcast.postBroadcastMessage).toHaveBeenCalledWith(clientId, expect.any(Object), false);
-        });
-        it('should broadcast protobuf message if no conversationId is given', async () => {
-            const [messageService, { apiClient }] = await buildMessageService();
-            const message = 'Lorem ipsum dolor sit amet';
-            jest
-                .spyOn(apiClient.api.broadcast, 'postBroadcastProtobufMessage')
-                .mockReturnValue(Promise.resolve({}));
-            await messageService.sendMessage(clientId, generateRecipients(generateUsers(3, 3)), createMessage(message), {
-                sendAsProtobuf: true,
-            });
-            expect(apiClient.api.broadcast.postBroadcastProtobufMessage).toHaveBeenCalledWith(clientId, expect.any(Object), false);
-        });
-        it('should not send as external if payload small', async () => {
-            const [messageService, { apiClient }] = await buildMessageService();
-            const message = 'Lorem ipsum dolor sit amet';
-            jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockReturnValue(Promise.resolve({}));
-            await messageService.sendMessage(clientId, generateRecipients(generateUsers(3, 3)), createMessage(message), {
-                conversationId,
-            });
-            expect(apiClient.api.conversation.postOTRMessage).toHaveBeenCalledWith(clientId, conversationId.id, expect.objectContaining({ data: undefined }), false);
-        });
-        it('should send as external if payload is big', async () => {
-            const [messageService, { apiClient }] = await buildMessageService();
-            const longMessage = 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Duis autem Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Duis autem';
-            jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockReturnValue(Promise.resolve({}));
-            await messageService.sendMessage(clientId, generateRecipients(generateUsers(30, 10)), createMessage(longMessage), {
-                conversationId,
-            });
-            expect(apiClient.api.conversation.postOTRMessage).toHaveBeenCalledWith(clientId, conversationId.id, expect.objectContaining({ data: expect.any(String) }), false);
-        });
         describe('client mismatch', () => {
-            const baseClientMismatch = {
-                deleted: {},
-                missing: {},
-                redundant: {},
-                time: new Date().toISOString(),
-            };
             it('handles client mismatch internally if no onClientMismatch is given', async () => {
                 const [messageService, { apiClient }] = await buildMessageService();
                 let spyCounter = 0;
-                const clientMismatch = Object.assign(Object.assign({}, baseClientMismatch), { deleted: { [user1.id]: [user1.clients[0]] }, missing: { [user2.id]: ['client22'] } });
+                const clientMismatch = Object.assign(Object.assign({}, baseMessageSendingStatus), { deleted: { [user1.domain]: { [user1.id]: [user1.clients[0]] } }, missing: { '2.wire.test': { [user2.id]: ['client22'] } } });
                 jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockImplementation(() => {
                     spyCounter++;
                     if (spyCounter === 1) {
@@ -272,10 +255,12 @@ describe('MessageService', () => {
                         };
                         return Promise.reject(error);
                     }
-                    return Promise.resolve(baseClientMismatch);
+                    return Promise.resolve(baseMessageSendingStatus);
                 });
-                jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockReturnValue(Promise.resolve({}));
-                const recipients = generateRecipients([user1, user2]);
+                jest
+                    .spyOn(apiClient.api.user, 'postMultiPreKeyBundles')
+                    .mockReturnValue(Promise.resolve({ qualified_user_client_prekeys: {} }));
+                const recipients = generateQualifiedRecipients([user1, user2]);
                 await messageService.sendMessage('senderclientid', recipients, new Uint8Array(), {
                     reportMissing: true,
                     conversationId: { id: 'convid', domain: '' },
@@ -284,8 +269,8 @@ describe('MessageService', () => {
             });
             it('continues message sending if onClientMismatch returns true', async () => {
                 const [messageService, { apiClient }] = await buildMessageService();
-                const onClientMismatch = jest.fn().mockReturnValue(Promise.resolve(true));
-                const clientMismatch = Object.assign(Object.assign({}, baseClientMismatch), { missing: { [user2.id]: ['client22'] } });
+                const onClientMismatch = jest.fn().mockReturnValue(true);
+                const clientMismatch = Object.assign(Object.assign({}, baseMessageSendingStatus), { missing: { '2.wire.test': { [user2.id]: ['client22'] } } });
                 let spyCounter = 0;
                 jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockImplementation(() => {
                     spyCounter++;
@@ -297,10 +282,12 @@ describe('MessageService', () => {
                         };
                         return Promise.reject(error);
                     }
-                    return Promise.resolve(baseClientMismatch);
+                    return Promise.resolve(baseMessageSendingStatus);
                 });
-                jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockReturnValue(Promise.resolve({}));
-                const recipients = generateRecipients([user1, user2]);
+                jest
+                    .spyOn(apiClient.api.user, 'postMultiPreKeyBundles')
+                    .mockReturnValue(Promise.resolve({ qualified_user_client_prekeys: {} }));
+                const recipients = generateQualifiedRecipients([user1, user2]);
                 await messageService.sendMessage('senderclientid', recipients, new Uint8Array(), {
                     reportMissing: true,
                     onClientMismatch,
@@ -309,10 +296,31 @@ describe('MessageService', () => {
                 expect(apiClient.api.conversation.postOTRMessage).toHaveBeenCalledTimes(2);
                 expect(onClientMismatch).toHaveBeenCalledWith(clientMismatch);
             });
+            it('warns the consumer if they try to send a message to a deleted client', async () => {
+                const [messageService, { apiClient, proteusService }] = await buildMessageService();
+                const onClientMismatch = jest.fn().mockReturnValue(true);
+                const recipients = generateQualifiedRecipients([user1, user2]);
+                const unknowns = {
+                    [user1.domain]: {
+                        [user1.id]: [user1.clients[0]],
+                    },
+                };
+                jest.spyOn(proteusService, 'encrypt').mockResolvedValue({
+                    payloads: {},
+                    unknowns,
+                });
+                jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockResolvedValue(baseMessageSendingStatus);
+                const result = await messageService.sendMessage('senderclientid', recipients, new Uint8Array(), {
+                    reportMissing: true,
+                    onClientMismatch,
+                    conversationId: { id: 'convid', domain: '' },
+                });
+                expect(result.deleted).toEqual(unknowns);
+            });
             it('stops message sending if onClientMismatch returns false', async () => {
                 const [messageService, { apiClient }] = await buildMessageService();
-                const onClientMismatch = jest.fn().mockReturnValue(Promise.resolve(false));
-                const clientMismatch = Object.assign(Object.assign({}, baseMessageSendingStatus), { missing: { [user2.id]: ['client22'] } });
+                const onClientMismatch = jest.fn().mockReturnValue(false);
+                const clientMismatch = Object.assign(Object.assign({}, baseMessageSendingStatus), { missing: { '2.wire.test': { [user2.id]: ['client22'] } } });
                 jest.spyOn(apiClient.api.conversation, 'postOTRMessage').mockImplementation(() => {
                     const error = new Error();
                     error.response = {
@@ -321,8 +329,10 @@ describe('MessageService', () => {
                     };
                     return Promise.reject(error);
                 });
-                jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockReturnValue(Promise.resolve({}));
-                const recipients = generateRecipients([user1, user2]);
+                jest
+                    .spyOn(apiClient.api.user, 'postMultiPreKeyBundles')
+                    .mockReturnValue(Promise.resolve({ qualified_user_client_prekeys: {} }));
+                const recipients = generateQualifiedRecipients([user1, user2]);
                 await messageService.sendMessage('senderclientid', recipients, new Uint8Array(), {
                     reportMissing: true,
                     onClientMismatch,

package/lib/conversation/message/PayloadBundle.js

@@ -64,4 +64,4 @@ var PayloadBundleType;
     PayloadBundleType["USER_LEGAL_HOLD_REQUEST"] = "PayloadBundleType.USER_LEGAL_HOLD_REQUEST";
     PayloadBundleType["USER_PROPERTIES_SET"] = "PayloadBundleType.USER_PROPERTIES_SET";
     PayloadBundleType["USER_UPDATE"] = "PayloadBundleType.USER_UPDATE";
-})(PayloadBundleType = exports.PayloadBundleType || (exports.PayloadBundleType = {}));
+})(PayloadBundleType || (exports.PayloadBundleType = PayloadBundleType = {}));

package/lib/conversation/message/UserClientsUtil.d.ts

@@ -1,23 +1,27 @@
 import { QualifiedId } from '@wireapp/api-client/lib/user';
-type UserClientsContainer<T> = {
+type UserMap<T> = {
     [userId: string]: T;
 };
-type QualifiedUserClientsContainer<T> = {
-    [domain: string]: UserClientsContainer<T>;
+type QualifiedUserMap<T> = {
+    [domain: string]: UserMap<T>;
 };
-export declare function flattenUserClients<T>(userClients: UserClientsContainer<T>, domain?: string): {
-    data: T;
-    userId: QualifiedId;
-}[];
 /**
- * Will flatten a container of users=>clients infos to an array
+ * Will flatten a container of domain=>users=>anything infos to an array
  *
- * @param userClients The UserClients (qualified or not) to flatten
+ * @param userMap The qualified UserMap to flatten
  * @return An array containing the qualified user Ids and the clients info
  */
-export declare function flattenQualifiedUserClients<T = unknown>(userClients: QualifiedUserClientsContainer<T>): {
+export declare function flattenUserMap<T = unknown>(userMap: QualifiedUserMap<T>): {
     data: T;
     userId: QualifiedId;
 }[];
+/**
+ * Will convert a list of qualified users to a UserMap
+ * @param users the list of users to convert
+ */
+export declare function nestUsersList<T = unknown>(users: {
+    data: T;
+    userId: QualifiedId;
+}[]): QualifiedUserMap<T>;
 export {};
 //# sourceMappingURL=UserClientsUtil.d.ts.map

package/lib/conversation/message/UserClientsUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UserClientsUtil.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/UserClientsUtil.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,KAAK,oBAAoB,CAAC,CAAC,IAAI;IAAC,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAA;CAAC,CAAC;AACrD,KAAK,6BAA6B,CAAC,CAAC,IAAI;IAAC,CAAC,MAAM,EAAE,MAAM,GAAG,oBAAoB,CAAC,CAAC,CAAC,CAAA;CAAC,CAAC;AAEpF,wBAAgB,kBAAkB,CAAC,CAAC,EAClC,WAAW,EAAE,oBAAoB,CAAC,CAAC,CAAC,EACpC,MAAM,GAAE,MAAW,GAClB;IAAC,IAAI,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAC,EAAE,CAElC;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,CAAC,GAAG,OAAO,EACrD,WAAW,EAAE,6BAA6B,CAAC,CAAC,CAAC,GAC5C;IAAC,IAAI,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAC,EAAE,CAIlC"}
+{"version":3,"file":"UserClientsUtil.d.ts","sourceRoot":"","sources":["../../../src/conversation/message/UserClientsUtil.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,KAAK,OAAO,CAAC,CAAC,IAAI;IAAC,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAA;CAAC,CAAC;AACxC,KAAK,gBAAgB,CAAC,CAAC,IAAI;IAAC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;CAAC,CAAC;AAE1D;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,CAAC,GAAG,OAAO,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG;IAAC,IAAI,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAC,EAAE,CAI1G;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE;IAAC,IAAI,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,WAAW,CAAA;CAAC,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAQvG"}

package/lib/conversation/message/UserClientsUtil.js

@@ -18,20 +18,30 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.flattenQualifiedUserClients = exports.flattenUserClients = void 0;
-function flattenUserClients(userClients, domain = '') {
-    return Object.entries(userClients).map(([id, data]) => ({ data, userId: { domain, id } }));
-}
-exports.flattenUserClients = flattenUserClients;
+exports.nestUsersList = exports.flattenUserMap = void 0;
 /**
- * Will flatten a container of users=>clients infos to an array
+ * Will flatten a container of domain=>users=>anything infos to an array
  *
- * @param userClients The UserClients (qualified or not) to flatten
+ * @param userMap The qualified UserMap to flatten
  * @return An array containing the qualified user Ids and the clients info
  */
-function flattenQualifiedUserClients(userClients) {
-    return Object.entries(userClients).reduce((ids, [domain, userClients]) => {
-        return [...ids, ...flattenUserClients(userClients, domain)];
+function flattenUserMap(userMap) {
+    return Object.entries(userMap).reduce((ids, [domain, userClients]) => {
+        return [...ids, ...Object.entries(userClients).map(([id, data]) => ({ data, userId: { domain, id } }))];
     }, []);
 }
-exports.flattenQualifiedUserClients = flattenQualifiedUserClients;
+exports.flattenUserMap = flattenUserMap;
+/**
+ * Will convert a list of qualified users to a UserMap
+ * @param users the list of users to convert
+ */
+function nestUsersList(users) {
+    return users.reduce((users, { data, userId: { domain, id } }) => {
+        if (!users[domain]) {
+            users[domain] = {};
+        }
+        users[domain][id] = data;
+        return users;
+    }, {});
+}
+exports.nestUsersList = nestUsersList;

package/lib/conversation/message/UserClientsUtils.test.js

@@ -27,15 +27,11 @@ describe('userClientsUtils', () => {
             { data: ['client11'], userId: { domain: 'domain1', id: 'user2' } },
             { data: ['client1', 'client2'], userId: { domain: 'domain2', id: 'user3' } },
         ];
-        expect((0, UserClientsUtil_1.flattenQualifiedUserClients)(payload)).toEqual(expected);
+        expect((0, UserClientsUtil_1.flattenUserMap)(payload)).toEqual(expected);
     });
-    it('extracts user and data info from non-qualified payload', () => {
-        const payload = { user1: ['client1'], user2: ['client11'], user3: ['client1', 'client2'] };
-        const expected = [
-            { data: ['client1'], userId: { domain: '', id: 'user1' } },
-            { data: ['client11'], userId: { domain: '', id: 'user2' } },
-            { data: ['client1', 'client2'], userId: { domain: '', id: 'user3' } },
-        ];
-        expect((0, UserClientsUtil_1.flattenUserClients)(payload)).toEqual(expected);
+    it('nest and flatten are inverse operations', () => {
+        const payload = { domain1: { user1: ['client1'], user2: ['client11'] }, domain2: { user3: ['client1', 'client2'] } };
+        const result = (0, UserClientsUtil_1.nestUsersList)((0, UserClientsUtil_1.flattenUserMap)(payload));
+        expect(result).toEqual(payload);
     });
 });

package/lib/messagingProtocols/mls/EventHandler/EventHandler.d.ts

@@ -1,5 +1,5 @@
 import { EventHandlerParams } from './EventHandler.types';
 import { EventHandlerResult } from '../../common.types';
-declare const handleBackendEvent: (params: EventHandlerParams, onEpochChanged: (groupId: string) => void) => EventHandlerResult;
+declare const handleBackendEvent: (params: EventHandlerParams, onEpochChanged: (groupId: string) => Promise<void>) => EventHandlerResult;
 export { handleBackendEvent };
 //# sourceMappingURL=EventHandler.d.ts.map

package/lib/messagingProtocols/mls/EventHandler/EventHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EventHandler.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/EventHandler/EventHandler.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAGxD,OAAO,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAEtD,QAAA,MAAM,kBAAkB,WACd,kBAAkB,4BACA,MAAM,KAAK,IAAI,uBAS1C,CAAC;AAEF,OAAO,EAAC,kBAAkB,EAAC,CAAC"}
+{"version":3,"file":"EventHandler.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/EventHandler/EventHandler.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAGxD,OAAO,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAEtD,QAAA,MAAM,kBAAkB,WACd,kBAAkB,4BACA,MAAM,KAAK,QAAQ,IAAI,CAAC,uBASnD,CAAC;AAEF,OAAO,EAAC,kBAAkB,EAAC,CAAC"}

package/lib/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.d.ts

@@ -5,6 +5,6 @@ declare const isMLSMessageAddEvent: (event: BackendEvent) => event is Conversati
 interface HandleMLSMessageAddParams extends EventHandlerParams {
     event: ConversationMLSMessageAddEvent;
 }
-declare const handleMLSMessageAdd: ({ mlsService, event }: HandleMLSMessageAddParams, onEpochChanged: (groupId: string) => void) => EventHandlerResult;
+declare const handleMLSMessageAdd: ({ mlsService, event }: HandleMLSMessageAddParams, onEpochChanged: (groupId: string) => Promise<void>) => EventHandlerResult;
 export { isMLSMessageAddEvent, handleMLSMessageAdd };
 //# sourceMappingURL=messageAdd.d.ts.map

package/lib/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messageAdd.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAE,8BAA8B,EAAqB,MAAM,+BAA+B,CAAC;AAK/G,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAE5D,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAE5D,QAAA,MAAM,oBAAoB,UAAW,YAAY,4CACE,CAAC;AAEpD,UAAU,yBAA0B,SAAQ,kBAAkB;IAC5D,KAAK,EAAE,8BAA8B,CAAC;CACvC;AACD,QAAA,MAAM,mBAAmB,0BACF,yBAAyB,4BACpB,MAAM,KAAK,IAAI,uBAuC1C,CAAC;AAEF,OAAO,EAAC,oBAAoB,EAAE,mBAAmB,EAAC,CAAC"}
+{"version":3,"file":"messageAdd.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAE,8BAA8B,EAAqB,MAAM,+BAA+B,CAAC;AAK/G,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAE5D,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAE5D,QAAA,MAAM,oBAAoB,UAAW,YAAY,4CACE,CAAC;AAEpD,UAAU,yBAA0B,SAAQ,kBAAkB;IAC5D,KAAK,EAAE,8BAA8B,CAAC;CACvC;AACD,QAAA,MAAM,mBAAmB,0BACF,yBAAyB,4BACpB,MAAM,KAAK,QAAQ,IAAI,CAAC,uBA+CnD,CAAC;AAEF,OAAO,EAAC,oBAAoB,EAAE,mBAAmB,EAAC,CAAC"}

package/lib/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.js

@@ -28,7 +28,12 @@ exports.isMLSMessageAddEvent = isMLSMessageAddEvent;
 const handleMLSMessageAdd = async ({ mlsService, event }, onEpochChanged) => {
     var _a;
     const encryptedData = bazinga64_1.Decoder.fromBase64(event.data).asBytes;
-    const groupId = await mlsService.getGroupIdFromConversationId((_a = event.qualified_conversation) !== null && _a !== void 0 ? _a : { id: event.conversation, domain: '' }, event.subconv);
+    const qualifiedConversationId = (_a = event.qualified_conversation) !== null && _a !== void 0 ? _a : { id: event.conversation, domain: '' };
+    const groupId = await mlsService.getGroupIdFromConversationId(qualifiedConversationId, event.subconv);
+    // We should not receive a message for a group the client is not aware of
+    if (!groupId) {
+        throw new Error(`Could not find a group_id for conversation ${qualifiedConversationId.id}@${qualifiedConversationId.domain}`);
+    }
     const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
     const { proposals, commitDelay, message, senderClientId: encodedSenderClientId, hasEpochChanged, } = await mlsService.decryptMessage(groupIdBytes, encryptedData);
     if (encodedSenderClientId) {
@@ -47,7 +52,7 @@ const handleMLSMessageAdd = async ({ mlsService, event }, onEpochChanged) => {
         });
     }
     if (hasEpochChanged) {
-        onEpochChanged(groupId);
+        await onEpochChanged(groupId);
     }
     return message ? { event, decryptedData: protocol_messaging_1.GenericMessage.decode(message) } : undefined;
 };

package/lib/messagingProtocols/mls/EventHandler/events/welcomeMessage/welcomeMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"welcomeMessage.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/EventHandler/events/welcomeMessage/welcomeMessage.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAE,2BAA2B,EAAqB,MAAM,+BAA+B,CAAC;AAG5G,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAE5D,QAAA,MAAM,qBAAqB,UAAW,YAAY,yCACK,CAAC;AAExD,UAAU,0BAA2B,SAAQ,kBAAkB;IAC7D,KAAK,EAAE,2BAA2B,CAAC;CACpC;AACD,QAAA,MAAM,oBAAoB,0BAA+B,0BAA0B,uBASlF,CAAC;AAEF,OAAO,EAAC,qBAAqB,EAAE,oBAAoB,EAAC,CAAC"}
+{"version":3,"file":"welcomeMessage.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/EventHandler/events/welcomeMessage/welcomeMessage.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAE,2BAA2B,EAAqB,MAAM,+BAA+B,CAAC;AAG5G,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAC,kBAAkB,EAAC,MAAM,0BAA0B,CAAC;AAE5D,QAAA,MAAM,qBAAqB,UAAW,YAAY,yCACK,CAAC;AAExD,UAAU,0BAA2B,SAAQ,kBAAkB;IAC7D,KAAK,EAAE,2BAA2B,CAAC;CACpC;AACD,QAAA,MAAM,oBAAoB,0BAA+B,0BAA0B,uBAYlF,CAAC;AAEF,OAAO,EAAC,qBAAqB,EAAE,oBAAoB,EAAC,CAAC"}

package/lib/messagingProtocols/mls/EventHandler/events/welcomeMessage/welcomeMessage.js

@@ -29,6 +29,8 @@ const handleWelcomeMessage = async ({ mlsService, event }) => {
     const newGroupId = await mlsService.processWelcomeMessage(data);
     const groupIdStr = bazinga64_1.Encoder.toBase64(newGroupId).asString;
     // The groupId can then be sent back to the consumer
+    // After we were added to the group we need to schedule a periodic key material renewal
+    mlsService.scheduleKeyMaterialRenewal(groupIdStr);
     return {
         event: Object.assign(Object.assign({}, event), { data: groupIdStr }),
     };

package/lib/messagingProtocols/mls/EventHandler/events/welcomeMessage/welcomeMessage.test.js

@@ -36,6 +36,7 @@ const mockParams = {
     source: {},
     mlsService: {
         processWelcomeMessage: jest.fn().mockResolvedValue('conversationId'),
+        scheduleKeyMaterialRenewal: jest.fn(),
     },
     dryRun: false,
 };
@@ -55,9 +56,10 @@ describe('MLS welcomeMessage eventHandler', () => {
         });
     });
     describe('handleWelcomeMessage', () => {
-        it('calls processWelcomeMessage', async () => {
+        it('calls processWelcomeMessage and schedules periodic key material updates', async () => {
             await (0, welcomeMessage_1.handleWelcomeMessage)(mockParams);
             expect(mockParams.mlsService.processWelcomeMessage).toHaveBeenCalled();
+            expect(mockParams.mlsService.scheduleKeyMaterialRenewal).toHaveBeenCalled();
         });
         it('returns a eventHandlerResult', async () => {
             const eventHandlerResult = await (0, welcomeMessage_1.handleWelcomeMessage)(mockParams);