@wireapp/core 42.19.1 → 42.20.0

package/lib/conversation/SubconversationService/SubconversationService.test.js

@@ -22,7 +22,7 @@ const conversation_1 = require("@wireapp/api-client/lib/conversation");
 const http_1 = require("@wireapp/api-client/lib/http");
 const api_client_1 = require("@wireapp/api-client");
 const SubconversationService_1 = require("./SubconversationService");
-const subconversationGroupIdStore_1 = require("../../messagingProtocols/mls/MLSService/stores/subconversationGroupIdStore/subconversationGroupIdStore");
+const CoreDB_1 = require("../../storage/CoreDB");
 const fullyQualifiedClientIdUtils_1 = require("../../util/fullyQualifiedClientIdUtils");
 const getSubconversationResponse = ({ epoch, epochTimestamp, parentConversationId, groupId, members = [], subconversationId = conversation_1.SUBCONVERSATION_ID.CONFERENCE, }) => {
     return {
@@ -35,7 +35,7 @@ const getSubconversationResponse = ({ epoch, epochTimestamp, parentConversationI
         epoch_timestamp: epochTimestamp,
     };
 };
-const buildSubconversationService = () => {
+const buildSubconversationService = async () => {
     const apiClient = new api_client_1.APIClient({ urls: api_client_1.APIClient.BACKEND.STAGING });
     const mlsService = {
         conversationExists: jest.fn(),
@@ -51,8 +51,9 @@ const buildSubconversationService = () => {
         off: jest.fn(),
         removeClientsFromConversation: jest.fn(),
     };
-    const subconversationService = new SubconversationService_1.SubconversationService(apiClient, mlsService);
-    return [subconversationService, { apiClient, mlsService }];
+    const coreDatabase = await (0, CoreDB_1.openDB)('core-test-db');
+    const subconversationService = new SubconversationService_1.SubconversationService(apiClient, coreDatabase, mlsService);
+    return [subconversationService, { apiClient, mlsService, coreDatabase }];
 };
 describe('SubconversationService', () => {
     describe('joinConferenceSubconversation', () => {
@@ -61,7 +62,7 @@ describe('SubconversationService', () => {
             jest.clearAllMocks();
         });
         it('wipes group locally (if it exists) before registering a group if remote epoch is equal 0', async () => {
-            const [subconversationService, { apiClient, mlsService }] = buildSubconversationService();
+            const [subconversationService, { apiClient, mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
             const subconversationGroupId = 'subconversationGroupId';
             const subconversationResponse = getSubconversationResponse({
@@ -78,7 +79,7 @@ describe('SubconversationService', () => {
             expect(mlsService.registerConversation).toHaveBeenCalledWith(subconversationGroupId, []);
         });
         it('registers a group if remote epoch is 0 and group does not exist locally', async () => {
-            const [subconversationService, { apiClient, mlsService }] = buildSubconversationService();
+            const [subconversationService, { apiClient, mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
             const subconversationGroupId = 'subconversationGroupId';
             const subconversationResponse = getSubconversationResponse({
@@ -96,7 +97,7 @@ describe('SubconversationService', () => {
         });
         it('deletes conference subconversation from backend if group is already established and epoch is older than one day, then rejoins', async () => {
             jest.useFakeTimers();
-            const [subconversationService, { apiClient, mlsService }] = buildSubconversationService();
+            const [subconversationService, { apiClient, mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
             const subconversationGroupId = 'subconversationGroupId';
             const initialSubconversationEpoch = 1;
@@ -133,7 +134,7 @@ describe('SubconversationService', () => {
         });
         it('joins conference subconversation with external commit if group is already established and epoch is younger than one day', async () => {
             jest.useFakeTimers();
-            const [subconversationService, { apiClient, mlsService }] = buildSubconversationService();
+            const [subconversationService, { apiClient, mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
             const subconversationGroupId = 'subconversationGroupId';
             const subconversationEpoch = 1;
@@ -157,7 +158,7 @@ describe('SubconversationService', () => {
             expect(mlsService.joinByExternalCommit).toHaveBeenCalled();
         });
         it('retries to join if registering a conversations throws an error', async () => {
-            const [subconversationService, { apiClient, mlsService }] = buildSubconversationService();
+            const [subconversationService, { apiClient, mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
             const subconversationGroupId = 'subconversationGroupId';
             const subconversationResponse = getSubconversationResponse({
@@ -178,7 +179,7 @@ describe('SubconversationService', () => {
             expect(mlsService.registerConversation).toHaveBeenCalledTimes(2);
         });
         it('returns fresh epoch number after joining the group', async () => {
-            const [subconversationService, { apiClient, mlsService }] = buildSubconversationService();
+            const [subconversationService, { apiClient, mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
             const subconversationGroupId = 'subconversationGroupId';
             const subconversationResponse = getSubconversationResponse({
@@ -200,31 +201,31 @@ describe('SubconversationService', () => {
     });
     describe('leaveConferenceSubconversation', () => {
         it('does nothing if subconversation id is not found in the store', async () => {
-            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const [subconversationService, { mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
             await subconversationService.leaveConferenceSubconversation(parentConversationId);
             expect(mlsService.wipeConversation).not.toHaveBeenCalled();
         });
         it('removes subconversation id from the store if conversations was known but not established locally', async () => {
-            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const [subconversationService, { mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
             const subconversationGroupId = 'subconversationGroupId';
-            subconversationGroupIdStore_1.subconversationGroupIdStore.storeGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, subconversationGroupId);
+            await subconversationService.saveSubconversationGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, subconversationGroupId);
             jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(false);
             await subconversationService.leaveConferenceSubconversation(parentConversationId);
-            const groupId = subconversationGroupIdStore_1.subconversationGroupIdStore.getGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+            const groupId = await subconversationService.getSubconversationGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
             expect(groupId).toEqual(undefined);
             expect(mlsService.wipeConversation).not.toHaveBeenCalled();
         });
         it('deletes self client from conference subconversation', async () => {
-            const [subconversationService, { apiClient, mlsService }] = buildSubconversationService();
+            const [subconversationService, { apiClient, mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
             const subconversationGroupId = 'subconversationGroupId';
-            subconversationGroupIdStore_1.subconversationGroupIdStore.storeGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, subconversationGroupId);
+            await subconversationService.saveSubconversationGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, subconversationGroupId);
             jest.spyOn(apiClient.api.conversation, 'deleteSubconversationSelf');
             jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
             await subconversationService.leaveConferenceSubconversation(parentConversationId);
-            const groupId = subconversationGroupIdStore_1.subconversationGroupIdStore.getGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+            const groupId = await subconversationService.getSubconversationGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
             expect(groupId).toEqual(undefined);
             expect(apiClient.api.conversation.deleteSubconversationSelf).toHaveBeenCalledWith(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
             expect(mlsService.wipeConversation).toHaveBeenCalledWith(subconversationGroupId);
@@ -232,47 +233,31 @@ describe('SubconversationService', () => {
     });
     describe('getSubconversationEpochInfo', () => {
         it('returns null if subconversation id is not known by a client', async () => {
-            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const [subconversationService] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
-            jest.spyOn(mlsService, 'getGroupIdFromConversationId').mockResolvedValue(undefined);
-            const response = await subconversationService.getSubconversationEpochInfo(parentConversationId);
+            const parentConversationGroupId = 'parentConversationGroupId';
+            const response = await subconversationService.getSubconversationEpochInfo(parentConversationId, parentConversationGroupId);
             expect(response).toEqual(null);
         });
         it('returns null if MLS group for subconversation does not exist locally', async () => {
-            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const [subconversationService, { mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
             const parentConversationGroupId = 'parentConversationGroupId';
-            const subconversationGroupId = 'subconversationGroupId';
-            jest
-                .spyOn(mlsService, 'getGroupIdFromConversationId')
-                .mockImplementation(async (_conversationId, subconverstionId) => {
-                if (subconverstionId) {
-                    return subconversationGroupId;
-                }
-                return parentConversationGroupId;
-            });
             jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(false);
-            const response = await subconversationService.getSubconversationEpochInfo(parentConversationId);
+            const response = await subconversationService.getSubconversationEpochInfo(parentConversationId, parentConversationGroupId);
             expect(response).toEqual(null);
         });
         it('returns epoch info and advances epoch number', async () => {
-            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const [subconversationService, { mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
             const parentConversationGroupId = 'parentConversationGroupId';
             const subconversationGroupId = 'subconversationGroupId';
-            jest
-                .spyOn(mlsService, 'getGroupIdFromConversationId')
-                .mockImplementation(async (_conversationId, subconverstionId) => {
-                if (subconverstionId) {
-                    return subconversationGroupId;
-                }
-                return parentConversationGroupId;
-            });
             jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
             const mockedEpoch = 2;
             jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(mockedEpoch);
             const mockedSecretKey = 'mockedSecretKey';
             jest.spyOn(mlsService, 'exportSecretKey').mockResolvedValueOnce(mockedSecretKey);
+            await subconversationService.saveSubconversationGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, subconversationGroupId);
             const subconversationMemberIds = [{ userId: 'userId1', clientId: 'clientId1', domain: 'domain' }];
             const parentConversationMemberIds = [
                 { userId: 'userId1', clientId: 'clientId1', domain: 'domain' },
@@ -284,7 +269,7 @@ describe('SubconversationService', () => {
                 }
                 return subconversationMemberIds;
             });
-            const response = await subconversationService.getSubconversationEpochInfo(parentConversationId, true);
+            const response = await subconversationService.getSubconversationEpochInfo(parentConversationId, parentConversationGroupId, true);
             const expected = {
                 epoch: mockedEpoch,
                 keyLength: 32,
@@ -300,12 +285,12 @@ describe('SubconversationService', () => {
     });
     describe('subscribeToEpochUpdates', () => {
         it('should subscribe to newEpoch event', async () => {
-            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const [subconversationService, { mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
             const parentConversationGroupId = 'parentConversationGroupId';
             const subconversationGroupId = 'subconversationGroupId';
             const mockedInitialEpoch = 1;
-            jest.spyOn(mlsService, 'getGroupIdFromConversationId').mockResolvedValue(subconversationGroupId);
+            await subconversationService.saveSubconversationGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, subconversationGroupId);
             const mockedEpochInfo = { epoch: mockedInitialEpoch, keyLength: 32, members: [], secretKey: '' };
             jest.spyOn(subconversationService, 'getSubconversationEpochInfo').mockResolvedValueOnce(mockedEpochInfo);
             jest
@@ -318,9 +303,9 @@ describe('SubconversationService', () => {
                 return undefined;
             };
             const onEpochUpdateCallback = jest.fn();
-            const unsubscribe = await subconversationService.subscribeToEpochUpdates(parentConversationId, findConversationByGroupId, onEpochUpdateCallback);
+            const unsubscribe = await subconversationService.subscribeToEpochUpdates(parentConversationId, parentConversationGroupId, findConversationByGroupId, onEpochUpdateCallback);
             expect(mlsService.on).toHaveBeenCalledWith('newEpoch', expect.any(Function));
-            expect(subconversationService.getSubconversationEpochInfo).toHaveBeenCalledWith(parentConversationId);
+            expect(subconversationService.getSubconversationEpochInfo).toHaveBeenCalledWith(parentConversationId, parentConversationGroupId);
             expect(onEpochUpdateCallback).toHaveBeenCalledWith(mockedEpochInfo);
             unsubscribe();
             expect(mlsService.off).toHaveBeenCalledWith('newEpoch', expect.any(Function));
@@ -328,9 +313,8 @@ describe('SubconversationService', () => {
     });
     describe('removeClientFromConferenceSubconversation', () => {
         it('does nothing if subconversation group is not known', async () => {
-            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const [subconversationService, { mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
-            jest.spyOn(mlsService, 'getGroupIdFromConversationId').mockResolvedValue(undefined);
             const user = { id: 'userId', domain: 'domain' };
             const clientId = 'clientId';
             const clientToRemove = { user, clientId };
@@ -338,10 +322,10 @@ describe('SubconversationService', () => {
             expect(mlsService.removeClientsFromConversation).not.toHaveBeenCalled();
         });
         it('does nothing if subconversation group is not established', async () => {
-            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const [subconversationService, { mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
             const subconversationGroupId = 'subconversationGroupId';
-            jest.spyOn(mlsService, 'getGroupIdFromConversationId').mockResolvedValue(subconversationGroupId);
+            await subconversationService.saveSubconversationGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, subconversationGroupId);
             jest.spyOn(mlsService, 'conversationExists').mockResolvedValue(false);
             const user = { id: 'userId', domain: 'domain' };
             const clientId = 'clientId';
@@ -350,10 +334,10 @@ describe('SubconversationService', () => {
             expect(mlsService.removeClientsFromConversation).not.toHaveBeenCalled();
         });
         it('does nothing if client is not a subconversation group member', async () => {
-            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const [subconversationService, { mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
             const subconversationGroupId = 'subconversationGroupId';
-            jest.spyOn(mlsService, 'getGroupIdFromConversationId').mockResolvedValue(subconversationGroupId);
+            await subconversationService.saveSubconversationGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, subconversationGroupId);
             jest.spyOn(mlsService, 'conversationExists').mockResolvedValue(true);
             const subconversationMemberIds = [
                 { userId: 'userId1', clientId: 'clientId1', domain: 'domain' },
@@ -367,10 +351,10 @@ describe('SubconversationService', () => {
             expect(mlsService.removeClientsFromConversation).not.toHaveBeenCalled();
         });
         it('removes client from subconversation group', async () => {
-            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const [subconversationService, { mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
             const subconversationGroupId = 'subconversationGroupId';
-            jest.spyOn(mlsService, 'getGroupIdFromConversationId').mockResolvedValue(subconversationGroupId);
+            await subconversationService.saveSubconversationGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, subconversationGroupId);
             jest.spyOn(mlsService, 'conversationExists').mockResolvedValue(true);
             const user = { id: 'userId3', domain: 'domain3' };
             const clientId = 'clientId3';

package/lib/conversation/SubconversationService/subconversationUtil.d.ts

@@ -0,0 +1,4 @@
+import { SUBCONVERSATION_ID } from '@wireapp/api-client/lib/conversation';
+import { QualifiedId } from '@wireapp/api-client/lib/user';
+export declare const generateSubconversationStoreKey: (parentConversationId: QualifiedId, subconversationId: SUBCONVERSATION_ID) => `${string}@${string}:${SUBCONVERSATION_ID}`;
+//# sourceMappingURL=subconversationUtil.d.ts.map

package/lib/conversation/SubconversationService/subconversationUtil.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subconversationUtil.d.ts","sourceRoot":"","sources":["../../../src/conversation/SubconversationService/subconversationUtil.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,kBAAkB,EAAC,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,eAAO,MAAM,+BAA+B,yBACpB,WAAW,qBACd,kBAAkB,KACpC,GAAG,MAAM,IAAI,MAAM,IAAI,kBAAkB,EAE3C,CAAC"}

package/lib/conversation/SubconversationService/subconversationUtil.js

@@ -0,0 +1,25 @@
+"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.generateSubconversationStoreKey = void 0;
+const generateSubconversationStoreKey = (parentConversationId, subconversationId) => {
+    return `${parentConversationId.id}@${parentConversationId.domain}:${subconversationId}`;
+};
+exports.generateSubconversationStoreKey = generateSubconversationStoreKey;

package/lib/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.d.ts

@@ -1,10 +1,13 @@
+import { SUBCONVERSATION_ID } from '@wireapp/api-client/lib/conversation';
 import { ConversationMLSMessageAddEvent } from '@wireapp/api-client/lib/event';
+import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { HandledEventPayload } from '../../../../../notification';
 import { MLSService } from '../../../MLSService/MLSService';
 interface HandleMLSMessageAddParams {
     event: ConversationMLSMessageAddEvent;
     mlsService: MLSService;
+    groupIdFromConversationId: (conversationId: QualifiedId, subconversationId?: SUBCONVERSATION_ID) => Promise<string | undefined>;
 }
-export declare const handleMLSMessageAdd: ({ event, mlsService, }: HandleMLSMessageAddParams) => Promise<HandledEventPayload | null>;
+export declare const handleMLSMessageAdd: ({ event, mlsService, groupIdFromConversationId, }: HandleMLSMessageAddParams) => Promise<HandledEventPayload | null>;
 export {};
 //# sourceMappingURL=messageAdd.d.ts.map

package/lib/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messageAdd.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,8BAA8B,EAAC,MAAM,+BAA+B,CAAC;AAK7E,OAAO,EAAC,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAC,UAAU,EAAuB,MAAM,gCAAgC,CAAC;AAEhF,UAAU,yBAAyB;IACjC,KAAK,EAAE,8BAA8B,CAAC;IACtC,UAAU,EAAE,UAAU,CAAC;CACxB;AAED,eAAO,MAAM,mBAAmB,2BAG7B,yBAAyB,KAAG,QAAQ,mBAAmB,GAAG,IAAI,CA+ChE,CAAC"}
+{"version":3,"file":"messageAdd.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,kBAAkB,EAAC,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAC,8BAA8B,EAAC,MAAM,+BAA+B,CAAC;AAC7E,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAKzD,OAAO,EAAC,mBAAmB,EAAC,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAC,UAAU,EAAuB,MAAM,gCAAgC,CAAC;AAEhF,UAAU,yBAAyB;IACjC,KAAK,EAAE,8BAA8B,CAAC;IACtC,UAAU,EAAE,UAAU,CAAC;IACvB,yBAAyB,EAAE,CACzB,cAAc,EAAE,WAAW,EAC3B,iBAAiB,CAAC,EAAE,kBAAkB,KACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAClC;AAED,eAAO,MAAM,mBAAmB,sDAI7B,yBAAyB,KAAG,QAAQ,mBAAmB,GAAG,IAAI,CA+ChE,CAAC"}

package/lib/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.js

@@ -22,11 +22,11 @@ exports.handleMLSMessageAdd = void 0;
 const bazinga64_1 = require("bazinga64");
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const MLSService_1 = require("../../../MLSService/MLSService");
-const handleMLSMessageAdd = async ({ event, mlsService, }) => {
+const handleMLSMessageAdd = async ({ event, mlsService, groupIdFromConversationId, }) => {
     var _a;
     const encryptedData = bazinga64_1.Decoder.fromBase64(event.data).asBytes;
     const qualifiedConversationId = (_a = event.qualified_conversation) !== null && _a !== void 0 ? _a : { id: event.conversation, domain: '' };
-    const groupId = await mlsService.getGroupIdFromConversationId(qualifiedConversationId, event.subconv);
+    const groupId = await groupIdFromConversationId(qualifiedConversationId, event.subconv);
     // We should not receive a message for a group the client is not aware of
     if (!groupId) {
         throw new Error(`Could not find a group_id for conversation ${qualifiedConversationId.id}@${qualifiedConversationId.domain}`);

package/lib/messagingProtocols/mls/EventHandler/events/messageAdd/messageAdd.test.js

@@ -46,13 +46,13 @@ const createMockedMessage = () => {
 describe('handleMLSMessageAdd', () => {
     it('throws when received a message for a group that is not known by a client', async () => {
         const event = createMLSMessageAddEventMock({ id: 'conversationId', domain: 'staging.zinfra.io' });
-        jest.spyOn(mockedMLSService, 'getGroupIdFromConversationId').mockResolvedValueOnce(undefined);
-        await expect((0, messageAdd_1.handleMLSMessageAdd)({ event, mlsService: mockedMLSService })).rejects.toThrow();
+        const groupIdFromConversationId = () => Promise.resolve(undefined);
+        await expect((0, messageAdd_1.handleMLSMessageAdd)({ event, mlsService: mockedMLSService, groupIdFromConversationId })).rejects.toThrow();
     });
     it('does not handle pending proposals if message does not contain proposals', async () => {
         const event = createMLSMessageAddEventMock({ id: 'conversationId', domain: 'staging.zinfra.io' });
         const mockGroupId = 'AAEAAH87aajaQ011i+rNLmwpy0sAZGl5YS53aXJlLmxpbms=';
-        jest.spyOn(mockedMLSService, 'getGroupIdFromConversationId').mockResolvedValueOnce(mockGroupId);
+        const groupIdFromConversationId = () => Promise.resolve(mockGroupId);
         const message = createMockedMessage();
         jest.spyOn(mockedMLSService, 'decryptMessage').mockResolvedValueOnce({
             proposals: [],
@@ -61,13 +61,13 @@ describe('handleMLSMessageAdd', () => {
             hasEpochChanged: false,
             isActive: true,
         });
-        await (0, messageAdd_1.handleMLSMessageAdd)({ event, mlsService: mockedMLSService });
+        await (0, messageAdd_1.handleMLSMessageAdd)({ event, mlsService: mockedMLSService, groupIdFromConversationId });
         expect(mockedMLSService.handlePendingProposals).not.toHaveBeenCalled();
     });
     it('handles pending proposals if message includes proposals', async () => {
         const event = createMLSMessageAddEventMock({ id: 'conversationId', domain: 'staging.zinfra.io' });
         const mockGroupId = 'AAEAAH87aajaQ011i+rNLmwpy0sAZGl5YS53aXJlLmxpbms=';
-        jest.spyOn(mockedMLSService, 'getGroupIdFromConversationId').mockResolvedValueOnce(mockGroupId);
+        const groupIdFromConversationId = () => Promise.resolve(mockGroupId);
         const message = createMockedMessage();
         jest.spyOn(mockedMLSService, 'decryptMessage').mockResolvedValueOnce({
             proposals: [{ proposal: new Uint8Array(), proposalRef: new Uint8Array() }],
@@ -76,7 +76,7 @@ describe('handleMLSMessageAdd', () => {
             hasEpochChanged: false,
             isActive: true,
         });
-        await (0, messageAdd_1.handleMLSMessageAdd)({ event, mlsService: mockedMLSService });
+        await (0, messageAdd_1.handleMLSMessageAdd)({ event, mlsService: mockedMLSService, groupIdFromConversationId });
         expect(mockedMLSService.handlePendingProposals).toHaveBeenCalledWith({
             groupId: mockGroupId,
             delayInMs: 2000,
@@ -86,7 +86,7 @@ describe('handleMLSMessageAdd', () => {
     it('emits "newEpoch" event if incoming message has advanced epoch number', async () => {
         const event = createMLSMessageAddEventMock({ id: 'conversationId', domain: 'staging.zinfra.io' });
         const mockGroupId = 'AAEAAH87aajaQ011i+rNLmwpy0sAZGl5YS53aXJlLmxpbms=';
-        jest.spyOn(mockedMLSService, 'getGroupIdFromConversationId').mockResolvedValueOnce(mockGroupId);
+        const groupIdFromConversationId = () => Promise.resolve(mockGroupId);
         const message = createMockedMessage();
         jest.spyOn(mockedMLSService, 'decryptMessage').mockResolvedValueOnce({
             proposals: [],
@@ -96,7 +96,7 @@ describe('handleMLSMessageAdd', () => {
         });
         const mockedNewEpoch = 5;
         jest.spyOn(mockedMLSService, 'getEpoch').mockResolvedValueOnce(mockedNewEpoch);
-        await (0, messageAdd_1.handleMLSMessageAdd)({ event, mlsService: mockedMLSService });
+        await (0, messageAdd_1.handleMLSMessageAdd)({ event, mlsService: mockedMLSService, groupIdFromConversationId });
         expect(mockedMLSService.emit).toHaveBeenCalledWith('newEpoch', {
             groupId: mockGroupId,
             epoch: mockedNewEpoch,

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

@@ -11,7 +11,7 @@ import { KeyPackageClaimUser } from '../../../conversation';
 import { CoreDatabase } from '../../../storage/CoreDB';
 import { RecurringTaskScheduler } from '../../../util/RecurringTaskScheduler';
 import { AcmeChallenge, E2EIServiceExternal, User } from '../E2EIdentityService';
-import { ClientId, CommitPendingProposalsParams, HandlePendingProposalsParams, MLSCallbacks } from '../types';
+import { ClientId, CommitPendingProposalsParams, HandlePendingProposalsParams } from '../types';
 export declare const optionalToUint8Array: (array: Uint8Array | []) => Uint8Array;
 interface LocalMLSServiceConfig extends MLSServiceConfig {
     /**
@@ -32,7 +32,6 @@ export declare class MLSService extends TypedEventEmitter<Events> {
     private readonly recurringTaskScheduler;
     logger: logdown.Logger;
     config: LocalMLSServiceConfig;
-    groupIdFromConversationId?: MLSCallbacks['groupIdFromConversationId'];
     private readonly textEncoder;
     private readonly textDecoder;
     constructor(apiClient: APIClient, coreCryptoClient: CoreCrypto, coreDatabase: CoreDatabase, recurringTaskScheduler: RecurringTaskScheduler, { keyingMaterialUpdateThreshold, nbKeyPackages, defaultCiphersuite, defaultCredentialType, }: Partial<MLSServiceConfig>);
@@ -46,7 +45,6 @@ export declare class MLSService extends TypedEventEmitter<Events> {
      * @param invitee - the list of keys of clients to add to the MLS group
      */
     addUsersToExistingConversation(groupId: string, invitee: Invitee[]): Promise<PostMlsMessageResponse>;
-    configureMLSCallbacks({ groupIdFromConversationId, ...coreCryptoCallbacks }: MLSCallbacks): void;
     getKeyPackagesPayload(qualifiedUsers: KeyPackageClaimUser[]): Promise<{
         coreCryptoKeyPackagesPayload: Invitee[];
         failedToFetchKeyPackages: QualifiedId[];
@@ -163,13 +161,6 @@ export declare class MLSService extends TypedEventEmitter<Events> {
     private uploadMLSPublicKeys;
     private uploadMLSKeyPackages;
     wipeConversation(groupId: string): Promise<void>;
-    /**
-     * If there is a matching conversationId => groupId pair in the database,
-     * we can find the groupId and return it as a string
-     *
-     * @param conversationQualifiedId
-     */
-    getGroupIdFromConversationId(conversationQualifiedId: QualifiedId, subconversationId?: SUBCONVERSATION_ID): Promise<string | undefined>;
     /**
      * If there are pending proposals, we need to either process them,
      * or save them in the database for later processing
@@ -205,7 +196,7 @@ export declare class MLSService extends TypedEventEmitter<Events> {
         clientId: ClientId;
         domain: string;
     }[]>;
-    handleMLSMessageAddEvent(event: ConversationMLSMessageAddEvent): Promise<import("../../../notification").HandledEventPayload | null>;
+    handleMLSMessageAddEvent(event: ConversationMLSMessageAddEvent, groupIdFromConversationId: (conversationId: QualifiedId, subconversationId?: SUBCONVERSATION_ID) => Promise<string | undefined>): Promise<import("../../../notification").HandledEventPayload | null>;
     handleMLSWelcomeMessageEvent(event: ConversationMLSWelcomeEvent, clientId: string): Promise<import("../../../notification").HandledEventPayload>;
     deleteMLSKeyPackages(clientId: ClientId, keyPackagRefs: Uint8Array[]): Promise<void>;
     /**

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

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

@@ -39,7 +39,6 @@ const logdown_1 = __importDefault(require("logdown"));
 const commons_1 = require("@wireapp/commons");
 const core_crypto_1 = require("@wireapp/core-crypto");
 const CoreCryptoMLSError_1 = require("./CoreCryptoMLSError");
-const subconversationGroupIdStore_1 = require("./stores/subconversationGroupIdStore/subconversationGroupIdStore");
 const messageSender_1 = require("../../../conversation/message/messageSender");
 const fullyQualifiedClientIdUtils_1 = require("../../../util/fullyQualifiedClientIdUtils");
 const numberToHex_1 = require("../../../util/numberToHex");
@@ -148,6 +147,12 @@ class MLSService extends commons_1.TypedEventEmitter {
     async initClient(userId, client) {
         const qualifiedClientId = (0, fullyQualifiedClientIdUtils_1.constructFullyQualifiedClientId)(userId.id, client.id, userId.domain);
         await this.coreCryptoClient.mlsInit(this.textEncoder.encode(qualifiedClientId), [this.config.defaultCiphersuite], this.config.nbKeyPackages);
+        await this.coreCryptoClient.registerCallbacks({
+            // All authorization/membership rules are enforced on backend
+            clientIsExistingGroupUser: async () => true,
+            authorize: async () => true,
+            userAuthorize: async () => true,
+        });
         // We need to make sure keypackages and public key are uploaded to the backend
         await this.uploadMLSPublicKeys(client);
         await this.verifyRemoteMLSKeyPackagesAmount(client.id);
@@ -166,14 +171,6 @@ class MLSService extends commons_1.TypedEventEmitter {
         }
         return this.processCommitAction(groupIdBytes, () => this.coreCryptoClient.addClientsToConversation(groupIdBytes, invitee));
     }
-    configureMLSCallbacks(_a) {
-        var { groupIdFromConversationId } = _a, coreCryptoCallbacks = __rest(_a, ["groupIdFromConversationId"]);
-        void this.coreCryptoClient.registerCallbacks(Object.assign(Object.assign({}, coreCryptoCallbacks), { clientIsExistingGroupUser: (_groupId, _client, _otherClients) => {
-                // All authorization/membership rules are enforced on backend
-                return Promise.resolve(true);
-            } }));
-        this.groupIdFromConversationId = groupIdFromConversationId;
-    }
     async getKeyPackagesPayload(qualifiedUsers) {
         /**
          * @note We need to fetch key packages for all the users
@@ -495,19 +492,6 @@ class MLSService extends commons_1.TypedEventEmitter {
         const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
         return this.coreCryptoClient.wipeConversation(groupIdBytes);
     }
-    /**
-     * If there is a matching conversationId => groupId pair in the database,
-     * we can find the groupId and return it as a string
-     *
-     * @param conversationQualifiedId
-     */
-    async getGroupIdFromConversationId(conversationQualifiedId, subconversationId) {
-        var _a;
-        const groupId = subconversationId
-            ? subconversationGroupIdStore_1.subconversationGroupIdStore.getGroupId(conversationQualifiedId, subconversationId)
-            : await ((_a = this.groupIdFromConversationId) === null || _a === void 0 ? void 0 : _a.call(this, conversationQualifiedId));
-        return groupId;
-    }
     /**
      * If there are pending proposals, we need to either process them,
      * or save them in the database for later processing
@@ -592,8 +576,8 @@ class MLSService extends commons_1.TypedEventEmitter {
         });
         return clientIds;
     }
-    async handleMLSMessageAddEvent(event) {
-        return (0, events_1.handleMLSMessageAdd)({ event, mlsService: this });
+    async handleMLSMessageAddEvent(event, groupIdFromConversationId) {
+        return (0, events_1.handleMLSMessageAdd)({ event, mlsService: this, groupIdFromConversationId });
     }
     async handleMLSWelcomeMessageEvent(event, clientId) {
         // Every time we've received a welcome message, it means that our key package was consumed,

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

@@ -46,6 +46,7 @@ const createMLSService = async () => {
         decryptMessage: jest.fn(),
         conversationEpoch: jest.fn(),
         commitPendingProposals: jest.fn(),
+        registerCallbacks: jest.fn(),
     };
     const mockedDb = await (0, CoreDB_1.openDB)('core-test-db');
     const recurringTaskScheduler = new RecurringTaskScheduler_1.RecurringTaskScheduler({
@@ -196,7 +197,7 @@ describe('MLSService', () => {
             const [mlsService, { coreCrypto: mockCoreCrypto }] = await createMLSService();
             const mockGroupId = 'mXOagqRIX/RFd7QyXJA8/Ed8X+hvQgLXIiwYHm3OQFc=';
             const mockedNewEpoch = 3;
-            jest.spyOn(mlsService, 'getGroupIdFromConversationId').mockResolvedValueOnce(mockGroupId);
+            const getGroupIdFromConversationId = () => Promise.resolve(mockGroupId);
             const mockedDecryptoedMessage = {
                 hasEpochChanged: true,
                 isActive: false,
@@ -213,7 +214,7 @@ describe('MLSService', () => {
                 from: '',
                 time: '',
             };
-            await mlsService.handleMLSMessageAddEvent(mockedMLSWelcomeEvent);
+            await mlsService.handleMLSMessageAddEvent(mockedMLSWelcomeEvent, getGroupIdFromConversationId);
             expect(mockCoreCrypto.decryptMessage).toHaveBeenCalled();
             expect(mlsService.emit).toHaveBeenCalledWith('newEpoch', { epoch: mockedNewEpoch, groupId: mockGroupId });
         });
@@ -223,7 +224,7 @@ describe('MLSService', () => {
             const mockGroupId = 'mXOagqRIX/RFd7QyXJA8/Ed8X+hvQgLXIiwYHm3OQFc=';
             const mockedNewEpoch = 3;
             const commitDelay = 1000;
-            jest.spyOn(mlsService, 'getGroupIdFromConversationId').mockResolvedValueOnce(mockGroupId);
+            const getGroupIdFromConversationId = () => Promise.resolve(mockGroupId);
             const mockedDecryptoedMessage = {
                 hasEpochChanged: true,
                 isActive: false,
@@ -241,7 +242,7 @@ describe('MLSService', () => {
                 from: '',
                 time: new Date().toISOString(),
             };
-            await mlsService.handleMLSMessageAddEvent(mockedMLSWelcomeEvent);
+            await mlsService.handleMLSMessageAddEvent(mockedMLSWelcomeEvent, getGroupIdFromConversationId);
             expect(mockCoreCrypto.commitPendingProposals).not.toHaveBeenCalled();
             jest.advanceTimersByTime(commitDelay);
             expect(mockCoreCrypto.decryptMessage).toHaveBeenCalled();

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

@@ -1,5 +1,4 @@
 import { QualifiedId } from '@wireapp/api-client/lib/user';
-import { CoreCryptoCallbacks } from '@wireapp/core-crypto';
 import { MLSServiceConfig } from './MLSService/MLSService.types';
 export type ClientId = string;
 export type SecretCrypto = {
@@ -11,12 +10,12 @@ export type SecretCrypto = {
     decrypt: (payload: Uint8Array) => Promise<string>;
     version: 1;
 };
-export interface MLSCallbacks extends Pick<CoreCryptoCallbacks, 'authorize' | 'userAuthorize'> {
+export interface CoreCallbacks {
     /**
      * Should return a groupId corresponding to the conversation ID given
      * Used for the core to know what core-crypto conversation we are dealing with when receiving events
      * @param conversationId
-     * @returns the bytes of the groupId corresponding to the conversation ID
+     * @returns the groupId corresponding to the conversation ID
      */
     groupIdFromConversationId: (conversationId: QualifiedId) => Promise<string | undefined>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/messagingProtocols/mls/types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,mBAAmB,EAAC,MAAM,sBAAsB,CAAC;AAEzD,OAAO,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAE/D,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC;AAE9B,MAAM,MAAM,YAAY,GACpB;IACE,OAAO,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACpD,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACtD,OAAO,EAAE,SAAS,CAAC;CACpB,GACD;IACE,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAChD,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAClD,OAAO,EAAE,CAAC,CAAC;CACZ,CAAC;AAEN,MAAM,WAAW,YAAa,SAAQ,IAAI,CAAC,mBAAmB,EAAE,WAAW,GAAG,eAAe,CAAC;IAC5F;;;;;OAKG;IACH,yBAAyB,EAAE,CAAC,cAAc,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACzF;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,SAAS,CAAC;AAEd,MAAM,MAAM,4BAA4B,GAAG;IACzC,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG,SAAS,CAAC;AAEd,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;OAIG;IACH,qBAAqB,EAAE,MAAM,CAAC;IAE9B,uEAAuE;IACvE,GAAG,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEhC,oKAAoK;IACpK,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/messagingProtocols/mls/types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AAE/D,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC;AAE9B,MAAM,MAAM,YAAY,GACpB;IACE,OAAO,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACpD,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACtD,OAAO,EAAE,SAAS,CAAC;CACpB,GACD;IACE,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IAChD,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAClD,OAAO,EAAE,CAAC,CAAC;CACZ,CAAC;AAEN,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,yBAAyB,EAAE,CAAC,cAAc,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACzF;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,SAAS,CAAC;AAEd,MAAM,MAAM,4BAA4B,GAAG;IACzC,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,GAAG,SAAS,CAAC;AAEd,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;OAIG;IACH,qBAAqB,EAAE,MAAM,CAAC;IAE9B,uEAAuE;IACvE,GAAG,CAAC,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEhC,oKAAoK;IACpK,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB"}