@wireapp/core 41.7.0 → 41.7.2

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

@@ -1,4 +1,4 @@
-import { Conversation, DefaultConversationRoleName, MutedStatus, NewConversation, QualifiedUserClients, RemoteConversations, PostMlsMessageResponse } from '@wireapp/api-client/lib/conversation';
+import { Conversation, DefaultConversationRoleName, MutedStatus, NewConversation, QualifiedUserClients, RemoteConversations, PostMlsMessageResponse, MLSConversation } from '@wireapp/api-client/lib/conversation';
 import { BackendEvent, ConversationMemberLeaveEvent } from '@wireapp/api-client/lib/event';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { XOR } from '@wireapp/commons/lib/util/TypeUtil';
@@ -91,7 +91,17 @@ export declare class ConversationService extends TypedEventEmitter<Events> {
      * @param epoch The current epoch of the local conversation
      */
     sendExternalJoinProposal(groupId: string, epoch: number): Promise<void>;
-    isMLSConversationEstablished(groupId: string): Promise<boolean>;
+    /**
+     * Will check if mls group exists locally.
+     * @param groupId groupId of the conversation
+     */
+    mlsGroupExistsLocally(groupId: string): Promise<boolean>;
+    /**
+     * Will check if mls group is established locally.
+     * Group is established after the first commit was sent in the group and epoch number is at least 1.
+     * @param groupId groupId of the conversation
+     */
+    isMLSGroupEstablishedLocally(groupId: string): Promise<boolean>;
     wipeMLSConversation(groupId: string): Promise<void>;
     private matchesEpoch;
     handleConversationsEpochMismatch(): Promise<void>;
@@ -113,7 +123,7 @@ export declare class ConversationService extends TypedEventEmitter<Events> {
     readonly establishMLS1to1Conversation: (groupId: string, selfUser: {
         user: QualifiedId;
         client: string;
-    }, otherUserId: QualifiedId) => Promise<void>;
+    }, otherUserId: QualifiedId, shouldRetry?: boolean) => Promise<MLSConversation>;
     private handleMLSMessageAddEvent;
     private handleMLSWelcomeMessageEvent;
     private handleOtrMessageAddEvent;

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

@@ -54,23 +54,41 @@ class ConversationService extends TypedEventEmitter_1.TypedEventEmitter {
          * @param selfUser - user and client ids of the self user
          * @param otherUserId - id of the other user
          */
-        this.establishMLS1to1Conversation = async (groupId, selfUser, otherUserId) => {
+        this.establishMLS1to1Conversation = async (groupId, selfUser, otherUserId, shouldRetry = true) => {
+            this.logger.info(`Trying to establish a MLS 1:1 conversation with user ${otherUserId.id}...`);
+            // Before trying to register a group, check if the group is already established o backend.
+            // If remote epoch is higher than 0, it means that the group was already established.
+            // It's possible that we've already received a welcome message.
+            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 on backend, checking the local epoch...`);
+                const isMLSGroupEstablishedLocally = await this.isMLSGroupEstablishedLocally(groupId);
+                // If group is already established locally, there's nothing more to do
+                if (isMLSGroupEstablishedLocally) {
+                    this.logger.info(`Conversation (id ${mlsConversation.qualified_id.id}) is already established locally.`);
+                    return mlsConversation;
+                }
+                // If local epoch is 0 it means that we've not received a welcome message
+                // We try joining via external commit.
+                this.logger.info(`Conversation (id ${mlsConversation.qualified_id.id}) is not yet established locally, joining via external commit...`);
+                await this.joinByExternalCommit(mlsConversation.qualified_id);
+                return this.apiClient.api.conversation.getMLS1to1Conversation(otherUserId);
+            }
+            // If group is not established on backend,
+            // we wipe the it locally (in case it exsits in the local store) and try to register it.
+            await this.mlsService.wipeConversation(groupId);
             try {
                 await this.mlsService.registerConversation(groupId, [otherUserId, selfUser.user], selfUser);
+                this.logger.info(`Conversation (id ${mlsConversation.qualified_id.id}) established successfully.`);
+                return this.apiClient.api.conversation.getMLS1to1Conversation(otherUserId);
             }
             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(`Could not register MLS group with id ${groupId}: `, error);
+                if (!shouldRetry) {
+                    throw error;
                 }
                 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);
+                return this.establishMLS1to1Conversation(groupId, selfUser, otherUserId, false);
             }
         };
         this.messageTimer = new conversation_2.MessageTimer();
@@ -310,9 +328,21 @@ class ConversationService extends TypedEventEmitter_1.TypedEventEmitter {
             this.mlsService.resetKeyMaterialRenewal(groupId);
         });
     }
-    async isMLSConversationEstablished(groupId) {
+    /**
+     * Will check if mls group exists locally.
+     * @param groupId groupId of the conversation
+     */
+    async mlsGroupExistsLocally(groupId) {
         return this.mlsService.conversationExists(groupId);
     }
+    /**
+     * Will check if mls group is established locally.
+     * Group is established after the first commit was sent in the group and epoch number is at least 1.
+     * @param groupId groupId of the conversation
+     */
+    async isMLSGroupEstablishedLocally(groupId) {
+        return this.mlsService.isConversationEstablished(groupId);
+    }
     async wipeMLSConversation(groupId) {
         return this.mlsService.wipeConversation(groupId);
     }
@@ -340,7 +370,7 @@ class ConversationService extends TypedEventEmitter_1.TypedEventEmitter {
     async handleConversationEpochMismatch(remoteMlsConversation, onSuccessfulRejoin) {
         const { qualified_id: qualifiedId, group_id: groupId, epoch } = remoteMlsConversation;
         try {
-            const isEstablished = await this.isMLSConversationEstablished(groupId);
+            const isEstablished = await this.mlsGroupExistsLocally(groupId);
             const doesEpochMatch = isEstablished && (await this.matchesEpoch(groupId, epoch));
             //if conversation is not established or epoch does not match -> try to rejoin
             if (!isEstablished || !doesEpochMatch) {

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

@@ -102,6 +102,7 @@ describe('ConversationService', () => {
             wipeConversation: jest.fn(),
             handleMLSMessageAddEvent: jest.fn(),
             conversationExists: jest.fn(),
+            isConversationEstablished: jest.fn(),
         };
         const conversationService = new __1.ConversationService(client, mockedProteusService, mockedMLSService);
         jest.spyOn(conversationService, 'joinByExternalCommit');
@@ -175,7 +176,7 @@ describe('ConversationService', () => {
             const mlsConversation2 = createConversation(remoteEpoch, 'conversation2');
             const mockedDBResponse = [mlsConversation1, mlsConversation2];
             jest.spyOn(apiClient.api.conversation, 'getConversationList').mockResolvedValueOnce({ found: mockedDBResponse });
-            jest.spyOn(conversationService, 'isMLSConversationEstablished').mockResolvedValue(false);
+            jest.spyOn(conversationService, 'mlsGroupExistsLocally').mockResolvedValue(false);
             await conversationService.handleConversationsEpochMismatch();
             expect(conversationService.joinByExternalCommit).toHaveBeenCalledWith(mlsConversation1.qualified_id);
             expect(conversationService.joinByExternalCommit).toHaveBeenCalledWith(mlsConversation2.qualified_id);
@@ -186,7 +187,7 @@ describe('ConversationService', () => {
             const mlsConversation2 = createConversation(1, 'conversation2');
             const mockedDBResponse = [mlsConversation1, mlsConversation2];
             jest.spyOn(apiClient.api.conversation, 'getConversationList').mockResolvedValueOnce({ found: mockedDBResponse });
-            jest.spyOn(conversationService, 'isMLSConversationEstablished').mockResolvedValue(true);
+            jest.spyOn(conversationService, 'mlsGroupExistsLocally').mockResolvedValue(true);
             jest.spyOn(mlsService, 'getEpoch').mockResolvedValue(2);
             await conversationService.handleConversationsEpochMismatch();
             expect(conversationService.joinByExternalCommit).toHaveBeenCalledWith(mlsConversation1.qualified_id);
@@ -197,7 +198,7 @@ describe('ConversationService', () => {
             const mlsConversation = createConversation(1);
             const mockedDBResponse = [mlsConversation];
             jest.spyOn(apiClient.api.conversation, 'getConversationList').mockResolvedValueOnce({ found: mockedDBResponse });
-            jest.spyOn(conversationService, 'isMLSConversationEstablished').mockResolvedValueOnce(true);
+            jest.spyOn(conversationService, 'mlsGroupExistsLocally').mockResolvedValueOnce(true);
             jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(1);
             jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
             await conversationService.handleConversationsEpochMismatch();
@@ -205,52 +206,117 @@ describe('ConversationService', () => {
         });
     });
     describe('establishMLS1to1Conversation', () => {
-        it('successfully register an MLS group if it did not exist before', async () => {
-            const [conversationService, { mlsService }] = buildConversationService();
+        it('only returns a conversation if a group is already established on backend and locally', 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' };
+            const remoteEpoch = 1;
+            jest.spyOn(apiClient.api.conversation, 'getMLS1to1Conversation').mockResolvedValueOnce({
+                qualified_id: mockConversationId,
+                protocol: conversation_1.ConversationProtocol.MLS,
+                epoch: remoteEpoch,
+                group_id: mockGroupId,
+            });
+            jest.spyOn(mlsService, 'isConversationEstablished').mockResolvedValueOnce(true);
             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();
+            expect(mlsService.registerConversation).not.toHaveBeenCalled();
+            expect(conversationService.joinByExternalCommit).not.toHaveBeenCalled();
         });
-        it('joins with external commit if epoch number is higher than 0', async () => {
+        it('joins with an external commit if a group is already established on backend but not established locally', 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);
+            const remoteEpoch = 1;
+            const updatedEpoch = 2;
+            jest.spyOn(apiClient.api.conversation, 'getMLS1to1Conversation').mockResolvedValueOnce({
+                qualified_id: mockConversationId,
+                protocol: conversation_1.ConversationProtocol.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,
-                epoch: 1,
+                epoch: updatedEpoch,
                 group_id: mockGroupId,
             });
-            await conversationService.establishMLS1to1Conversation(mockGroupId, selfUser, otherUserId);
-            expect(mlsService.registerConversation).toHaveBeenCalledTimes(1);
-            expect(mlsService.registerConversation).toHaveBeenCalledWith(mockGroupId, [otherUserId, selfUser.user], selfUser);
+            jest.spyOn(mlsService, 'isConversationEstablished').mockResolvedValueOnce(false);
+            jest.spyOn(mlsService, 'joinByExternalCommit').mockResolvedValueOnce({ events: [], time: '' });
+            const establishedConversation = await conversationService.establishMLS1to1Conversation(mockGroupId, selfUser, otherUserId);
+            expect(mlsService.registerConversation).not.toHaveBeenCalled();
             expect(conversationService.joinByExternalCommit).toHaveBeenCalledWith(mockConversationId);
+            expect(establishedConversation.epoch).toEqual(updatedEpoch);
         });
-        it('retries to register mls group if epoch number is equal 0', async () => {
+        it('wipes the conversation and registers it if a group is not yet established on backend', 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);
+            const remoteEpoch = 0;
+            const updatedEpoch = 1;
             jest.spyOn(apiClient.api.conversation, 'getMLS1to1Conversation').mockResolvedValueOnce({
                 qualified_id: mockConversationId,
                 protocol: conversation_1.ConversationProtocol.MLS,
-                epoch: 0,
+                epoch: remoteEpoch,
                 group_id: mockGroupId,
             });
-            await conversationService.establishMLS1to1Conversation(mockGroupId, selfUser, otherUserId);
+            // 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,
+                epoch: updatedEpoch,
+                group_id: mockGroupId,
+            });
+            jest.spyOn(mlsService, 'wipeConversation');
+            const establishedConversation = await conversationService.establishMLS1to1Conversation(mockGroupId, selfUser, otherUserId);
+            expect(mlsService.wipeConversation).toHaveBeenCalledWith(mockGroupId);
+            expect(mlsService.registerConversation).toHaveBeenCalledTimes(1);
             expect(mlsService.registerConversation).toHaveBeenCalledWith(mockGroupId, [otherUserId, selfUser.user], selfUser);
+            expect(conversationService.joinByExternalCommit).not.toHaveBeenCalled();
+            expect(establishedConversation.epoch).toEqual(updatedEpoch);
+        });
+        it('retries to register the conversation after it has failed for the first time', 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' };
+            const remoteEpoch = 0;
+            const updatedEpoch = 1;
+            jest.spyOn(apiClient.api.conversation, 'getMLS1to1Conversation').mockResolvedValueOnce({
+                qualified_id: mockConversationId,
+                protocol: conversation_1.ConversationProtocol.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,
+                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,
+                epoch: updatedEpoch,
+                group_id: mockGroupId,
+            });
+            jest.spyOn(mlsService, 'registerConversation').mockRejectedValueOnce(undefined);
+            jest.spyOn(mlsService, 'wipeConversation');
+            const establishedConversation = await conversationService.establishMLS1to1Conversation(mockGroupId, selfUser, otherUserId);
             expect(mlsService.wipeConversation).toHaveBeenCalledWith(mockGroupId);
             expect(mlsService.registerConversation).toHaveBeenCalledTimes(2);
+            expect(mlsService.registerConversation).toHaveBeenCalledWith(mockGroupId, [otherUserId, selfUser.user], selfUser);
+            expect(conversationService.joinByExternalCommit).not.toHaveBeenCalled();
+            expect(establishedConversation.epoch).toEqual(updatedEpoch);
         });
     });
     describe('handleEvent', () => {

package/lib/messagingProtocols/mls/MLSService/MLSService.d.ts

@@ -107,7 +107,17 @@ export declare class MLSService extends TypedEventEmitter<Events> {
      */
     removeClientsFromConversation(groupId: string, clientIds: string[]): Promise<PostMlsMessageResponse>;
     private commitProposals;
+    /**
+     * Will check if mls group exists in corecrypto.
+     * @param groupId groupId of the conversation
+     */
     conversationExists(groupId: string): Promise<boolean>;
+    /**
+     * Will check if mls group is established in coreCrypto.
+     * Group is established after the first commit was sent in the group and epoch number is at least 1.
+     * @param groupId groupId of the conversation
+     */
+    isConversationEstablished(groupId: string): Promise<boolean>;
     clientValidKeypackagesCount(): Promise<number>;
     clientKeypackages(amountRequested: number): Promise<Uint8Array[]>;
     /**

package/lib/messagingProtocols/mls/MLSService/MLSService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,sBAAsB,EAAE,kBAAkB,EAAC,MAAM,sCAAsC,CAAC;AAChG,OAAO,EAAC,eAAe,EAAC,MAAM,sDAAsD,CAAC;AACrF,OAAO,EAAC,8BAA8B,EAAE,2BAA2B,EAAC,MAAM,+BAA+B,CAAC;AAE1G,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAGzD,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EACL,eAAe,EAIf,cAAc,EACd,UAAU,EAEV,gBAAgB,EAChB,uBAAuB,EACvB,oBAAoB,EACpB,OAAO,EACP,YAAY,EACZ,YAAY,EACZ,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAC,gBAAgB,EAAsB,MAAM,oBAAoB,CAAC;AAIzE,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAM1D,OAAO,EAAC,iBAAiB,EAAC,MAAM,iCAAiC,CAAC;AAElE,OAAO,EAAC,4BAA4B,EAAE,4BAA4B,EAAE,YAAY,EAAC,MAAM,UAAU,CAAC;AAIlG,eAAO,MAAM,oBAAoB,UAAW,UAAU,GAAG,EAAE,KAAG,UAE7D,CAAC;AASF,MAAM,WAAW,8BAA8B;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,KAAK,MAAM,GAAG;IACZ,QAAQ,EAAE;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAC,CAAC;CAC5C,CAAC;AACF,qBAAa,UAAW,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAQrD,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IARnC,MAAM,iBAAuC;IAC7C,MAAM,EAAE,gBAAgB,CAAC;IACzB,yBAAyB,CAAC,EAAE,YAAY,CAAC,2BAA2B,CAAC,CAAC;IACtE,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IACjD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;gBAG9B,SAAS,EAAE,SAAS,EACpB,gBAAgB,EAAE,UAAU,EAC7C,EACE,6BAA2E,EAC3E,aAA2C,EAC3C,kBAAqD,EACrD,qBAA2D,GAC5D,EAAE,OAAO,CAAC,gBAAgB,CAAC;IAWjB,UAAU,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM;IAKhD,YAAY,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM;YAajD,kBAAkB;IAuChC;;;;;;OAMG;IACI,8BAA8B,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE;IAWlE,qBAAqB,CAAC,EAAC,yBAAyB,EAAE,GAAG,mBAAmB,EAAC,EAAE,YAAY,GAAG,IAAI;IAWxF,qBAAqB,CAAC,cAAc,EAAE,mBAAmB,EAAE;;;;IA8CjE,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU;IAK/B,WAAW,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,GAAG,eAAe,GAAG,kBAAkB;IAIjG,oBAAoB,CAAC,YAAY,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC;IAwB5D,4BAA4B,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC;YAIlF,+BAA+B;IAO7C;;;;OAIG;IACU,8BAA8B,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IA4B1E,oCAAoC,IAAI,OAAO,CAAC,IAAI,CAAC;IAUlE;;;;;OAKG;IACU,6BAA6B,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,CAAC;IAkCrG,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAMpE,mBAAmB,CAAC,oBAAoB,EAAE,oBAAoB,EAAE,IAAI,EAAE,uBAAuB;IAI7F,qBAAqB,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC;IAI1E,cAAc,CAAC,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAI9F,cAAc,CAAC,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAIrG;;;;;;;;;OASG;YACW,mBAAmB;IAQjC,OAAO,CAAC,oBAAoB;IAK5B;;;OAGG;IACU,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAatE;;;;;OAKG;IACU,oBAAoB,CAC/B,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,WAAW,EAAE,EACpB,OAAO,CAAC,EAAE;QAAC,IAAI,EAAE,WAAW,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAC,GAC7C,OAAO,CAAC,sBAAsB,CAAC;IAiClC;;;;OAIG;IACI,6BAA6B,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE;YAW3D,eAAe;IAK7B;;;OAGG;IACU,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKlE;;;;OAIG;IACU,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK5D,2BAA2B,IAAI,OAAO,CAAC,MAAM,CAAC;IAO9C,iBAAiB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAQ9E;;;;OAIG;IACU,gBAAgB,CAAC,OAAO,EAAE,MAAM;IAc7C,OAAO,CAAC,sCAAsC;IAI9C;;;OAGG;IACI,uBAAuB,CAAC,OAAO,EAAE,MAAM;IAK9C;;;OAGG;IACI,wBAAwB,CAAC,OAAO,EAAE,MAAM;IAI/C;;;OAGG;IACI,0BAA0B,CAAC,OAAO,EAAE,MAAM;IAUjD;;;OAGG;IACI,mCAAmC,CAAC,QAAQ,EAAE,MAAM,EAAE;IAQ7D;;;OAGG;IACI,8BAA8B;YAQvB,eAAe;IAsB7B;;;;;OAKG;YACW,mBAAmB;YAMnB,oBAAoB;IAOrB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY7D;;;;;OAKG;IACU,4BAA4B,CACvC,uBAAuB,EAAE,WAAW,EACpC,iBAAiB,CAAC,EAAE,kBAAkB,GACrC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAQ9B;;;;;;;OAOG;IACU,sBAAsB,CAAC,EAAC,SAAS,EAAE,OAAO,EAAE,SAAS,EAAC,EAAE,4BAA4B;IAoBjG;;;;;OAKG;IACU,sBAAsB,CAAC,EAAC,OAAO,EAAE,UAAkB,EAAC,EAAE,4BAA4B;IAa/F;;;;OAIG;IACU,6BAA6B;IAiB1C;;;;OAIG;IACU,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,EAAE,CAAC;IAY5F,wBAAwB,CAAC,KAAK,EAAE,8BAA8B;IAI9D,4BAA4B,CAAC,KAAK,EAAE,2BAA2B;CAG7E"}

package/lib/messagingProtocols/mls/MLSService/MLSService.js

@@ -372,10 +372,23 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
         const commitBundle = await this.coreCryptoClient.commitPendingProposals(groupId);
         return commitBundle ? void (await this.uploadCommitBundle(groupId, commitBundle)) : undefined;
     }
+    /**
+     * Will check if mls group exists in corecrypto.
+     * @param groupId groupId of the conversation
+     */
     async conversationExists(groupId) {
         const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
         return this.coreCryptoClient.conversationExists(groupIdBytes);
     }
+    /**
+     * Will check if mls group is established in coreCrypto.
+     * Group is established after the first commit was sent in the group and epoch number is at least 1.
+     * @param groupId groupId of the conversation
+     */
+    async isConversationEstablished(groupId) {
+        const doesConversationExist = await this.conversationExists(groupId);
+        return doesConversationExist && (await this.getEpoch(groupId)) > 0;
+    }
     async clientValidKeypackagesCount() {
         return this.coreCryptoClient.clientValidKeypackagesCount(this.config.defaultCiphersuite, this.config.defaultCredentialType);
     }
@@ -481,8 +494,8 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
         return this.apiClient.api.client.uploadMLSKeyPackages(clientId, keypackages.map(keypackage => btoa(bazinga64_1.Converter.arrayBufferViewToBaselineString(keypackage))));
     }
     async wipeConversation(groupId) {
-        const isMLSConversationEstablished = await this.conversationExists(groupId);
-        if (!isMLSConversationEstablished) {
+        const doesConversationExist = await this.conversationExists(groupId);
+        if (!doesConversationExist) {
             //if the mls group does not exist, we don't need to wipe it
             return;
         }

package/lib/messagingProtocols/mls/MLSService/MLSService.test.js

@@ -71,4 +71,29 @@ describe('MLSService', () => {
             expect(mlsService.cancelKeyMaterialRenewal).toHaveBeenCalledWith(groupId);
         });
     });
+    describe('isConversationEstablished', () => {
+        it('returns false if conversation does not exist locally', async () => {
+            const mlsService = new MLSService_1.MLSService(apiClient, mockCoreCrypto, {});
+            const groupId = 'mXOagqRIX/RFd7QyXJA8/Ed8X+hvQgLXIiwYHm3OQFc=';
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(false);
+            const isEstablshed = await mlsService.isConversationEstablished(groupId);
+            expect(isEstablshed).toBe(false);
+        });
+        it('returns false if epoch number is 0', async () => {
+            const mlsService = new MLSService_1.MLSService(apiClient, mockCoreCrypto, {});
+            const groupId = 'mXOagqRIX/RFd7QyXJA8/Ed8X+hvQgLXIiwYHm3OQFc=';
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
+            jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(0);
+            const isEstablshed = await mlsService.isConversationEstablished(groupId);
+            expect(isEstablshed).toBe(false);
+        });
+        it.each([1, 2, 100])('returns false if epoch number is 1 or more', async (epoch) => {
+            const mlsService = new MLSService_1.MLSService(apiClient, mockCoreCrypto, {});
+            const groupId = 'mXOagqRIX/RFd7QyXJA8/Ed8X+hvQgLXIiwYHm3OQFc=';
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
+            jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(epoch);
+            const isEstablshed = await mlsService.isConversationEstablished(groupId);
+            expect(isEstablshed).toBe(true);
+        });
+    });
 });

package/package.json

@@ -11,7 +11,7 @@
     "./lib/cryptography/AssetCryptography/crypto.node": "./lib/cryptography/AssetCryptography/crypto.browser.js"
   },
   "dependencies": {
-    "@wireapp/api-client": "^25.4.0",
+    "@wireapp/api-client": "^25.4.1",
     "@wireapp/commons": "^5.1.0",
     "@wireapp/core-crypto": "1.0.0-rc.6",
     "@wireapp/cryptobox": "12.8.0",
@@ -20,7 +20,7 @@
     "@wireapp/store-engine": "5.1.1",
     "@wireapp/store-engine-dexie": "^2.1.3",
     "axios": "1.5.0",
-    "bazinga64": "6.1.2",
+    "bazinga64": "6.1.3",
     "deepmerge-ts": "5.1.0",
     "hash.js": "1.1.7",
     "http-status-codes": "2.2.0",
@@ -60,6 +60,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "41.7.0",
-  "gitHead": "6cec3bde870a1f566dc7213e7c254f56fdff19d0"
+  "version": "41.7.2",
+  "gitHead": "f9a30a2960bbd94bcdfc6e590aba55c8594dae45"
 }