@wireapp/core 38.15.2 → 39.0.0

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

@@ -1,7 +1,7 @@
 import type { APIClient } from '@wireapp/api-client/lib/APIClient';
 import type { PreKey, Context } from '@wireapp/api-client/lib/auth';
-import type { Conversation, OTRRecipients, QualifiedOTRRecipients, QualifiedUserClients, UserClients } from '@wireapp/api-client/lib/conversation';
-import type { QualifiedId, QualifiedUserPreKeyBundleMap, UserPreKeyBundleMap } from '@wireapp/api-client/lib/user';
+import type { Conversation, QualifiedOTRRecipients, QualifiedUserClients } from '@wireapp/api-client/lib/conversation';
+import type { QualifiedId, QualifiedUserPreKeyBundleMap } from '@wireapp/api-client/lib/user';
 import { CRUDEngine } from '@wireapp/store-engine';
 import { CryptoClient } from './CryptoClient';
 import type { AddUsersToProteusConversationParams, CreateProteusConversationParams, ProteusServiceConfig, SendProteusMessageParams } from './ProteusService.types';
@@ -10,9 +10,9 @@ import type { EventHandlerResult } from '../../common.types';
 import { EventHandlerParams } from '../EventHandler';
 type EncryptionResult = {
     /** the encrypted payloads for the clients that have a valid sessions */
-    payloads: OTRRecipients<Uint8Array>;
+    payloads: QualifiedOTRRecipients;
     /** user-client that do not have prekeys on backend (deleted clients) */
-    unknowns?: UserClients;
+    unknowns?: QualifiedUserClients;
 };
 export declare class ProteusService {
     private readonly apiClient;
@@ -28,7 +28,7 @@ export declare class ProteusService {
      * Get the fingerprint of the local client.
      */
     getLocalFingerprint(): Promise<string>;
-    constructSessionId(userId: string | QualifiedId, clientId: string, domain?: string): string;
+    constructSessionId(userId: QualifiedId, clientId: string): string;
     /**
      * Get the fingerprint of a remote client
      * @param userId ID of user
@@ -39,14 +39,10 @@ export declare class ProteusService {
     getRemoteFingerprint(userId: QualifiedId, clientId: string, prekey?: PreKey): Promise<string>;
     createConversation({ conversationData, otherUserIds, }: CreateProteusConversationParams): Promise<Conversation>;
     addUsersToConversation({ conversationId, qualifiedUserIds }: AddUsersToProteusConversationParams): Promise<import("@wireapp/api-client/lib/event").ConversationMemberJoinEvent>;
-    sendMessage({ userIds, sendAsProtobuf, conversationId, nativePush, targetMode, payload, onClientMismatch, }: SendProteusMessageParams): Promise<SendResult>;
+    sendMessage({ userIds, conversationId, nativePush, targetMode, payload, onClientMismatch, }: SendProteusMessageParams): Promise<SendResult>;
     private decrypt;
-    encrypt(plainText: Uint8Array, recipients: UserPreKeyBundleMap | UserClients, domain?: string): Promise<EncryptionResult>;
     deleteSession(userId: QualifiedId, clientId: string): Promise<void>;
-    encryptQualified(plainText: Uint8Array, preKeyBundles: QualifiedUserPreKeyBundleMap | QualifiedUserClients): Promise<{
-        payloads: QualifiedOTRRecipients;
-        unknowns?: QualifiedUserClients;
-    }>;
+    encrypt(plainText: Uint8Array, recipients: QualifiedUserPreKeyBundleMap | QualifiedUserClients): Promise<EncryptionResult>;
     wipe(storeEngine?: CRUDEngine): Promise<void>;
 }
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"ProteusService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ProteusService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/ProteusService.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,mCAAmC,CAAC;AACjE,OAAO,KAAK,EAAC,MAAM,EAAE,OAAO,EAAC,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EACV,YAAY,EAEZ,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAI5F,OAAO,EAAC,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAI5C,OAAO,KAAK,EACV,mCAAmC,EACnC,+BAA+B,EAC/B,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAA0C,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAE1F,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAC,kBAAkB,EAAqB,MAAM,iBAAiB,CAAC;AAWvE,KAAK,gBAAgB,GAAG;IACtB,wEAAwE;IACxE,QAAQ,EAAE,sBAAsB,CAAC;IACjC,wEAAwE;IACxE,QAAQ,CAAC,EAAE,oBAAoB,CAAC;CACjC,CAAC;AACF,qBAAa,cAAc;IAKvB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2C;gBAG/C,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,oBAAoB;IAKlC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC,GAAG,kBAAkB;IAiBhG,UAAU,CAAC,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO;IAyB1D,YAAY,CAAC,OAAO,CAAC,EAAE,UAAU;IAIxC;;OAEG;IACI,mBAAmB;IAInB,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IAIxE;;;;;;OAMG;IACU,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM;IAQ3E,kBAAkB,CAAC,EAC9B,gBAAgB,EAChB,YAAY,GACb,EAAE,+BAA+B,GAAG,OAAO,CAAC,YAAY,CAAC;IAiB7C,sBAAsB,CAAC,EAAC,cAAc,EAAE,gBAAgB,EAAC,EAAE,mCAAmC;IAI9F,WAAW,CAAC,EACvB,OAAO,EACP,cAAc,EACd,UAAU,EACV,UAAU,EACV,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,UAAU,CAAC;YA0CnC,OAAO;IAuBd,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM;IAQ7C,OAAO,CAClB,SAAS,EAAE,UAAU,EACrB,UAAU,EAAE,4BAA4B,GAAG,oBAAoB,GAC9D,OAAO,CAAC,gBAAgB,CAAC;IAgBtB,IAAI,CAAC,WAAW,CAAC,EAAE,UAAU;CAMpC"}

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

@@ -56,7 +56,7 @@ class ProteusService {
     }
     async initClient(storeEngine, context) {
         const dbName = storeEngine.storeName;
-        if (context.domain && this.config.useQualifiedIds) {
+        if (context.domain) {
             // We want sessions to be fully qualified from now on
             if (!cryptoMigrationStateStore_1.cryptoMigrationStore.qualifiedSessions.isReady(dbName)) {
                 this.logger.info(`Migrating existing session ids to qualified ids.`);
@@ -87,8 +87,8 @@ class ProteusService {
     getLocalFingerprint() {
         return this.cryptoClient.getFingerprint();
     }
-    constructSessionId(userId, clientId, domain) {
-        return (0, SessionHandler_1.constructSessionId)({ clientId, userId, domain, useQualifiedIds: this.config.useQualifiedIds });
+    constructSessionId(userId, clientId) {
+        return (0, SessionHandler_1.constructSessionId)({ clientId, userId });
     }
     /**
      * Get the fingerprint of a remote client
@@ -119,25 +119,20 @@ class ProteusService {
     async addUsersToConversation({ conversationId, qualifiedUserIds }) {
         return this.apiClient.api.conversation.postMembers(conversationId, qualifiedUserIds);
     }
-    async sendMessage({ userIds, sendAsProtobuf, conversationId, nativePush, targetMode, payload, onClientMismatch, }) {
+    async sendMessage({ userIds, conversationId, nativePush, targetMode, payload, onClientMismatch, }) {
         const messageParams = await (0, getGenericMessageParams_1.getGenericMessageParams)({
             apiClient: this.apiClient,
             sendingClientId: this.apiClient.validatedClientId,
             conversationId,
             genericMessage: payload,
-            useQualifiedIds: this.config.useQualifiedIds,
             options: {
                 userIds,
-                sendAsProtobuf,
                 nativePush,
                 targetMode,
-                onClientMismatch,
             },
         });
-        const { federated, sendingClientId, recipients, plainText, options } = messageParams;
-        const response = federated
-            ? await this.messageService.sendFederatedMessage(sendingClientId, recipients, plainText, Object.assign(Object.assign({}, options), { onClientMismatch: mismatch => onClientMismatch === null || onClientMismatch === void 0 ? void 0 : onClientMismatch(mismatch, false) }))
-            : await this.messageService.sendMessage(sendingClientId, recipients, plainText, Object.assign(Object.assign({}, options), { sendAsProtobuf, onClientMismatch: mismatch => onClientMismatch === null || onClientMismatch === void 0 ? void 0 : onClientMismatch(mismatch, false) }));
+        const { sendingClientId, recipients, plainText, options } = messageParams;
+        const response = await this.messageService.sendMessage(sendingClientId, recipients, plainText, Object.assign(Object.assign({}, options), { onClientMismatch: mismatch => onClientMismatch === null || onClientMismatch === void 0 ? void 0 : onClientMismatch(mismatch, false) }));
         if (!response.canceled) {
             if (!(0, isClearFromMismatch_1.isClearFromMismatch)(response)) {
                 // We warn the consumer that there is a mismatch that did not prevent message sending
@@ -178,38 +173,24 @@ class ProteusService {
             throw (0, DecryptionErrorGenerator_1.generateDecryptionError)({ userId, clientId }, error);
         }
     }
-    async encrypt(plainText, recipients, domain = '') {
-        const { sessions, unknowns } = await (0, SessionHandler_1.initSessions)({
-            recipients,
-            domain,
-            apiClient: this.apiClient,
-            cryptoClient: this.cryptoClient,
-            logger: this.logger,
-        });
-        const payload = await this.cryptoClient.encrypt(sessions, plainText);
-        return { payloads: (0, SessionHandler_1.buildEncryptedPayloads)(payload), unknowns };
-    }
     deleteSession(userId, clientId) {
         return (0, SessionHandler_1.deleteSession)({
             userId,
             clientId,
-            useQualifiedIds: this.config.useQualifiedIds,
             cryptoClient: this.cryptoClient,
         });
     }
-    async encryptQualified(plainText, preKeyBundles) {
-        const qualifiedOTRRecipients = {};
-        const missingRecipients = {};
-        for (const [domain, preKeyBundleMap] of Object.entries(preKeyBundles)) {
-            const { unknowns, payloads } = await this.encrypt(plainText, preKeyBundleMap, domain);
-            qualifiedOTRRecipients[domain] = payloads;
-            if (unknowns) {
-                missingRecipients[domain] = unknowns;
-            }
-        }
+    async encrypt(plainText, recipients) {
+        const { sessions, unknowns } = await (0, SessionHandler_1.initSessions)({
+            recipients,
+            apiClient: this.apiClient,
+            cryptoClient: this.cryptoClient,
+            logger: this.logger,
+        });
+        const payloads = await this.cryptoClient.encrypt(sessions, plainText);
         return {
-            payloads: qualifiedOTRRecipients,
-            unknowns: Object.keys(missingRecipients).length > 0 ? missingRecipients : undefined,
+            payloads: (0, SessionHandler_1.buildEncryptedPayloads)(payloads),
+            unknowns,
         };
     }
     async wipe(storeEngine) {

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,7 +24,7 @@ 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,
@@ -34,7 +34,6 @@ const buildProteusService = async (federated = false) => {
     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,7 +128,7 @@ describe('ProteusService', () => {
             const expectedFingerprint = 'fingerprint-client1';
             const userId = { id: 'user1', domain: 'domain.com' };
             const clientId = 'client1';
-            jest.spyOn(apiClient.api.user, 'postQualifiedMultiPreKeyBundles').mockResolvedValue({
+            jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockResolvedValue({
                 [userId.domain]: {
                     [userId.id]: {
                         [clientId]: {
@@ -154,7 +148,7 @@ 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 getPrekeysSpy = jest.spyOn(apiClient.api.user, 'postQualifiedMultiPreKeyBundles');
+            const getPrekeysSpy = jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles');
             jest.spyOn(cryptoClient, 'getRemoteFingerprint').mockResolvedValue(expectedFingerprint);
             const saveSessionSpy = jest.spyOn(cryptoClient, 'sessionFromPrekey').mockResolvedValue(undefined);
             jest.spyOn(cryptoClient, 'saveSession').mockResolvedValue(undefined);
@@ -220,58 +214,11 @@ describe('ProteusService', () => {
         });
     });
     describe('"encrypt"', () => {
-        it('returns encrypted payload', async () => {
-            const { services, data: { firstUser, encryptedMessageBuffer, messageBuffer }, } = await prepareDataForEncryption(false);
-            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 { payloads } = await services.proteusService.encrypt(messageBuffer, userClients);
-            expect(services.cryptoClient.encrypt).toHaveBeenCalledWith([firstUser.sessions.first, firstUser.sessions.second], messageBuffer);
-            expect(payloads).toEqual({
-                [firstUser.id]: {
-                    [firstUser.clients.first]: encryptedMessageBuffer,
-                    [firstUser.clients.second]: encryptedMessageBuffer,
-                },
-            });
-        });
-        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 { 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({
-                [firstUser.id]: {
-                    [firstUser.clients.first]: encryptedMessageBuffer,
-                    [firstUser.clients.second]: encryptedMessageBuffer,
-                },
-                [secondUser.id]: {
-                    [secondUser.clients.first]: encryptedMessageBuffer,
-                },
-            });
-        });
-    });
-    describe('"encryptQualified"', () => {
         it('returns encrypted payload', async () => {
             const { services, data: { firstUser, 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],
                 },
             };
             const encryptedPayload = new Map([
@@ -280,12 +227,11 @@ describe('ProteusService', () => {
             ]);
             jest.spyOn(services.cryptoClient, 'sessionExists').mockResolvedValue(true);
             jest.spyOn(services.cryptoClient, 'encrypt').mockResolvedValueOnce(encryptedPayload);
-            const { payloads } = await services.proteusService.encryptQualified(messageBuffer, userClients);
-            // console.log({encrypted, missing});
+            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]: {
+                    [firstUser.id.id]: {
                         [firstUser.clients.first]: encryptedMessageBuffer,
                         [firstUser.clients.second]: encryptedMessageBuffer,
                     },
@@ -296,8 +242,8 @@ describe('ProteusService', () => {
             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([
@@ -307,15 +253,15 @@ describe('ProteusService', () => {
             ]);
             jest.spyOn(services.cryptoClient, 'sessionExists').mockResolvedValue(true);
             jest.spyOn(services.cryptoClient, 'encrypt').mockResolvedValueOnce(encryptedPayload);
-            const { payloads } = await services.proteusService.encryptQualified(messageBuffer, userClients);
+            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]: {
+                    [secondUser.id.id]: {
                         [secondUser.clients.first]: encryptedMessageBuffer,
                     },
                 },
@@ -325,8 +271,8 @@ describe('ProteusService', () => {
             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([
@@ -334,16 +280,16 @@ describe('ProteusService', () => {
                 [firstUser.sessions.second, encryptedMessageBuffer],
                 [secondUser.sessions.first, encryptedMessageBuffer],
             ]);
-            jest.spyOn(services.apiClient.api.user, 'postQualifiedMultiPreKeyBundles').mockResolvedValue({
+            jest.spyOn(services.apiClient.api.user, 'postMultiPreKeyBundles').mockResolvedValue({
                 [domain]: {
-                    [firstUser.id]: {
+                    [firstUser.id.id]: {
                         [firstUser.clients.first]: null,
                         [firstUser.clients.second]: {
                             id: 123,
                             key: 'pQABARhIAqEAWCCaJpFa9c626ORmjj1aV6OnOYgmTjfoiE3ynOfNfGAOmgOhAKEAWCD60VMzRrLfO+1GSjgyhnVp2N7L58DM+eeJhZJi1tBLfQT2',
                         },
                     },
-                    [secondUser.id]: {
+                    [secondUser.id.id]: {
                         [secondUser.clients.first]: {
                             id: 123,
                             key: 'pQABARhIAqEAWCCaJpFa9c626ORmjj1aV6OnOYgmTjfoiE3ynOfNfGAOmgOhAKEAWCD60VMzRrLfO+1GSjgyhnVp2N7L58DM+eeJhZJi1tBLfQT2',
@@ -355,20 +301,20 @@ describe('ProteusService', () => {
             jest.spyOn(services.cryptoClient, 'encrypt').mockResolvedValueOnce(encryptedPayload);
             jest.spyOn(services.cryptoClient, 'sessionFromPrekey').mockResolvedValue();
             jest.spyOn(services.cryptoClient, 'saveSession').mockResolvedValue();
-            const { payloads, unknowns } = await services.proteusService.encryptQualified(messageBuffer, userClients);
+            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]: [firstUser.clients.first],
+                    [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,
                     },
                 },
@@ -398,7 +344,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({});
@@ -410,7 +362,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' },
+                        ],
+                    }));
                 });
             });
             [
@@ -422,9 +379,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' },
@@ -432,7 +389,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' },
@@ -441,9 +398,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({
@@ -465,11 +428,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' },
@@ -477,19 +438,19 @@ 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);
+                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 },

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, ClientMismatch, 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,20 +6,17 @@ 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;
+    userIds?: QualifiedId[] | QualifiedUserClients;
     onClientMismatch?: (status: ClientMismatch | MessageSendingStatus, wasSent: boolean) => void | boolean | Promise<boolean>;
     protocol: ConversationProtocol.PROTEUS;
 };

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,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,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,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"}

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, QualifiedUserPreKeyBundleMap } 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 | QualifiedUserPreKeyBundleMap>;
+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;AAC5D,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAE,4BAA4B,EAAC,MAAM,8BAA8B,CAAC;AAOvF,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,GAAG,4BAA4B,CAO3G,CAAC;AAEF,OAAO,EAAC,4BAA4B,EAAC,CAAC"}

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

@@ -18,26 +18,15 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRecipientsForConversation = exports.getQualifiedRecipientsForConversation = void 0;
+exports.getRecipientsForConversation = void 0;
 const PreKeyBundle_1 = require("./PreKeyBundle/PreKeyBundle");
 const getConversationQualifiedMembers_1 = require("../../../conversation/ConversationService/Utility/getConversationQualifiedMembers");
 const util_1 = require("../../../util");
-const getQualifiedRecipientsForConversation = async ({ apiClient, conversationId, userIds, }) => {
+const getRecipientsForConversation = 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;
-const getRecipientsForConversation = async ({ apiClient, conversationId, userIds, }) => {
-    if ((0, util_1.isUserClients)(userIds)) {
-        return userIds;
-    }
-    return (0, PreKeyBundle_1.getPreKeyBundleMap)({
-        apiClient: apiClient,
-        conversationId,
-        userIds,
-    });
-};
 exports.getRecipientsForConversation = getRecipientsForConversation;