@wireapp/core 40.5.3-draft-20-cc.3 → 40.5.3-draft-20-cc-1.3

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

@@ -1,11 +1,11 @@
-import { PostMlsMessageResponse } from '@wireapp/api-client/lib/conversation';
+import { PostMlsMessageResponse, SUBCONVERSATION_ID } from '@wireapp/api-client/lib/conversation';
 import { Subconversation } from '@wireapp/api-client/lib/conversation/Subconversation';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import logdown from 'logdown';
 import { APIClient } from '@wireapp/api-client';
-import { AddProposalArgs, ConversationId, CoreCrypto, DecryptedMessage, ExternalProposalArgs, ExternalProposalType, ExternalRemoveProposalArgs, Invitee, ProposalArgs, ProposalType, RemoveProposalArgs } from '@wireapp/core-crypto';
+import { AddProposalArgs, ConversationId, CoreCrypto, DecryptedMessage, ExternalAddProposalArgs, ExternalProposalType, Invitee, ProposalArgs, ProposalType, RemoveProposalArgs } from '@wireapp/core-crypto';
 import { MLSServiceConfig } from './MLSService.types';
-import { QualifiedUsers } from '../../../conversation';
+import { KeyPackageClaimUser } from '../../../conversation';
 import { TypedEventEmitter } from '../../../util/TypedEventEmitter';
 import { EventHandlerResult } from '../../common.types';
 import { EventHandlerParams } from '../EventHandler';
@@ -30,19 +30,26 @@ export declare class MLSService extends TypedEventEmitter<Events> {
     groupIdFromConversationId?: MLSCallbacks['groupIdFromConversationId'];
     private readonly textEncoder;
     private readonly textDecoder;
+    private readonly defaultCiphersuite;
     constructor(apiClient: APIClient, coreCryptoClient: CoreCrypto, { keyingMaterialUpdateThreshold, nbKeyPackages, }: Partial<MLSServiceConfig>);
     initClient(userId: QualifiedId, clientId: string): Promise<void>;
     createClient(userId: QualifiedId, clientId: string): Promise<void>;
     private uploadCommitBundle;
-    addUsersToExistingConversation(groupId: Uint8Array, invitee: Invitee[]): Promise<PostMlsMessageResponse | null>;
+    addUsersToExistingConversation(groupId: Uint8Array, invitee: Invitee[]): Promise<PostMlsMessageResponse | null> | null;
     configureMLSCallbacks({ groupIdFromConversationId, ...coreCryptoCallbacks }: MLSCallbacks): void;
-    getKeyPackagesPayload(qualifiedUsers: QualifiedUsers[]): Promise<Invitee[]>;
+    getKeyPackagesPayload(qualifiedUsers: KeyPackageClaimUser[]): Promise<Invitee[]>;
     getEpoch(groupId: string | Uint8Array): Promise<number>;
     newProposal(proposalType: ProposalType, args: ProposalArgs | AddProposalArgs | RemoveProposalArgs): Promise<import("@wireapp/core-crypto").ProposalBundle>;
     joinByExternalCommit(getGroupInfo: () => Promise<Uint8Array>): Promise<PostMlsMessageResponse | null>;
     getConferenceSubconversation(conversationId: QualifiedId): Promise<Subconversation>;
     private deleteConferenceSubconversation;
+    /**
+     * Will leave conference subconversation if it's known by client and established.
+     *
+     * @param conversationId Id of the parent conversation which subconversation we want to leave
+     */
     leaveConferenceSubconversation(conversationId: QualifiedId): Promise<void>;
+    leaveStaleConferenceSubconversations(): Promise<void>;
     /**
      * Will join or register an mls subconversation for conference calls.
      * Will return the secret key derived from the subconversation
@@ -54,7 +61,7 @@ export declare class MLSService extends TypedEventEmitter<Events> {
         epoch: number;
     }>;
     exportSecretKey(groupId: string, keyLength: number): Promise<string>;
-    newExternalProposal(externalProposalType: ExternalProposalType, args: ExternalProposalArgs | ExternalRemoveProposalArgs): Promise<Uint8Array>;
+    newExternalProposal(externalProposalType: ExternalProposalType, args: ExternalAddProposalArgs): Promise<Uint8Array>;
     processWelcomeMessage(welcomeMessage: Uint8Array): Promise<ConversationId>;
     decryptMessage(conversationId: ConversationId, payload: Uint8Array): Promise<DecryptedMessage>;
     encryptMessage(conversationId: ConversationId, message: Uint8Array): Promise<Uint8Array>;
@@ -102,6 +109,11 @@ export declare class MLSService extends TypedEventEmitter<Events> {
      * @param groupId The group that should have its key material updated
      */
     resetKeyMaterialRenewal(groupId: string): void;
+    /**
+     * Will cancel the renewal of the key material for a given groupId
+     * @param groupId The group that should stop having its key material updated
+     */
+    cancelKeyMaterialRenewal(groupId: string): void;
     /**
      * Will schedule a task to update the key material of the conversation according to the threshold given as config
      * @param groupId
@@ -111,7 +123,7 @@ export declare class MLSService extends TypedEventEmitter<Events> {
      * Get all keying material last update dates and schedule tasks for renewal
      * Function must only be called once, after application start
      */
-    checkForKeyMaterialsUpdate(): void;
+    schedulePeriodicKeyMaterialRenewals(groupIds: string[]): void;
     /**
      * Get date of last key packages count query and schedule a task to sync it with backend
      * Function must only be called once, after application start
@@ -134,7 +146,7 @@ export declare class MLSService extends TypedEventEmitter<Events> {
      *
      * @param conversationQualifiedId
      */
-    getGroupIdFromConversationId(conversationQualifiedId: QualifiedId, subconversationId?: string): Promise<string>;
+    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

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,10 +39,9 @@ const axios_1 = __importDefault(require("axios"));
 const bazinga64_1 = require("bazinga64");
 const logdown_1 = __importDefault(require("logdown"));
 const commons_1 = require("@wireapp/commons");
-const commitBundleUtil_1 = require("./commitBundleUtil");
-const keyMaterialUpdatesStore_1 = require("./stores/keyMaterialUpdatesStore");
+const core_crypto_1 = require("@wireapp/core-crypto");
 const pendingProposalsStore_1 = require("./stores/pendingProposalsStore");
-const subconversationGroupIdMapper_1 = require("./subconversationGroupIdMapper");
+const subconversationGroupIdStore_1 = require("./stores/subconversationGroupIdStore/subconversationGroupIdStore");
 const messageSender_1 = require("../../../conversation/message/messageSender");
 const fullyQualifiedClientIdUtils_1 = require("../../../util/fullyQualifiedClientIdUtils");
 const RecurringTaskScheduler_1 = require("../../../util/RecurringTaskScheduler");
@@ -67,6 +66,7 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
         this.logger = (0, logdown_1.default)('@wireapp/core/MLSService');
         this.textEncoder = new TextEncoder();
         this.textDecoder = new TextDecoder();
+        this.defaultCiphersuite = core_crypto_1.Ciphersuite.MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519;
         this.config = {
             keyingMaterialUpdateThreshold,
             nbKeyPackages,
@@ -74,20 +74,21 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
     }
     async initClient(userId, clientId) {
         const qualifiedClientId = (0, fullyQualifiedClientIdUtils_1.constructFullyQualifiedClientId)(userId.id, clientId, userId.domain);
-        await this.coreCryptoClient.mlsInit(this.textEncoder.encode(qualifiedClientId));
+        await this.coreCryptoClient.mlsInit(this.textEncoder.encode(qualifiedClientId), [this.defaultCiphersuite]);
     }
     async createClient(userId, clientId) {
         await this.initClient(userId, clientId);
         // If the device is new, we need to upload keypackages and public key to the backend
-        const publicKey = await this.coreCryptoClient.clientPublicKey();
-        const keyPackages = await this.coreCryptoClient.clientKeypackages(this.config.nbKeyPackages);
+        const publicKey = await this.coreCryptoClient.clientPublicKey(this.defaultCiphersuite);
+        const keyPackages = await this.coreCryptoClient.clientKeypackages(this.defaultCiphersuite, this.config.nbKeyPackages);
         await this.uploadMLSPublicKeys(publicKey, clientId);
         await this.uploadMLSKeyPackages(keyPackages, clientId);
     }
     async uploadCommitBundle(groupId, commitBundle, { regenerateCommitBundle, isExternalCommit } = {}) {
-        const bundlePayload = (0, commitBundleUtil_1.toProtobufCommitBundle)(commitBundle);
+        const { commit, groupInfo, welcome } = commitBundle;
+        const bundlePayload = new Uint8Array([...commit, ...groupInfo.payload, ...(welcome || [])]);
         try {
-            const response = await this.apiClient.api.conversation.postMlsCommitBundle(bundlePayload.slice());
+            const response = await this.apiClient.api.conversation.postMlsCommitBundle(bundlePayload);
             if (isExternalCommit) {
                 await this.coreCryptoClient.mergePendingGroupFromExternalCommit(groupId);
             }
@@ -119,16 +120,18 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
         return null;
     }
     addUsersToExistingConversation(groupId, invitee) {
+        if (invitee.length < 1) {
+            // providing an empty invitee list to addClientsToConversation method would make core-crypto throw an error
+            // we want to skip adding clinets in this case
+            return null;
+        }
         return this.processCommitAction(groupId, () => this.coreCryptoClient.addClientsToConversation(groupId, invitee));
     }
     configureMLSCallbacks(_a) {
         var { groupIdFromConversationId } = _a, coreCryptoCallbacks = __rest(_a, ["groupIdFromConversationId"]);
-        void this.coreCryptoClient.registerCallbacks(Object.assign(Object.assign({}, coreCryptoCallbacks), { clientIsExistingGroupUser: (_groupId, client, otherClients) => {
-                const { user } = (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(this.textDecoder.decode(client));
-                return Promise.resolve(otherClients.some(client => {
-                    const { user: otherUser } = (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(this.textDecoder.decode(client));
-                    return otherUser.toLowerCase() === user.toLowerCase();
-                }));
+        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;
     }
@@ -138,9 +141,7 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
          * we want to add to the new MLS conversations,
          * includes self user too.
          */
-        const keyPackages = await Promise.all([
-            ...qualifiedUsers.map(({ id, domain, skipOwn }) => this.apiClient.api.client.claimMLSKeyPackages(id, domain, skipOwn)),
-        ]);
+        const keyPackages = await Promise.all(qualifiedUsers.map(({ id, domain, skipOwnClientId }) => this.apiClient.api.client.claimMLSKeyPackages(id, domain, skipOwnClientId)));
         const coreCryptoKeyPackagesPayload = keyPackages.reduce((previousValue, currentValue) => {
             // skip users that have not uploaded their MLS key packages
             if (currentValue.key_packages.length > 0) {
@@ -166,14 +167,20 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
     async joinByExternalCommit(getGroupInfo) {
         const generateCommit = async () => {
             const groupInfo = await getGroupInfo();
-            const _a = await this.coreCryptoClient.joinByExternalCommit(groupInfo), { conversationId } = _a, commitBundle = __rest(_a, ["conversationId"]);
+            const _a = await this.coreCryptoClient.joinByExternalCommit(groupInfo, core_crypto_1.CredentialType.Basic), { conversationId } = _a, commitBundle = __rest(_a, ["conversationId"]);
             return { groupId: conversationId, commitBundle };
         };
         const { commitBundle, groupId } = await generateCommit();
-        return this.uploadCommitBundle(groupId, commitBundle, {
+        const mlsResponse = await this.uploadCommitBundle(groupId, commitBundle, {
             isExternalCommit: true,
             regenerateCommitBundle: async () => (await generateCommit()).commitBundle,
         });
+        if (mlsResponse) {
+            //after we've successfully joined via external commit, we schedule periodic key material renewal
+            const groupIdStr = bazinga64_1.Encoder.toBase64(groupId).asString;
+            this.scheduleKeyMaterialRenewal(groupIdStr);
+        }
+        return mlsResponse;
     }
     async getConferenceSubconversation(conversationId) {
         return this.apiClient.api.conversation.getSubconversation(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
@@ -181,14 +188,36 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
     async deleteConferenceSubconversation(conversationId, data) {
         return this.apiClient.api.conversation.deleteSubconversation(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, data);
     }
+    /**
+     * Will leave conference subconversation if it's known by client and established.
+     *
+     * @param conversationId Id of the parent conversation which subconversation we want to leave
+     */
     async leaveConferenceSubconversation(conversationId) {
-        const subconversationGroupId = await this.getGroupIdFromConversationId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+        const subconversationGroupId = subconversationGroupIdStore_1.subconversationGroupIdStore.getGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+        if (!subconversationGroupId) {
+            return;
+        }
         const isSubconversationEstablished = await this.conversationExists(subconversationGroupId);
         if (!isSubconversationEstablished) {
-            return;
+            // if the subconversation was known by a client but is not established anymore, we can remove it from the store
+            return subconversationGroupIdStore_1.subconversationGroupIdStore.removeGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+        }
+        try {
+            await this.apiClient.api.conversation.deleteSubconversationSelf(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+        }
+        catch (error) {
+            this.logger.error(`Failed to leave conference subconversation:`, error);
+        }
+        await this.wipeConversation(subconversationGroupId);
+        // once we've left the subconversation, we can remove it from the store
+        subconversationGroupIdStore_1.subconversationGroupIdStore.removeGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+    }
+    async leaveStaleConferenceSubconversations() {
+        const conversationIds = subconversationGroupIdStore_1.subconversationGroupIdStore.getAllGroupIdsBySubconversationId(conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+        for (const { parentConversationId } of conversationIds) {
+            await this.leaveConferenceSubconversation(parentConversationId);
         }
-        await this.apiClient.api.conversation.deleteSubconversationSelf(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
-        return this.wipeConversation(subconversationGroupId);
     }
     /**
      * Will join or register an mls subconversation for conference calls.
@@ -218,7 +247,7 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
         }
         const epoch = Number(await this.getEpoch(subconversation.group_id));
         // We store the mapping between the subconversation and the parent conversation
-        (0, subconversationGroupIdMapper_1.storeSubconversationGroupId)(conversationId, subconversation.subconv_id, subconversation.group_id);
+        subconversationGroupIdStore_1.subconversationGroupIdStore.storeGroupId(conversationId, subconversation.subconv_id, subconversation.group_id);
         return { groupId: subconversation.group_id, epoch };
     }
     async exportSecretKey(groupId, keyLength) {
@@ -270,16 +299,16 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
         const mlsKeyBytes = Object.values(mlsKeys).map((key) => bazinga64_1.Decoder.fromBase64(key).asBytes);
         const configuration = {
             externalSenders: mlsKeyBytes,
-            ciphersuite: 1, // TODO: Use the correct ciphersuite enum.
+            ciphersuite: this.defaultCiphersuite,
         };
-        await this.coreCryptoClient.createConversation(groupIdBytes, configuration);
+        await this.coreCryptoClient.createConversation(groupIdBytes, core_crypto_1.CredentialType.Basic, configuration);
         const keyPackages = await this.getKeyPackagesPayload(users.map(user => {
             if (user.id === (creator === null || creator === void 0 ? void 0 : creator.user.id)) {
                 /**
                  * we should skip fetching key packages for current self client,
                  * it's already added by the backend on the group creation time
                  */
-                return Object.assign(Object.assign({}, creator.user), { skipOwn: creator.client });
+                return Object.assign(Object.assign({}, creator.user), { skipOwnClientId: creator.client });
             }
             return user;
         }));
@@ -287,7 +316,7 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
             ? await this.addUsersToExistingConversation(groupIdBytes, keyPackages)
             : // If there are no clients to add, just update the keying material
                 await this.processCommitAction(groupIdBytes, () => this.coreCryptoClient.updateKeyingMaterial(groupIdBytes));
-        // We schedule a key material renewal
+        // We schedule a periodic key material renewal
         this.scheduleKeyMaterialRenewal(groupId);
         return response;
     }
@@ -309,10 +338,10 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
         return this.coreCryptoClient.conversationExists(groupIdBytes);
     }
     async clientValidKeypackagesCount() {
-        return this.coreCryptoClient.clientValidKeypackagesCount();
+        return this.coreCryptoClient.clientValidKeypackagesCount(this.defaultCiphersuite);
     }
     async clientKeypackages(amountRequested) {
-        return this.coreCryptoClient.clientKeypackages(amountRequested);
+        return this.coreCryptoClient.clientKeypackages(this.defaultCiphersuite, amountRequested);
     }
     /**
      * Renew key material for a given groupId
@@ -323,7 +352,7 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
         try {
             const groupConversationExists = await this.conversationExists(groupId);
             if (!groupConversationExists) {
-                keyMaterialUpdatesStore_1.keyMaterialUpdatesStore.deleteLastKeyMaterialUpdateDate({ groupId });
+                this.cancelKeyMaterialRenewal(groupId);
                 return;
             }
             const groupIdDecodedFromBase64 = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
@@ -341,9 +370,16 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
      * @param groupId The group that should have its key material updated
      */
     resetKeyMaterialRenewal(groupId) {
-        (0, RecurringTaskScheduler_1.cancelRecurringTask)(this.createKeyMaterialUpdateTaskSchedulerId(groupId));
+        this.cancelKeyMaterialRenewal(groupId);
         this.scheduleKeyMaterialRenewal(groupId);
     }
+    /**
+     * Will cancel the renewal of the key material for a given groupId
+     * @param groupId The group that should stop having its key material updated
+     */
+    cancelKeyMaterialRenewal(groupId) {
+        return (0, RecurringTaskScheduler_1.cancelRecurringTask)(this.createKeyMaterialUpdateTaskSchedulerId(groupId));
+    }
     /**
      * Will schedule a task to update the key material of the conversation according to the threshold given as config
      * @param groupId
@@ -360,10 +396,9 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
      * Get all keying material last update dates and schedule tasks for renewal
      * Function must only be called once, after application start
      */
-    checkForKeyMaterialsUpdate() {
+    schedulePeriodicKeyMaterialRenewals(groupIds) {
         try {
-            const keyMaterialUpdateDates = keyMaterialUpdatesStore_1.keyMaterialUpdatesStore.getAllUpdateDates();
-            keyMaterialUpdateDates.forEach(({ groupId }) => this.scheduleKeyMaterialRenewal(groupId));
+            groupIds.forEach(groupId => this.scheduleKeyMaterialRenewal(groupId));
         }
         catch (error) {
             this.logger.error('Could not get last key material update dates', error);
@@ -409,11 +444,21 @@ 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) {
+            //if the mls group does not exist, we don't need to wipe it
+            return;
+        }
+        this.cancelKeyMaterialRenewal(groupId);
         const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
         return this.coreCryptoClient.wipeConversation(groupIdBytes);
     }
     async handleEvent(params) {
         return (0, EventHandler_1.handleBackendEvent)(Object.assign(Object.assign({}, params), { mlsService: this }), async (groupId) => {
+            const conversationExists = await this.conversationExists(groupId);
+            if (!conversationExists) {
+                return;
+            }
             const newEpoch = await this.getEpoch(groupId);
             this.emit('newEpoch', { groupId, epoch: newEpoch });
         });
@@ -426,13 +471,9 @@ class MLSService extends TypedEventEmitter_1.TypedEventEmitter {
      */
     async getGroupIdFromConversationId(conversationQualifiedId, subconversationId) {
         var _a;
-        const { id: conversationId, domain: conversationDomain } = conversationQualifiedId;
         const groupId = subconversationId
-            ? (0, subconversationGroupIdMapper_1.getGroupId)(conversationQualifiedId, subconversationId)
+            ? subconversationGroupIdStore_1.subconversationGroupIdStore.getGroupId(conversationQualifiedId, subconversationId)
             : await ((_a = this.groupIdFromConversationId) === null || _a === void 0 ? void 0 : _a.call(this, conversationQualifiedId));
-        if (!groupId) {
-            throw new Error(`Could not find a group_id for conversation ${conversationId}@${conversationDomain}`);
-        }
         return groupId;
     }
     /**

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

@@ -29,6 +29,8 @@ describe('MLSService', () => {
     const apiClient = new api_client_1.APIClient();
     const mockCoreCrypto = {
         createConversation: jest.fn(),
+        conversationExists: jest.fn(),
+        wipeConversation: jest.fn(),
     };
     describe('registerConversation', () => {
         let mlsService;
@@ -40,6 +42,7 @@ describe('MLSService', () => {
             jest.spyOn(apiClient.api.client, 'claimMLSKeyPackages').mockResolvedValue({ key_packages: [] });
             jest.spyOn(mlsService, 'scheduleKeyMaterialRenewal').mockImplementation();
             jest.spyOn(mlsService, 'processCommitAction').mockImplementation();
+            jest.spyOn(mlsService, 'cancelKeyMaterialRenewal').mockImplementation();
         });
         it('creates a new mls conversation and avoid adding the selfUser', async () => {
             const groupId = 'mXOagqRIX/RFd7QyXJA8/Ed8X+hvQgLXIiwYHm3OQFc=';
@@ -56,5 +59,11 @@ describe('MLSService', () => {
             await mlsService.registerConversation(groupId, [createUserId(), createUserId()]);
             expect(mlsService.scheduleKeyMaterialRenewal).toHaveBeenCalledWith(groupId);
         });
+        it('cancels key material timers after group is wiped', async () => {
+            const groupId = 'mXOagqRIX/RFd7QyXJA8/Ed8X+hvQgLXIiwYHm4OQFc=';
+            jest.spyOn(mockCoreCrypto, 'conversationExists').mockResolvedValueOnce(true);
+            await mlsService.wipeConversation(groupId);
+            expect(mlsService.cancelKeyMaterialRenewal).toHaveBeenCalledWith(groupId);
+        });
     });
 });

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

@@ -4,5 +4,5 @@ import { CommitBundle } from '@wireapp/core-crypto';
  * @param commitBundle a commit bundle generated by coreCrypto
  * @returns
  */
-export declare function toProtobufCommitBundle({ commit, welcome, publicGroupState }: CommitBundle): Uint8Array;
+export declare function toProtobufCommitBundle({ commit, welcome, groupInfo }: CommitBundle): Uint8Array;
 //# sourceMappingURL=commitBundleUtil.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"commitBundleUtil.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/commitBundleUtil.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,YAAY,EAAkD,MAAM,sBAAsB,CAAC;AAYnG;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,EAAC,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAC,EAAE,YAAY,GAAG,UAAU,CAWpG"}
+{"version":3,"file":"commitBundleUtil.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/commitBundleUtil.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,YAAY,EAA2C,MAAM,sBAAsB,CAAC;AAY5F;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,EAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAC,EAAE,YAAY,GAAG,UAAU,CAW7F"}

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

@@ -27,20 +27,20 @@ const ratchetTreeMapping = {
     [core_crypto_1.RatchetTreeType.Delta]: mls_1.mls.RatchetTreeType.DELTA,
 };
 const groupInfoType = {
-    [core_crypto_1.PublicGroupStateEncryptionType.Plaintext]: mls_1.mls.GroupInfoType.PUBLIC_GROUP_STATE,
-    [core_crypto_1.PublicGroupStateEncryptionType.JweEncrypted]: mls_1.mls.GroupInfoType.GROUP_INFO_JWE,
+    [core_crypto_1.GroupInfoEncryptionType.Plaintext]: mls_1.mls.GroupInfoType.PUBLIC_GROUP_STATE,
+    [core_crypto_1.GroupInfoEncryptionType.JweEncrypted]: mls_1.mls.GroupInfoType.GROUP_INFO_JWE,
 };
 /**
  * Will convert a coreCrypto commit bundle into a Uint8Array representing a protobuf object
  * @param commitBundle a commit bundle generated by coreCrypto
  * @returns
  */
-function toProtobufCommitBundle({ commit, welcome, publicGroupState }) {
-    const { ratchetTreeType, encryptionType } = publicGroupState;
+function toProtobufCommitBundle({ commit, welcome, groupInfo }) {
+    const { ratchetTreeType, encryptionType } = groupInfo;
     return mls_1.mls.CommitBundle.encode({
         groupInfoBundle: {
             ratchetTreeType: ratchetTreeMapping[ratchetTreeType],
-            groupInfo: publicGroupState.payload,
+            groupInfo: groupInfo.payload,
             groupInfoType: groupInfoType[encryptionType],
         },
         commit,

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

@@ -27,17 +27,17 @@ describe('toProtobufCommitBundle', () => {
         const payload = {
             commit: Uint8Array.from([0]),
             welcome: Uint8Array.from([1]),
-            publicGroupState: {
+            groupInfo: {
                 ratchetTreeType: core_crypto_1.RatchetTreeType.Full,
                 payload: Uint8Array.from([2]),
-                encryptionType: core_crypto_1.PublicGroupStateEncryptionType.Plaintext,
+                encryptionType: core_crypto_1.GroupInfoEncryptionType.Plaintext,
             },
         };
         const result = (0, commitBundleUtil_1.toProtobufCommitBundle)(payload);
         const { commit, welcome, groupInfoBundle } = mls_1.mls.CommitBundle.decode(result);
         expect(bazinga64_1.Encoder.toBase64(commit)).toEqual(bazinga64_1.Encoder.toBase64(payload.commit));
         expect(bazinga64_1.Encoder.toBase64(welcome)).toEqual(bazinga64_1.Encoder.toBase64(payload.welcome));
-        expect(bazinga64_1.Encoder.toBase64(groupInfoBundle.groupInfo)).toEqual(bazinga64_1.Encoder.toBase64(payload.publicGroupState.payload));
+        expect(bazinga64_1.Encoder.toBase64(groupInfoBundle.groupInfo)).toEqual(bazinga64_1.Encoder.toBase64(payload.groupInfo.payload));
         expect(groupInfoBundle.ratchetTreeType).toEqual(mls_1.mls.RatchetTreeType.FULL);
         expect(groupInfoBundle.groupInfoType).toEqual(mls_1.mls.GroupInfoType.PUBLIC_GROUP_STATE);
     });

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

@@ -0,0 +1,13 @@
+import { SUBCONVERSATION_ID } from '@wireapp/api-client/lib/conversation';
+import { QualifiedId } from '@wireapp/api-client/lib/user';
+export declare const subconversationGroupIdStore: {
+    storeGroupId: (parentConversationId: QualifiedId, subconversationId: SUBCONVERSATION_ID, subconversationGroupId: string) => void;
+    getGroupId: (parentConversationId: QualifiedId, subconversationId: SUBCONVERSATION_ID) => string | undefined;
+    removeGroupId: (parentConversationId: QualifiedId, subconversationId: SUBCONVERSATION_ID) => void;
+    getAllGroupIdsBySubconversationId: (subconversationIdQuery: SUBCONVERSATION_ID) => {
+        subconversationGroupId: string;
+        parentConversationId: QualifiedId;
+        subconversationId: SUBCONVERSATION_ID;
+    }[];
+};
+//# sourceMappingURL=subconversationGroupIdStore.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"subconversationGroupIdStore.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/MLSService/stores/subconversationGroupIdStore/subconversationGroupIdStore.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,kBAAkB,EAAC,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAgEzD,eAAO,MAAM,2BAA2B;yCA3BhB,WAAW,qBACd,kBAAkB,0BACb,MAAM;uCAMU,WAAW,qBAAqB,kBAAkB;0CAc/C,WAAW,qBAAqB,kBAAkB;gEAT5B,kBAAkB;;8BArC3D,WAAW;2BAAqB,kBAAkB;;CAwD3E,CAAC"}

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

@@ -0,0 +1,67 @@
+"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.subconversationGroupIdStore = void 0;
+const storageKey = 'subconversationGroupIdStore';
+const generateSubconversationStoreKey = (parentConversationId, subconversationId) => {
+    return `${parentConversationId.id}@${parentConversationId.domain}:${subconversationId}`;
+};
+const parseSubconversationStoreKey = (subconversationStoreKey) => {
+    const [parentConversationId, subconversationId] = subconversationStoreKey.split(':');
+    const [id, domain] = parentConversationId.split('@');
+    return { parentConversationId: { domain, id }, subconversationId };
+};
+const getCurrentMap = () => {
+    const storedEntry = localStorage.getItem(storageKey);
+    return storedEntry ? new Map(JSON.parse(storedEntry)) : new Map();
+};
+const addItemToMap = (subconversationId, subgroupId) => {
+    const currentMap = getCurrentMap();
+    currentMap.set(subconversationId, subgroupId);
+    localStorage.setItem(storageKey, JSON.stringify(Array.from(currentMap.entries())));
+};
+const removeItemFromMap = (subconversationId) => {
+    const currentMap = getCurrentMap();
+    currentMap.delete(subconversationId);
+    localStorage.setItem(storageKey, JSON.stringify(Array.from(currentMap.entries())));
+};
+const storeGroupId = (parentConversationId, subconversationId, subconversationGroupId) => {
+    const subconversationStoreKey = generateSubconversationStoreKey(parentConversationId, subconversationId);
+    addItemToMap(subconversationStoreKey, subconversationGroupId);
+};
+const getGroupId = (parentConversationId, subconversationId) => {
+    const subconversationStoreKey = generateSubconversationStoreKey(parentConversationId, subconversationId);
+    return getCurrentMap().get(subconversationStoreKey);
+};
+const getAllGroupIdsBySubconversationId = (subconversationIdQuery) => {
+    return Array.from(getCurrentMap().entries())
+        .map(([subconversationId, subconversationGroupId]) => (Object.assign(Object.assign({}, parseSubconversationStoreKey(subconversationId)), { subconversationGroupId })))
+        .filter(({ subconversationId }) => subconversationId === subconversationIdQuery);
+};
+const removeGroupId = (parentConversationId, subconversationId) => {
+    const subconversationStoreKey = generateSubconversationStoreKey(parentConversationId, subconversationId);
+    return removeItemFromMap(subconversationStoreKey);
+};
+exports.subconversationGroupIdStore = {
+    storeGroupId,
+    getGroupId,
+    removeGroupId,
+    getAllGroupIdsBySubconversationId,
+};

package/lib/messagingProtocols/mls/MLSService/stores/subconversationGroupIdStore/subconversationGroupIdStore.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=subconversationGroupIdStore.test.d.ts.map

package/lib/messagingProtocols/mls/MLSService/stores/subconversationGroupIdStore/subconversationGroupIdStore.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subconversationGroupIdStore.test.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/MLSService/stores/subconversationGroupIdStore/subconversationGroupIdStore.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,72 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2018 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 });
+const conversation_1 = require("@wireapp/api-client/lib/conversation");
+const subconversationGroupIdStore_1 = require("./subconversationGroupIdStore");
+describe('subconversationGroupIdMapper', () => {
+    it('returns empty groupId if conversation is not known', () => {
+        const groupId = subconversationGroupIdStore_1.subconversationGroupIdStore.getGroupId({ domain: 'example.com', id: '123' }, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+        expect(groupId).toBeUndefined();
+    });
+    it('returns the stored groupId', () => {
+        const conversationId = { domain: 'example.com', id: '123' };
+        const subconversation = conversation_1.SUBCONVERSATION_ID.CONFERENCE;
+        const groupId = 'groupID';
+        subconversationGroupIdStore_1.subconversationGroupIdStore.storeGroupId(conversationId, subconversation, groupId);
+        const result = subconversationGroupIdStore_1.subconversationGroupIdStore.getGroupId(conversationId, subconversation);
+        expect(result).toBe(groupId);
+    });
+    it('removes groupId from the store', () => {
+        const conversationId = { domain: 'example.com', id: '123' };
+        const subconversation = conversation_1.SUBCONVERSATION_ID.CONFERENCE;
+        const groupId = 'groupID';
+        subconversationGroupIdStore_1.subconversationGroupIdStore.storeGroupId(conversationId, subconversation, groupId);
+        expect(subconversationGroupIdStore_1.subconversationGroupIdStore.getGroupId(conversationId, subconversation)).toEqual(groupId);
+        subconversationGroupIdStore_1.subconversationGroupIdStore.removeGroupId(conversationId, subconversation);
+        expect(subconversationGroupIdStore_1.subconversationGroupIdStore.getGroupId(conversationId, subconversation)).toBeUndefined();
+    });
+    it('retrieves all entries from the store by subconversation id', () => {
+        const conversationId = { domain: 'example.com', id: '123' };
+        const subconversation = conversation_1.SUBCONVERSATION_ID.CONFERENCE;
+        const groupId = 'groupID';
+        const conversationId2 = { domain: 'example2.com', id: '1234' };
+        const subconversation2 = conversation_1.SUBCONVERSATION_ID.CONFERENCE;
+        const groupId2 = 'groupID2';
+        const conversationId3 = { domain: 'example3.com', id: '12345' };
+        const subconversation3 = 'none';
+        const groupId3 = 'groupID3';
+        subconversationGroupIdStore_1.subconversationGroupIdStore.storeGroupId(conversationId, subconversation, groupId);
+        subconversationGroupIdStore_1.subconversationGroupIdStore.storeGroupId(conversationId2, subconversation2, groupId2);
+        subconversationGroupIdStore_1.subconversationGroupIdStore.storeGroupId(conversationId3, subconversation3, groupId3);
+        const result = subconversationGroupIdStore_1.subconversationGroupIdStore.getAllGroupIdsBySubconversationId(conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+        expect(result).toEqual([
+            {
+                parentConversationId: conversationId,
+                subconversationId: subconversation,
+                subconversationGroupId: groupId,
+            },
+            {
+                parentConversationId: conversationId2,
+                subconversationId: subconversation2,
+                subconversationGroupId: groupId2,
+            },
+        ]);
+    });
+});