@wireapp/core 46.43.0 → 46.45.0

package/lib/Account.d.ts

@@ -335,7 +335,7 @@ export declare class Account extends TypedEventEmitter<Events> {
     private readonly initEngine;
     private readonly groupIdFromConversationId;
     isMLSActiveForClient: () => Promise<boolean>;
-    private isMLSConversationRecoveryEnabled;
+    private readonly isMLSConversationRecoveryEnabled;
 }
 export {};
 //# sourceMappingURL=Account.d.ts.map

package/lib/Account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../src/Account.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../src/Account.ts"],"names":[],"mappings":"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"}

package/lib/Account.js

@@ -897,7 +897,7 @@ class Account extends commons_1.TypedEventEmitter {
         }
         // Check if MLS is enabled for the public via backend feature flag
         const commonConfig = (await this.service?.team.getCommonFeatureConfig()) ?? {};
-        return commonConfig[team_1.FEATURE_KEY.MLS]?.status === team_1.FeatureStatus.ENABLED;
+        return commonConfig[team_1.FEATURE_KEY.MLS]?.status === team_1.FEATURE_STATUS.ENABLED;
     };
     isMLSConversationRecoveryEnabled = async () => {
         const commonConfig = (await this.service?.team.getCommonFeatureConfig()) ?? {};

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":"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"}
+{"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

@@ -22,6 +22,7 @@ exports.ConversationService = void 0;
 const conversation_1 = require("@wireapp/api-client/lib/conversation");
 const data_1 = require("@wireapp/api-client/lib/conversation/data");
 const event_1 = require("@wireapp/api-client/lib/event");
+const team_1 = require("@wireapp/api-client/lib/team");
 const bazinga64_1 = require("bazinga64");
 const commons_1 = require("@wireapp/commons");
 const core_crypto_1 = require("@wireapp/core-crypto");
@@ -131,7 +132,7 @@ class ConversationService extends commons_1.TypedEventEmitter {
      */
     async send(params) {
         function isMLS(params) {
-            return params.protocol === conversation_1.ConversationProtocol.MLS;
+            return params.protocol === team_1.CONVERSATION_PROTOCOL.MLS;
         }
         return (0, messageSender_1.sendMessage)(() => (isMLS(params) ? this.sendMLSMessage(params) : this.proteusService.sendMessage(params)));
     }
@@ -363,6 +364,19 @@ class ConversationService extends commons_1.TypedEventEmitter {
                 this.logger.warn("Tried to add users to MLS conversation but it's broken, resetting the conversation", error);
                 return this.handleBrokenMLSConversation(conversationId, newGroupId => this.addUsersToMLSConversation({ qualifiedUsers, groupId: newGroupId, conversationId, shouldRetry: false }));
             }
+            if ((0, CoreCryptoMLSError_1.isMLSStaleMessageError)(error)) {
+                this.logger.info('Failed to add users to MLS conversation because of stale message, recovering by joining with external commit', {
+                    error,
+                    groupId,
+                });
+                await this.recoverMLSGroupFromEpochMismatch(conversationId);
+                return this.addUsersToMLSConversation({
+                    groupId,
+                    conversationId,
+                    qualifiedUsers,
+                    shouldRetry: false,
+                });
+            }
             if ((0, CoreCryptoMLSError_1.isMLSGroupOutOfSyncError)(error)) {
                 this.logger.info('Failed to send MLS message because of group out of sync, recovering by adding missing users', {
                     error,
@@ -402,6 +416,13 @@ class ConversationService extends commons_1.TypedEventEmitter {
                     shouldRetry: false,
                 }));
             }
+            if ((0, CoreCryptoMLSError_1.isMLSStaleMessageError)(error)) {
+                this.logger.info('Failed to remove users from MLS conversation because of stale message, recovering by joining with external commit', {
+                    error,
+                    groupId,
+                });
+                await this.recoverMLSGroupFromEpochMismatch(conversationId);
+            }
             if ((0, CoreCryptoMLSError_1.isMLSGroupOutOfSyncError)(error)) {
                 this.logger.info('Failed to send MLS message because of group out of sync, recovering by adding missing users', {
                     error,
@@ -413,14 +434,13 @@ class ConversationService extends commons_1.TypedEventEmitter {
                     conversationId,
                     qualifiedUsers: missingUsers,
                 });
-                return this.removeUsersFromMLSConversation({
-                    groupId,
-                    conversationId,
-                    qualifiedUserIds,
-                    shouldRetry: false,
-                });
             }
-            throw error;
+            return this.removeUsersFromMLSConversation({
+                groupId,
+                conversationId,
+                qualifiedUserIds,
+                shouldRetry: false,
+            });
         }
     }
     async joinByExternalCommit(conversationId, shouldRetry = true) {
@@ -437,6 +457,11 @@ class ConversationService extends commons_1.TypedEventEmitter {
                 this.logger.info('Resetting MLS conversation due to broken mls conversation error', error);
                 return this.handleBrokenMLSConversation(conversationId);
             }
+            if ((0, CoreCryptoMLSError_1.isMLSStaleMessageError)(error)) {
+                this.logger.info('Failed to join MLS conversation with external commit because of stale message, recovering by joining with external commit', { error, conversationId });
+                await this.recoverMLSGroupFromEpochMismatch(conversationId);
+                return;
+            }
             throw error;
         }
     }
@@ -473,6 +498,13 @@ class ConversationService extends commons_1.TypedEventEmitter {
                 this.logger.info('Tried to update key material for a broken MLS conversation, initiating reset', error);
                 return this.handleBrokenMLSConversation(conversation.qualified_id);
             }
+            if ((0, CoreCryptoMLSError_1.isMLSStaleMessageError)(error)) {
+                this.logger.info('Tried to update key material for a stale MLS conversation, recovering by joining with external commit', {
+                    error,
+                    groupId,
+                });
+                await this.recoverMLSGroupFromEpochMismatch(conversation.qualified_id);
+            }
             if ((0, CoreCryptoMLSError_1.isMLSGroupOutOfSyncError)(error)) {
                 this.logger.info('Tried to update key material for an out of sync conversation, recovering by adding missing users', {
                     error,

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

@@ -45,6 +45,7 @@ const client_1 = require("@wireapp/api-client/lib/client");
 const conversation_1 = require("@wireapp/api-client/lib/conversation");
 const event_1 = require("@wireapp/api-client/lib/event");
 const http_1 = require("@wireapp/api-client/lib/http");
+const team_1 = require("@wireapp/api-client/lib/team");
 const http_status_codes_1 = require("http-status-codes");
 const api_client_1 = require("@wireapp/api-client");
 const core_crypto_1 = require("@wireapp/core-crypto");
@@ -108,7 +109,7 @@ describe('ConversationService', () => {
         }));
         jest
             .spyOn(client.api.user, 'getUserSupportedProtocols')
-            .mockReturnValue(Promise.resolve([conversation_1.ConversationProtocol.MLS, conversation_1.ConversationProtocol.PROTEUS]));
+            .mockReturnValue(Promise.resolve([team_1.CONVERSATION_PROTOCOL.MLS, team_1.CONVERSATION_PROTOCOL.PROTEUS]));
         client.context = {
             clientType: client_1.ClientType.NONE,
             userId: PayloadHelper.getUUID(),
@@ -130,6 +131,7 @@ describe('ConversationService', () => {
             getClientIdsInGroup: jest.fn(),
             getKeyPackagesPayload: jest.fn(),
             addUsersToExistingConversation: jest.fn(),
+            removeClientsFromConversation: jest.fn(),
             resetKeyMaterialRenewal: jest.fn(),
             handleMLSWelcomeMessageEvent: jest.fn(),
         };
@@ -161,7 +163,7 @@ describe('ConversationService', () => {
                 const sentTime = new Date().toISOString();
                 mockedProteusService.sendMessage = jest.fn().mockResolvedValue({ sentAt: sentTime });
                 const promise = conversationService.send({
-                    protocol: conversation_1.ConversationProtocol.PROTEUS,
+                    protocol: team_1.CONVERSATION_PROTOCOL.PROTEUS,
                     conversationId: { id: 'conv1', domain: '' },
                     payload: message,
                 });
@@ -170,6 +172,80 @@ describe('ConversationService', () => {
             });
         });
     });
+    describe('removeUsersFromMLSConversation', () => {
+        it('recovers and retries when stale-message occurs during remove users commit upload', async () => {
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
+            const mockGroupId = 'groupId-stale-remove';
+            const mockConversationId = { id: PayloadHelper.getUUID(), domain: 'staging.zinfra.io' };
+            const qualifiedUserIds = [
+                { id: 'test-id-1', domain: 'test-domain' },
+                { id: 'test-id-2', domain: 'test-domain' },
+            ];
+            const staleMessageError = {
+                type: core_crypto_1.ErrorType.Mls,
+                context: {
+                    type: core_crypto_1.MlsErrorType.MessageRejected,
+                    context: {
+                        reason: (0, CoreCryptoMLSError_1.serializeAbortReason)({ message: CoreCryptoMLSError_1.UPLOAD_COMMIT_BUNDLE_ABORT_REASONS.MLS_STALE_MESSAGE }),
+                    },
+                },
+            };
+            // First removal attempt fails with stale, second succeeds
+            jest
+                .spyOn(mlsService, 'removeClientsFromConversation')
+                .mockRejectedValueOnce(staleMessageError)
+                .mockResolvedValueOnce(undefined);
+            const remoteEpoch = 6;
+            const localEpoch = 5;
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
+            jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(localEpoch);
+            jest.spyOn(apiClient.api.conversation, 'getConversation').mockResolvedValue({
+                qualified_id: mockConversationId,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
+                epoch: remoteEpoch,
+                group_id: mockGroupId,
+            });
+            await conversationService.removeUsersFromMLSConversation({
+                groupId: mockGroupId,
+                conversationId: mockConversationId,
+                qualifiedUserIds,
+            });
+            expect(conversationService.joinByExternalCommit).toHaveBeenCalledWith(mockConversationId);
+            expect(mlsService.removeClientsFromConversation).toHaveBeenCalledTimes(2);
+            expect(mlsService.resetKeyMaterialRenewal).toHaveBeenCalledWith(mockGroupId);
+        });
+    });
+    describe('joinByExternalCommit', () => {
+        it('retries join when stale-message occurs during external commit join', async () => {
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
+            const conversationId = { id: 'conv-join-stale', domain: 'staging.zinfra.io' };
+            const staleMessageError = {
+                type: core_crypto_1.ErrorType.Mls,
+                context: {
+                    type: core_crypto_1.MlsErrorType.MessageRejected,
+                    context: {
+                        reason: (0, CoreCryptoMLSError_1.serializeAbortReason)({ message: CoreCryptoMLSError_1.UPLOAD_COMMIT_BUNDLE_ABORT_REASONS.MLS_STALE_MESSAGE }),
+                    },
+                },
+            };
+            jest
+                .spyOn(mlsService, 'joinByExternalCommit')
+                .mockRejectedValueOnce(staleMessageError)
+                .mockResolvedValueOnce(undefined);
+            const remoteEpoch = 10;
+            const localEpoch = 9;
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
+            jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(localEpoch);
+            jest.spyOn(apiClient.api.conversation, 'getConversation').mockResolvedValueOnce({
+                qualified_id: conversationId,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
+                epoch: remoteEpoch,
+                group_id: 'gid-join-stale',
+            });
+            await conversationService.joinByExternalCommit(conversationId);
+            expect(mlsService.joinByExternalCommit).toHaveBeenCalledTimes(2);
+        });
+    });
     describe('"send MLS"', () => {
         const groupId = PayloadHelper.getUUID();
         const messages = [
@@ -185,7 +261,7 @@ describe('ConversationService', () => {
             it(`calls callbacks when sending '${type}' message is starting and successful`, async () => {
                 const [conversationService] = await buildConversationService();
                 const promise = conversationService.send({
-                    protocol: conversation_1.ConversationProtocol.MLS,
+                    protocol: team_1.CONVERSATION_PROTOCOL.MLS,
                     groupId,
                     payload: message,
                     conversationId: { id: '', domain: '' },
@@ -194,6 +270,43 @@ describe('ConversationService', () => {
                 expect(result.state).toBe(__1.MessageSendingState.OUTGOING_SENT);
             });
         });
+        it('rejoins a MLS group when stale-message error occurs during commit bundle upload', async () => {
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
+            const mockGroupId = 'AAEAAH87aajaQ011i+rNLmwpy0sAZGl5YS53aXJlamxpbms=';
+            const mockConversationId = { id: 'mockConversationId', domain: 'staging.zinfra.io' };
+            const mockedMessage = MessageBuilder.buildTextMessage({ text: 'test' });
+            const staleMessageError = new conversation_1.MLSStaleMessageError('', http_1.BackendErrorLabel.MLS_STALE_MESSAGE, http_status_codes_1.StatusCodes.CONFLICT);
+            // First attempt to upload commit bundle fails with stale-message, second attempt succeeds
+            jest
+                .spyOn(mlsService, 'commitPendingProposals')
+                .mockRejectedValueOnce(staleMessageError)
+                .mockResolvedValueOnce(undefined);
+            const remoteEpoch = 5;
+            const localEpoch = 4;
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
+            jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(localEpoch);
+            jest.spyOn(apiClient.api.conversation, 'getConversation').mockResolvedValueOnce({
+                qualified_id: mockConversationId,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
+                epoch: remoteEpoch,
+                group_id: mockGroupId,
+            });
+            await conversationService.send({
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
+                groupId: mockGroupId,
+                payload: mockedMessage,
+                conversationId: mockConversationId,
+            });
+            // Recovery via external commit should have been triggered
+            expect(conversationService.joinByExternalCommit).toHaveBeenCalledWith(mockConversationId);
+            expect(conversationService.emit).toHaveBeenCalledWith('MLSConversationRecovered', {
+                conversationId: mockConversationId,
+            });
+            // Because the failure happened before posting the message, postMlsMessage should be called only once (after recovery)
+            expect(apiClient.api.conversation.postMlsMessage).toHaveBeenCalledTimes(1);
+            // commitPendingProposals is called twice: first fails, second succeeds
+            expect(mlsService.commitPendingProposals).toHaveBeenCalledTimes(2);
+        });
         it('rejoins a MLS group when failed encrypting MLS message', async () => {
             const [conversationService, { apiClient, mlsService }] = await buildConversationService();
             const mockGroupId = 'AAEAAH87aajaQ011i+rNLmwpy0sAZGl5YS53aXJlamxpbms=';
@@ -207,12 +320,12 @@ describe('ConversationService', () => {
             jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(localEpoch);
             jest.spyOn(apiClient.api.conversation, 'getConversation').mockResolvedValueOnce({
                 qualified_id: mockConversationId,
-                protocol: conversation_1.ConversationProtocol.MLS,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
                 epoch: remoteEpoch,
                 group_id: mockGroupId,
             });
             await conversationService.send({
-                protocol: conversation_1.ConversationProtocol.MLS,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
                 groupId: mockGroupId,
                 payload: mockedMessage,
                 conversationId: mockConversationId,
@@ -239,7 +352,7 @@ describe('ConversationService', () => {
                 .spyOn(conversationService, 'addUsersToMLSConversation')
                 .mockResolvedValueOnce({ conversation: { members: { others: [] } } });
             await conversationService.send({
-                protocol: conversation_1.ConversationProtocol.MLS,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
                 groupId: mockGroupId,
                 payload: mockedMessage,
                 conversationId: mockConversationId,
@@ -260,7 +373,7 @@ describe('ConversationService', () => {
             return {
                 group_id: 'group-id',
                 qualified_id: { id: conversationId || 'conversation-id', domain: 'staging.zinfra.io' },
-                protocol: conversation_1.ConversationProtocol.MLS,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
                 epoch,
             };
         };
@@ -310,7 +423,7 @@ describe('ConversationService', () => {
             const remoteEpoch = 1;
             jest.spyOn(apiClient.api.conversation, 'getMLS1to1Conversation').mockResolvedValueOnce({
                 qualified_id: mockConversationId,
-                protocol: conversation_1.ConversationProtocol.MLS,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
                 epoch: remoteEpoch,
                 group_id: mockGroupId,
             });
@@ -329,14 +442,14 @@ describe('ConversationService', () => {
             const updatedEpoch = 2;
             jest.spyOn(apiClient.api.conversation, 'getMLS1to1Conversation').mockResolvedValueOnce({
                 qualified_id: mockConversationId,
-                protocol: conversation_1.ConversationProtocol.MLS,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
                 epoch: remoteEpoch,
                 group_id: mockGroupId,
             });
             // The 2nd request we make after joining the conversation with external commit
             jest.spyOn(apiClient.api.conversation, 'getMLS1to1Conversation').mockResolvedValueOnce({
                 qualified_id: mockConversationId,
-                protocol: conversation_1.ConversationProtocol.MLS,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
                 epoch: updatedEpoch,
                 group_id: mockGroupId,
             });
@@ -357,14 +470,14 @@ describe('ConversationService', () => {
             const updatedEpoch = 1;
             jest.spyOn(apiClient.api.conversation, 'getMLS1to1Conversation').mockResolvedValueOnce({
                 qualified_id: mockConversationId,
-                protocol: conversation_1.ConversationProtocol.MLS,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
                 epoch: remoteEpoch,
                 group_id: mockGroupId,
             });
             // The 2nd request we make after successfully registering a group
             jest.spyOn(apiClient.api.conversation, 'getMLS1to1Conversation').mockResolvedValueOnce({
                 qualified_id: mockConversationId,
-                protocol: conversation_1.ConversationProtocol.MLS,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
                 epoch: updatedEpoch,
                 group_id: mockGroupId,
             });
@@ -386,21 +499,21 @@ describe('ConversationService', () => {
             const updatedEpoch = 1;
             jest.spyOn(apiClient.api.conversation, 'getMLS1to1Conversation').mockResolvedValueOnce({
                 qualified_id: mockConversationId,
-                protocol: conversation_1.ConversationProtocol.MLS,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
                 epoch: remoteEpoch,
                 group_id: mockGroupId,
             });
             // The 2nd request we make when retrying to register the conversation
             jest.spyOn(apiClient.api.conversation, 'getMLS1to1Conversation').mockResolvedValueOnce({
                 qualified_id: mockConversationId,
-                protocol: conversation_1.ConversationProtocol.MLS,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
                 epoch: remoteEpoch,
                 group_id: mockGroupId,
             });
             // The 3rd request we make after successfully registering a group
             jest.spyOn(apiClient.api.conversation, 'getMLS1to1Conversation').mockResolvedValueOnce({
                 qualified_id: mockConversationId,
-                protocol: conversation_1.ConversationProtocol.MLS,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
                 epoch: updatedEpoch,
                 group_id: mockGroupId,
             });
@@ -429,7 +542,7 @@ describe('ConversationService', () => {
             jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(localEpoch);
             jest.spyOn(apiClient.api.conversation, 'getConversation').mockResolvedValueOnce({
                 qualified_id: conversationId,
-                protocol: conversation_1.ConversationProtocol.MLS,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
                 epoch: remoteEpoch,
                 group_id: mockGroupId,
             });
@@ -473,7 +586,7 @@ describe('ConversationService', () => {
             jest.spyOn(mlsService, 'handleMLSWelcomeMessageEvent').mockRejectedValueOnce(orphanWelcomeMessageError);
             jest.spyOn(apiClient.api.conversation, 'getConversation').mockResolvedValueOnce({
                 qualified_id: conversationId,
-                protocol: conversation_1.ConversationProtocol.MLS,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
             });
             await conversationService.handleEvent(mockMLSWelcomeMessageEvent);
             await new Promise(resolve => setImmediate(resolve));
@@ -549,7 +662,7 @@ describe('ConversationService', () => {
                 .mockResolvedValueOnce({ keyPackages: [new Uint8Array(0)], failures: [] });
             jest.spyOn(apiClient.api.conversation, 'getConversation').mockResolvedValueOnce({
                 qualified_id: mockConversationId,
-                protocol: conversation_1.ConversationProtocol.MLS,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
                 epoch: 1,
                 group_id: mockGroupId,
             });
@@ -577,9 +690,9 @@ describe('ConversationService', () => {
             };
             jest.spyOn(apiClient.api.user, 'getUserSupportedProtocols').mockImplementation(id => {
                 if (id === otherUsersToAdd[2]) {
-                    return Promise.resolve([conversation_1.ConversationProtocol.PROTEUS]);
+                    return Promise.resolve([team_1.CONVERSATION_PROTOCOL.PROTEUS]);
                 }
-                return Promise.resolve([conversation_1.ConversationProtocol.MLS, conversation_1.ConversationProtocol.PROTEUS]);
+                return Promise.resolve([team_1.CONVERSATION_PROTOCOL.MLS, team_1.CONVERSATION_PROTOCOL.PROTEUS]);
             });
             jest.spyOn(mlsService, 'getKeyPackagesPayload').mockResolvedValueOnce({
                 keyPackages: [new Uint8Array(0)],
@@ -587,7 +700,7 @@ describe('ConversationService', () => {
             });
             jest.spyOn(apiClient.api.conversation, 'getConversation').mockResolvedValueOnce({
                 qualified_id: mockConversationId,
-                protocol: conversation_1.ConversationProtocol.MLS,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
                 epoch: 1,
                 group_id: mockGroupId,
             });
@@ -599,6 +712,52 @@ describe('ConversationService', () => {
             });
             expect(failedToAdd).toEqual([keysClaimingFailure]);
         });
+        it('recovers and retries when stale-message occurs during add users commit upload', async () => {
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
+            const mockGroupId = 'groupId-stale-add';
+            const mockConversationId = { id: PayloadHelper.getUUID(), domain: 'local.wire.com' };
+            const otherUsersToAdd = Array(2)
+                .fill(0)
+                .map(() => ({ id: PayloadHelper.getUUID(), domain: 'local.wire.com' }));
+            const qualifiedUsers = [...otherUsersToAdd];
+            const staleMessageError = {
+                type: core_crypto_1.ErrorType.Mls,
+                context: {
+                    type: core_crypto_1.MlsErrorType.MessageRejected,
+                    context: {
+                        reason: (0, CoreCryptoMLSError_1.serializeAbortReason)({ message: CoreCryptoMLSError_1.UPLOAD_COMMIT_BUNDLE_ABORT_REASONS.MLS_STALE_MESSAGE }),
+                    },
+                },
+            };
+            const getKPSpy = jest.spyOn(mlsService, 'getKeyPackagesPayload');
+            getKPSpy.mockResolvedValue({
+                keyPackages: [new Uint8Array(0)],
+                failures: [],
+            });
+            // Simulate commit upload failing once with stale, then succeeding
+            jest
+                .spyOn(mlsService, 'addUsersToExistingConversation')
+                .mockRejectedValueOnce(staleMessageError)
+                .mockResolvedValueOnce(undefined);
+            const remoteEpoch = 5;
+            const localEpoch = 4;
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
+            jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(localEpoch);
+            const getConvSpy = jest.spyOn(apiClient.api.conversation, 'getConversation');
+            getConvSpy.mockResolvedValue({
+                qualified_id: mockConversationId,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
+                epoch: remoteEpoch,
+                group_id: mockGroupId,
+            });
+            await conversationService.addUsersToMLSConversation({
+                qualifiedUsers,
+                groupId: mockGroupId,
+                conversationId: mockConversationId,
+            });
+            expect(conversationService.joinByExternalCommit).toHaveBeenCalledWith(mockConversationId);
+            expect(mlsService.addUsersToExistingConversation).toHaveBeenCalledTimes(2);
+        });
     });
     describe('tryEstablishingMLSGroup', () => {
         it('should add all the users to a MLS group after group was established by the self client', async () => {
@@ -656,7 +815,7 @@ describe('ConversationService', () => {
             const groupId = 'group-1';
             const qualified_id = { id: 'conv-1', domain: 'staging.zinfra.io' };
             jest.spyOn(apiClient.api.conversation, 'getConversationList').mockResolvedValueOnce({
-                found: [{ group_id: groupId, qualified_id, protocol: conversation_1.ConversationProtocol.MLS, epoch: 1 }],
+                found: [{ group_id: groupId, qualified_id, protocol: team_1.CONVERSATION_PROTOCOL.MLS, epoch: 1 }],
             });
             const resetSpy = jest
                 .spyOn(conversationService, 'handleBrokenMLSConversation')
@@ -685,7 +844,7 @@ describe('ConversationService', () => {
                 { id: 'u2', domain: 'staging.zinfra.io' },
             ];
             jest.spyOn(apiClient.api.conversation, 'getConversationList').mockResolvedValueOnce({
-                found: [{ group_id: groupId, qualified_id, protocol: conversation_1.ConversationProtocol.MLS, epoch: 1 }],
+                found: [{ group_id: groupId, qualified_id, protocol: team_1.CONVERSATION_PROTOCOL.MLS, epoch: 1 }],
             });
             const addUsersSpy = jest
                 .spyOn(conversationService, 'addUsersToMLSConversation')
@@ -719,7 +878,7 @@ describe('ConversationService', () => {
             const groupId = 'group-dup';
             const qualified_id = { id: 'conv-dup', domain: 'staging.zinfra.io' };
             jest.spyOn(apiClient.api.conversation, 'getConversationList').mockResolvedValue({
-                found: [{ group_id: groupId, qualified_id, protocol: conversation_1.ConversationProtocol.MLS, epoch: 1 }],
+                found: [{ group_id: groupId, qualified_id, protocol: team_1.CONVERSATION_PROTOCOL.MLS, epoch: 1 }],
             });
             // Make the recovery hang until we resolve it, to simulate overlapping calls
             let resolveDeferred;
@@ -746,13 +905,45 @@ describe('ConversationService', () => {
             await Promise.allSettled([p1, p2]);
             expect(resetSpy).toHaveBeenCalledTimes(1);
         });
+        it('handles stale-message by rejoining via external commit and emits recovery event', async () => {
+            const [conversationService, { apiClient, mlsService }] = await buildConversationService();
+            const groupId = 'group-stale';
+            const qualified_id = { id: 'conv-stale', domain: 'staging.zinfra.io' };
+            jest.spyOn(apiClient.api.conversation, 'getConversationList').mockResolvedValueOnce({
+                found: [{ group_id: groupId, qualified_id, protocol: team_1.CONVERSATION_PROTOCOL.MLS, epoch: 2 }],
+            });
+            const handler = getKeyMaterialFailureHandler(mlsService);
+            const staleMessageError = {
+                type: core_crypto_1.ErrorType.Mls,
+                context: {
+                    type: core_crypto_1.MlsErrorType.MessageRejected,
+                    context: {
+                        reason: (0, CoreCryptoMLSError_1.serializeAbortReason)({ message: CoreCryptoMLSError_1.UPLOAD_COMMIT_BUNDLE_ABORT_REASONS.MLS_STALE_MESSAGE }),
+                    },
+                },
+            };
+            const remoteEpoch = 3;
+            const localEpoch = 2;
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
+            jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(localEpoch);
+            jest.spyOn(apiClient.api.conversation, 'getConversation').mockResolvedValueOnce({
+                qualified_id,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
+                epoch: remoteEpoch,
+                group_id: groupId,
+            });
+            await handler({ error: staleMessageError, groupId });
+            // Expect a rejoin on stale and a recovery event
+            expect(conversationService.joinByExternalCommit).toHaveBeenCalledWith(qualified_id);
+            expect(conversationService.emit).toHaveBeenCalledWith('MLSConversationRecovered', { conversationId: qualified_id });
+        });
     });
     describe('groupIdConversationMap cache', () => {
         function makeConversation(group_id, id) {
             return {
                 group_id,
                 qualified_id: { id, domain: 'staging.zinfra.io' },
-                protocol: conversation_1.ConversationProtocol.MLS,
+                protocol: team_1.CONVERSATION_PROTOCOL.MLS,
                 epoch: 1,
             };
         }

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

@@ -1,5 +1,6 @@
-import { QualifiedUserClients, ConversationProtocol, MessageSendingStatus, Conversation } from '@wireapp/api-client/lib/conversation';
+import { QualifiedUserClients, MessageSendingStatus, Conversation } from '@wireapp/api-client/lib/conversation';
 import { ConversationEvent, ConversationMemberJoinEvent } from '@wireapp/api-client/lib/event';
+import { CONVERSATION_PROTOCOL } from '@wireapp/api-client/lib/team';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { GenericMessage } from '@wireapp/protocol-messaging';
 import { MessageSendingState } from '..';
@@ -48,7 +49,7 @@ export interface MessageSendingCallbacks {
  * The protocol to use to send the message (MLS or Proteus)
  */
 export type ProtocolParam = {
-    protocol: ConversationProtocol;
+    protocol: CONVERSATION_PROTOCOL;
 };
 /**
  * The message to send to the conversation
@@ -62,7 +63,7 @@ export type SendMlsMessageParams = SendCommonParams & {
      * The groupId of the conversation to send the message to (Needed only for MLS)
      */
     groupId: string;
-    protocol: ConversationProtocol.MLS;
+    protocol: CONVERSATION_PROTOCOL.MLS;
 };
 export type KeyPackageClaimUser = QualifiedId & {
     skipOwnClientId?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"ConversationService.types.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ConversationService.types.d.ts","sourceRoot":"","sources":["../../../src/conversation/ConversationService/ConversationService.types.ts"],"names":[],"mappings":"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"}

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

@@ -52,6 +52,7 @@ const event_1 = require("@wireapp/api-client/lib/event");
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const errors_1 = require("../../../errors");
 const testUtils_1 = require("../../../testUtils");
+const team_1 = require("@wireapp/api-client/lib/team");
 jest.mock('./CryptoClient/CoreCryptoWrapper/PrekeysTracker', () => {
     return {
         PrekeyTracker: jest.fn().mockImplementation(() => {
@@ -346,7 +347,7 @@ describe('ProteusService', () => {
                 const params = {
                     conversationId: (0, testUtils_1.generateQualifiedId)('domain'),
                     payload: message,
-                    protocol: conversation_1.ConversationProtocol.PROTEUS,
+                    protocol: team_1.CONVERSATION_PROTOCOL.PROTEUS,
                     targetMode: conversation_2.MessageTargetMode.USERS,
                 };
                 try {
@@ -371,7 +372,7 @@ describe('ProteusService', () => {
                     MockedRecipients.getRecipientsForConversation.mockResolvedValue({});
                     jest.spyOn(proteusService['messageService'], 'sendMessage').mockReturnValue(Promise.resolve({}));
                     await proteusService.sendMessage({
-                        protocol: conversation_1.ConversationProtocol.PROTEUS,
+                        protocol: team_1.CONVERSATION_PROTOCOL.PROTEUS,
                         payload: message,
                         targetMode: conversation_2.MessageTargetMode.USERS,
                         userIds: recipients,
@@ -398,7 +399,7 @@ describe('ProteusService', () => {
                     MockedRecipients.getRecipientsForConversation.mockResolvedValue({});
                     jest.spyOn(proteusService['messageService'], 'sendMessage').mockResolvedValue({});
                     await proteusService.sendMessage({
-                        protocol: conversation_1.ConversationProtocol.PROTEUS,
+                        protocol: team_1.CONVERSATION_PROTOCOL.PROTEUS,
                         conversationId: { id: 'conv1', domain: 'domain1' },
                         payload: message,
                         targetMode: conversation_2.MessageTargetMode.USERS,
@@ -426,7 +427,7 @@ describe('ProteusService', () => {
                     jest.spyOn(proteusService['messageService'], 'sendMessage').mockReturnValue(Promise.resolve({}));
                     await proteusService.sendMessage({
                         conversationId: { id: 'conv1', domain: '' },
-                        protocol: conversation_1.ConversationProtocol.PROTEUS,
+                        protocol: team_1.CONVERSATION_PROTOCOL.PROTEUS,
                         payload: message,
                         targetMode: conversation_2.MessageTargetMode.USERS_CLIENTS,
                         userIds: recipients,
@@ -447,7 +448,7 @@ describe('ProteusService', () => {
                     MockedRecipients.getRecipientsForConversation.mockResolvedValue({});
                     jest.spyOn(proteusService['messageService'], 'sendMessage').mockReturnValue(Promise.resolve({}));
                     await proteusService.sendMessage({
-                        protocol: conversation_1.ConversationProtocol.PROTEUS,
+                        protocol: team_1.CONVERSATION_PROTOCOL.PROTEUS,
                         conversationId: { id: 'conv1', domain: 'domain1' },
                         payload: message,
                         targetMode: conversation_2.MessageTargetMode.USERS_CLIENTS,
@@ -473,7 +474,7 @@ describe('ProteusService', () => {
                     deleted: {},
                 });
                 const result = await proteusService.sendMessage({
-                    protocol: conversation_1.ConversationProtocol.PROTEUS,
+                    protocol: team_1.CONVERSATION_PROTOCOL.PROTEUS,
                     conversationId: (0, testUtils_1.generateQualifiedId)('domain'),
                     payload: message,
                     targetMode: conversation_2.MessageTargetMode.USERS_CLIENTS,
@@ -575,7 +576,7 @@ describe('ProteusService', () => {
                     status_time: '',
                 },
             },
-            protocol: conversation_1.ConversationProtocol.PROTEUS,
+            protocol: team_1.CONVERSATION_PROTOCOL.PROTEUS,
         };
         it('adds all requested users to a new conversation', async () => {
             const [proteusService, { apiClient }] = await (0, ProteusService_mocks_1.buildProteusService)();

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

@@ -1,4 +1,5 @@
-import { QualifiedUserClients, MessageSendingStatus, ConversationProtocol, NewConversation } from '@wireapp/api-client/lib/conversation';
+import { QualifiedUserClients, MessageSendingStatus, NewConversation } from '@wireapp/api-client/lib/conversation';
+import { CONVERSATION_PROTOCOL } from '@wireapp/api-client/lib/team';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { AddUsersParams, MessageSendingOptions, SendCommonParams } from '../../../conversation';
 export interface NewClient {
@@ -17,7 +18,7 @@ export type SendProteusMessageParams = SendCommonParams & MessageSendingOptions
      */
     userIds?: QualifiedId[] | QualifiedUserClients;
     onClientMismatch?: (status: MessageSendingStatus, wasSent: boolean) => void | boolean | Promise<boolean>;
-    protocol: ConversationProtocol.PROTEUS;
+    protocol: CONVERSATION_PROTOCOL.PROTEUS;
 };
 export type CreateProteusConversationParams = {
     conversationData: NewConversation | string;

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

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

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

@@ -44,10 +44,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable import/order */
 const GenericMessageParams = __importStar(require("../Utility/getGenericMessageParams"));
 const client_1 = require("@wireapp/api-client/lib/client");
-const conversation_1 = require("@wireapp/api-client/lib/conversation");
-const conversation_2 = require("../../../conversation");
+const conversation_1 = require("../../../conversation");
 const MessageBuilder_1 = require("../../../conversation/message/MessageBuilder");
 const ProteusService_mocks_1 = require("./ProteusService.mocks");
+const team_1 = require("@wireapp/api-client/lib/team");
 jest.mock('../Utility/getGenericMessageParams', () => {
     return {
         getGenericMessageParams: jest.fn(),
@@ -89,9 +89,9 @@ describe('sendGenericMessage', () => {
             const payloadBundle = await proteusService.sendMessage({
                 payload: message,
                 conversationId: { id: 'conv1', domain: '' },
-                protocol: conversation_1.ConversationProtocol.PROTEUS,
+                protocol: team_1.CONVERSATION_PROTOCOL.PROTEUS,
             });
-            expect(payloadBundle.state).toBe(conversation_2.MessageSendingState.CANCELED);
+            expect(payloadBundle.state).toBe(conversation_1.MessageSendingState.CANCELED);
         });
     });
 });

package/lib/self/SelfService.d.ts

@@ -1,5 +1,5 @@
-import { ConversationProtocol } from '@wireapp/api-client/lib/conversation';
 import { Self } from '@wireapp/api-client/lib/self/';
+import { CONVERSATION_PROTOCOL } from '@wireapp/api-client/lib/team';
 import { APIClient } from '@wireapp/api-client';
 export declare class SelfService {
     private readonly apiClient;
@@ -16,6 +16,6 @@ export declare class SelfService {
      * Update self user's list of supported-protocols
      * @param supportedProtocols The list of supported protocols
      */
-    putSupportedProtocols(supportedProtocols: ConversationProtocol[]): Promise<void>;
+    putSupportedProtocols(supportedProtocols: CONVERSATION_PROTOCOL[]): Promise<void>;
 }
 //# sourceMappingURL=SelfService.d.ts.map

package/lib/self/SelfService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SelfService.d.ts","sourceRoot":"","sources":["../../src/self/SelfService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAC,IAAI,EAAC,MAAM,+BAA+B,CAAC;AAEnD,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAG9C,qBAAa,WAAW;IAGV,OAAO,CAAC,QAAQ,CAAC,SAAS;IAFtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqD;gBAE/C,SAAS,EAAE,SAAS;IAEpC,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKvD,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAMhD,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAK1B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAKxB,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKhD,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpC,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD;;;OAGG;IACU,qBAAqB,CAAC,kBAAkB,EAAE,oBAAoB,EAAE;CAY9E"}
+{"version":3,"file":"SelfService.d.ts","sourceRoot":"","sources":["../../src/self/SelfService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,IAAI,EAAC,MAAM,+BAA+B,CAAC;AACnD,OAAO,EAAC,qBAAqB,EAAC,MAAM,8BAA8B,CAAC;AAEnE,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAG9C,qBAAa,WAAW;IAGV,OAAO,CAAC,QAAQ,CAAC,SAAS;IAFtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqD;gBAE/C,SAAS,EAAE,SAAS;IAEpC,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKvD,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAMhD,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC;IAK1B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAKxB,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAKhD,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpC,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInD;;;OAGG;IACU,qBAAqB,CAAC,kBAAkB,EAAE,qBAAqB,EAAE;CAY/E"}

package/lib/self/SelfService.test.js

@@ -18,7 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const conversation_1 = require("@wireapp/api-client/lib/conversation");
+const team_1 = require("@wireapp/api-client/lib/team");
 const api_client_1 = require("@wireapp/api-client");
 const SelfService_1 = require("./SelfService");
 const BASE_URL = 'mock-backend.wire.com';
@@ -33,7 +33,7 @@ describe('SelfService', () => {
         apiClient.backendFeatures.supportsMLS = true;
         it('updates the list of self supported protocols', async () => {
             const selfService = new SelfService_1.SelfService(apiClient);
-            const supportedProtocols = [conversation_1.ConversationProtocol.PROTEUS, conversation_1.ConversationProtocol.MLS];
+            const supportedProtocols = [team_1.CONVERSATION_PROTOCOL.PROTEUS, team_1.CONVERSATION_PROTOCOL.MLS];
             jest.spyOn(apiClient.api.self, 'putSupportedProtocols').mockImplementation(jest.fn());
             await selfService.putSupportedProtocols(supportedProtocols);
             expect(apiClient.api.self.putSupportedProtocols).toHaveBeenCalledWith(supportedProtocols);

package/lib/user/UserService.d.ts

@@ -1,4 +1,4 @@
-import { ConversationProtocol } from '@wireapp/api-client/lib/conversation';
+import { CONVERSATION_PROTOCOL } from '@wireapp/api-client/lib/team';
 import { QualifiedId, User } from '@wireapp/api-client/lib/user/';
 import { APIClient } from '@wireapp/api-client';
 export declare class UserService {
@@ -13,6 +13,6 @@ export declare class UserService {
     /**
      * Get the list of other user's supported protocols.
      */
-    getUserSupportedProtocols(userId: QualifiedId): Promise<ConversationProtocol[]>;
+    getUserSupportedProtocols(userId: QualifiedId): Promise<CONVERSATION_PROTOCOL[]>;
 }
 //# sourceMappingURL=UserService.d.ts.map

package/lib/user/UserService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UserService.d.ts","sourceRoot":"","sources":["../../src/user/UserService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,oBAAoB,EAAC,MAAM,sCAAsC,CAAC;AAC1E,OAAO,EAAC,WAAW,EAAE,IAAI,EAAC,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;gBAE1B,SAAS,EAAE,SAAS;IAIzB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C,QAAQ,CAAC,OAAO,EAAE,WAAW,EAAE;;;;;IAO5C;;OAEG;IACU,yBAAyB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;CAS7F"}
+{"version":3,"file":"UserService.d.ts","sourceRoot":"","sources":["../../src/user/UserService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,qBAAqB,EAAC,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAC,WAAW,EAAE,IAAI,EAAC,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;gBAE1B,SAAS,EAAE,SAAS;IAIzB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9C,QAAQ,CAAC,OAAO,EAAE,WAAW,EAAE;;;;;IAO5C;;OAEG;IACU,yBAAyB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;CAS9F"}

package/lib/user/UserService.js

@@ -19,7 +19,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserService = void 0;
-const conversation_1 = require("@wireapp/api-client/lib/conversation");
+const team_1 = require("@wireapp/api-client/lib/team");
 class UserService {
     apiClient;
     constructor(apiClient) {
@@ -40,10 +40,10 @@ class UserService {
     async getUserSupportedProtocols(userId) {
         // Clients that uses version below the one supporting MLS, are not aware of user's supported protocols, we default to Proteus in this case.
         if (!this.apiClient.backendFeatures.supportsMLS) {
-            return [conversation_1.ConversationProtocol.PROTEUS];
+            return [team_1.CONVERSATION_PROTOCOL.PROTEUS];
         }
         const supportedProtocols = await this.apiClient.api.user.getUserSupportedProtocols(userId);
-        return supportedProtocols.length > 0 ? supportedProtocols : [conversation_1.ConversationProtocol.PROTEUS];
+        return supportedProtocols.length > 0 ? supportedProtocols : [team_1.CONVERSATION_PROTOCOL.PROTEUS];
     }
 }
 exports.UserService = UserService;

package/lib/util/TypePredicateUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TypePredicateUtil.d.ts","sourceRoot":"","sources":["../../src/util/TypePredicateUtil.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,YAAY,EAEZ,eAAe,EACf,oBAAoB,EACpB,WAAW,EACZ,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAC,WAAW,EAAC,MAAM,+BAA+B,CAAC;AAE1D,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,MAAM,EAAE,CAEvD;AAMD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,WAAW,EAAE,CAEjE;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,oBAAoB,CAS5E;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,WAAW,CAM1D;AAED,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,YAAY,GAAG,YAAY,IAAI,eAAe,CAG7F"}
+{"version":3,"file":"TypePredicateUtil.d.ts","sourceRoot":"","sources":["../../src/util/TypePredicateUtil.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAE,eAAe,EAAE,oBAAoB,EAAE,WAAW,EAAC,MAAM,uCAAuC,CAAC;AAEvH,OAAO,EAAC,WAAW,EAAC,MAAM,+BAA+B,CAAC;AAE1D,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,MAAM,EAAE,CAEvD;AAMD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,WAAW,EAAE,CAEjE;AAED,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,oBAAoB,CAS5E;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,WAAW,CAM1D;AAED,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,YAAY,GAAG,YAAY,IAAI,eAAe,CAG7F"}

package/lib/util/TypePredicateUtil.js

@@ -23,7 +23,7 @@ exports.isQualifiedIdArray = isQualifiedIdArray;
 exports.isQualifiedUserClients = isQualifiedUserClients;
 exports.isUserClients = isUserClients;
 exports.isMLSConversation = isMLSConversation;
-const conversation_1 = require("@wireapp/api-client/lib/conversation/");
+const team_1 = require("@wireapp/api-client/lib/team");
 function isStringArray(obj) {
     return Array.isArray(obj) && (obj.length === 0 || typeof obj[0] === 'string');
 }
@@ -52,5 +52,5 @@ function isUserClients(obj) {
 }
 function isMLSConversation(conversation) {
     const { protocol, epoch, group_id } = conversation;
-    return protocol === conversation_1.ConversationProtocol.MLS && epoch !== undefined && group_id !== undefined;
+    return protocol === team_1.CONVERSATION_PROTOCOL.MLS && epoch !== undefined && group_id !== undefined;
 }

package/package.json

@@ -11,7 +11,7 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^27.86.0",
+    "@wireapp/api-client": "^27.87.0",
     "@wireapp/commons": "^5.4.9",
     "@wireapp/core-crypto": "9.1.0",
     "@wireapp/cryptobox": "12.8.0",
@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "46.43.0",
-  "gitHead": "54e8913dd88d97c1e6629115c84a8811a5b528bb"
+  "version": "46.45.0",
+  "gitHead": "031bc333d66a0228a3475dc0a10b5c3685784132"
 }