@wireapp/core 41.0.0 → 41.2.0

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

@@ -9,6 +9,10 @@ import { MLSService } from '../../messagingProtocols/mls';
 import { ProteusService } from '../../messagingProtocols/proteus';
 import { AddUsersToProteusConversationParams, SendProteusMessageParams } from '../../messagingProtocols/proteus/ProteusService/ProteusService.types';
 import { RemoteData } from '../content';
+export declare enum AddUsersFailureReasons {
+    NON_FEDERATING_BACKENDS = "NON_FEDERATING_BACKENDS",
+    UNREACHABLE_BACKENDS = "UNREACHABLE_BACKENDS"
+}
 export declare class ConversationService {
     private readonly apiClient;
     private readonly proteusService;
@@ -27,6 +31,8 @@ export declare class ConversationService {
     /**
      * Create a group conversation.
      *
+     * This method might fail with a `BackendsNotConnectedError` if there are users from not connected backends that are part of the payload
+     *
      * @note Do not include yourself as the requestor
      * @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/conversations/createGroupConversation
      *
@@ -40,7 +46,10 @@ export declare class ConversationService {
     getUnencryptedAsset(assetId: string, assetToken?: string): Promise<ArrayBuffer>;
     addUsersToProteusConversation(params: AddUsersToProteusConversationParams): Promise<{
         event?: import("@wireapp/api-client/lib/event").ConversationMemberJoinEvent | undefined;
-        failedToAdd?: QualifiedId[] | undefined;
+        failedToAdd?: {
+            reason: AddUsersFailureReasons;
+            users: QualifiedId[];
+        } | undefined;
     }>;
     removeUserFromConversation(conversationId: QualifiedId, userId: QualifiedId): Promise<ConversationMemberLeaveEvent>;
     /**
@@ -89,5 +98,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

@@ -21,7 +21,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConversationService = void 0;
+exports.ConversationService = exports.AddUsersFailureReasons = void 0;
 const conversation_1 = require("@wireapp/api-client/lib/conversation");
 const data_1 = require("@wireapp/api-client/lib/conversation/data");
 const bazinga64_1 = require("bazinga64");
@@ -35,12 +35,44 @@ const proteus_1 = require("../../messagingProtocols/proteus");
 const util_1 = require("../../util");
 const fullyQualifiedClientIdUtils_1 = require("../../util/fullyQualifiedClientIdUtils");
 const messageSender_1 = require("../message/messageSender");
+var AddUsersFailureReasons;
+(function (AddUsersFailureReasons) {
+    AddUsersFailureReasons["NON_FEDERATING_BACKENDS"] = "NON_FEDERATING_BACKENDS";
+    AddUsersFailureReasons["UNREACHABLE_BACKENDS"] = "UNREACHABLE_BACKENDS";
+})(AddUsersFailureReasons || (exports.AddUsersFailureReasons = AddUsersFailureReasons = {}));
 class ConversationService {
     constructor(apiClient, proteusService, _mlsService) {
         this.apiClient = apiClient;
         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() {
@@ -68,8 +100,19 @@ class ConversationService {
         }));
         return qualifiedUserClients;
     }
-    async createProteusConversation(conversationData, otherUserIds) {
-        return this.proteusService.createConversation({ conversationData, otherUserIds });
+    /**
+     * Create a group conversation.
+     *
+     * This method might fail with a `BackendsNotConnectedError` if there are users from not connected backends that are part of the payload
+     *
+     * @note Do not include yourself as the requestor
+     * @see https://staging-nginz-https.zinfra.io/swagger-ui/#!/conversations/createGroupConversation
+     *
+     * @param conversationData Payload object for group creation
+     * @returns Resolves when the conversation was created
+     */
+    async createProteusConversation(conversationData) {
+        return this.proteusService.createConversation(conversationData);
     }
     async getConversation(conversationId) {
         return this.apiClient.api.conversation.getConversation(conversationId);

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/errors/FederatedBackendsError.d.ts

@@ -0,0 +1,9 @@
+/**
+ * This error means we are trying to add users that are parts of 2 backends that are not federating with each other to a new conversation.
+ */
+export declare class NonFederatingBackendsError extends Error {
+    readonly backends: string[];
+    constructor(backends: string[]);
+}
+export declare function isNonFederatingBackendsError(error: unknown): error is NonFederatingBackendsError;
+//# sourceMappingURL=FederatedBackendsError.d.ts.map

package/lib/errors/FederatedBackendsError.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FederatedBackendsError.d.ts","sourceRoot":"","sources":["../../src/errors/FederatedBackendsError.ts"],"names":[],"mappings":"AAmBA;;GAEG;AACH,qBAAa,0BAA2B,SAAQ,KAAK;aACvB,QAAQ,EAAE,MAAM,EAAE;gBAAlB,QAAQ,EAAE,MAAM,EAAE;CAI/C;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,0BAA0B,CAEhG"}

package/lib/errors/FederatedBackendsError.js

@@ -0,0 +1,36 @@
+"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.isNonFederatingBackendsError = exports.NonFederatingBackendsError = void 0;
+/**
+ * This error means we are trying to add users that are parts of 2 backends that are not federating with each other to a new conversation.
+ */
+class NonFederatingBackendsError extends Error {
+    constructor(backends) {
+        super('2 backends are not connected');
+        this.backends = backends;
+        this.name = 'NonFederatingBackendError';
+    }
+}
+exports.NonFederatingBackendsError = NonFederatingBackendsError;
+function isNonFederatingBackendsError(error) {
+    return !!error && typeof error === 'object' && 'name' in error && error.name === 'NonFederatingBackendError';
+}
+exports.isNonFederatingBackendsError = isNonFederatingBackendsError;

package/lib/errors/index.d.ts

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

package/lib/errors/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/errors/index.ts"],"names":[],"mappings":"AAmBA,cAAc,mBAAmB,CAAC;AAClC,cAAc,0BAA0B,CAAC"}

package/lib/errors/index.js

@@ -0,0 +1,36 @@
+"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/.
+ *
+ */
+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("./DecryptionError"), exports);
+__exportStar(require("./FederatedBackendsError"), exports);

package/lib/index.d.ts

@@ -5,4 +5,5 @@ export { CoreError } from './CoreError';
 export * as cryptography from './cryptography/';
 export * as util from './util';
 export * as MessageBuilder from './conversation/message/MessageBuilder';
+export * as errors from './errors';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAC,MAAM,WAAW,CAAC;AAC1E,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAChC,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,cAAc,MAAM,uCAAuC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAC,MAAM,WAAW,CAAC;AAC1E,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAChC,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,cAAc,MAAM,uCAAuC,CAAC;AACxE,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC"}

package/lib/index.js

@@ -41,7 +41,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MessageBuilder = exports.util = exports.cryptography = exports.CoreError = exports.conversation = exports.auth = exports.ConnectionState = exports.Account = void 0;
+exports.errors = exports.MessageBuilder = exports.util = exports.cryptography = exports.CoreError = exports.conversation = exports.auth = exports.ConnectionState = exports.Account = void 0;
 var Account_1 = require("./Account");
 Object.defineProperty(exports, "Account", { enumerable: true, get: function () { return Account_1.Account; } });
 Object.defineProperty(exports, "ConnectionState", { enumerable: true, get: function () { return Account_1.ConnectionState; } });
@@ -52,3 +52,4 @@ Object.defineProperty(exports, "CoreError", { enumerable: true, get: function ()
 exports.cryptography = __importStar(require("./cryptography/"));
 exports.util = __importStar(require("./util"));
 exports.MessageBuilder = __importStar(require("./conversation/message/MessageBuilder"));
+exports.errors = __importStar(require("./errors"));

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

@@ -1,12 +1,12 @@
 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 { Conversation, NewConversation, 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';
-import type { AddUsersToProteusConversationParams, CreateProteusConversationParams, ProteusServiceConfig, SendProteusMessageParams } from './ProteusService.types';
-import { SendResult } from '../../../conversation';
+import type { AddUsersToProteusConversationParams, ProteusServiceConfig, SendProteusMessageParams } from './ProteusService.types';
+import { AddUsersFailureReasons, SendResult } from '../../../conversation';
 import type { EventHandlerResult } from '../../common.types';
 import { EventHandlerParams } from '../EventHandler';
 export type EncryptionResult = {
@@ -40,14 +40,17 @@ export declare class ProteusService {
      *   If not provided and the session doesn't exists it will fetch a new prekey from the backend
      */
     getRemoteFingerprint(userId: QualifiedId, clientId: string, prekey?: PreKey): Promise<string>;
-    createConversation({ conversationData, otherUserIds, }: CreateProteusConversationParams): Promise<Conversation>;
+    createConversation(conversationData: NewConversation): Promise<Conversation>;
     /**
      * 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[];
+        failedToAdd?: {
+            reason: AddUsersFailureReasons;
+            users: QualifiedId[];
+        };
     }>;
     sendMessage({ userIds, conversationId, nativePush, targetMode, payload, onClientMismatch, }: SendProteusMessageParams): Promise<SendResult>;
     private decrypt;

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,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"}
+{"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,EAGZ,eAAe,EACf,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,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,wBAAwB,CAAC;AAIhC,OAAO,EAAC,sBAAsB,EAA2C,UAAU,EAAC,MAAM,uBAAuB,CAAC;AAGlH,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,gBAAgB,EAAE,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC;IAiCzF;;;OAGG;IACU,sBAAsB,CAAC,EAAC,cAAc,EAAE,cAAc,EAAC,EAAE,mCAAmC,GAAG,OAAO,CAAC;QAClH,KAAK,CAAC,EAAE,2BAA2B,CAAC;QACpC,WAAW,CAAC,EAAE;YAAC,MAAM,EAAE,sBAAsB,CAAC;YAAC,KAAK,EAAE,WAAW,EAAE,CAAA;SAAC,CAAC;KACtE,CAAC;IAqCW,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

@@ -32,6 +32,7 @@ const sessionIdMigrator_1 = require("./sessionIdMigrator");
 const userDomainFilters_1 = require("./userDomainFilters");
 const conversation_2 = require("../../../conversation");
 const MessageService_1 = require("../../../conversation/message/MessageService");
+const errors_1 = require("../../../errors");
 const EventHandler_1 = require("../EventHandler");
 const getGenericMessageParams_1 = require("../Utility/getGenericMessageParams");
 const isClearFromMismatch_1 = require("../Utility/isClearFromMismatch");
@@ -106,32 +107,25 @@ class ProteusService {
         const sessionId = await (0, SessionHandler_1.initSession)({ userId, clientId, initialPrekey: prekey }, { cryptoClient: this.cryptoClient, apiClient: this.apiClient });
         return this.cryptoClient.getRemoteFingerprint(sessionId);
     }
-    async createConversation({ conversationData, otherUserIds, }) {
-        let payload;
-        if (typeof conversationData === 'string') {
-            const ids = typeof otherUserIds === 'string' ? [otherUserIds] : otherUserIds;
-            payload = {
-                name: conversationData,
-                receipt_mode: null,
-                users: ids !== null && ids !== void 0 ? ids : [],
-            };
-        }
-        else {
-            payload = conversationData;
+    async createConversation(conversationData) {
+        var _a;
+        try {
+            return await this.apiClient.api.conversation.postConversation(conversationData);
         }
-        return this.apiClient.api.conversation.postConversation(payload).catch(async (error) => {
-            var _a;
+        catch (error) {
             if ((0, conversation_1.isFederatedBackendsError)(error)) {
                 switch (error.label) {
+                    case conversation_1.FederatedBackendsErrorLabel.NON_FEDERATING_BACKENDS: {
+                        // In case we are trying to create a conversation with users from 2 backends that are not connected, we should stop the procedure and throw an error
+                        throw new errors_1.NonFederatingBackendsError(error.backends);
+                    }
                     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 });
+                        const { excludedUsers: unreachableUsers, includedUsers: availableUsers } = (0, userDomainFilters_1.filterUsersFromDomains)((_a = conversationData.qualified_users) !== null && _a !== void 0 ? _a : [], backends);
+                        conversationData = Object.assign(Object.assign({}, conversationData), { 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;
-                        });
+                        const response = await this.apiClient.api.conversation.postConversation(conversationData);
                         // 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;
@@ -140,7 +134,7 @@ class ProteusService {
                 }
             }
             throw error;
-        });
+        }
     }
     /**
      * Tries to add all the given users to the given conversation.
@@ -151,19 +145,26 @@ class ProteusService {
             return { event: await this.apiClient.api.conversation.postMembers(conversationId, qualifiedUsers) };
         }
         catch (error) {
+            const failureReasonsMap = {
+                [conversation_1.FederatedBackendsErrorLabel.NON_FEDERATING_BACKENDS]: conversation_2.AddUsersFailureReasons.NON_FEDERATING_BACKENDS,
+                [conversation_1.FederatedBackendsErrorLabel.UNREACHABLE_BACKENDS]: conversation_2.AddUsersFailureReasons.UNREACHABLE_BACKENDS,
+            };
             if ((0, conversation_1.isFederatedBackendsError)(error)) {
                 switch (error.label) {
+                    case conversation_1.FederatedBackendsErrorLabel.NON_FEDERATING_BACKENDS:
                     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 };
+                            return { failedToAdd: { reason: failureReasonsMap[error.label], users: unreachableUsers } };
                         }
-                        // In case the request to add users failed with a `UNREACHABLE_BACKENDS` error, we try again with the users from available backends
+                        // In case the request to add users failed with a `UNREACHABLE_BACKENDS` or `NOT_CONNECTED_BACKENDS` errors, we try again with the users from available backends
                         const response = await this.apiClient.api.conversation.postMembers(conversationId, availableUsers);
                         return {
                             event: response,
-                            failedToAdd: unreachableUsers,
+                            failedToAdd: unreachableUsers.length > 0
+                                ? { reason: failureReasonsMap[error.label], users: unreachableUsers }
+                                : undefined,
                         };
                     }
                 }

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

@@ -51,6 +51,7 @@ const SessionHandler_1 = require("../Utility/SessionHandler");
 const notification_1 = require("../../../notification");
 const event_1 = require("@wireapp/api-client/lib/event");
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
+const errors_1 = require("../../../errors");
 jest.mock('./CryptoClient/CoreCryptoWrapper/PrekeysTracker', () => {
     return {
         PrekeyTracker: jest.fn().mockImplementation(() => {
@@ -487,7 +488,8 @@ describe('ProteusService', () => {
         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' };
+        const userDomain2 = { id: 'user-1-2', domain: 'domain2' };
+        const userDomain3 = { id: 'user-1-3', domain: 'domain3' };
         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);
@@ -498,6 +500,7 @@ describe('ProteusService', () => {
             expect(event).toEqual(baseResponse);
         });
         it('partially add users if some backends are unreachable', async () => {
+            var _a, _b;
             const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             const postMembersSpy = jest
                 .spyOn(apiClient.api.conversation, 'postMembers')
@@ -510,7 +513,28 @@ describe('ProteusService', () => {
             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]);
+            expect((_a = result.failedToAdd) === null || _a === void 0 ? void 0 : _a.reason).toBe(conversation_2.AddUsersFailureReasons.UNREACHABLE_BACKENDS);
+            expect((_b = result.failedToAdd) === null || _b === void 0 ? void 0 : _b.users).toEqual([userDomain1, user2Domain1]);
+        });
+        it('partially add users if some users are part of not-connected backends', async () => {
+            var _a, _b;
+            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.NON_FEDERATING_BACKENDS, [
+                userDomain2.domain,
+                userDomain3.domain,
+            ]))
+                .mockResolvedValueOnce(baseResponse.event);
+            const result = await proteusService.addUsersToConversation({
+                conversationId,
+                qualifiedUsers: [userDomain1, user2Domain1, userDomain2, userDomain3],
+            });
+            expect(postMembersSpy).toHaveBeenCalledTimes(2);
+            expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining([userDomain1, user2Domain1, userDomain2]));
+            expect(postMembersSpy).toHaveBeenCalledWith(conversationId, expect.arrayContaining([userDomain1, user2Domain1]));
+            expect((_a = result.failedToAdd) === null || _a === void 0 ? void 0 : _a.reason).toBe(conversation_2.AddUsersFailureReasons.NON_FEDERATING_BACKENDS);
+            expect((_b = result.failedToAdd) === null || _b === void 0 ? void 0 : _b.users).toEqual([userDomain2, userDomain3]);
         });
     });
     describe('createConversation', () => {
@@ -545,10 +569,8 @@ describe('ProteusService', () => {
             const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
             jest.spyOn(apiClient.api.conversation, 'postConversation').mockResolvedValueOnce(Object.assign({}, newConversation));
             const result = await proteusService.createConversation({
-                conversationData: {
-                    receipt_mode: null,
-                    qualified_users: [userDomain1, user2Domain1, userDomain2],
-                },
+                receipt_mode: null,
+                qualified_users: [userDomain1, user2Domain1, userDomain2],
             });
             expect(result).toEqual(newConversation);
         });
@@ -559,10 +581,8 @@ describe('ProteusService', () => {
                 .mockRejectedValueOnce(new conversation_1.FederatedBackendsError(conversation_1.FederatedBackendsErrorLabel.UNREACHABLE_BACKENDS, [userDomain1.domain]))
                 .mockResolvedValueOnce(newConversation);
             const result = await proteusService.createConversation({
-                conversationData: {
-                    receipt_mode: null,
-                    qualified_users: [userDomain1, user2Domain1, userDomain2],
-                },
+                receipt_mode: null,
+                qualified_users: [userDomain1, user2Domain1, userDomain2],
             });
             expect(postConversationSpy).toHaveBeenCalledTimes(2);
             expect(postConversationSpy).toHaveBeenCalledWith(expect.objectContaining({ qualified_users: [userDomain1, user2Domain1, userDomain2] }));
@@ -579,15 +599,26 @@ describe('ProteusService', () => {
             ]))
                 .mockResolvedValueOnce({});
             const result = await proteusService.createConversation({
-                conversationData: {
-                    receipt_mode: null,
-                    qualified_users: [userDomain1, user2Domain1, userDomain2],
-                },
+                receipt_mode: null,
+                qualified_users: [userDomain1, user2Domain1, userDomain2],
             });
             expect(postConversationSpy).toHaveBeenCalledTimes(2);
             expect(postConversationSpy).toHaveBeenCalledWith(expect.objectContaining({ qualified_users: [userDomain1, user2Domain1, userDomain2] }));
             expect(postConversationSpy).toHaveBeenCalledWith(expect.objectContaining({ qualified_users: [] }));
             expect(result.failed_to_add).toEqual([userDomain1, user2Domain1, userDomain2]);
         });
+        it('fails to create a conversation if there are users from non-connected backends', async () => {
+            const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();
+            jest
+                .spyOn(apiClient.api.conversation, 'postConversation')
+                .mockRejectedValueOnce(new conversation_1.FederatedBackendsError(conversation_1.FederatedBackendsErrorLabel.NON_FEDERATING_BACKENDS, [
+                userDomain1.domain,
+                userDomain2.domain,
+            ]));
+            await expect(() => proteusService.createConversation({
+                receipt_mode: null,
+                qualified_users: [userDomain1, user2Domain1, userDomain2],
+            })).rejects.toThrow(errors_1.NonFederatingBackendsError);
+        });
     });
 });

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

@@ -102,22 +102,14 @@ describe('createConversation', () => {
         it('when a new conversation object is given', async () => {
             const proteusService = await prepareProteusService();
             const conversationData = createConversationResult;
-            const returnData = await proteusService.createConversation({ conversationData });
+            const returnData = await proteusService.createConversation(conversationData);
             expect(returnData).toStrictEqual(createConversationResult);
         });
         it('create a new conversation with no name', async () => {
             const proteusService = await prepareProteusService();
-            const otherUserIds = ['user1', 'user2'];
             const conversationData = { users: ['user1', 'user2'], receipt_mode: null };
-            const returnData = await proteusService.createConversation({ conversationData, otherUserIds });
+            const returnData = await proteusService.createConversation(conversationData);
             expect(returnData).toStrictEqual(conversationData);
         });
-        it('when a conversation string and userIds are given', async () => {
-            const proteusService = await prepareProteusService();
-            const otherUserIds = ['user1', 'user2'];
-            const conversationData = 'test';
-            const returnData = await proteusService.createConversation({ conversationData, otherUserIds });
-            expect(returnData).toStrictEqual(createConversationResult);
-        });
     });
 });

package/package.json

@@ -11,7 +11,7 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^25.0.0",
+    "@wireapp/api-client": "^25.2.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": "41.0.0",
-  "gitHead": "7d3f425539e2e8a549fa813c1b6d5d19598475d8"
+  "version": "41.2.0",
+  "gitHead": "139c43189700e34d69f734596cfd6e3f12732ff3"
 }