@wireapp/core 41.4.1 → 41.4.2

package/lib/conversation/ConversationService/ConversationService.js

@@ -341,7 +341,7 @@ class ConversationService extends TypedEventEmitter_1.TypedEventEmitter {
         const { qualified_id: qualifiedId, group_id: groupId, epoch } = remoteMlsConversation;
         try {
             const isEstablished = await this.isMLSConversationEstablished(groupId);
-            const doesEpochMatch = await this.matchesEpoch(groupId, epoch);
+            const doesEpochMatch = isEstablished && (await this.matchesEpoch(groupId, epoch));
             //if conversation is not established or epoch does not match -> try to rejoin
             if (!isEstablished || !doesEpochMatch) {
                 this.logger.log(`Conversation (id ${qualifiedId.id}) was not established or it's epoch number was out of date, joining via external commit`);

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

@@ -156,7 +156,7 @@ describe('ConversationService', () => {
             });
         });
     });
-    describe('"handleEpochMismatch"', () => {
+    describe('handleConversationsEpochMismatch', () => {
         beforeEach(() => {
             jest.clearAllMocks();
         });
@@ -169,15 +169,13 @@ describe('ConversationService', () => {
             };
         };
         it('re-joins multiple not-established conversations', async () => {
-            const [conversationService, { apiClient, mlsService }] = buildConversationService();
+            const [conversationService, { apiClient }] = buildConversationService();
             const remoteEpoch = 1;
-            const localEpoch = 0;
             const mlsConversation1 = createConversation(remoteEpoch, 'conversation1');
             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(mlsService, 'getEpoch').mockResolvedValue(localEpoch);
             await conversationService.handleConversationsEpochMismatch();
             expect(conversationService.joinByExternalCommit).toHaveBeenCalledWith(mlsConversation1.qualified_id);
             expect(conversationService.joinByExternalCommit).toHaveBeenCalledWith(mlsConversation2.qualified_id);

package/package.json

@@ -60,6 +60,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "41.4.1",
-  "gitHead": "58f87c165ba58f3e9b99329aa7c60b0947034053"
+  "version": "41.4.2",
+  "gitHead": "56088325e0b4eb6aa7a8ad9df359eca0e3142d17"
 }