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

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.mocks.d.ts

@@ -1,7 +1,7 @@
 import { APIClient } from '@wireapp/api-client';
 import { CryptoClient } from './CryptoClient';
 import { ProteusService } from './ProteusService';
-export declare const buildProteusService: (federated?: boolean) => Promise<[ProteusService, {
+export declare const buildProteusService: () => Promise<[ProteusService, {
     apiClient: APIClient;
     cryptoClient: CryptoClient;
 }]>;

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.mocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProteusService.mocks.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.mocks.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAIhD,eAAO,MAAM,mBAAmB;eAEQ,SAAS;kBAAgB,YAAY;GAgB5E,CAAC"}
+{"version":3,"file":"ProteusService.mocks.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.mocks.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAIhD,eAAO,MAAM,mBAAmB;eACD,SAAS;kBAAgB,YAAY;GAgBnE,CAAC"}

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.mocks.js

@@ -24,17 +24,16 @@ const api_client_1 = require("@wireapp/api-client");
 const CoreCryptoWrapper_1 = require("./CryptoClient/CoreCryptoWrapper/CoreCryptoWrapper");
 const ProteusService_1 = require("./ProteusService");
 const PayloadHelper_1 = require("../../../test/PayloadHelper");
-const buildProteusService = async (federated = false) => {
+const buildProteusService = async () => {
     const apiClient = new api_client_1.APIClient({ urls: api_client_1.APIClient.BACKEND.STAGING });
     apiClient.context = {
         clientType: client_1.ClientType.NONE,
         userId: (0, PayloadHelper_1.getUUID)(),
         clientId: (0, PayloadHelper_1.getUUID)(),
     };
-    const cryptoClient = new CoreCryptoWrapper_1.CoreCryptoWrapper({}, {}, {});
+    const cryptoClient = new CoreCryptoWrapper_1.CoreCryptoWrapper({}, {});
     const proteusService = new ProteusService_1.ProteusService(apiClient, cryptoClient, {
         nbPrekeys: 0,
-        useQualifiedIds: federated,
     });
     return [proteusService, { apiClient, cryptoClient }];
 };

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.test.js

@@ -64,11 +64,11 @@ jest.mock('./CryptoClient/CoreCryptoWrapper/PrekeysTracker', () => {
 });
 jest.mock('../Utility/Recipients', () => (Object.assign(Object.assign({}, jest.requireActual('../Utility/Recipients')), { getRecipientsForConversation: jest.fn(), getQualifiedRecipientsForConversation: jest.fn() })));
 const MockedRecipients = Recipients;
-const prepareDataForEncryption = async (useQualifiedIds = true) => {
-    const [proteusService, { cryptoClient, apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)(useQualifiedIds);
+const prepareDataForEncryption = async () => {
+    const [proteusService, { cryptoClient, apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
     const domain = 'staging.zinfra.io';
     //user 1
-    const firstUserId = 'bc0c99f1-49a5-4ad2-889a-62885af37088';
+    const firstUserId = { id: 'bc0c99f1-49a5-4ad2-889a-62885af37088', domain };
     //user 1 clients
     const firstClientId = 'be67218b77d02d30';
     const secondClientId = 'ae87218e77d02d30';
@@ -76,25 +76,19 @@ const prepareDataForEncryption = async (useQualifiedIds = true) => {
     const firstClientSessionId = (0, SessionHandler_1.constructSessionId)({
         userId: firstUserId,
         clientId: firstClientId,
-        useQualifiedIds,
-        domain: useQualifiedIds ? domain : undefined,
     });
     const firstClientSession2Id = (0, SessionHandler_1.constructSessionId)({
         userId: firstUserId,
         clientId: secondClientId,
-        useQualifiedIds,
-        domain: useQualifiedIds ? domain : undefined,
     });
     //user 2
-    const secondUserId = 'cd0c88f1-49a5-4ar2-889a-62885af37069';
+    const secondUserId = { id: 'cd0c88f1-49a5-4ar2-889a-62885af37069', domain };
     //user 2 client
     const thirdClientId = 'ce67218b77d02d69';
     //user 2 sessions
     const secondClientSessionId = (0, SessionHandler_1.constructSessionId)({
         userId: secondUserId,
         clientId: thirdClientId,
-        useQualifiedIds,
-        domain: useQualifiedIds ? domain : undefined,
     });
     //message sent by a user
     const message = 'Hello';
@@ -134,12 +128,14 @@ describe('ProteusService', () => {
             const expectedFingerprint = 'fingerprint-client1';
             const userId = { id: 'user1', domain: 'domain.com' };
             const clientId = 'client1';
-            jest.spyOn(apiClient.api.user, 'postQualifiedMultiPreKeyBundles').mockResolvedValue({
-                [userId.domain]: {
-                    [userId.id]: {
-                        [clientId]: {
-                            id: 123,
-                            key: 'pQABARhIAqEAWCCaJpFa9c626ORmjj1aV6OnOYgmTjfoiE3ynOfNfGAOmgOhAKEAWCD60VMzRrLfO+1GSjgyhnVp2N7L58DM+eeJhZJi1tBLfQT2',
+            jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockResolvedValue({
+                qualified_user_client_prekeys: {
+                    [userId.domain]: {
+                        [userId.id]: {
+                            [clientId]: {
+                                id: 123,
+                                key: 'pQABARhIAqEAWCCaJpFa9c626ORmjj1aV6OnOYgmTjfoiE3ynOfNfGAOmgOhAKEAWCD60VMzRrLfO+1GSjgyhnVp2N7L58DM+eeJhZJi1tBLfQT2',
+                            },
                         },
                     },
                 },
@@ -154,9 +150,9 @@ describe('ProteusService', () => {
         it('create a session from given prekey if session does not exists', async () => {
             const [proteusService, { apiClient, cryptoClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             const expectedFingerprint = 'fingerprint-client1';
-            const getPrekeyMock = jest.spyOn(apiClient.api.user, 'getClientPreKey');
+            const getPrekeysSpy = jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles');
             jest.spyOn(cryptoClient, 'getRemoteFingerprint').mockResolvedValue(expectedFingerprint);
-            jest.spyOn(cryptoClient, 'sessionFromPrekey').mockResolvedValue(undefined);
+            const saveSessionSpy = jest.spyOn(cryptoClient, 'sessionFromPrekey').mockResolvedValue(undefined);
             jest.spyOn(cryptoClient, 'saveSession').mockResolvedValue(undefined);
             jest.spyOn(cryptoClient, 'sessionExists').mockResolvedValue(false);
             const userId = { id: 'user1', domain: 'domain.com' };
@@ -165,7 +161,8 @@ describe('ProteusService', () => {
                 key: 'pQABARhIAqEAWCCaJpFa9c626ORmjj1aV6OnOYgmTjfoiE3ynOfNfGAOmgOhAKEAWCD60VMzRrLfO+1GSjgyhnVp2N7L58DM+eeJhZJi1tBLfQT2',
                 id: 123,
             });
-            expect(getPrekeyMock).not.toHaveBeenCalled();
+            expect(saveSessionSpy).toHaveBeenCalled();
+            expect(getPrekeysSpy).not.toHaveBeenCalled();
             expect(result).toBe(expectedFingerprint);
         });
         it('returns the fingerprint from existing session', async () => {
@@ -220,83 +217,64 @@ describe('ProteusService', () => {
     });
     describe('"encrypt"', () => {
         it('returns encrypted payload', async () => {
-            const { services, data: { firstUser, encryptedMessageBuffer, messageBuffer }, } = await prepareDataForEncryption(false);
+            const { services, data: { firstUser, encryptedMessageBuffer, messageBuffer, domain }, } = await prepareDataForEncryption();
             const userClients = {
-                [firstUser.id]: [firstUser.clients.first, firstUser.clients.second],
-            };
-            const encryptedPayload = new Map([
-                [firstUser.sessions.first, encryptedMessageBuffer],
-                [firstUser.sessions.second, encryptedMessageBuffer],
-            ]);
-            jest.spyOn(services.cryptoClient, 'sessionExists').mockResolvedValue(true);
-            jest.spyOn(services.cryptoClient, 'encrypt').mockImplementationOnce(() => Promise.resolve(encryptedPayload));
-            const encrypted = await services.proteusService.encrypt(messageBuffer, userClients);
-            expect(services.cryptoClient.encrypt).toHaveBeenCalledWith([firstUser.sessions.first, firstUser.sessions.second], messageBuffer);
-            expect(encrypted).toEqual({
-                [firstUser.id]: {
-                    [firstUser.clients.first]: encryptedMessageBuffer,
-                    [firstUser.clients.second]: encryptedMessageBuffer,
+                [domain]: {
+                    [firstUser.id.id]: [firstUser.clients.first, firstUser.clients.second],
                 },
-            });
-        });
-        it('returns encrypted payload for multiple users', async () => {
-            const { services, data: { firstUser, secondUser, encryptedMessageBuffer, messageBuffer }, } = await prepareDataForEncryption(false);
-            const userClients = {
-                [firstUser.id]: [firstUser.clients.first, firstUser.clients.second],
-                [secondUser.id]: [secondUser.clients.first],
             };
             const encryptedPayload = new Map([
                 [firstUser.sessions.first, encryptedMessageBuffer],
                 [firstUser.sessions.second, encryptedMessageBuffer],
-                [secondUser.sessions.first, encryptedMessageBuffer],
             ]);
             jest.spyOn(services.cryptoClient, 'sessionExists').mockResolvedValue(true);
             jest.spyOn(services.cryptoClient, 'encrypt').mockResolvedValueOnce(encryptedPayload);
-            const encrypted = await services.proteusService.encrypt(messageBuffer, userClients);
-            expect(services.cryptoClient.encrypt).toHaveBeenCalledWith([firstUser.sessions.first, firstUser.sessions.second, secondUser.sessions.first], messageBuffer);
-            expect(encrypted).toEqual({
-                [firstUser.id]: {
-                    [firstUser.clients.first]: encryptedMessageBuffer,
-                    [firstUser.clients.second]: encryptedMessageBuffer,
-                },
-                [secondUser.id]: {
-                    [secondUser.clients.first]: encryptedMessageBuffer,
+            const { payloads } = await services.proteusService.encrypt(messageBuffer, userClients);
+            expect(services.cryptoClient.encrypt).toHaveBeenCalledWith([firstUser.sessions.first, firstUser.sessions.second], messageBuffer);
+            expect(payloads).toEqual({
+                [domain]: {
+                    [firstUser.id.id]: {
+                        [firstUser.clients.first]: encryptedMessageBuffer,
+                        [firstUser.clients.second]: encryptedMessageBuffer,
+                    },
                 },
             });
         });
-    });
-    describe('"encryptQualified"', () => {
-        it('returns encrypted payload', async () => {
-            const { services, data: { firstUser, encryptedMessageBuffer, messageBuffer, domain }, } = await prepareDataForEncryption();
+        it('returns missing clients and encrypted payload for multiple users', async () => {
+            const { services, data: { firstUser, secondUser, encryptedMessageBuffer, messageBuffer, domain }, } = await prepareDataForEncryption();
             const userClients = {
                 [domain]: {
-                    [firstUser.id]: [firstUser.clients.first, firstUser.clients.second],
+                    [firstUser.id.id]: [firstUser.clients.first, firstUser.clients.second],
+                    [secondUser.id.id]: [secondUser.clients.first],
                 },
             };
             const encryptedPayload = new Map([
                 [firstUser.sessions.first, encryptedMessageBuffer],
                 [firstUser.sessions.second, encryptedMessageBuffer],
+                [secondUser.sessions.first, encryptedMessageBuffer],
             ]);
             jest.spyOn(services.cryptoClient, 'sessionExists').mockResolvedValue(true);
             jest.spyOn(services.cryptoClient, 'encrypt').mockResolvedValueOnce(encryptedPayload);
-            const encrypted = await services.proteusService.encryptQualified(messageBuffer, userClients);
-            // console.log({encrypted, missing});
-            expect(services.cryptoClient.encrypt).toHaveBeenCalledWith([firstUser.sessions.first, firstUser.sessions.second], messageBuffer);
-            expect(encrypted).toEqual({
+            const { payloads } = await services.proteusService.encrypt(messageBuffer, userClients);
+            expect(services.cryptoClient.encrypt).toHaveBeenCalledWith([firstUser.sessions.first, firstUser.sessions.second, secondUser.sessions.first], messageBuffer);
+            expect(payloads).toEqual({
                 [domain]: {
-                    [firstUser.id]: {
+                    [firstUser.id.id]: {
                         [firstUser.clients.first]: encryptedMessageBuffer,
                         [firstUser.clients.second]: encryptedMessageBuffer,
                     },
+                    [secondUser.id.id]: {
+                        [secondUser.clients.first]: encryptedMessageBuffer,
+                    },
                 },
             });
         });
-        it('returns missing clients and encrypted payload for multiple users', async () => {
+        it('returns the unknown clients that are deleted on backend', async () => {
             const { services, data: { firstUser, secondUser, encryptedMessageBuffer, messageBuffer, domain }, } = await prepareDataForEncryption();
             const userClients = {
                 [domain]: {
-                    [firstUser.id]: [firstUser.clients.first, firstUser.clients.second],
-                    [secondUser.id]: [secondUser.clients.first],
+                    [firstUser.id.id]: [firstUser.clients.first, firstUser.clients.second],
+                    [secondUser.id.id]: [secondUser.clients.first],
                 },
             };
             const encryptedPayload = new Map([
@@ -304,17 +282,43 @@ describe('ProteusService', () => {
                 [firstUser.sessions.second, encryptedMessageBuffer],
                 [secondUser.sessions.first, encryptedMessageBuffer],
             ]);
-            jest.spyOn(services.cryptoClient, 'sessionExists').mockResolvedValue(true);
+            jest.spyOn(services.apiClient.api.user, 'postMultiPreKeyBundles').mockResolvedValue({
+                qualified_user_client_prekeys: {
+                    [domain]: {
+                        [firstUser.id.id]: {
+                            [firstUser.clients.first]: null,
+                            [firstUser.clients.second]: {
+                                id: 123,
+                                key: 'pQABARhIAqEAWCCaJpFa9c626ORmjj1aV6OnOYgmTjfoiE3ynOfNfGAOmgOhAKEAWCD60VMzRrLfO+1GSjgyhnVp2N7L58DM+eeJhZJi1tBLfQT2',
+                            },
+                        },
+                        [secondUser.id.id]: {
+                            [secondUser.clients.first]: {
+                                id: 123,
+                                key: 'pQABARhIAqEAWCCaJpFa9c626ORmjj1aV6OnOYgmTjfoiE3ynOfNfGAOmgOhAKEAWCD60VMzRrLfO+1GSjgyhnVp2N7L58DM+eeJhZJi1tBLfQT2',
+                            },
+                        },
+                    },
+                },
+            });
+            jest.spyOn(services.cryptoClient, 'sessionExists').mockResolvedValue(false);
             jest.spyOn(services.cryptoClient, 'encrypt').mockResolvedValueOnce(encryptedPayload);
-            const encrypted = await services.proteusService.encryptQualified(messageBuffer, userClients);
-            expect(services.cryptoClient.encrypt).toHaveBeenCalledWith([firstUser.sessions.first, firstUser.sessions.second, secondUser.sessions.first], messageBuffer);
-            expect(encrypted).toEqual({
+            jest.spyOn(services.cryptoClient, 'sessionFromPrekey').mockResolvedValue();
+            jest.spyOn(services.cryptoClient, 'saveSession').mockResolvedValue();
+            const { payloads, unknowns } = await services.proteusService.encrypt(messageBuffer, userClients);
+            expect(services.cryptoClient.encrypt).toHaveBeenCalledWith([firstUser.sessions.second, secondUser.sessions.first], messageBuffer);
+            expect(unknowns).toEqual({
+                [domain]: {
+                    [firstUser.id.id]: [firstUser.clients.first],
+                },
+            });
+            expect(payloads).toEqual({
                 [domain]: {
-                    [firstUser.id]: {
+                    [firstUser.id.id]: {
                         [firstUser.clients.first]: encryptedMessageBuffer,
                         [firstUser.clients.second]: encryptedMessageBuffer,
                     },
-                    [secondUser.id]: {
+                    [secondUser.id.id]: {
                         [secondUser.clients.first]: encryptedMessageBuffer,
                     },
                 },
@@ -344,7 +348,13 @@ describe('ProteusService', () => {
                     expect(errorMessage).toContain('no userIds are given');
                 }
             });
-            [{ user1: ['client1'], user2: ['client11', 'client12'] }, ['user1', 'user2']].forEach(recipients => {
+            [
+                { domain: { user1: ['client1'], user2: ['client11', 'client12'] } },
+                [
+                    { domain: 'domain', id: 'user1' },
+                    { domain: 'domain', id: 'user2' },
+                ],
+            ].forEach(recipients => {
                 it(`forwards the list of users to report (${JSON.stringify(recipients)})`, async () => {
                     const [proteusService] = await (0, ProteusService_mocks_1.buildProteusService)();
                     MockedRecipients.getRecipientsForConversation.mockResolvedValue({});
@@ -356,7 +366,12 @@ describe('ProteusService', () => {
                         userIds: recipients,
                         conversationId: { id: 'conv1', domain: '' },
                     });
-                    expect(proteusService['messageService'].sendMessage).toHaveBeenCalledWith(expect.any(String), expect.any(Object), expect.any(Uint8Array), expect.objectContaining({ reportMissing: ['user1', 'user2'] }));
+                    expect(proteusService['messageService'].sendMessage).toHaveBeenCalledWith(expect.any(String), expect.any(Object), expect.any(Uint8Array), expect.objectContaining({
+                        reportMissing: [
+                            { domain: 'domain', id: 'user1' },
+                            { domain: 'domain', id: 'user2' },
+                        ],
+                    }));
                 });
             });
             [
@@ -368,9 +383,9 @@ describe('ProteusService', () => {
                 ],
             ].forEach(recipients => {
                 it(`forwards the list of users to report for federated message (${JSON.stringify(recipients)})`, async () => {
-                    const [proteusService] = await (0, ProteusService_mocks_1.buildProteusService)(true);
-                    MockedRecipients.getQualifiedRecipientsForConversation.mockResolvedValue({});
-                    jest.spyOn(proteusService['messageService'], 'sendFederatedMessage').mockResolvedValue({});
+                    const [proteusService] = await (0, ProteusService_mocks_1.buildProteusService)();
+                    MockedRecipients.getRecipientsForConversation.mockResolvedValue({});
+                    jest.spyOn(proteusService['messageService'], 'sendMessage').mockResolvedValue({});
                     await proteusService.sendMessage({
                         protocol: conversation_1.ConversationProtocol.PROTEUS,
                         conversationId: { id: 'conv1', domain: 'domain1' },
@@ -378,7 +393,7 @@ describe('ProteusService', () => {
                         targetMode: conversation_2.MessageTargetMode.USERS,
                         userIds: recipients,
                     });
-                    expect(proteusService['messageService'].sendFederatedMessage).toHaveBeenCalledWith(expect.any(String), expect.any(Object), expect.any(Uint8Array), expect.objectContaining({
+                    expect(proteusService['messageService'].sendMessage).toHaveBeenCalledWith(expect.any(String), expect.any(Object), expect.any(Uint8Array), expect.objectContaining({
                         reportMissing: [
                             { id: 'user1', domain: 'domain1' },
                             { id: 'user2', domain: 'domain1' },
@@ -387,9 +402,15 @@ describe('ProteusService', () => {
                     }));
                 });
             });
-            [{ user1: ['client1'], user2: ['client11', 'client12'] }, ['user1', 'user2']].forEach(recipients => {
+            [
+                { domain: { user1: ['client1'], user2: ['client11', 'client12'] } },
+                [
+                    { domain: 'domain', id: 'user1' },
+                    { domain: 'domain', id: 'user2' },
+                ],
+            ].forEach(recipients => {
                 it(`ignores all missing user/client pair if targetMode is USER_CLIENTS`, async () => {
-                    const [proteusService] = await (0, ProteusService_mocks_1.buildProteusService)(false);
+                    const [proteusService] = await (0, ProteusService_mocks_1.buildProteusService)();
                     MockedRecipients.getRecipientsForConversation.mockReturnValue(Promise.resolve({}));
                     jest.spyOn(proteusService['messageService'], 'sendMessage').mockReturnValue(Promise.resolve({}));
                     await proteusService.sendMessage({
@@ -411,11 +432,9 @@ describe('ProteusService', () => {
                 ],
             ].forEach(recipients => {
                 it(`ignores all missing user/client pair if targetMode is USER_CLIENTS on federated env`, async () => {
-                    const [proteusService] = await (0, ProteusService_mocks_1.buildProteusService)(true);
-                    MockedRecipients.getQualifiedRecipientsForConversation.mockResolvedValue({});
-                    jest
-                        .spyOn(proteusService['messageService'], 'sendFederatedMessage')
-                        .mockReturnValue(Promise.resolve({}));
+                    const [proteusService] = await (0, ProteusService_mocks_1.buildProteusService)();
+                    MockedRecipients.getRecipientsForConversation.mockResolvedValue({});
+                    jest.spyOn(proteusService['messageService'], 'sendMessage').mockReturnValue(Promise.resolve({}));
                     await proteusService.sendMessage({
                         protocol: conversation_1.ConversationProtocol.PROTEUS,
                         conversationId: { id: 'conv1', domain: 'domain1' },
@@ -423,19 +442,20 @@ describe('ProteusService', () => {
                         targetMode: conversation_2.MessageTargetMode.USERS_CLIENTS,
                         userIds: recipients,
                     });
-                    expect(proteusService['messageService'].sendFederatedMessage).toHaveBeenCalledWith(expect.any(String), expect.any(Object), expect.any(Uint8Array), expect.objectContaining({
+                    expect(proteusService['messageService'].sendMessage).toHaveBeenCalledWith(expect.any(String), expect.any(Object), expect.any(Uint8Array), expect.objectContaining({
                         reportMissing: false,
                     }));
                 });
             });
-            it(`returns the recipients that could not receive the message`, async () => {
-                const [proteusService] = await (0, ProteusService_mocks_1.buildProteusService)(true);
+            it(`returns the recipients that will receive the message later`, async () => {
+                var _a;
+                const [proteusService] = await (0, ProteusService_mocks_1.buildProteusService)();
                 const recipients = {
                     domain1: { user1: ['client1'], user2: ['client11', 'client12'] },
                     domain2: { user3: ['client3'] },
                 };
-                MockedRecipients.getQualifiedRecipientsForConversation.mockResolvedValue({});
-                jest.spyOn(proteusService['messageService'], 'sendFederatedMessage').mockResolvedValue({
+                MockedRecipients.getRecipientsForConversation.mockResolvedValue({});
+                jest.spyOn(proteusService['messageService'], 'sendMessage').mockResolvedValue({
                     missing: {},
                     redundant: {},
                     failed_to_send: { domain2: recipients.domain2 },
@@ -450,7 +470,7 @@ describe('ProteusService', () => {
                     userIds: recipients,
                 });
                 expect(result.state).toBe(conversation_2.MessageSendingState.OUTGOING_SENT);
-                expect(result.failedToSend).toEqual({ domain2: recipients.domain2 });
+                expect((_a = result.failedToSend) === null || _a === void 0 ? void 0 : _a.queued).toEqual({ domain2: recipients.domain2 });
             });
         });
     });

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.types.d.ts

@@ -1,4 +1,4 @@
-import { UserClients, QualifiedUserClients, ClientMismatch, MessageSendingStatus, ConversationProtocol, NewConversation } from '@wireapp/api-client/lib/conversation';
+import { QualifiedUserClients, MessageSendingStatus, ConversationProtocol, NewConversation } from '@wireapp/api-client/lib/conversation';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { AddUsersParams, MessageSendingOptions, SendCommonParams } from '../../../conversation';
 export interface NewClient {
@@ -6,21 +6,18 @@ export interface NewClient {
     userId: QualifiedId;
 }
 export type ProteusServiceConfig = {
-    useQualifiedIds: boolean;
     onNewClient?: (client: NewClient) => void;
     nbPrekeys: number;
 };
 export type SendProteusMessageParams = SendCommonParams & MessageSendingOptions & {
     conversationId: QualifiedId;
     /**
-     * Can be either a QualifiedId[], string[], UserClients or QualfiedUserClients. The type has some effect on the behavior of the method. (Needed only for Proteus)
-     *    When given a QualifiedId[] or string[] the method will fetch the freshest list of devices for those users (since they are not given by the consumer). As a consequence no ClientMismatch error will trigger and we will ignore missing clients when sending
-     *    When given a QualifiedUserClients or UserClients the method will only send to the clients listed in the userIds. This could lead to ClientMismatch (since the given list of devices might not be the freshest one and new clients could have been created)
-     *    When given a QualifiedId[] or QualifiedUserClients the method will send the message through the federated API endpoint
-     *    When given a string[] or UserClients the method will send the message through the old API endpoint
+     * Can be either a QualifiedId[] or QualfiedUserClients. The type has some effect on the behavior of the method. (Needed only for Proteus)
+     *    When given a QualifiedId[] the method will fetch the freshest list of devices for those users (since they are not given by the consumer). As a consequence no ClientMismatch error will trigger and we will ignore missing clients when sending
+     *    When given a QualifiedUserClients the method will only send to the clients listed in the userIds. This could lead to ClientMismatch (since the given list of devices might not be the freshest one and new clients could have been created)
      */
-    userIds?: string[] | QualifiedId[] | UserClients | QualifiedUserClients;
-    onClientMismatch?: (status: ClientMismatch | MessageSendingStatus, wasSent: boolean) => void | boolean | Promise<boolean>;
+    userIds?: QualifiedId[] | QualifiedUserClients;
+    onClientMismatch?: (status: MessageSendingStatus, wasSent: boolean) => void | boolean | Promise<boolean>;
     protocol: ConversationProtocol.PROTEUS;
 };
 export type CreateProteusConversationParams = {

package/lib/messagingProtocols/proteus/ProteusService/ProteusService.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProteusService.types.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,WAAW,EACX,oBAAoB,EACpB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EAChB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,cAAc,EAAE,qBAAqB,EAAE,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAE9F,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;CACrB;AACD,MAAM,MAAM,oBAAoB,GAAG;IACjC,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,IAAI,CAAC;IAC1C,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,gBAAgB,GACrD,qBAAqB,GAAG;IACtB,cAAc,EAAE,WAAW,CAAC;IAE5B;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,GAAG,WAAW,GAAG,oBAAoB,CAAC;IACxE,gBAAgB,CAAC,EAAE,CACjB,MAAM,EAAE,cAAc,GAAG,oBAAoB,EAC7C,OAAO,EAAE,OAAO,KACb,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACvC,QAAQ,EAAE,oBAAoB,CAAC,OAAO,CAAC;CACxC,CAAC;AAEJ,MAAM,MAAM,+BAA+B,GAAG;IAC5C,gBAAgB,EAAE,eAAe,GAAG,MAAM,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC"}
+{"version":3,"file":"ProteusService.types.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,EAChB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,cAAc,EAAE,qBAAqB,EAAE,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAE9F,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;CACrB;AACD,MAAM,MAAM,oBAAoB,GAAG;IACjC,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,KAAK,IAAI,CAAC;IAC1C,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,gBAAgB,GACrD,qBAAqB,GAAG;IACtB,cAAc,EAAE,WAAW,CAAC;IAE5B;;;;OAIG;IACH,OAAO,CAAC,EAAE,WAAW,EAAE,GAAG,oBAAoB,CAAC;IAC/C,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,oBAAoB,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACzG,QAAQ,EAAE,oBAAoB,CAAC,OAAO,CAAC;CACxC,CAAC;AAEJ,MAAM,MAAM,+BAA+B,GAAG;IAC5C,gBAAgB,EAAE,eAAe,GAAG,MAAM,CAAC;IAC3C,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG,IAAI,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC"}

package/lib/messagingProtocols/proteus/Utility/Recipients.d.ts

@@ -1,17 +1,11 @@
 import { APIClient } from '@wireapp/api-client/lib/APIClient';
-import { QualifiedUserClients, UserClients } from '@wireapp/api-client/lib/conversation';
-import { QualifiedId, QualifiedUserPreKeyBundleMap, UserPreKeyBundleMap } from '@wireapp/api-client/lib/user';
+import { QualifiedUserClients } from '@wireapp/api-client/lib/conversation';
+import { QualifiedId } from '@wireapp/api-client/lib/user';
 interface GetRecipientsForConversationQualifiedParams {
     apiClient: APIClient;
     conversationId: QualifiedId;
     userIds?: QualifiedId[] | QualifiedUserClients;
 }
-declare const getQualifiedRecipientsForConversation: ({ apiClient, conversationId, userIds, }: GetRecipientsForConversationQualifiedParams) => Promise<QualifiedUserClients | QualifiedUserPreKeyBundleMap>;
-interface GetRecipientsForConversationParams {
-    apiClient: APIClient;
-    conversationId: QualifiedId;
-    userIds?: string[] | UserClients;
-}
-declare const getRecipientsForConversation: ({ apiClient, conversationId, userIds, }: GetRecipientsForConversationParams) => Promise<UserClients | UserPreKeyBundleMap>;
-export { getQualifiedRecipientsForConversation, getRecipientsForConversation };
+declare const getRecipientsForConversation: ({ apiClient, conversationId, userIds, }: GetRecipientsForConversationQualifiedParams) => Promise<QualifiedUserClients>;
+export { getRecipientsForConversation };
 //# sourceMappingURL=Recipients.d.ts.map

package/lib/messagingProtocols/proteus/Utility/Recipients.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Recipients.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/Utility/Recipients.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AAC5D,OAAO,EAAC,oBAAoB,EAAE,WAAW,EAAC,MAAM,sCAAsC,CAAC;AACvF,OAAO,EAAC,WAAW,EAAE,4BAA4B,EAAE,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAO5G,UAAU,2CAA2C;IACnD,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,WAAW,CAAC;IAC5B,OAAO,CAAC,EAAE,WAAW,EAAE,GAAG,oBAAoB,CAAC;CAChD;AAED,QAAA,MAAM,qCAAqC,4CAIxC,2CAA2C,KAAG,QAAQ,oBAAoB,GAAG,4BAA4B,CAO3G,CAAC;AAEF,UAAU,kCAAkC;IAC1C,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,WAAW,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;CAClC;AACD,QAAA,MAAM,4BAA4B,4CAI/B,kCAAkC,KAAG,QAAQ,WAAW,GAAG,mBAAmB,CAShF,CAAC;AAEF,OAAO,EAAC,qCAAqC,EAAE,4BAA4B,EAAC,CAAC"}
+{"version":3,"file":"Recipients.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/Utility/Recipients.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AAE5D,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAczD,UAAU,2CAA2C;IACnD,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,WAAW,CAAC;IAC5B,OAAO,CAAC,EAAE,WAAW,EAAE,GAAG,oBAAoB,CAAC;CAChD;AAED,QAAA,MAAM,4BAA4B,4CAI/B,2CAA2C,KAAG,QAAQ,oBAAoB,CAW5E,CAAC;AAEF,OAAO,EAAC,4BAA4B,EAAC,CAAC"}

package/lib/messagingProtocols/proteus/Utility/Recipients.js

@@ -18,26 +18,26 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRecipientsForConversation = exports.getQualifiedRecipientsForConversation = void 0;
-const PreKeyBundle_1 = require("./PreKeyBundle/PreKeyBundle");
+exports.getRecipientsForConversation = void 0;
 const getConversationQualifiedMembers_1 = require("../../../conversation/ConversationService/Utility/getConversationQualifiedMembers");
+const UserClientsUtil_1 = require("../../../conversation/message/UserClientsUtil");
 const util_1 = require("../../../util");
-const getQualifiedRecipientsForConversation = async ({ apiClient, conversationId, userIds, }) => {
-    if ((0, util_1.isQualifiedUserClients)(userIds)) {
-        return userIds;
-    }
-    const recipientIds = userIds || (await (0, getConversationQualifiedMembers_1.getConversationQualifiedMembers)({ apiClient: apiClient, conversationId }));
-    return (0, PreKeyBundle_1.getQualifiedPreKeyBundle)({ apiClient, userIds: recipientIds });
-};
-exports.getQualifiedRecipientsForConversation = getQualifiedRecipientsForConversation;
+function toQualifiedUserClients(publicClients) {
+    const userList = (0, UserClientsUtil_1.flattenUserMap)(publicClients).map(({ userId, data: clientInfo }) => ({
+        userId,
+        data: clientInfo.map(client => client.id),
+    }));
+    return (0, UserClientsUtil_1.nestUsersList)(userList);
+}
 const getRecipientsForConversation = async ({ apiClient, conversationId, userIds, }) => {
-    if ((0, util_1.isUserClients)(userIds)) {
+    if ((0, util_1.isQualifiedUserClients)(userIds)) {
         return userIds;
     }
-    return (0, PreKeyBundle_1.getPreKeyBundleMap)({
-        apiClient: apiClient,
-        conversationId,
-        userIds,
-    });
+    const hasTargetUsers = userIds && Object.keys(userIds).length > 0;
+    const recipientIds = hasTargetUsers
+        ? userIds
+        : await (0, getConversationQualifiedMembers_1.getConversationQualifiedMembers)({ apiClient: apiClient, conversationId });
+    const allClients = await apiClient.api.user.postListClients({ qualified_users: recipientIds });
+    return toQualifiedUserClients(allClients.qualified_user_map);
 };
 exports.getRecipientsForConversation = getRecipientsForConversation;

package/lib/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.d.ts

@@ -1,16 +1,23 @@
 import { PreKey } from '@wireapp/api-client/lib/auth';
-import { UserClients } from '@wireapp/api-client/lib/conversation';
-import { QualifiedId, UserPreKeyBundleMap } from '@wireapp/api-client/lib/user';
+import { QualifiedUserClients } from '@wireapp/api-client/lib/conversation';
+import { QualifiedId, QualifiedUserPreKeyBundleMap } from '@wireapp/api-client/lib/user';
 import { Logger } from 'logdown';
 import { APIClient } from '@wireapp/api-client';
 import { CryptoClient } from '../../ProteusService/CryptoClient';
 interface ConstructSessionIdParams {
-    userId: string | QualifiedId;
+    userId: QualifiedId;
     clientId: string;
-    useQualifiedIds: boolean;
     domain?: string;
 }
-declare const constructSessionId: ({ userId, clientId, useQualifiedIds, domain }: ConstructSessionIdParams) => string;
+type InitSessionsResult = {
+    /** valid sessions that either already existed or have been freshly created */
+    sessions: string[];
+    /** client that do we do not have sessions with and that do not have existence on backend (deleted clients) */
+    unknowns?: QualifiedUserClients;
+    /** clients for which we had problem fetch prekeys (federated server down) */
+    failed?: QualifiedId[];
+};
+declare const constructSessionId: ({ userId, clientId }: ConstructSessionIdParams) => string;
 /**
  * Will make sure the session is available in cryptoClient
  * @param sessionId the session to init
@@ -24,8 +31,7 @@ declare const initSession: ({ userId, clientId, initialPrekey }: {
     cryptoClient: CryptoClient;
 }) => Promise<string>;
 interface GetSessionsAndClientsFromRecipientsProps {
-    recipients: UserClients | UserPreKeyBundleMap;
-    domain?: string;
+    recipients: QualifiedUserClients | QualifiedUserPreKeyBundleMap;
     apiClient: APIClient;
     cryptoClient: CryptoClient;
     logger?: Logger;
@@ -33,15 +39,14 @@ interface GetSessionsAndClientsFromRecipientsProps {
 /**
  * Will make sure all the sessions need to encrypt for those user/clients pair are set
  */
-declare const initSessions: ({ recipients, domain, apiClient, cryptoClient, logger, }: GetSessionsAndClientsFromRecipientsProps) => Promise<string[]>;
+declare const initSessions: ({ recipients, apiClient, cryptoClient, logger, }: GetSessionsAndClientsFromRecipientsProps) => Promise<InitSessionsResult>;
 interface DeleteSessionParams {
     userId: QualifiedId;
     clientId: string;
     cryptoClient: CryptoClient;
-    useQualifiedIds: boolean;
 }
 declare function deleteSession(params: DeleteSessionParams): Promise<void>;
-type EncryptedPayloads<T> = Record<string, Record<string, T>>;
+type EncryptedPayloads<T> = Record<string, Record<string, Record<string, T>>>;
 /**
  * creates an encrypted payload that can be sent to backend from a bunch of sessionIds/encrypted payload
  */

package/lib/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionHandler.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAC,WAAW,EAAC,MAAM,sCAAsC,CAAC;AACjE,OAAO,EAAC,WAAW,EAAE,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAE9E,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AAE/B,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAK9C,OAAO,EAAC,YAAY,EAAC,MAAM,mCAAmC,CAAC;AAE/D,UAAU,wBAAwB;IAChC,MAAM,EAAE,MAAM,GAAG,WAAW,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,QAAA,MAAM,kBAAkB,kDAAiD,wBAAwB,KAAG,MAKnG,CAAC;AAuFF;;;GAGG;AACH,QAAA,MAAM,WAAW;YAC6B,WAAW;cAAY,MAAM;;;eAClC,SAAS;kBAAgB,YAAY;MAC3E,QAAQ,MAAM,CAmBhB,CAAC;AAyBF,UAAU,wCAAwC;IAChD,UAAU,EAAE,WAAW,GAAG,mBAAmB,CAAC;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,QAAA,MAAM,YAAY,6DAMf,wCAAwC,KAAG,QAAQ,MAAM,EAAE,CAgC7D,CAAC;AAEF,UAAU,mBAAmB;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;CAC1B;AACD,iBAAe,aAAa,CAAC,MAAM,EAAE,mBAAmB,iBAGvD;AA+CD,KAAK,iBAAiB,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;AAC9D;;GAEG;AACH,QAAA,MAAM,sBAAsB,uDAO3B,CAAC;AAEF,OAAO,EAAC,kBAAkB,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,sBAAsB,EAAC,CAAC"}
+{"version":3,"file":"SessionHandler.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,MAAM,EAAC,MAAM,8BAA8B,CAAC;AACpD,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAEvF,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AAE/B,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAK9C,OAAO,EAAC,YAAY,EAAC,MAAM,mCAAmC,CAAC;AAE/D,UAAU,wBAAwB;IAChC,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,KAAK,kBAAkB,GAAG;IACxB,8EAA8E;IAC9E,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,8GAA8G;IAC9G,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,6EAA6E;IAC7E,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;CACxB,CAAC;AAEF,QAAA,MAAM,kBAAkB,yBAAwB,wBAAwB,KAAG,MAI1E,CAAC;AA6BF;;;GAGG;AACH,QAAA,MAAM,WAAW;YAC6B,WAAW;cAAY,MAAM;;;eAClC,SAAS;kBAAgB,YAAY;MAC3E,QAAQ,MAAM,CAUhB,CAAC;AAqBF,UAAU,wCAAwC;IAChD,UAAU,EAAE,oBAAoB,GAAG,4BAA4B,CAAC;IAChE,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,YAAY,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,QAAA,MAAM,YAAY,qDAKf,wCAAwC,KAAG,QAAQ,kBAAkB,CAwDvE,CAAC;AAEF,UAAU,mBAAmB;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,YAAY,CAAC;CAC5B;AACD,iBAAe,aAAa,CAAC,MAAM,EAAE,mBAAmB,iBAGvD;AA4CD,KAAK,iBAAiB,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9E;;GAEG;AACH,QAAA,MAAM,sBAAsB,uDAY3B,CAAC;AAEF,OAAO,EAAC,kBAAkB,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,sBAAsB,EAAC,CAAC"}