@wireapp/core 39.0.2 → 39.1.1

package/lib/broadcast/BroadcastService.d.ts

@@ -1,5 +1,4 @@
 import { ClientMismatch, MessageSendingStatus, QualifiedUserClients } from '@wireapp/api-client/lib/conversation';
-import { UserPreKeyBundleMap } from '@wireapp/api-client/lib/user/';
 import { APIClient } from '@wireapp/api-client';
 import { GenericMessage } from '@wireapp/protocol-messaging';
 import { ProteusService } from '../messagingProtocols/proteus';
@@ -8,14 +7,6 @@ export declare class BroadcastService {
     private readonly proteusService;
     private readonly messageService;
     constructor(apiClient: APIClient, proteusService: ProteusService);
-    /**
-     * Will create a key bundle for all the users of the team
-     *
-     * @param teamId
-     * @param skipOwnClients=false
-     * @param onlyDirectConnections=false Will generate a bundle only for directly connected users (users the self user has conversation with). Allows avoiding broadcasting messages to too many people
-     */
-    getPreKeyBundlesFromTeam(teamId: string, skipOwnClients?: boolean, onlyDirectConnections?: boolean): Promise<UserPreKeyBundleMap>;
     broadcastGenericMessage(genericMessage: GenericMessage, recipients: QualifiedUserClients, onClientMismatch?: (mismatch: ClientMismatch | MessageSendingStatus) => void | boolean | Promise<boolean>): Promise<ClientMismatch | MessageSendingStatus>;
 }
 //# sourceMappingURL=BroadcastService.d.ts.map

package/lib/broadcast/BroadcastService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BroadcastService.d.ts","sourceRoot":"","sources":["../../src/broadcast/BroadcastService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,cAAc,EAAE,oBAAoB,EAAE,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAChH,OAAO,EAAC,mBAAmB,EAAC,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAK3D,OAAO,EAAC,cAAc,EAAC,MAAM,+BAA+B,CAAC;AAE7D,qBAAa,gBAAgB;IAGf,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAa,OAAO,CAAC,QAAQ,CAAC,cAAc;IAFlF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAEnB,SAAS,EAAE,SAAS,EAAmB,cAAc,EAAE,cAAc;IAIlG;;;;;;OAMG;IACU,wBAAwB,CACnC,MAAM,EAAE,MAAM,EACd,cAAc,UAAQ,EACtB,qBAAqB,UAAQ,GAC5B,OAAO,CAAC,mBAAmB,CAAC;IAyBlB,uBAAuB,CAClC,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,oBAAoB,EAChC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,GAAG,oBAAoB,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAY5G"}
+{"version":3,"file":"BroadcastService.d.ts","sourceRoot":"","sources":["../../src/broadcast/BroadcastService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,cAAc,EAAE,oBAAoB,EAAE,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAEhH,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAK3D,OAAO,EAAC,cAAc,EAAC,MAAM,+BAA+B,CAAC;AAE7D,qBAAa,gBAAgB;IAGf,OAAO,CAAC,QAAQ,CAAC,SAAS;IAAa,OAAO,CAAC,QAAQ,CAAC,cAAc;IAFlF,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;gBAEnB,SAAS,EAAE,SAAS,EAAmB,cAAc,EAAE,cAAc;IAIrF,uBAAuB,CAClC,cAAc,EAAE,cAAc,EAC9B,UAAU,EAAE,oBAAoB,EAChC,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,GAAG,oBAAoB,KAAK,IAAI,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;CAY5G"}

package/lib/broadcast/BroadcastService.js

@@ -29,38 +29,11 @@ class BroadcastService {
         this.proteusService = proteusService;
         this.messageService = new MessageService_1.MessageService(this.apiClient, this.proteusService);
     }
-    /**
-     * Will create a key bundle for all the users of the team
-     *
-     * @param teamId
-     * @param skipOwnClients=false
-     * @param onlyDirectConnections=false Will generate a bundle only for directly connected users (users the self user has conversation with). Allows avoiding broadcasting messages to too many people
-     */
-    async getPreKeyBundlesFromTeam(teamId, skipOwnClients = false, onlyDirectConnections = false) {
-        const teamMembers = onlyDirectConnections
-            ? (await this.apiClient.api.conversation.getConversations()).conversations
-                .map(({ members }) => members.others.map(user => user.id).concat(members.self.id))
-                .flat()
-            : (await this.apiClient.api.teams.member.getAllMembers(teamId)).members.map(({ user }) => user);
-        let members = Array.from(new Set(teamMembers)).map(member => ({ id: member }));
-        if (skipOwnClients) {
-            const selfUser = await this.apiClient.api.self.getSelf();
-            members = members.filter(member => member.id !== selfUser.id);
-        }
-        const preKeys = await Promise.all(members.map(member => this.apiClient.api.user.getUserPreKeys(member.id)));
-        return preKeys.reduce((bundleMap, bundle) => {
-            bundleMap[bundle.user] = {};
-            for (const client of bundle.clients) {
-                bundleMap[bundle.user][client.client] = client.prekey;
-            }
-            return bundleMap;
-        }, {});
-    }
     async broadcastGenericMessage(genericMessage, recipients, onClientMismatch) {
         const plainTextArray = protocol_messaging_1.GenericMessage.encode(genericMessage).finish();
         const send = () => {
             return this.messageService.sendMessage(this.apiClient.validatedClientId, recipients, plainTextArray, {
-                reportMissing: (0, UserClientsUtil_1.flattenQualifiedUserClients)(recipients).map(({ userId }) => userId),
+                reportMissing: (0, UserClientsUtil_1.flattenUserMap)(recipients).map(({ userId }) => userId),
                 onClientMismatch,
             });
         };

package/lib/conversation/message/MessageService.js

@@ -127,12 +127,12 @@ class MessageService {
      * @return resolves with a new message payload that can be sent
      */
     async reencryptAfterMismatch(mismatch, recipients, plainText) {
-        const deleted = (0, UserClientsUtil_1.flattenQualifiedUserClients)(mismatch.deleted);
+        const deleted = (0, UserClientsUtil_1.flattenUserMap)(mismatch.deleted);
         // remove deleted clients to the recipients
         deleted.forEach(({ userId, data }) => data.forEach(clientId => delete recipients[userId.domain][userId.id][clientId]));
         if (Object.keys(mismatch.missing).length) {
             const { payloads } = await this.proteusService.encrypt(plainText, mismatch.missing);
-            const reEncryptedPayloads = (0, UserClientsUtil_1.flattenQualifiedUserClients)(payloads);
+            const reEncryptedPayloads = (0, UserClientsUtil_1.flattenUserMap)(payloads);
             reEncryptedPayloads.forEach(({ data, userId }) => {
                 var _a;
                 const domainRecipients = (_a = recipients[userId.domain]) !== null && _a !== void 0 ? _a : {};

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

@@ -150,7 +150,9 @@ describe('MessageService', () => {
                     }
                     return Promise.resolve(baseClientMismatch);
                 });
-                jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockReturnValue(Promise.resolve({}));
+                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,
@@ -174,7 +176,9 @@ describe('MessageService', () => {
                     }
                     return Promise.resolve(baseClientMismatch);
                 });
-                jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockReturnValue(Promise.resolve({}));
+                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,
@@ -199,7 +203,9 @@ describe('MessageService', () => {
                     }
                     return Promise.resolve(baseClientMismatch);
                 });
-                jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockReturnValue(Promise.resolve({}));
+                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,
@@ -221,7 +227,9 @@ describe('MessageService', () => {
                     };
                     return Promise.reject(error);
                 });
-                jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockReturnValue(Promise.resolve({}));
+                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,
@@ -249,7 +257,9 @@ describe('MessageService', () => {
                     }
                     return Promise.resolve(baseMessageSendingStatus);
                 });
-                jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockReturnValue(Promise.resolve({}));
+                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,
@@ -274,7 +284,9 @@ describe('MessageService', () => {
                     }
                     return Promise.resolve(baseMessageSendingStatus);
                 });
-                jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockReturnValue(Promise.resolve({}));
+                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,
@@ -317,7 +329,9 @@ describe('MessageService', () => {
                     };
                     return Promise.reject(error);
                 });
-                jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockReturnValue(Promise.resolve({}));
+                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,

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/proteus/ProteusService/ProteusService.d.ts

@@ -13,6 +13,8 @@ type EncryptionResult = {
     payloads: QualifiedOTRRecipients;
     /** user-client that do not have prekeys on backend (deleted clients) */
     unknowns?: QualifiedUserClients;
+    /** users for whom we could retrieve a prekey and, thus, for which we could not encrypt the message */
+    failed?: QualifiedId[];
 };
 export declare class ProteusService {
     private readonly apiClient;

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":"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"}
+{"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;IAChC,sGAAsG;IACtG,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;CACxB,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;IAiBtB,IAAI,CAAC,WAAW,CAAC,EAAE,UAAU;CAMpC"}

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

@@ -181,7 +181,7 @@ class ProteusService {
         });
     }
     async encrypt(plainText, recipients) {
-        const { sessions, unknowns } = await (0, SessionHandler_1.initSessions)({
+        const { sessions, unknowns, failed } = await (0, SessionHandler_1.initSessions)({
             recipients,
             apiClient: this.apiClient,
             cryptoClient: this.cryptoClient,
@@ -191,6 +191,7 @@ class ProteusService {
         return {
             payloads: (0, SessionHandler_1.buildEncryptedPayloads)(payloads),
             unknowns,
+            failed,
         };
     }
     async wipe(storeEngine) {

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

@@ -129,11 +129,13 @@ describe('ProteusService', () => {
             const userId = { id: 'user1', domain: 'domain.com' };
             const clientId = 'client1';
             jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockResolvedValue({
-                [userId.domain]: {
-                    [userId.id]: {
-                        [clientId]: {
-                            id: 123,
-                            key: 'pQABARhIAqEAWCCaJpFa9c626ORmjj1aV6OnOYgmTjfoiE3ynOfNfGAOmgOhAKEAWCD60VMzRrLfO+1GSjgyhnVp2N7L58DM+eeJhZJi1tBLfQT2',
+                qualified_user_client_prekeys: {
+                    [userId.domain]: {
+                        [userId.id]: {
+                            [clientId]: {
+                                id: 123,
+                                key: 'pQABARhIAqEAWCCaJpFa9c626ORmjj1aV6OnOYgmTjfoiE3ynOfNfGAOmgOhAKEAWCD60VMzRrLfO+1GSjgyhnVp2N7L58DM+eeJhZJi1tBLfQT2',
+                            },
                         },
                     },
                 },
@@ -281,18 +283,20 @@ describe('ProteusService', () => {
                 [secondUser.sessions.first, encryptedMessageBuffer],
             ]);
             jest.spyOn(services.apiClient.api.user, 'postMultiPreKeyBundles').mockResolvedValue({
-                [domain]: {
-                    [firstUser.id.id]: {
-                        [firstUser.clients.first]: null,
-                        [firstUser.clients.second]: {
-                            id: 123,
-                            key: 'pQABARhIAqEAWCCaJpFa9c626ORmjj1aV6OnOYgmTjfoiE3ynOfNfGAOmgOhAKEAWCD60VMzRrLfO+1GSjgyhnVp2N7L58DM+eeJhZJi1tBLfQT2',
+                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',
+                        [secondUser.id.id]: {
+                            [secondUser.clients.first]: {
+                                id: 123,
+                                key: 'pQABARhIAqEAWCCaJpFa9c626ORmjj1aV6OnOYgmTjfoiE3ynOfNfGAOmgOhAKEAWCD60VMzRrLfO+1GSjgyhnVp2N7L58DM+eeJhZJi1tBLfQT2',
+                            },
                         },
                     },
                 },

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

@@ -1,11 +1,11 @@
 import { APIClient } from '@wireapp/api-client/lib/APIClient';
 import { QualifiedUserClients } from '@wireapp/api-client/lib/conversation';
-import { QualifiedId, QualifiedUserPreKeyBundleMap } from '@wireapp/api-client/lib/user';
+import { QualifiedId } from '@wireapp/api-client/lib/user';
 interface GetRecipientsForConversationQualifiedParams {
     apiClient: APIClient;
     conversationId: QualifiedId;
     userIds?: QualifiedId[] | QualifiedUserClients;
 }
-declare const getRecipientsForConversation: ({ apiClient, conversationId, userIds, }: GetRecipientsForConversationQualifiedParams) => Promise<QualifiedUserClients | QualifiedUserPreKeyBundleMap>;
+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,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"}
+{"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,CAQ5E,CAAC;AAEF,OAAO,EAAC,4BAA4B,EAAC,CAAC"}

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

@@ -19,14 +19,22 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRecipientsForConversation = void 0;
-const PreKeyBundle_1 = require("./PreKeyBundle/PreKeyBundle");
 const getConversationQualifiedMembers_1 = require("../../../conversation/ConversationService/Utility/getConversationQualifiedMembers");
+const UserClientsUtil_1 = require("../../../conversation/message/UserClientsUtil");
 const util_1 = require("../../../util");
+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.isQualifiedUserClients)(userIds)) {
         return userIds;
     }
     const recipientIds = userIds || (await (0, getConversationQualifiedMembers_1.getConversationQualifiedMembers)({ apiClient: apiClient, conversationId }));
-    return (0, PreKeyBundle_1.getQualifiedPreKeyBundle)({ apiClient, userIds: recipientIds });
+    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

@@ -14,6 +14,8 @@ type InitSessionsResult = {
     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;
 /**

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,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;CACjC,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;AAeF,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,CAoDvE,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"}
+{"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"}

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

@@ -63,11 +63,12 @@ exports.initSession = initSession;
  * @param {userClientMap} map of domain to (map of user IDs to client IDs) or map of user IDs containg the lists of clients
  */
 const createSessions = async ({ recipients, apiClient, cryptoClient }) => {
-    const prekeyBundleMap = await apiClient.api.user.postMultiPreKeyBundles(recipients);
-    return await createSessionsFromPreKeys({
-        recipients: prekeyBundleMap,
+    const { qualified_user_client_prekeys: prekeysBundle, failed_to_list: failed } = await apiClient.api.user.postMultiPreKeyBundles(recipients);
+    const result = await createSessionsFromPreKeys({
+        recipients: prekeysBundle,
         cryptoClient,
     });
+    return Object.assign(Object.assign({}, result), { failed });
 };
 /**
  * Will make sure all the sessions need to encrypt for those user/clients pair are set
@@ -77,7 +78,7 @@ const initSessions = async ({ recipients, apiClient, cryptoClient, logger, }) =>
     const missingClients = {};
     const missingClientsWithPrekeys = {};
     const existingSessions = [];
-    const users = (0, UserClientsUtil_1.flattenQualifiedUserClients)(recipients);
+    const users = (0, UserClientsUtil_1.flattenUserMap)(recipients);
     for (const user of users) {
         const { userId, data } = user;
         const clients = Array.isArray(data) ? data : Object.keys(data);
@@ -106,17 +107,18 @@ const initSessions = async ({ recipients, apiClient, cryptoClient, logger, }) =>
             cryptoClient,
         })
         : { sessions: [], unknowns: {} };
-    const { sessions: created, unknowns } = Object.keys(missingClients).length > 0
+    const { sessions: created, failed, unknowns, } = Object.keys(missingClients).length > 0
         ? await createSessions({
             recipients: missingClients,
             apiClient,
             cryptoClient,
             logger,
         })
-        : { sessions: [], unknowns: {} };
+        : { sessions: [], failed: undefined, unknowns: undefined };
     const allUnknowns = Object.assign(Object.assign({}, prekeyUnknows), unknowns);
     return {
         sessions: [...existingSessions, ...prekeyCreated, ...created],
+        failed,
         unknowns: Object.keys(allUnknowns).length > 0 ? allUnknowns : undefined,
     };
 };

package/lib/messagingProtocols/proteus/Utility/SessionHandler/SessionHandler.test.js

@@ -20,14 +20,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const api_client_1 = require("@wireapp/api-client");
 const SessionHandler_1 = require("./SessionHandler");
-function generatePrekeys(userId, clientIds) {
-    const clients = clientIds.reduce((prekeys, clientId, index) => {
-        return Object.assign(Object.assign({}, prekeys), { [clientId]: {
-                id: index,
-                key: 'pQABARn//wKhAFggJ1Fbpg5l6wnzKOJE+vXpRnkqUYhIvVnR5lNXEbO2o/0DoQChAFggHxZvgvtDktY/vqBcpjjo6rQnXvcNQhfwmy8AJQJKlD0E9g==',
-            } });
-    }, {});
-    return { [userId.id]: clients };
+function generatePrekeys(recipients) {
+    const prekeys = {};
+    const failed = [];
+    Object.entries(recipients).forEach(([domain, userClients]) => {
+        Object.entries(userClients).forEach(([userId, clientIds]) => {
+            if (domain.startsWith('offline:')) {
+                failed.push({ id: userId, domain });
+                return;
+            }
+            const domainUsers = prekeys[domain] || {};
+            domainUsers[userId] = clientIds.reduce((acc, clientId, index) => {
+                const payload = clientId.startsWith('deleted:')
+                    ? null
+                    : {
+                        id: index,
+                        key: 'pQABARn//wKhAFggJ1Fbpg5l6wnzKOJE+vXpRnkqUYhIvVnR5lNXEbO2o/0DoQChAFggHxZvgvtDktY/vqBcpjjo6rQnXvcNQhfwmy8AJQJKlD0E9g==',
+                    };
+                return Object.assign(Object.assign({}, acc), { [clientId]: payload });
+            }, {});
+            prekeys[domain] = domainUsers;
+        });
+    });
+    return Promise.resolve({ qualified_user_client_prekeys: prekeys, failed_to_list: failed });
 }
 describe('SessionHandler', () => {
     const cryptoClient = {
@@ -38,6 +53,9 @@ describe('SessionHandler', () => {
         deleteSession: jest.fn(),
     };
     const apiClient = new api_client_1.APIClient({ urls: api_client_1.APIClient.BACKEND.STAGING });
+    beforeAll(() => {
+        jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockImplementation(generatePrekeys);
+    });
     describe('constructSessionId', () => {
         describe('constructs a session ID', () => {
             it('without a domain', () => {
@@ -70,22 +88,6 @@ describe('SessionHandler', () => {
             const userId = { id: 'user1', domain: 'domain' };
             const clientId = 'client1';
             jest.spyOn(cryptoClient, 'sessionExists').mockResolvedValue(false);
-            jest
-                .spyOn(apiClient.api.user, 'postMultiPreKeyBundles')
-                .mockResolvedValue({ domain: generatePrekeys(userId, [clientId]) });
-            const sessionId = (0, SessionHandler_1.constructSessionId)({
-                userId,
-                clientId,
-            });
-            await (0, SessionHandler_1.initSession)({ userId, clientId }, { apiClient, cryptoClient });
-            expect(cryptoClient.sessionFromPrekey).toHaveBeenCalledWith(sessionId, expect.any(Object));
-        });
-        it('indicates the consumer if a session could not be created', async () => {
-            const userId = { id: 'user1', domain: 'domain' };
-            const clientId = 'client1';
-            jest
-                .spyOn(apiClient.api.user, 'postMultiPreKeyBundles')
-                .mockResolvedValue({ domain: generatePrekeys(userId, [clientId]) });
             const sessionId = (0, SessionHandler_1.constructSessionId)({
                 userId,
                 clientId,
@@ -104,9 +106,6 @@ describe('SessionHandler', () => {
                 'missing-user1': ['client1'],
                 'missing-user2': ['client1', 'client2'],
             };
-            jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockResolvedValue({
-                domain: Object.assign(Object.assign({}, generatePrekeys({ id: 'missing-user1', domain: '' }, ['client1'])), generatePrekeys({ id: 'missing-user2', domain: '' }, ['client1', 'client2'])),
-            });
             jest
                 .spyOn(cryptoClient, 'sessionExists')
                 .mockImplementation(sessionId => Promise.resolve(sessionId.includes('missing')));
@@ -121,18 +120,15 @@ describe('SessionHandler', () => {
         });
         it('returns the list of deleted clients (clients with null prekeys)', async () => {
             const userClients = {
-                'existing-user1': ['client1', 'deleteclient'],
+                'existing-user1': ['client1', 'deleted:client2'],
             };
-            const allKeys = { domain: generatePrekeys({ id: 'existing-user1', domain: 'domain' }, ['client1']) };
-            allKeys['domain']['existing-user1']['deleteclient'] = null;
-            jest.spyOn(apiClient.api.user, 'postMultiPreKeyBundles').mockResolvedValue(allKeys);
             const { sessions, unknowns } = await (0, SessionHandler_1.initSessions)({
                 recipients: { domain: userClients },
                 apiClient,
                 cryptoClient,
             });
             expect(sessions).toEqual(['domain@existing-user1@client1']);
-            expect(unknowns).toEqual({ domain: { 'existing-user1': ['deleteclient'] } });
+            expect(unknowns).toEqual({ domain: { 'existing-user1': ['deleted:client2'] } });
         });
         it('initializes sessions across multiple domains', async () => {
             const userClients = {
@@ -148,5 +144,19 @@ describe('SessionHandler', () => {
             expect(sessions).toEqual(['domain1@existing-user1@client11', 'domain2@existing-user2@client21']);
             expect(unknowns).toBeUndefined();
         });
+        it('returns failed session creation', async () => {
+            const recipients = {
+                domain1: { 'existing-user1': ['client1'] },
+                'offline:domain': { user2: ['client12'] },
+            };
+            jest.spyOn(cryptoClient, 'sessionExists').mockResolvedValue(false);
+            const { sessions, failed } = await (0, SessionHandler_1.initSessions)({
+                recipients,
+                apiClient,
+                cryptoClient,
+            });
+            expect(sessions).toEqual(['domain1@existing-user1@client1']);
+            expect(failed).toEqual([{ id: 'user2', domain: 'offline:domain' }]);
+        });
     });
 });

package/package.json

@@ -11,7 +11,7 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^23.0.0",
+    "@wireapp/api-client": "^23.1.0",
     "@wireapp/commons": "^5.0.4",
     "@wireapp/core-crypto": "0.6.2",
     "@wireapp/cryptobox": "12.8.0",
@@ -60,6 +60,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "39.0.2",
-  "gitHead": "273aabdefe09d486c3b3cc11065794eec1bfe3ba"
+  "version": "39.1.1",
+  "gitHead": "1113dc9010564d42a335f3eb8a53f0797c92c746"
 }

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

@@ -1,25 +0,0 @@
-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';
-declare const preKeyBundleToUserClients: (users: UserPreKeyBundleMap) => UserClients;
-interface GetPreKeyBundleMapParams {
-    apiClient: APIClient;
-    conversationId: QualifiedId;
-    userIds?: string[] | QualifiedId[] | UserClients;
-}
-declare const getPreKeyBundleMap: ({ apiClient, conversationId, userIds, }: GetPreKeyBundleMapParams) => Promise<UserPreKeyBundleMap>;
-/**
- * Will generate a prekey bundle for specific users.
- * If a QualifiedId array is given the bundle will contain all the clients from those users fetched from the server.
- * If a QualifiedUserClients is provided then only the clients in the payload will be targeted (which could generate a ClientMismatch when sending messages)
- *
- * @param {QualifiedId[]|QualifiedUserClients} userIds - Targeted users.
- * @returns {Promise<QualifiedUserPreKeyBundleMap}
- */
-interface GetQualifiedPreKeyBundleMapParams {
-    apiClient: APIClient;
-    userIds?: QualifiedId[] | QualifiedUserClients;
-}
-declare const getQualifiedPreKeyBundle: ({ apiClient, userIds, }: GetQualifiedPreKeyBundleMapParams) => Promise<QualifiedUserPreKeyBundleMap>;
-export { getPreKeyBundleMap, getQualifiedPreKeyBundle, preKeyBundleToUserClients };
-//# sourceMappingURL=PreKeyBundle.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"PreKeyBundle.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/Utility/PreKeyBundle/PreKeyBundle.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;AAI5G,QAAA,MAAM,yBAAyB,UAAW,mBAAmB,KAAG,WAK/D,CAAC;AAEF,UAAU,wBAAwB;IAChC,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,WAAW,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,WAAW,EAAE,GAAG,WAAW,CAAC;CAClD;AACD,QAAA,MAAM,kBAAkB,4CAIrB,wBAAwB,KAAG,QAAQ,mBAAmB,CA+BxD,CAAC;AAEF;;;;;;;GAOG;AACH,UAAU,iCAAiC;IACzC,SAAS,EAAE,SAAS,CAAC;IACrB,OAAO,CAAC,EAAE,WAAW,EAAE,GAAG,oBAAoB,CAAC;CAChD;AACD,QAAA,MAAM,wBAAwB,4BAG3B,iCAAiC,KAAG,QAAQ,4BAA4B,CAoC1E,CAAC;AAEF,OAAO,EAAC,kBAAkB,EAAE,wBAAwB,EAAE,yBAAyB,EAAC,CAAC"}

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

@@ -1,93 +0,0 @@
-"use strict";
-/*
- * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.preKeyBundleToUserClients = exports.getQualifiedPreKeyBundle = exports.getPreKeyBundleMap = void 0;
-const util_1 = require("../../../../util");
-const preKeyBundleToUserClients = (users) => {
-    return Object.entries(users).reduce((acc, [userId, clientsObj]) => {
-        acc[userId] = Object.keys(clientsObj);
-        return acc;
-    }, {});
-};
-exports.preKeyBundleToUserClients = preKeyBundleToUserClients;
-const getPreKeyBundleMap = async ({ apiClient, conversationId, userIds = [], }) => {
-    let members = [];
-    if (userIds) {
-        if ((0, util_1.isStringArray)(userIds)) {
-            members = userIds;
-        }
-        else if ((0, util_1.isUserClients)(userIds)) {
-            members = Object.keys(userIds);
-        }
-    }
-    if (!members.length) {
-        const conversation = await apiClient.api.conversation.getConversation(conversationId);
-        /*
-         * If you are sending a message to a conversation, you have to include
-         * yourself in the list of users if you want to sync a message also to your
-         * other clients.
-         */
-        members = conversation.members.others.map(member => member.id).concat(conversation.members.self.id);
-    }
-    const preKeys = await Promise.all(members.map(member => apiClient.api.user.getUserPreKeys(member)));
-    return preKeys.reduce((bundleMap, bundle) => {
-        const userId = bundle.user;
-        bundleMap[userId] || (bundleMap[userId] = {});
-        for (const client of bundle.clients) {
-            bundleMap[userId][client.client] = client.prekey;
-        }
-        return bundleMap;
-    }, {});
-};
-exports.getPreKeyBundleMap = getPreKeyBundleMap;
-const getQualifiedPreKeyBundle = async ({ apiClient, userIds, }) => {
-    let targets = [];
-    if (userIds) {
-        if ((0, util_1.isQualifiedIdArray)(userIds)) {
-            targets = userIds.map(id => ({ id }));
-        }
-        else {
-            targets = Object.entries(userIds).reduce((accumulator, [domain, userClients]) => {
-                for (const userId in userClients) {
-                    accumulator.push({ id: { id: userId, domain }, clients: userClients[userId] });
-                }
-                return accumulator;
-            }, []);
-        }
-    }
-    const preKeys = await Promise.all(targets.map(async ({ id: userId, clients }) => {
-        const prekeyBundle = await apiClient.api.user.getUserPreKeys(userId);
-        // We filter the clients that should not receive the message (if a QualifiedUserClients was given as parameter)
-        const userClients = clients
-            ? prekeyBundle.clients.filter(client => clients.includes(client.client))
-            : prekeyBundle.clients;
-        return { user: userId, clients: userClients };
-    }));
-    return preKeys.reduce((bundleMap, qualifiedPrekey) => {
-        var _a, _b, _c;
-        bundleMap[_a = qualifiedPrekey.user.domain] || (bundleMap[_a] = {});
-        for (const client of qualifiedPrekey.clients) {
-            (_b = bundleMap[qualifiedPrekey.user.domain])[_c = qualifiedPrekey.user.id] || (_b[_c] = {});
-            bundleMap[qualifiedPrekey.user.domain][qualifiedPrekey.user.id][client.client] = client.prekey;
-        }
-        return bundleMap;
-    }, {});
-};
-exports.getQualifiedPreKeyBundle = getQualifiedPreKeyBundle;

package/lib/messagingProtocols/proteus/Utility/PreKeyBundle/PreKeyBundle.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=PreKeyBundle.test.d.ts.map

package/lib/messagingProtocols/proteus/Utility/PreKeyBundle/PreKeyBundle.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"PreKeyBundle.test.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/Utility/PreKeyBundle/PreKeyBundle.test.ts"],"names":[],"mappings":""}

package/lib/messagingProtocols/proteus/Utility/PreKeyBundle/PreKeyBundle.test.js

@@ -1,66 +0,0 @@
-"use strict";
-/*
- * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-const PreKeyBundle_1 = require("./PreKeyBundle");
-const firstUser = {
-    id: 'bc0c99f1-49a5-4ad2-889a-62885af37088',
-    clients: { first: 'be67218b77d02d30', second: 'ae87218e77d02d30' },
-};
-const secondUser = {
-    id: 'bc0c99ff-ffa5-ffd2-ff9a-6ff85af3ff88',
-    clients: { first: 'kk67218b77d02d30', second: 'kk87218e77d02d30' },
-};
-const validPreKey = {
-    id: 1337,
-    key: 'pQABARn//wKhAFggJ1Fbpg5l6wnzKOJE+vXpRnkqUYhIvVnR5lNXEbO2o/0DoQChAFggHxZvgvtDktY/vqBcpjjo6rQnXvcNQhfwmy8AJQJKlD0E9g==',
-};
-describe('PrekeyHandler', () => {
-    describe('preKeyBundleToUserClients', () => {
-        it('maps preKeyBundle to userClients', () => {
-            const input = {
-                [firstUser.id]: { [firstUser.clients.first]: validPreKey },
-            };
-            const output = {
-                [firstUser.id]: [firstUser.clients.first],
-            };
-            expect((0, PreKeyBundle_1.preKeyBundleToUserClients)(input)).toEqual(output);
-        });
-        it('maps preKeyBundle to userClients (multiple clients)', () => {
-            const input = {
-                [firstUser.id]: { [firstUser.clients.first]: validPreKey, [firstUser.clients.second]: validPreKey },
-            };
-            const output = {
-                [firstUser.id]: [firstUser.clients.first, firstUser.clients.second],
-            };
-            expect((0, PreKeyBundle_1.preKeyBundleToUserClients)(input)).toEqual(output);
-        });
-        it('maps preKeyBundle to userClients (multiple users)', () => {
-            const input = {
-                [firstUser.id]: { [firstUser.clients.first]: validPreKey, [firstUser.clients.second]: validPreKey },
-                [secondUser.id]: { [secondUser.clients.first]: validPreKey, [secondUser.clients.second]: validPreKey },
-            };
-            const output = {
-                [firstUser.id]: [firstUser.clients.first, firstUser.clients.second],
-                [secondUser.id]: [secondUser.clients.first, secondUser.clients.second],
-            };
-            expect((0, PreKeyBundle_1.preKeyBundleToUserClients)(input)).toEqual(output);
-        });
-    });
-});

package/lib/messagingProtocols/proteus/Utility/PreKeyBundle/index.d.ts

@@ -1,2 +0,0 @@
-export * from './PreKeyBundle';
-//# sourceMappingURL=index.d.ts.map

package/lib/messagingProtocols/proteus/Utility/PreKeyBundle/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/proteus/Utility/PreKeyBundle/index.ts"],"names":[],"mappings":"AAmBA,cAAc,gBAAgB,CAAC"}

package/lib/messagingProtocols/proteus/Utility/PreKeyBundle/index.js

@@ -1,35 +0,0 @@
-"use strict";
-/*
- * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./PreKeyBundle"), exports);