@wireapp/core 40.9.3 → 41.1.0

package/lib/conversation/ConversationService/ConversationService.d.ts

@@ -38,7 +38,10 @@ export declare class ConversationService {
     getConversations(conversationIds?: QualifiedId[]): Promise<RemoteConversations>;
     getAsset({ assetId, assetToken, otrKey, sha256 }: RemoteData): Promise<Uint8Array>;
     getUnencryptedAsset(assetId: string, assetToken?: string): Promise<ArrayBuffer>;
-    addUsersToProteusConversation(params: AddUsersToProteusConversationParams): Promise<import("@wireapp/api-client/lib/event").ConversationMemberJoinEvent>;
+    addUsersToProteusConversation(params: AddUsersToProteusConversationParams): Promise<{
+        event?: import("@wireapp/api-client/lib/event").ConversationMemberJoinEvent | undefined;
+        failedToAdd?: QualifiedId[] | undefined;
+    }>;
     removeUserFromConversation(conversationId: QualifiedId, userId: QualifiedId): Promise<ConversationMemberLeaveEvent>;
     /**
      * Sends a message to a conversation
@@ -86,5 +89,17 @@ export declare class ConversationService {
     wipeMLSConversation(groupId: string): Promise<void>;
     private matchesEpoch;
     handleEpochMismatch(): Promise<void>;
+    /**
+     * Will try registering mls 1:1 conversation adding the other user.
+     * If it fails and the conversation is already established, it will try joining via external commit instead.
+     *
+     * @param mlsConversation - mls 1:1 conversation
+     * @param selfUser - user and client ids of the self user
+     * @param otherUserId - id of the other user
+     */
+    readonly establishMLS1to1Conversation: (groupId: string, selfUser: {
+        user: QualifiedId;
+        client: string;
+    }, otherUserId: QualifiedId) => Promise<void>;
 }
 //# sourceMappingURL=ConversationService.d.ts.map

package/lib/conversation/ConversationService/ConversationService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,YAAY,EACZ,2BAA2B,EAC3B,WAAW,EACX,eAAe,EACf,oBAAoB,EAEpB,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAAC,4BAA4B,EAAC,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAC,GAAG,EAAC,MAAM,oCAAoC,CAAC;AAIvD,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAI9C,OAAO,EAAC,cAAc,EAAE,aAAa,EAAE,oBAAoB,EAAE,UAAU,EAAC,MAAM,6BAA6B,CAAC;AAE5G,OAAO,EAAC,YAAY,EAAuB,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AAEzF,OAAO,EAAC,UAAU,EAAuB,MAAM,8BAA8B,CAAC;AAC9E,OAAO,EAAkC,cAAc,EAAC,MAAM,kCAAkC,CAAC;AACjG,OAAO,EACL,mCAAmC,EACnC,wBAAwB,EACzB,MAAM,sEAAsE,CAAC;AAG9E,OAAO,EAAC,UAAU,EAAC,MAAM,YAAY,CAAC;AAGtC,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAN/B,SAAgB,YAAY,EAAE,YAAY,CAAC;IAC3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgD;gBAGpD,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,cAAc,EAC9B,WAAW,CAAC,wBAAY;IAK3C,IAAI,UAAU,IAAI,UAAU,CAK3B;IAED;;;;;OAKG;IACU,2BAA2B,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAkBpG;;;;;;;;OAQG;IACU,yBAAyB,CAAC,gBAAgB,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC;IAQnF,eAAe,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IAInE,gBAAgB,CAAC,eAAe,CAAC,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAO/E,QAAQ,CAAC,EAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAC,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAWhF,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAK/E,6BAA6B,CAAC,MAAM,EAAE,mCAAmC;IAIzE,0BAA0B,CACrC,cAAc,EAAE,WAAW,EAC3B,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,4BAA4B,CAAC;IAIxC;;;OAGG;IACU,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,oBAAoB,EAAE,wBAAwB,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC;IAO5F,eAAe,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,cAAc,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjE;;OAEG;IACH,gBAAgB,IAAI,OAAO;IAIpB,0BAA0B,CAC/B,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,WAAW,EACnB,aAAa,EAAE,MAAM,GAAG,IAAI,GAC3B,OAAO,CAAC,IAAI,CAAC;IAaT,yBAAyB,CAC9B,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,OAAO,EACjB,gBAAgB,GAAE,MAAM,GAAG,IAAiB,GAC3C,OAAO,CAAC,IAAI,CAAC;IAaT,yBAAyB,CAC9B,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,2BAA2B,GAAG,MAAM,GACrD,OAAO,CAAC,IAAI,CAAC;IAMhB;;;;OAIG;IAEH;;;OAGG;IACU,qBAAqB,CAChC,gBAAgB,EAAE,eAAe,EACjC,UAAU,EAAE,WAAW,EACvB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,aAAa,CAAC;YAqCX,cAAc;IAiC5B;;;;;;OAMG;IACU,yBAAyB,CAAC,EACrC,cAAc,EACd,OAAO,EACP,cAAc,GACf,EAAE,QAAQ,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;IAkBvC,8BAA8B,CAAC,EAC1C,OAAO,EACP,cAAc,EACd,gBAAgB,GACjB,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC;IAoBhC,oBAAoB,CAAC,cAAc,EAAE,WAAW;IAI7D;;;;;OAKG;IACU,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAmBvD,4BAA4B,CAAC,OAAO,EAAE,MAAM;IAI5C,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAIlD,YAAY;IAYb,mBAAmB;CA2BjC"}
+{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.ts"],"names":[],"mappings":"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"}

package/lib/conversation/ConversationService/ConversationService.js

@@ -41,6 +41,33 @@ class ConversationService {
         this.proteusService = proteusService;
         this._mlsService = _mlsService;
         this.logger = (0, logdown_1.default)('@wireapp/core/ConversationService');
+        /**
+         * Will try registering mls 1:1 conversation adding the other user.
+         * If it fails and the conversation is already established, it will try joining via external commit instead.
+         *
+         * @param mlsConversation - mls 1:1 conversation
+         * @param selfUser - user and client ids of the self user
+         * @param otherUserId - id of the other user
+         */
+        this.establishMLS1to1Conversation = async (groupId, selfUser, otherUserId) => {
+            try {
+                await this.mlsService.registerConversation(groupId, [otherUserId, selfUser.user], selfUser);
+            }
+            catch (error) {
+                this.logger.info(`Could not register MLS group with id ${groupId}.`);
+                const mlsConversation = await this.apiClient.api.conversation.getMLS1to1Conversation(otherUserId);
+                if (mlsConversation.epoch > 0) {
+                    this.logger.info(`Conversation (id ${mlsConversation.qualified_id.id}) is already established, joining via external commit`);
+                    // If its already established, we join with external commit
+                    await this.joinByExternalCommit(mlsConversation.qualified_id);
+                    return;
+                }
+                this.logger.info(`Conversation (id ${mlsConversation.qualified_id.id}) is not established, retrying to establish it`);
+                // If conversation is not established, we can wipe it and try to establish it again
+                await this.wipeMLSConversation(groupId);
+                return this.establishMLS1to1Conversation(groupId, selfUser, otherUserId);
+            }
+        };
         this.messageTimer = new conversation_2.MessageTimer();
     }
     get mlsService() {

package/lib/conversation/ConversationService/ConversationService.test.js

@@ -56,6 +56,8 @@ const mockedMLSService = {
     commitPendingProposals: () => Promise.resolve(),
     getEpoch: () => Promise.resolve(),
     joinByExternalCommit: jest.fn(),
+    registerConversation: jest.fn(),
+    wipeConversation: jest.fn(),
 };
 const mockedProteusService = {
     encryptGenericMessage: () => Promise.resolve(),
@@ -186,6 +188,55 @@ describe('ConversationService', () => {
             expect(conversationService.joinByExternalCommit).not.toHaveBeenCalled();
         });
     });
+    describe('establishMLS1to1Conversation', () => {
+        it('successfully register an MLS group if it did not exist before', async () => {
+            const [conversationService, { mlsService }] = buildConversationService();
+            const mockGroupId = 'mock-group-id';
+            const selfUser = { user: { id: 'self-user-id', domain: 'staging.zinfra.io' }, client: 'self-user-client-id' };
+            const otherUserId = { id: 'other-user-id', domain: 'staging.zinfra.io' };
+            await conversationService.establishMLS1to1Conversation(mockGroupId, selfUser, otherUserId);
+            expect(mlsService.registerConversation).toHaveBeenCalledTimes(1);
+            expect(mlsService.registerConversation).toHaveBeenCalledWith(mockGroupId, [otherUserId, selfUser.user], selfUser);
+            expect(mlsService.joinByExternalCommit).not.toHaveBeenCalled();
+            expect(mlsService.wipeConversation).not.toHaveBeenCalled();
+        });
+        it('joins with external commit if epoch number is higher than 0', async () => {
+            const [conversationService, { apiClient, mlsService }] = buildConversationService();
+            const mockConversationId = { id: 'mock-conversation-id', domain: 'staging.zinfra.io' };
+            const mockGroupId = 'mock-group-id';
+            const selfUser = { user: { id: 'self-user-id', domain: 'staging.zinfra.io' }, client: 'self-user-client-id' };
+            const otherUserId = { id: 'other-user-id', domain: 'staging.zinfra.io' };
+            jest.spyOn(mlsService, 'registerConversation').mockRejectedValueOnce(undefined);
+            jest.spyOn(apiClient.api.conversation, 'getMLS1to1Conversation').mockResolvedValueOnce({
+                qualified_id: mockConversationId,
+                protocol: conversation_1.ConversationProtocol.MLS,
+                epoch: 1,
+                group_id: mockGroupId,
+            });
+            await conversationService.establishMLS1to1Conversation(mockGroupId, selfUser, otherUserId);
+            expect(mlsService.registerConversation).toHaveBeenCalledTimes(1);
+            expect(mlsService.registerConversation).toHaveBeenCalledWith(mockGroupId, [otherUserId, selfUser.user], selfUser);
+            expect(conversationService.joinByExternalCommit).toHaveBeenCalledWith(mockConversationId);
+        });
+        it('retries to register mls group if epoch number is equal 0', async () => {
+            const [conversationService, { apiClient, mlsService }] = buildConversationService();
+            const mockConversationId = { id: 'mock-conversation-id', domain: 'staging.zinfra.io' };
+            const mockGroupId = 'mock-group-id';
+            const selfUser = { user: { id: 'self-user-id', domain: 'staging.zinfra.io' }, client: 'self-user-client-id' };
+            const otherUserId = { id: 'other-user-id', domain: 'staging.zinfra.io' };
+            jest.spyOn(mlsService, 'registerConversation').mockRejectedValueOnce(undefined);
+            jest.spyOn(apiClient.api.conversation, 'getMLS1to1Conversation').mockResolvedValueOnce({
+                qualified_id: mockConversationId,
+                protocol: conversation_1.ConversationProtocol.MLS,
+                epoch: 0,
+                group_id: mockGroupId,
+            });
+            await conversationService.establishMLS1to1Conversation(mockGroupId, selfUser, otherUserId);
+            expect(mlsService.registerConversation).toHaveBeenCalledWith(mockGroupId, [otherUserId, selfUser.user], selfUser);
+            expect(mlsService.wipeConversation).toHaveBeenCalledWith(mockGroupId);
+            expect(mlsService.registerConversation).toHaveBeenCalledTimes(2);
+        });
+    });
     describe('fetchAllParticipantsClients', () => {
         it('gives the members and clients of a federated conversation', async () => {
             const [conversationService, { apiClient }] = buildConversationService();

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

@@ -1,6 +1,7 @@
 import type { APIClient } from '@wireapp/api-client/lib/APIClient';
 import type { PreKey, Context } from '@wireapp/api-client/lib/auth';
 import { Conversation, QualifiedOTRRecipients, QualifiedUserClients } from '@wireapp/api-client/lib/conversation';
+import type { ConversationMemberJoinEvent } from '@wireapp/api-client/lib/event';
 import type { QualifiedId, QualifiedUserPreKeyBundleMap } from '@wireapp/api-client/lib/user';
 import { CRUDEngine } from '@wireapp/store-engine';
 import { CryptoClient } from './CryptoClient';
@@ -40,7 +41,14 @@ export declare class ProteusService {
      */
     getRemoteFingerprint(userId: QualifiedId, clientId: string, prekey?: PreKey): Promise<string>;
     createConversation({ conversationData, otherUserIds, }: CreateProteusConversationParams): Promise<Conversation>;
-    addUsersToConversation({ conversationId, qualifiedUsers }: AddUsersToProteusConversationParams): Promise<import("@wireapp/api-client/lib/event").ConversationMemberJoinEvent>;
+    /**
+     * Tries to add all the given users to the given conversation.
+     * If some users are not reachable, it will try to add the remaining users and list them in the `failedToAdd` property of the response.
+     */
+    addUsersToConversation({ conversationId, qualifiedUsers }: AddUsersToProteusConversationParams): Promise<{
+        event?: ConversationMemberJoinEvent;
+        failedToAdd?: QualifiedId[];
+    }>;
     sendMessage({ userIds, conversationId, nativePush, targetMode, payload, onClientMismatch, }: SendProteusMessageParams): Promise<SendResult>;
     private decrypt;
     deleteSession(userId: QualifiedId, clientId: string): Promise<void>;

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,EACL,YAAY,EAIZ,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,MAAM,MAAM,gBAAgB,GAAG;IAC7B,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;AAEF,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;IA2B1D,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;IA2C7C,sBAAsB,CAAC,EAAC,cAAc,EAAE,cAAc,EAAC,EAAE,mCAAmC;IAI5F,WAAW,CAAC,EACvB,OAAO,EACP,cAAc,EACd,UAAU,EACV,UAAU,EACV,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,UAAU,CAAC;YA6CnC,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"}
+{"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,EACL,YAAY,EAIZ,sBAAsB,EACtB,oBAAoB,EACrB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,KAAK,EAAC,2BAA2B,EAAC,MAAM,+BAA+B,CAAC;AAC/E,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;AAIhC,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,MAAM,MAAM,gBAAgB,GAAG;IAC7B,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;AAEF,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;IA2B1D,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;IA0C1D;;;OAGG;IACU,sBAAsB,CAAC,EAAC,cAAc,EAAE,cAAc,EAAC,EAAE,mCAAmC,GAAG,OAAO,CAAC;QAClH,KAAK,CAAC,EAAE,2BAA2B,CAAC;QACpC,WAAW,CAAC,EAAE,WAAW,EAAE,CAAC;KAC7B,CAAC;IA4BW,WAAW,CAAC,EACvB,OAAO,EACP,cAAc,EACd,UAAU,EACV,UAAU,EACV,OAAO,EACP,gBAAgB,GACjB,EAAE,wBAAwB,GAAG,OAAO,CAAC,UAAU,CAAC;YA6CnC,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

@@ -29,6 +29,7 @@ const cryptoMigrationStateStore_1 = require("./cryptoMigrationStateStore");
 const DecryptionErrorGenerator_1 = require("./DecryptionErrorGenerator");
 const identityClearer_1 = require("./identityClearer");
 const sessionIdMigrator_1 = require("./sessionIdMigrator");
+const userDomainFilters_1 = require("./userDomainFilters");
 const conversation_2 = require("../../../conversation");
 const MessageService_1 = require("../../../conversation/message/MessageService");
 const EventHandler_1 = require("../EventHandler");
@@ -120,31 +121,55 @@ class ProteusService {
         }
         return this.apiClient.api.conversation.postConversation(payload).catch(async (error) => {
             var _a;
-            const backendError = error;
-            switch (backendError.label) {
-                case conversation_1.FederatedBackendsErrorLabel.UNREACHABLE_BACKENDS: {
-                    const { backends } = backendError;
-                    const users = (_a = payload.qualified_users) !== null && _a !== void 0 ? _a : [];
-                    const availableUsers = [];
-                    const unreachableUsers = [];
-                    users.forEach(user => backends.includes(user.domain) ? unreachableUsers.push(user) : availableUsers.push(user));
-                    payload = Object.assign(Object.assign({}, payload), { qualified_users: availableUsers });
-                    // If conversation creation returns an error because a backend is offline,
-                    // we try creating the conversation again with users from available backends
-                    const response = await this.apiClient.api.conversation.postConversation(payload).catch((error) => {
-                        throw error;
-                    });
-                    // on a succesfull conversation creation with the available users,
-                    // we append the users from an unreachable backend to the response
-                    response.failed_to_add = unreachableUsers;
-                    return response;
+            if ((0, conversation_1.isFederatedBackendsError)(error)) {
+                switch (error.label) {
+                    case conversation_1.FederatedBackendsErrorLabel.UNREACHABLE_BACKENDS: {
+                        const { backends } = error;
+                        const { excludedUsers: unreachableUsers, includedUsers: availableUsers } = (0, userDomainFilters_1.filterUsersFromDomains)((_a = payload.qualified_users) !== null && _a !== void 0 ? _a : [], backends);
+                        payload = Object.assign(Object.assign({}, payload), { qualified_users: availableUsers });
+                        // If conversation creation returns an error because a backend is offline,
+                        // we try creating the conversation again with users from available backends
+                        const response = await this.apiClient.api.conversation.postConversation(payload).catch((error) => {
+                            throw error;
+                        });
+                        // on a succesfull conversation creation with the available users,
+                        // we append the users from an unreachable backend to the response
+                        response.failed_to_add = unreachableUsers;
+                        return response;
+                    }
                 }
             }
             throw error;
         });
     }
+    /**
+     * Tries to add all the given users to the given conversation.
+     * If some users are not reachable, it will try to add the remaining users and list them in the `failedToAdd` property of the response.
+     */
     async addUsersToConversation({ conversationId, qualifiedUsers }) {
-        return this.apiClient.api.conversation.postMembers(conversationId, qualifiedUsers);
+        try {
+            return { event: await this.apiClient.api.conversation.postMembers(conversationId, qualifiedUsers) };
+        }
+        catch (error) {
+            if ((0, conversation_1.isFederatedBackendsError)(error)) {
+                switch (error.label) {
+                    case conversation_1.FederatedBackendsErrorLabel.UNREACHABLE_BACKENDS: {
+                        const { backends } = error;
+                        const { excludedUsers: unreachableUsers, includedUsers: availableUsers } = (0, userDomainFilters_1.filterUsersFromDomains)(qualifiedUsers, backends);
+                        if (availableUsers.length === 0) {
+                            return { failedToAdd: unreachableUsers };
+                        }
+                        // In case the request to add users failed with a `UNREACHABLE_BACKENDS` error, we try again with the users from available backends
+                        const response = await this.apiClient.api.conversation.postMembers(conversationId, availableUsers);
+                        return {
+                            event: response,
+                            failedToAdd: unreachableUsers,
+                        };
+                    }
+                }
+            }
+            throw error;
+        }
     }
     async sendMessage({ userIds, conversationId, nativePush, targetMode, payload, onClientMismatch, }) {
         var _a;

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

@@ -474,6 +474,45 @@ describe('ProteusService', () => {
             });
         });
     });
+    describe('addUsersToConversation', () => {
+        const baseResponse = {
+            event: {
+                conversation: '',
+                from: '',
+                time: Date.now().toString(),
+                data: { users: [], user_ids: [] },
+                type: event_1.CONVERSATION_EVENT.MEMBER_JOIN,
+            },
+        };
+        const conversationId = { id: 'conv1', domain: 'domain1' };
+        const userDomain1 = { id: 'user-1-1', domain: 'domain1' };
+        const user2Domain1 = { id: 'user-2-1', domain: 'domain1' };
+        const userDomain2 = { id: 'user-2-2', domain: 'domain2' };
+        it('adds all requested users to an existing conversation', async () => {
+            const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
+            jest.spyOn(apiClient.api.conversation, 'postMembers').mockResolvedValueOnce(baseResponse.event);
+            const event = await proteusService.addUsersToConversation({
+                conversationId,
+                qualifiedUsers: [userDomain1, user2Domain1, userDomain2],
+            });
+            expect(event).toEqual(baseResponse);
+        });
+        it('partially add users if some backends are unreachable', async () => {
+            const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
+            const postMembersSpy = jest
+                .spyOn(apiClient.api.conversation, 'postMembers')
+                .mockRejectedValueOnce(new conversation_1.FederatedBackendsError(conversation_1.FederatedBackendsErrorLabel.UNREACHABLE_BACKENDS, [userDomain1.domain]))
+                .mockResolvedValueOnce(baseResponse.event);
+            const result = await proteusService.addUsersToConversation({
+                conversationId,
+                qualifiedUsers: [userDomain1, user2Domain1, userDomain2],
+            });
+            expect(postMembersSpy).toHaveBeenCalledTimes(2);
+            expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining([userDomain1, user2Domain1, userDomain2]));
+            expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining([userDomain2]));
+            expect(result.failedToAdd).toEqual([userDomain1, user2Domain1]);
+        });
+    });
     describe('createConversation', () => {
         const newConversation = {
             qualified_id: { id: '', domain: '' },

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

@@ -0,0 +1,6 @@
+import { QualifiedId } from '@wireapp/api-client/lib/user';
+export declare function filterUsersFromDomains(userIds: QualifiedId[], domainsToExclude: string[]): {
+    excludedUsers: QualifiedId[];
+    includedUsers: QualifiedId[];
+};
+//# sourceMappingURL=userDomainFilters.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"userDomainFilters.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/proteus/ProteusService/userDomainFilters.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,WAAW,EAAE,EACtB,gBAAgB,EAAE,MAAM,EAAE,GACzB;IAAC,aAAa,EAAE,WAAW,EAAE,CAAC;IAAC,aAAa,EAAE,WAAW,EAAE,CAAA;CAAC,CAW9D"}

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

@@ -0,0 +1,31 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2023 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.filterUsersFromDomains = void 0;
+function filterUsersFromDomains(userIds, domainsToExclude) {
+    const excludedUsers = [];
+    const includedUsers = [];
+    userIds.forEach(user => domainsToExclude.includes(user.domain) ? excludedUsers.push(user) : includedUsers.push(user));
+    return {
+        excludedUsers,
+        includedUsers,
+    };
+}
+exports.filterUsersFromDomains = filterUsersFromDomains;

package/package.json

@@ -11,7 +11,7 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^24.21.2",
+    "@wireapp/api-client": "^25.1.0",
     "@wireapp/commons": "^5.1.0",
     "@wireapp/core-crypto": "1.0.0-rc.6",
     "@wireapp/cryptobox": "12.8.0",
@@ -60,6 +60,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "40.9.3",
-  "gitHead": "737803befa8e5090a776c8ceaff97d031c9f98da"
+  "version": "41.1.0",
+  "gitHead": "b88ae7c76cc5ed141344814dd0012cdaf47a8af2"
 }