@wireapp/core 44.0.7 → 44.0.9

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

@@ -96,7 +96,7 @@ class ConversationService extends commons_1.TypedEventEmitter {
             // 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);
+                await this.mlsService.registerConversation(groupId, [otherUserId, selfUser.user], { creator: selfUser });
                 this.logger.info(`Conversation (id ${mlsConversation.qualified_id.id}) established successfully.`);
                 return this.getMLS1to1Conversation(otherUserId);
             }
@@ -248,8 +248,10 @@ class ConversationService extends commons_1.TypedEventEmitter {
             throw new Error('No group_id found in response which is required for creating MLS conversations.');
         }
         const response = await this.mlsService.registerConversation(groupId, qualifiedUsers.concat(selfUserId), {
-            user: selfUserId,
-            client: selfClientId,
+            creator: {
+                user: selfUserId,
+                client: selfClientId,
+            },
         });
         // We fetch the fresh version of the conversation created on backend with the newly added users
         const conversation = await this.apiClient.api.conversation.getConversation(qualifiedId);
@@ -374,7 +376,7 @@ class ConversationService extends commons_1.TypedEventEmitter {
      * Handles epoch mismatch in a subconversation.
      * @param subconversation - subconversation
      */
-    async handleSubconversationEpochMismatch(subconversation) {
+    async handleSubconversationEpochMismatch(subconversation, parentGroupId) {
         const { parent_qualified_id: parentConversationId, group_id: groupId, epoch, subconv_id: subconversationId, } = subconversation;
         if (await this.hasEpochMismatch(groupId, epoch)) {
             this.logger.log(`Subconversation "${subconversationId}" (parent id: ${parentConversationId.id}) was not established or its epoch number was out of date, joining via external commit`);
@@ -383,7 +385,7 @@ class ConversationService extends commons_1.TypedEventEmitter {
                 throw new Error('Unexpected subconversation id');
             }
             try {
-                await this.subconversationService.joinConferenceSubconversation(parentConversationId);
+                await this.subconversationService.joinConferenceSubconversation(parentConversationId, parentGroupId);
             }
             catch (error) {
                 const message = `There was an error while handling epoch mismatch in MLS subconversation (id: ${parentConversationId.id}, subconv: ${subconversationId}):`;
@@ -482,8 +484,12 @@ class ConversationService extends commons_1.TypedEventEmitter {
     }
     async recoverMLSGroupFromEpochMismatch(conversationId, subconversationId) {
         if (subconversationId) {
+            const parentGroupId = await this.groupIdFromConversationId(conversationId);
             const subconversation = await this.apiClient.api.conversation.getSubconversation(conversationId, subconversationId);
-            return this.handleSubconversationEpochMismatch(subconversation);
+            if (!parentGroupId) {
+                throw new Error('Could not find parent group id for the subconversation');
+            }
+            return this.handleSubconversationEpochMismatch(subconversation, parentGroupId);
         }
         const mlsConversation = await this.apiClient.api.conversation.getConversation(conversationId);
         if (!(0, util_1.isMLSConversation)(mlsConversation)) {

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

@@ -109,7 +109,7 @@ describe('ConversationService', () => {
             resetKeyMaterialRenewal: jest.fn(),
         };
         const mockedDb = await (0, CoreDB_1.openDB)('core-test-db');
-        const groupIdFromConversationId = jest.fn();
+        const groupIdFromConversationId = jest.fn(async () => 'groupId');
         const mockedSubconversationService = {
             joinConferenceSubconversation: jest.fn(),
         };
@@ -320,7 +320,9 @@ describe('ConversationService', () => {
             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(mlsService.registerConversation).toHaveBeenCalledWith(mockGroupId, [otherUserId, selfUser.user], {
+                creator: selfUser,
+            });
             expect(conversationService.joinByExternalCommit).not.toHaveBeenCalled();
             expect(establishedConversation.epoch).toEqual(updatedEpoch);
         });
@@ -357,7 +359,9 @@ describe('ConversationService', () => {
             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(mlsService.registerConversation).toHaveBeenCalledWith(mockGroupId, [otherUserId, selfUser.user], {
+                creator: selfUser,
+            });
             expect(conversationService.joinByExternalCommit).not.toHaveBeenCalled();
             expect(establishedConversation.epoch).toEqual(updatedEpoch);
         });
@@ -408,7 +412,7 @@ describe('ConversationService', () => {
             await conversationService.handleEvent(mockMLSMessageAddEvent);
             await new Promise(resolve => setImmediate(resolve));
             expect(conversationService.joinByExternalCommit).not.toHaveBeenCalled();
-            expect(subconversationService.joinConferenceSubconversation).toHaveBeenCalledWith(conversationId);
+            expect(subconversationService.joinConferenceSubconversation).toHaveBeenCalledWith(conversationId, 'groupId');
         });
     });
     describe('getConversations', () => {

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

@@ -26,8 +26,9 @@ export declare class SubconversationService extends TypedEventEmitter<Events> {
      * Will return the secret key derived from the subconversation
      *
      * @param conversationId Id of the parent conversation in which the call should happen
+     * @param groupId groupId of the parent conversation in which the call should happen
      */
-    joinConferenceSubconversation(conversationId: QualifiedId, shouldRetry?: boolean): Promise<{
+    joinConferenceSubconversation(conversationId: QualifiedId, groupId: string, shouldRetry?: boolean): Promise<{
         groupId: string;
         epoch: number;
     }>;

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

@@ -1 +1 @@
-{"version":3,"file":"SubconversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/SubconversationService/SubconversationService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,kBAAkB,EAAkB,MAAM,sCAAsC,CAAC;AACzF,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AAInD,OAAO,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAGlD,KAAK,MAAM,GAAG;IACZ,wBAAwB,EAAE;QAAC,cAAc,EAAE,WAAW,CAAA;KAAC,CAAC;CACzD,CAAC;AAEF,MAAM,WAAW,8BAA8B;IAC7C,MAAM,EAAE,GAAG,MAAM,IAAI,MAAM,EAAE,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;CACrB;AAID,qBAAa,sBAAuB,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAIjE,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAL/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmD;gBAGvD,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,WAAW,CAAC,wBAAY;IAK3C,IAAI,UAAU,IAAI,UAAU,CAK3B;IAED;;;;;OAKG;IACU,6BAA6B,CACxC,cAAc,EAAE,WAAW,EAC3B,WAAW,UAAO,GACjB,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,CAAC;IAiD5C;;;;OAIG;IACU,8BAA8B,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB1E,oCAAoC,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrD,2BAA2B,CACtC,oBAAoB,EAAE,WAAW,EACjC,yBAAyB,EAAE,MAAM,EACjC,kBAAkB,UAAQ,GACzB,OAAO,CAAC;QACT,OAAO,EAAE,8BAA8B,EAAE,CAAC;QAC1C,KAAK,EAAE,MAAM,CAAC;QACd,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,GAAG,IAAI,CAAC;IAoCI,uBAAuB,CAClC,oBAAoB,EAAE,WAAW,EACjC,yBAAyB,EAAE,MAAM,EACjC,yBAAyB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,WAAW,GAAG,SAAS,EACvE,aAAa,EAAE,CAAC,IAAI,EAAE;QACpB,OAAO,EAAE,8BAA8B,EAAE,CAAC;QAC1C,KAAK,EAAE,MAAM,CAAC;QACd,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,KAAK,IAAI,GACT,OAAO,CAAC,MAAM,IAAI,CAAC;IA+CT,yCAAyC,CACpD,cAAc,EAAE,WAAW,EAC3B,cAAc,EAAE;QAAC,IAAI,EAAE,WAAW,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,GACpD,OAAO,CAAC,IAAI,CAAC;YAgCF,mCAAmC;YAMnC,4BAA4B;YAI5B,+BAA+B;YAO/B,8BAA8B;IAsBrC,yBAAyB,yBACR,WAAW,qBACd,kBAAkB,KACpC,QAAQ,MAAM,GAAG,SAAS,CAAC,CAO5B;IAEK,iCAAiC,sBACnB,kBAAkB;8BAGb,WAAW;2BACd,kBAAkB;iBAC5B,MAAM;SASjB;IAEK,0BAA0B,yBACT,WAAW,qBACd,kBAAkB,WAC5B,MAAM,qBAOf;IAEK,2BAA2B,yBACV,WAAW,qBACd,kBAAkB,mBAMrC;CACH"}
+{"version":3,"file":"SubconversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/SubconversationService/SubconversationService.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,kBAAkB,EAAkB,MAAM,sCAAsC,CAAC;AACzF,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AAInD,OAAO,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAGlD,KAAK,MAAM,GAAG;IACZ,wBAAwB,EAAE;QAAC,cAAc,EAAE,WAAW,CAAA;KAAC,CAAC;CACzD,CAAC;AAEF,MAAM,WAAW,8BAA8B;IAC7C,MAAM,EAAE,GAAG,MAAM,IAAI,MAAM,EAAE,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;CACrB;AAID,qBAAa,sBAAuB,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAIjE,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAL/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmD;gBAGvD,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,WAAW,CAAC,wBAAY;IAK3C,IAAI,UAAU,IAAI,UAAU,CAK3B;IAED;;;;;;OAMG;IACU,6BAA6B,CACxC,cAAc,EAAE,WAAW,EAC3B,OAAO,EAAE,MAAM,EACf,WAAW,UAAO,GACjB,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,CAAC;IAiD5C;;;;OAIG;IACU,8BAA8B,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB1E,oCAAoC,IAAI,OAAO,CAAC,IAAI,CAAC;IAQrD,2BAA2B,CACtC,oBAAoB,EAAE,WAAW,EACjC,yBAAyB,EAAE,MAAM,EACjC,kBAAkB,UAAQ,GACzB,OAAO,CAAC;QACT,OAAO,EAAE,8BAA8B,EAAE,CAAC;QAC1C,KAAK,EAAE,MAAM,CAAC;QACd,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,GAAG,IAAI,CAAC;IAoCI,uBAAuB,CAClC,oBAAoB,EAAE,WAAW,EACjC,yBAAyB,EAAE,MAAM,EACjC,yBAAyB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,WAAW,GAAG,SAAS,EACvE,aAAa,EAAE,CAAC,IAAI,EAAE;QACpB,OAAO,EAAE,8BAA8B,EAAE,CAAC;QAC1C,KAAK,EAAE,MAAM,CAAC;QACd,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,KAAK,IAAI,GACT,OAAO,CAAC,MAAM,IAAI,CAAC;IAiDT,yCAAyC,CACpD,cAAc,EAAE,WAAW,EAC3B,cAAc,EAAE;QAAC,IAAI,EAAE,WAAW,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,GACpD,OAAO,CAAC,IAAI,CAAC;YAgCF,mCAAmC;YAMnC,4BAA4B;YAI5B,+BAA+B;YAO/B,8BAA8B;IAsBrC,yBAAyB,yBACR,WAAW,qBACd,kBAAkB,KACpC,QAAQ,MAAM,GAAG,SAAS,CAAC,CAO5B;IAEK,iCAAiC,sBACnB,kBAAkB;8BAGb,WAAW;2BACd,kBAAkB;iBAC5B,MAAM;SASjB;IAEK,0BAA0B,yBACT,WAAW,qBACd,kBAAkB,WAC5B,MAAM,qBAOf;IAEK,2BAA2B,yBACV,WAAW,qBACd,kBAAkB,mBAMrC;CACH"}

package/lib/conversation/SubconversationService/SubconversationService.js

@@ -63,8 +63,9 @@ class SubconversationService extends commons_1.TypedEventEmitter {
      * Will return the secret key derived from the subconversation
      *
      * @param conversationId Id of the parent conversation in which the call should happen
+     * @param groupId groupId of the parent conversation in which the call should happen
      */
-    async joinConferenceSubconversation(conversationId, shouldRetry = true) {
+    async joinConferenceSubconversation(conversationId, groupId, shouldRetry = true) {
         try {
             const { group_id: subconversationGroupId, epoch: subconversationEpoch, epoch_timestamp: subconversationEpochTimestamp, subconv_id: subconversationId, } = await this.getConferenceSubconversation(conversationId);
             if (subconversationEpoch === 0) {
@@ -73,7 +74,7 @@ class SubconversationService extends commons_1.TypedEventEmitter {
                     await this.mlsService.wipeConversation(subconversationGroupId);
                 }
                 // If subconversation is not yet established, create it and upload the commit bundle.
-                await this.mlsService.registerConversation(subconversationGroupId, []);
+                await this.mlsService.registerConversation(subconversationGroupId, [], { parentGroupId: groupId });
             }
             else {
                 const epochUpdateTime = new Date(subconversationEpochTimestamp).getTime();
@@ -85,7 +86,7 @@ class SubconversationService extends commons_1.TypedEventEmitter {
                         epoch: subconversationEpoch,
                     });
                     await this.mlsService.wipeConversation(subconversationGroupId);
-                    return this.joinConferenceSubconversation(conversationId);
+                    return this.joinConferenceSubconversation(conversationId, groupId);
                 }
                 await this.joinSubconversationByExternalCommit(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
             }
@@ -96,7 +97,7 @@ class SubconversationService extends commons_1.TypedEventEmitter {
         }
         catch (error) {
             if (shouldRetry) {
-                return this.joinConferenceSubconversation(conversationId, false);
+                return this.joinConferenceSubconversation(conversationId, groupId, false);
             }
             throw error;
         }
@@ -153,7 +154,7 @@ class SubconversationService extends commons_1.TypedEventEmitter {
         return { members, epoch, keyLength: MLS_CONVERSATION_KEY_LENGTH, secretKey };
     }
     async subscribeToEpochUpdates(parentConversationId, parentConversationGroupId, findConversationByGroupId, onEpochUpdate) {
-        const { epoch: initialEpoch, groupId: subconversationGroupId } = await this.joinConferenceSubconversation(parentConversationId);
+        const { epoch: initialEpoch, groupId: subconversationGroupId } = await this.joinConferenceSubconversation(parentConversationId, parentConversationGroupId);
         const forwardNewEpoch = async ({ groupId }) => {
             if (groupId !== subconversationGroupId) {
                 // if the epoch update did not happen in the subconversation directly, check if it happened in the parent conversation

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

@@ -64,6 +64,7 @@ describe('SubconversationService', () => {
         it('wipes group locally (if it exists) before registering a group if remote epoch is equal 0', async () => {
             const [subconversationService, { apiClient, mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const parentGroupId = 'parentGroupId';
             const subconversationGroupId = 'subconversationGroupId';
             const subconversationResponse = getSubconversationResponse({
                 epoch: 0,
@@ -74,13 +75,14 @@ describe('SubconversationService', () => {
             });
             jest.spyOn(apiClient.api.conversation, 'getSubconversation').mockResolvedValueOnce(subconversationResponse);
             jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
-            await subconversationService.joinConferenceSubconversation(parentConversationId);
+            await subconversationService.joinConferenceSubconversation(parentConversationId, parentGroupId);
             expect(mlsService.wipeConversation).toHaveBeenCalledWith(subconversationGroupId);
-            expect(mlsService.registerConversation).toHaveBeenCalledWith(subconversationGroupId, []);
+            expect(mlsService.registerConversation).toHaveBeenCalledWith(subconversationGroupId, [], { parentGroupId });
         });
         it('registers a group if remote epoch is 0 and group does not exist locally', async () => {
             const [subconversationService, { apiClient, mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const parentGroupId = 'parentGroupId';
             const subconversationGroupId = 'subconversationGroupId';
             const subconversationResponse = getSubconversationResponse({
                 epoch: 0,
@@ -91,14 +93,15 @@ describe('SubconversationService', () => {
             });
             jest.spyOn(apiClient.api.conversation, 'getSubconversation').mockResolvedValueOnce(subconversationResponse);
             jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(false);
-            await subconversationService.joinConferenceSubconversation(parentConversationId);
+            await subconversationService.joinConferenceSubconversation(parentConversationId, parentGroupId);
             expect(mlsService.wipeConversation).not.toHaveBeenCalled();
-            expect(mlsService.registerConversation).toHaveBeenCalledWith(subconversationGroupId, []);
+            expect(mlsService.registerConversation).toHaveBeenCalledWith(subconversationGroupId, [], { parentGroupId });
         });
         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 }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const parentGroupId = 'parentGroupId';
             const subconversationGroupId = 'subconversationGroupId';
             const initialSubconversationEpoch = 1;
             const currentTimeISO = '2023-10-24T12:00:00.000Z';
@@ -124,7 +127,7 @@ describe('SubconversationService', () => {
                 subconversationId: conversation_1.SUBCONVERSATION_ID.CONFERENCE,
             });
             jest.spyOn(apiClient.api.conversation, 'getSubconversation').mockResolvedValueOnce(subconversationResponse2);
-            await subconversationService.joinConferenceSubconversation(parentConversationId);
+            await subconversationService.joinConferenceSubconversation(parentConversationId, parentGroupId);
             expect(apiClient.api.conversation.deleteSubconversation).toHaveBeenCalledWith(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, {
                 groupId: subconversationGroupId,
                 epoch: initialSubconversationEpoch,
@@ -137,6 +140,7 @@ describe('SubconversationService', () => {
             const [subconversationService, { apiClient, mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
             const subconversationGroupId = 'subconversationGroupId';
+            const parentGroupId = 'parentGroupId';
             const subconversationEpoch = 1;
             const currentTimeISO = '2023-10-24T12:00:00.000Z';
             jest.setSystemTime(new Date(currentTimeISO));
@@ -151,7 +155,7 @@ describe('SubconversationService', () => {
                 subconversationId: conversation_1.SUBCONVERSATION_ID.CONFERENCE,
             });
             jest.spyOn(apiClient.api.conversation, 'getSubconversation').mockResolvedValueOnce(subconversationResponse);
-            await subconversationService.joinConferenceSubconversation(parentConversationId);
+            await subconversationService.joinConferenceSubconversation(parentConversationId, parentGroupId);
             expect(apiClient.api.conversation.deleteSubconversation).not.toHaveBeenCalled();
             expect(mlsService.registerConversation).not.toHaveBeenCalled();
             expect(mlsService.wipeConversation).not.toHaveBeenCalled();
@@ -160,6 +164,7 @@ describe('SubconversationService', () => {
         it('retries to join if registering a conversations throws an error', async () => {
             const [subconversationService, { apiClient, mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const parentGroupId = 'parentGroupId';
             const subconversationGroupId = 'subconversationGroupId';
             const subconversationResponse = getSubconversationResponse({
                 epoch: 0,
@@ -173,14 +178,15 @@ describe('SubconversationService', () => {
             jest
                 .spyOn(mlsService, 'registerConversation')
                 .mockRejectedValueOnce(new http_1.BackendError('', http_1.BackendErrorLabel.MLS_STALE_MESSAGE, http_1.StatusCode.CONFLICT));
-            await subconversationService.joinConferenceSubconversation(parentConversationId);
+            await subconversationService.joinConferenceSubconversation(parentConversationId, parentGroupId);
             expect(mlsService.wipeConversation).not.toHaveBeenCalled();
-            expect(mlsService.registerConversation).toHaveBeenCalledWith(subconversationGroupId, []);
+            expect(mlsService.registerConversation).toHaveBeenCalledWith(subconversationGroupId, [], { parentGroupId });
             expect(mlsService.registerConversation).toHaveBeenCalledTimes(2);
         });
         it('returns fresh epoch number after joining the group', async () => {
             const [subconversationService, { apiClient, mlsService }] = await buildSubconversationService();
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const parentGroupId = 'parentGroupId';
             const subconversationGroupId = 'subconversationGroupId';
             const subconversationResponse = getSubconversationResponse({
                 epoch: 0,
@@ -193,9 +199,9 @@ describe('SubconversationService', () => {
             jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(false);
             const updatedEpoch = 1;
             jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(updatedEpoch);
-            const response = await subconversationService.joinConferenceSubconversation(parentConversationId);
+            const response = await subconversationService.joinConferenceSubconversation(parentConversationId, parentGroupId);
             expect(mlsService.wipeConversation).not.toHaveBeenCalled();
-            expect(mlsService.registerConversation).toHaveBeenCalledWith(subconversationGroupId, []);
+            expect(mlsService.registerConversation).toHaveBeenCalledWith(subconversationGroupId, [], { parentGroupId });
             expect(response).toEqual({ epoch: updatedEpoch, groupId: subconversationGroupId });
         });
     });

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.d.ts

@@ -20,9 +20,10 @@ export declare class E2EIServiceExternal extends TypedEventEmitter<Events> {
     private readonly clientService;
     private readonly mlsService;
     private _acmeService?;
+    private readonly enrollmentStorage;
     constructor(coreCryptoClient: CoreCrypto, coreDatabase: CoreDatabase, recurringTaskScheduler: RecurringTaskScheduler, clientService: ClientService, mlsService: MLSService);
-    isEnrollmentInProgress(): boolean;
-    clearAllProgress(): void;
+    isEnrollmentInProgress(): Promise<boolean>;
+    clearAllProgress(): Promise<void>;
     getConversationState(conversationId: Uint8Array): Promise<E2eiConversationState>;
     isE2EIEnabled(): Promise<boolean>;
     getAllGroupUsersIdentities(groupId: string): Promise<Map<string, DeviceIdentity[]>>;
@@ -30,6 +31,13 @@ export declare class E2EIServiceExternal extends TypedEventEmitter<Events> {
     getDevicesIdentities(groupId: string, userClientsMap: Record<string, QualifiedId>): Promise<DeviceIdentity[]>;
     isFreshMLSSelfClient(): Promise<boolean>;
     private registerLocalCertificateRoot;
+    /**
+     * will initialize the E2EIServiceExternal with the given discoveryUrl and userId.
+     * It will also register the server certificates in CoreCrypto.
+     *
+     * @param discoveryUrl the discovery url of the acme server
+     * @param userId the user that is concerned by the enrollment
+     */
     initialize(discoveryUrl: string): Promise<void>;
     private get acmeService();
     private registerCrossSignedCertificates;
@@ -46,7 +54,7 @@ export declare class E2EIServiceExternal extends TypedEventEmitter<Events> {
      *
      * Both must be registered before the first enrollment.
      */
-    registerServerCertificates(): Promise<void>;
+    private registerServerCertificates;
     private scheduleCrlDistributionTimer;
     private initialiseCrlDistributionTimers;
     private addCrlDistributionTimer;

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"E2EIServiceExternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAC,UAAU,EAAE,qBAAqB,EAAE,YAAY,EAAE,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAMnG,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAKrD,OAAO,EAAC,sBAAsB,EAAC,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,QAAQ,CAAC,GAAG;IAAC,MAAM,CAAC,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAC,CAAC;AAE/G,KAAK,MAAM,GAAG;IACZ,gBAAgB,EAAE,SAAS,CAAC;IAC5B,cAAc,EAAE,SAAS,CAAC;CAC3B,CAAC;AAGF,qBAAa,mBAAoB,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAI9D,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAP7B,OAAO,CAAC,YAAY,CAAC,CAAc;gBAGhB,gBAAgB,EAAE,UAAU,EAC5B,YAAY,EAAE,YAAY,EAC1B,sBAAsB,EAAE,sBAAsB,EAC9C,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,UAAU;IAUlC,sBAAsB,IAAI,OAAO;IAIjC,gBAAgB,IAAI,IAAI;IAIxB,oBAAoB,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIhF,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,0BAA0B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;IAgBnF,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;IAgDnG,oBAAoB,CAC/B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAC1C,OAAO,CAAC,cAAc,EAAE,CAAC;IAef,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC;YAQvC,4BAA4B;IAO7B,UAAU,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5D,OAAO,KAAK,WAAW,GAKtB;YAEa,+BAA+B;IAK7C;;;;;;;;;;;;OAYG;IACU,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC;IA6BxD,OAAO,CAAC,4BAA4B;YAStB,+BAA+B;YAQ/B,uBAAuB;YAKvB,0BAA0B;IAI3B,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;YAQ/B,4BAA4B;YAS5B,WAAW;YAkBX,8BAA8B;CAK7C"}
+{"version":3,"file":"E2EIServiceExternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAC,UAAU,EAAE,qBAAqB,EAAE,YAAY,EAAE,YAAY,EAAC,MAAM,sBAAsB,CAAC;AAMnG,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAKrD,OAAO,EAAC,sBAAsB,EAAC,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,MAAM,MAAM,cAAc,GAAG,IAAI,CAAC,YAAY,EAAE,MAAM,GAAG,QAAQ,CAAC,GAAG;IAAC,MAAM,CAAC,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAC,CAAC;AAE/G,KAAK,MAAM,GAAG;IACZ,gBAAgB,EAAE,SAAS,CAAC;IAC5B,cAAc,EAAE,SAAS,CAAC;CAC3B,CAAC;AAGF,qBAAa,mBAAoB,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAK9D,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,sBAAsB;IACvC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAR7B,OAAO,CAAC,YAAY,CAAC,CAAc;IACnC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAiD;gBAGhE,gBAAgB,EAAE,UAAU,EAC5B,YAAY,EAAE,YAAY,EAC1B,sBAAsB,EAAE,sBAAsB,EAC9C,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,UAAU;IAW5B,sBAAsB,IAAI,OAAO,CAAC,OAAO,CAAC;IAKhD,gBAAgB;IAIhB,oBAAoB,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIhF,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,0BAA0B,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;IAgBnF,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;IAgDnG,oBAAoB,CAC/B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAC1C,OAAO,CAAC,cAAc,EAAE,CAAC;IAef,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC;YAQvC,4BAA4B;IAO1C;;;;;;OAMG;IACU,UAAU,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK5D,OAAO,KAAK,WAAW,GAKtB;YAEa,+BAA+B;IAK7C;;;;;;;;;;;;OAYG;YACW,0BAA0B;IA6BxC,OAAO,CAAC,4BAA4B;YAStB,+BAA+B;YAQ/B,uBAAuB;YAKvB,0BAA0B;IAI3B,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;YAQ/B,4BAA4B;YAS5B,WAAW;YAkBX,8BAA8B;CAK7C"}

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceExternal.js

@@ -39,14 +39,16 @@ class E2EIServiceExternal extends commons_1.TypedEventEmitter {
         this.clientService = clientService;
         this.mlsService = mlsService;
         void this.initialiseCrlDistributionTimers();
+        this.enrollmentStorage = (0, E2EIStorage_1.createE2EIEnrollmentStorage)(coreDatabase);
         mlsService.on('newCrlDistributionPoints', distributionPoints => this.handleNewCrlDistributionPoints(distributionPoints));
     }
     // If we have a handle in the local storage, we are in the enrollment process (this handle is saved before oauth redirect)
-    isEnrollmentInProgress() {
-        return E2EIStorage_1.E2EIStorage.has.handle();
+    async isEnrollmentInProgress() {
+        const data = await this.enrollmentStorage.getPendingEnrollmentData();
+        return !!data;
     }
     clearAllProgress() {
-        E2EIStorage_1.E2EIStorage.remove.temporaryData();
+        return this.enrollmentStorage.deletePendingEnrollmentData();
     }
     getConversationState(conversationId) {
         return this.coreCryptoClient.e2eiConversationState(conversationId);
@@ -104,8 +106,16 @@ class E2EIServiceExternal extends commons_1.TypedEventEmitter {
         await this.coreCryptoClient.e2eiRegisterAcmeCA(localCertificateRoot);
         return localCertificateRoot;
     }
+    /**
+     * will initialize the E2EIServiceExternal with the given discoveryUrl and userId.
+     * It will also register the server certificates in CoreCrypto.
+     *
+     * @param discoveryUrl the discovery url of the acme server
+     * @param userId the user that is concerned by the enrollment
+     */
     async initialize(discoveryUrl) {
         this._acmeService = new Connection_1.AcmeService(discoveryUrl);
+        await this.registerServerCertificates();
     }
     get acmeService() {
         if (!this._acmeService) {
@@ -132,7 +142,7 @@ class E2EIServiceExternal extends commons_1.TypedEventEmitter {
      */
     async registerServerCertificates() {
         const ROOT_CA_KEY = 'e2ei_root-registered';
-        const store = (0, LocalStorageStore_1.LocalStorageStore)(ROOT_CA_KEY);
+        const store = (0, LocalStorageStore_1.LocalStorageStore)(this.coreDatabase.name);
         // Register root certificate if not already registered
         if (!store.has(ROOT_CA_KEY)) {
             await this.registerLocalCertificateRoot(this.acmeService);

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.d.ts

@@ -1,6 +1,7 @@
 import { APIClient } from '@wireapp/api-client';
 import { CoreCrypto, RotateBundle } from './E2EIService.types';
 import { InitialData } from './Storage/E2EIStorage.schema';
+import { CoreDatabase } from '../../../storage/CoreDB';
 export declare class E2EIServiceInternal {
     private readonly coreCryptoClient;
     private readonly apiClient;
@@ -10,7 +11,8 @@ export declare class E2EIServiceInternal {
     private readonly initialData;
     private readonly logger;
     private acmeService;
-    constructor(coreCryptoClient: CoreCrypto, apiClient: APIClient, 
+    private enrollmentStorage;
+    constructor(coreDb: CoreDatabase, coreCryptoClient: CoreCrypto, apiClient: APIClient, 
     /** number of seconds the certificate should be valid */
     certificateTtl: number, keyPackagesAmount: number, initialData: InitialData);
     startCertificateProcess(hasActiveCertificate: boolean): Promise<{

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"E2EIServiceInternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAG9C,OAAO,EAA6B,UAAU,EAAkB,YAAY,EAAC,MAAM,qBAAqB,CAAC;AASzG,OAAO,EAAW,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAEnE,qBAAa,mBAAmB;IAK5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,wDAAwD;IACxD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAT9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuD;IAC9E,OAAO,CAAC,WAAW,CAAc;gBAGd,gBAAgB,EAAE,UAAU,EAC5B,SAAS,EAAE,SAAS;IACrC,wDAAwD;IACvC,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,MAAM,EACzB,WAAW,EAAE,WAAW;IAM9B,uBAAuB,CAAC,oBAAoB,EAAE,OAAO;;;;;;;;IAkBrD,0BAA0B,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAYhG;;;;;OAKG;IACU,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,oBAAoB,EAAE,OAAO;YASnE,YAAY;YAuBZ,YAAY;YAUZ,eAAe;IAQ7B;;;;;OAKG;YACW,uBAAuB;IAyCrC;;;;;;;OAOG;YACW,eAAe;CA6D9B"}
+{"version":3,"file":"E2EIServiceInternal.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAG9C,OAAO,EAA6B,UAAU,EAAkB,YAAY,EAAC,MAAM,qBAAqB,CAAC;AASzG,OAAO,EAAC,WAAW,EAAiC,MAAM,8BAA8B,CAAC;AAEzF,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAErD,qBAAa,mBAAmB;IAO5B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,wDAAwD;IACxD,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW;IAX9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuD;IAC9E,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,iBAAiB,CAAiD;gBAGxE,MAAM,EAAE,YAAY,EACH,gBAAgB,EAAE,UAAU,EAC5B,SAAS,EAAE,SAAS;IACrC,wDAAwD;IACvC,cAAc,EAAE,MAAM,EACtB,iBAAiB,EAAE,MAAM,EACzB,WAAW,EAAE,WAAW;IAO9B,uBAAuB,CAAC,oBAAoB,EAAE,OAAO;;;;;;;;IAiBrD,0BAA0B,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;IAYhG;;;;;OAKG;IACU,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,oBAAoB,EAAE,OAAO;YASnE,YAAY;YAuBZ,YAAY;YAUZ,eAAe;IAQ7B;;;;;OAKG;YACW,uBAAuB;IAyCrC;;;;;;;OAOG;YACW,eAAe;CAgE9B"}

package/lib/messagingProtocols/mls/E2EIdentityService/E2EIServiceInternal.js

@@ -22,7 +22,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.E2EIServiceInternal = void 0;
-const bazinga64_1 = require("bazinga64");
 const logdown_1 = __importDefault(require("logdown"));
 const AcmeServer_1 = require("./Connection/AcmeServer");
 const E2EIService_types_1 = require("./E2EIService.types");
@@ -35,7 +34,7 @@ const OidcChallenge_1 = require("./Steps/OidcChallenge");
 const Order_1 = require("./Steps/Order");
 const E2EIStorage_1 = require("./Storage/E2EIStorage");
 class E2EIServiceInternal {
-    constructor(coreCryptoClient, apiClient, 
+    constructor(coreDb, coreCryptoClient, apiClient, 
     /** number of seconds the certificate should be valid */
     certificateTtl, keyPackagesAmount, initialData) {
         this.coreCryptoClient = coreCryptoClient;
@@ -46,27 +45,26 @@ class E2EIServiceInternal {
         this.logger = (0, logdown_1.default)('@wireapp/core/E2EIdentityServiceInternal');
         const { discoveryUrl } = initialData;
         this.acmeService = new AcmeServer_1.AcmeService(discoveryUrl);
+        this.enrollmentStorage = (0, E2EIStorage_1.createE2EIEnrollmentStorage)(coreDb);
     }
     async startCertificateProcess(hasActiveCertificate) {
         const identity = await this.initIdentity(hasActiveCertificate);
         // Store the values in local storage for later use (e.g. in the continue flow)
-        const { orderUrl, authChallenges } = await this.getEnrollmentChallenges(identity);
-        const { authorization: { keyauth, oidcChallenge }, } = authChallenges;
+        const enrollmentData = await this.getEnrollmentChallenges(identity);
+        const { keyauth, oidcChallenge } = enrollmentData.authorization;
         // store auth data for continuing the flow later on
         const handle = await this.coreCryptoClient.e2eiEnrollmentStash(identity);
-        E2EIStorage_1.E2EIStorage.store.handle(bazinga64_1.Encoder.toBase64(handle).asString);
-        E2EIStorage_1.E2EIStorage.store.authData(authChallenges);
-        E2EIStorage_1.E2EIStorage.store.orderData({ orderUrl });
+        await this.enrollmentStorage.savePendingEnrollmentData(Object.assign({ handle }, enrollmentData));
         return { challenge: oidcChallenge, keyAuth: keyauth };
     }
     async continueCertificateProcess(oAuthIdToken) {
-        const handle = E2EIStorage_1.E2EIStorage.get.handle();
-        const identity = await this.coreCryptoClient.e2eiEnrollmentStashPop(bazinga64_1.Decoder.fromBase64(handle).asBytes);
-        if (!identity) {
+        const enrollmentData = await this.enrollmentStorage.getPendingEnrollmentData();
+        if (!enrollmentData) {
             throw new Error('Error while trying to continue OAuth flow. No enrollment in progress found');
         }
-        const authData = E2EIStorage_1.E2EIStorage.get.authData();
-        return this.getRotateBundle(identity, oAuthIdToken, authData);
+        const { handle } = enrollmentData;
+        const identity = await this.coreCryptoClient.e2eiEnrollmentStashPop(handle);
+        return this.getRotateBundle(identity, oAuthIdToken, enrollmentData);
     }
     /**
      * This function starts a ACME refresh flow for an existing client with a valid refresh token
@@ -76,8 +74,8 @@ class E2EIServiceInternal {
      */
     async renewCertificate(oAuthIdToken, hasActiveCertificate) {
         const identity = await this.initIdentity(hasActiveCertificate);
-        const authData = await this.getEnrollmentChallenges(identity);
-        return this.getRotateBundle(identity, oAuthIdToken, authData.authChallenges);
+        const enrollmentData = await this.getEnrollmentChallenges(identity);
+        return this.getRotateBundle(identity, oAuthIdToken, enrollmentData);
     }
     // ############ Internal Functions ############
     async initIdentity(hasActiveCertificate) {
@@ -142,7 +140,7 @@ class E2EIServiceInternal {
             authzUrls: orderData.authzUrls,
             nonce: orderData.nonce,
         });
-        return { authChallenges, orderUrl: orderData.orderUrl };
+        return Object.assign({ orderUrl: orderData.orderUrl }, authChallenges);
     }
     /**
      * Continuation of the ACME enrollment flow
@@ -152,14 +150,14 @@ class E2EIServiceInternal {
      * @param oAuthIdToken
      * @returns RotateBundle
      */
-    async getRotateBundle(identity, oAuthIdToken, authData) {
+    async getRotateBundle(identity, oAuthIdToken, enrollmentData) {
         // Step 7: Do OIDC client challenge
         const oidcData = await (0, OidcChallenge_1.doWireOidcChallenge)({
             oAuthIdToken,
-            authData,
+            authData: enrollmentData,
             connection: this.acmeService,
             identity,
-            nonce: authData.nonce,
+            nonce: enrollmentData.nonce,
         });
         this.logger.log('oidc data', oidcData);
         if (!oidcData.data.validated) {
@@ -168,7 +166,7 @@ class E2EIServiceInternal {
         const { user: wireUser, clientId } = this.initialData;
         //Step 8: Do DPOP Challenge
         const dpopData = await (0, DpopChallenge_1.doWireDpopChallenge)({
-            authData,
+            authData: enrollmentData,
             clientId,
             connection: this.acmeService,
             identity,
@@ -182,12 +180,11 @@ class E2EIServiceInternal {
             throw new Error('Error while trying to continue OAuth flow. DPOP challenge not validated');
         }
         //Step 9: Finalize Order
-        const orderData = E2EIStorage_1.E2EIStorage.get.orderData();
         const finalizeOrderData = await (0, Order_1.finalizeOrder)({
             connection: this.acmeService,
             identity,
             nonce: dpopData.nonce,
-            orderUrl: orderData.orderUrl,
+            orderUrl: enrollmentData.orderUrl,
         });
         if (!finalizeOrderData.certificateUrl) {
             throw new Error('Error while trying to continue OAuth flow. No certificateUrl received');

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/Authorization.d.ts

@@ -1,12 +1,12 @@
 import { AcmeService } from '../Connection';
 import { E2eiEnrollment, Nonce } from '../E2EIService.types';
-import { AuthData } from '../Storage/E2EIStorage.schema';
+import { EnrollmentFlowData } from '../Storage/E2EIStorage.schema';
 interface GetAuthorizationParams {
     nonce: Nonce;
     authzUrls: string[];
     identity: E2eiEnrollment;
     connection: AcmeService;
 }
-export declare const getAuthorizationChallenges: ({ authzUrls, nonce, identity, connection, }: GetAuthorizationParams) => Promise<AuthData>;
+export declare const getAuthorizationChallenges: ({ authzUrls, nonce, identity, connection, }: GetAuthorizationParams) => Promise<Pick<EnrollmentFlowData, 'authorization' | 'nonce'>>;
 export {};
 //# sourceMappingURL=Authorization.d.ts.map

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/Authorization.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Authorization.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Steps/Authorization.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAgB,KAAK,EAAC,MAAM,sBAAsB,CAAC;AAEzE,OAAO,EAAC,QAAQ,EAAC,MAAM,+BAA+B,CAAC;AAEvD,UAAU,sBAAsB;IAC9B,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,WAAW,CAAC;CACzB;AAED,eAAO,MAAM,0BAA0B,gDAKpC,sBAAsB,KAAG,QAAQ,QAAQ,CAsC3C,CAAC"}
+{"version":3,"file":"Authorization.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Steps/Authorization.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAgB,KAAK,EAAC,MAAM,sBAAsB,CAAC;AAEzE,OAAO,EAAC,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AAEjE,UAAU,sBAAsB;IAC9B,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,WAAW,CAAC;CACzB;AAED,eAAO,MAAM,0BAA0B,gDAKpC,sBAAsB,KAAG,QAAQ,KAAK,kBAAkB,EAAE,eAAe,GAAG,OAAO,CAAC,CAsCtF,CAAC"}

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/DpopChallenge/DpopChallenge.types.d.ts

@@ -2,12 +2,12 @@ import { APIClient } from '@wireapp/api-client';
 import { ClientId } from '../../../types';
 import { AcmeService } from '../../Connection/AcmeServer';
 import { E2eiEnrollment, Nonce, User } from '../../E2EIService.types';
-import { AuthData } from '../../Storage/E2EIStorage.schema';
+import { UnidentifiedEnrollmentFlowData } from '../../Storage/E2EIStorage.schema';
 export interface DoWireDpopChallengeParams {
     apiClient: APIClient;
     clientId: ClientId;
     userDomain: User['domain'];
-    authData: AuthData;
+    authData: UnidentifiedEnrollmentFlowData;
     identity: E2eiEnrollment;
     connection: AcmeService;
     nonce: Nonce;

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/DpopChallenge/DpopChallenge.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DpopChallenge.types.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/E2EIdentityService/Steps/DpopChallenge/DpopChallenge.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAC,cAAc,EAAE,KAAK,EAAE,IAAI,EAAC,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAC,QAAQ,EAAC,MAAM,kCAAkC,CAAC;AAE1D,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,WAAW,CAAC;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,yBAAyB,EAAE,UAAU,GAAG,WAAW,CAAC,CAAC;AAE7F,MAAM,MAAM,0BAA0B,GAAG,IAAI,CAC3C,yBAAyB,EACzB,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,YAAY,GAAG,YAAY,CACpE,GAAG;IACF,WAAW,EAAE,KAAK,CAAC;CACpB,CAAC"}
+{"version":3,"file":"DpopChallenge.types.d.ts","sourceRoot":"","sources":["../../../../../../src/messagingProtocols/mls/E2EIdentityService/Steps/DpopChallenge/DpopChallenge.types.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAC,cAAc,EAAE,KAAK,EAAE,IAAI,EAAC,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAC,8BAA8B,EAAC,MAAM,kCAAkC,CAAC;AAEhF,MAAM,WAAW,yBAAyB;IACxC,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,QAAQ,CAAC;IACnB,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3B,QAAQ,EAAE,8BAA8B,CAAC;IACzC,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,WAAW,CAAC;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,yBAAyB,EAAE,UAAU,GAAG,WAAW,CAAC,CAAC;AAE7F,MAAM,MAAM,0BAA0B,GAAG,IAAI,CAC3C,yBAAyB,EACzB,UAAU,GAAG,WAAW,GAAG,UAAU,GAAG,YAAY,GAAG,YAAY,CACpE,GAAG;IACF,WAAW,EAAE,KAAK,CAAC;CACpB,CAAC"}

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/OidcChallenge.d.ts

@@ -1,8 +1,8 @@
 import { AcmeService } from '../Connection/AcmeServer';
 import { E2eiEnrollment, Nonce } from '../E2EIService.types';
-import { AuthData } from '../Storage/E2EIStorage.schema';
+import { UnidentifiedEnrollmentFlowData } from '../Storage/E2EIStorage.schema';
 interface DoWireOidcChallengeParams {
-    authData: AuthData;
+    authData: UnidentifiedEnrollmentFlowData;
     identity: E2eiEnrollment;
     connection: AcmeService;
     nonce: Nonce;

package/lib/messagingProtocols/mls/E2EIdentityService/Steps/OidcChallenge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OidcChallenge.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Steps/OidcChallenge.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,WAAW,EAAC,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAC,cAAc,EAAE,KAAK,EAAC,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAC,QAAQ,EAAC,MAAM,+BAA+B,CAAC;AAEvD,UAAU,yBAAyB;IACjC,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,WAAW,CAAC;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,mBAAmB,6DAM7B,yBAAyB;;;;;;;;;;;GAiB3B,CAAC"}
+{"version":3,"file":"OidcChallenge.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Steps/OidcChallenge.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,WAAW,EAAC,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAC,cAAc,EAAE,KAAK,EAAC,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAC,8BAA8B,EAAC,MAAM,+BAA+B,CAAC;AAE7E,UAAU,yBAAyB;IACjC,QAAQ,EAAE,8BAA8B,CAAC;IACzC,QAAQ,EAAE,cAAc,CAAC;IACzB,UAAU,EAAE,WAAW,CAAC;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,mBAAmB,6DAM7B,yBAAyB;;;;;;;;;;;GAiB3B,CAAC"}

package/lib/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.d.ts

@@ -1,21 +1,8 @@
-import { AuthData, OrderData } from './E2EIStorage.schema';
-export declare const E2EIStorage: {
-    store: {
-        handle: (handle: string) => void;
-        authData: (data: AuthData) => void;
-        orderData: (data: OrderData) => void;
-    };
-    get: {
-        handle: () => string;
-        authData: () => AuthData;
-        orderData: () => OrderData;
-    };
-    has: {
-        handle: () => boolean;
-    };
-    remove: {
-        temporaryData: () => void;
-        all: () => void;
-    };
+import { EnrollmentFlowData } from './E2EIStorage.schema';
+import { CoreDatabase } from '../../../../storage/CoreDB';
+export declare function createE2EIEnrollmentStorage(coreDB: CoreDatabase): {
+    getPendingEnrollmentData(): Promise<EnrollmentFlowData | undefined>;
+    savePendingEnrollmentData(data: EnrollmentFlowData): Promise<void>;
+    deletePendingEnrollmentData(): Promise<void>;
 };
 //# sourceMappingURL=E2EIStorage.d.ts.map

package/lib/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"E2EIStorage.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,QAAQ,EAAkB,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAqDzE,eAAO,MAAM,WAAW;;yBA3CK,MAAM;yBAEN,QAAQ;0BADP,SAAS;;;;wBAcN,QAAQ;yBASP,SAAS;;;;;;;;;CAqC1C,CAAC"}
+{"version":3,"file":"E2EIStorage.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAKxD,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,YAAY;gCAE1B,QAAQ,kBAAkB,GAAG,SAAS,CAAC;oCAGnC,kBAAkB,GAAG,QAAQ,IAAI,CAAC;mCAGnC,QAAQ,IAAI,CAAC;EAIrD"}

package/lib/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.js

@@ -18,65 +18,20 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.E2EIStorage = void 0;
-const bazinga64_1 = require("bazinga64");
-const E2EIStorage_schema_1 = require("./E2EIStorage.schema");
-const LocalStorageStore_1 = require("../../../../util/LocalStorageStore");
-const HandleKey = 'Handle';
-const AuthDataKey = 'AuthData';
-const OderDataKey = 'OrderData';
-const storage = (0, LocalStorageStore_1.LocalStorageStore)('E2EIStorage');
-const storeHandle = (handle) => storage.add(HandleKey, bazinga64_1.Encoder.toBase64(handle).asString);
-const storeOrderData = (data) => storage.add(OderDataKey, bazinga64_1.Encoder.toBase64(JSON.stringify(data)).asString);
-const storeAuthData = (data) => storage.add(AuthDataKey, bazinga64_1.Encoder.toBase64(JSON.stringify(data)).asString);
-const hasHandle = () => storage.has(HandleKey);
-const getAndVerifyHandle = () => {
-    const handle = storage.get(HandleKey);
-    if (!handle) {
-        throw new Error('ACME: No handle found');
-    }
-    return bazinga64_1.Decoder.fromBase64(handle).asString;
-};
-const getAndVerifyAuthData = () => {
-    const data = storage.get(AuthDataKey);
-    if (!data) {
-        throw new Error('ACME: AuthData not found');
-    }
-    const decodedData = bazinga64_1.Decoder.fromBase64(data).asString;
-    return E2EIStorage_schema_1.AuthDataSchema.parse(JSON.parse(decodedData));
-};
-const getAndVerifyOrderData = () => {
-    const data = storage.get(OderDataKey);
-    if (!data) {
-        throw new Error('ACME: OrderData not found');
-    }
-    const decodedData = bazinga64_1.Decoder.fromBase64(data).asString;
-    return JSON.parse(decodedData);
-};
-const removeTemporaryData = () => {
-    storage.remove(HandleKey);
-    storage.remove(AuthDataKey);
-    storage.remove(OderDataKey);
-};
-const removeAll = () => {
-    removeTemporaryData();
-};
-exports.E2EIStorage = {
-    store: {
-        handle: storeHandle,
-        authData: storeAuthData,
-        orderData: storeOrderData,
-    },
-    get: {
-        handle: getAndVerifyHandle,
-        authData: getAndVerifyAuthData,
-        orderData: getAndVerifyOrderData,
-    },
-    has: {
-        handle: hasHandle,
-    },
-    remove: {
-        temporaryData: removeTemporaryData,
-        all: removeAll,
-    },
-};
+exports.createE2EIEnrollmentStorage = void 0;
+const PENDING_ENROLLMENT_TABLE = 'pendingEnrollmentData';
+const STORAGE_KEY = 'data';
+function createE2EIEnrollmentStorage(coreDB) {
+    return {
+        async getPendingEnrollmentData() {
+            return coreDB.get(PENDING_ENROLLMENT_TABLE, STORAGE_KEY);
+        },
+        async savePendingEnrollmentData(data) {
+            await coreDB.put(PENDING_ENROLLMENT_TABLE, data, STORAGE_KEY);
+        },
+        async deletePendingEnrollmentData() {
+            return coreDB.delete(PENDING_ENROLLMENT_TABLE, STORAGE_KEY);
+        },
+    };
+}
+exports.createE2EIEnrollmentStorage = createE2EIEnrollmentStorage;

package/lib/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.schema.d.ts

@@ -43,7 +43,9 @@ export declare const InitialDataSchema: z.ZodObject<{
     discoveryUrl: string;
 }>;
 export type InitialData = z.infer<typeof InitialDataSchema>;
-export declare const AuthDataSchema: z.ZodObject<{
+export declare const EnrollmentFlowDataSchema: z.ZodObject<{
+    handle: z.ZodType<Uint8Array, z.ZodTypeDef, Uint8Array>;
+    orderUrl: z.ZodString;
     authorization: z.ZodObject<{
         keyauth: z.ZodString;
         dpopChallenge: z.ZodObject<{
@@ -113,6 +115,8 @@ export declare const AuthDataSchema: z.ZodObject<{
             delegate: Uint8Array;
         };
     };
+    handle: Uint8Array;
+    orderUrl: string;
 }, {
     nonce: string;
     authorization: {
@@ -128,14 +132,9 @@ export declare const AuthDataSchema: z.ZodObject<{
             delegate: Uint8Array;
         };
     };
-}>;
-export type AuthData = z.infer<typeof AuthDataSchema>;
-export declare const OrderDataSchema: z.ZodObject<{
-    orderUrl: z.ZodString;
-}, "strip", z.ZodTypeAny, {
-    orderUrl: string;
-}, {
+    handle: Uint8Array;
     orderUrl: string;
 }>;
-export type OrderData = z.infer<typeof OrderDataSchema>;
+export type EnrollmentFlowData = z.infer<typeof EnrollmentFlowDataSchema>;
+export type UnidentifiedEnrollmentFlowData = Omit<EnrollmentFlowData, 'handle'>;
 //# sourceMappingURL=E2EIStorage.schema.d.ts.map

package/lib/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"E2EIStorage.schema.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.schema.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAU5B,CAAC;AACH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAU5D,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAOzB,CAAC;AACH,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAEtD,eAAO,MAAM,eAAe;;;;;;EAE1B,CAAC;AACH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC"}
+{"version":3,"file":"E2EIStorage.schema.d.ts","sourceRoot":"","sources":["../../../../../src/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.schema.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAU5B,CAAC;AACH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAO5D,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EASnC,CAAC;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAC1E,MAAM,MAAM,8BAA8B,GAAG,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC"}

package/lib/messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.schema.js

@@ -18,7 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OrderDataSchema = exports.AuthDataSchema = exports.InitialDataSchema = void 0;
+exports.EnrollmentFlowDataSchema = exports.InitialDataSchema = void 0;
 const zod_1 = require("zod");
 exports.InitialDataSchema = zod_1.z.object({
     discoveryUrl: zod_1.z.string(),
@@ -31,13 +31,14 @@ exports.InitialDataSchema = zod_1.z.object({
         teamId: zod_1.z.string(),
     }),
 });
-const Uint8ArraySchema = zod_1.z.custom(value => value instanceof Uint8Array ? { success: true } : { success: false, message: 'Expected Uint8Array' });
 const AcmeChallengeSchema = zod_1.z.object({
-    delegate: Uint8ArraySchema,
+    delegate: zod_1.z.instanceof(Uint8Array),
     url: zod_1.z.string(),
     target: zod_1.z.string(),
 });
-exports.AuthDataSchema = zod_1.z.object({
+exports.EnrollmentFlowDataSchema = zod_1.z.object({
+    handle: zod_1.z.instanceof(Uint8Array),
+    orderUrl: zod_1.z.string().url(),
     authorization: zod_1.z.object({
         keyauth: zod_1.z.string(),
         dpopChallenge: AcmeChallengeSchema,
@@ -45,6 +46,3 @@ exports.AuthDataSchema = zod_1.z.object({
     }),
     nonce: zod_1.z.string(),
 });
-exports.OrderDataSchema = zod_1.z.object({
-    orderUrl: zod_1.z.string().url(),
-});

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

@@ -89,17 +89,22 @@ export declare class MLSService extends TypedEventEmitter<Events> {
     /**
      * Will create an empty conversation inside of coreCrypto.
      * @param groupId the id of the group to create inside of coreCrypto
+     * @param parentGroupId in case the conversation is a subconversation, the id of the parent conversation
      */
-    registerEmptyConversation(groupId: string): Promise<void>;
+    registerEmptyConversation(groupId: string, parentGroupId?: string): Promise<void>;
     /**
      * Will create a conversation inside of coreCrypto, add users to it or update the keying material if empty key packages list is provided.
      * @param groupId the id of the group to create inside of coreCrypto
      * @param users the list of users that will be members of the conversation (including the self user)
-     * @param creator the creator of the list. Most of the time will be the self user (or empty if the conversation was created by backend first)
-     */
-    registerConversation(groupId: string, users: QualifiedId[], creator?: {
-        user: QualifiedId;
-        client?: string;
+     * @param options.creator the creator of the list. Most of the time will be the self user (or empty if the conversation was created by backend first)
+     * @param options.parentGroupId in case the conversation is a subconversation, the id of the parent conversation
+     */
+    registerConversation(groupId: string, users: QualifiedId[], options?: {
+        creator?: {
+            user: QualifiedId;
+            client?: string;
+        };
+        parentGroupId?: string;
     }): Promise<PostMlsMessageResponse>;
     /**
      * Will try to register mls group and send an empty commit to establish it.

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

@@ -335,13 +335,21 @@ class MLSService extends commons_1.TypedEventEmitter {
     /**
      * Will create an empty conversation inside of coreCrypto.
      * @param groupId the id of the group to create inside of coreCrypto
+     * @param parentGroupId in case the conversation is a subconversation, the id of the parent conversation
      */
-    async registerEmptyConversation(groupId) {
+    async registerEmptyConversation(groupId, parentGroupId) {
         const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
-        const mlsKeys = (await this.apiClient.api.client.getPublicKeys()).removal;
-        const mlsKeyBytes = Object.values(mlsKeys).map((key) => bazinga64_1.Decoder.fromBase64(key).asBytes);
+        let externalSenders = [];
+        if (parentGroupId) {
+            const parentGroupIdBytes = bazinga64_1.Decoder.fromBase64(parentGroupId).asBytes;
+            externalSenders = [await this.coreCryptoClient.getExternalSender(parentGroupIdBytes)];
+        }
+        else {
+            const mlsKeys = (await this.apiClient.api.client.getPublicKeys()).removal;
+            externalSenders = Object.values(mlsKeys).map((key) => bazinga64_1.Decoder.fromBase64(key).asBytes);
+        }
         const configuration = {
-            externalSenders: mlsKeyBytes,
+            externalSenders,
             ciphersuite: this.config.cipherSuite,
         };
         const credentialType = await this.getCredentialType();
@@ -351,10 +359,12 @@ class MLSService extends commons_1.TypedEventEmitter {
      * Will create a conversation inside of coreCrypto, add users to it or update the keying material if empty key packages list is provided.
      * @param groupId the id of the group to create inside of coreCrypto
      * @param users the list of users that will be members of the conversation (including the self user)
-     * @param creator the creator of the list. Most of the time will be the self user (or empty if the conversation was created by backend first)
+     * @param options.creator the creator of the list. Most of the time will be the self user (or empty if the conversation was created by backend first)
+     * @param options.parentGroupId in case the conversation is a subconversation, the id of the parent conversation
      */
-    async registerConversation(groupId, users, creator) {
-        await this.registerEmptyConversation(groupId);
+    async registerConversation(groupId, users, options) {
+        await this.registerEmptyConversation(groupId, options === null || options === void 0 ? void 0 : options.parentGroupId);
+        const creator = options === null || options === void 0 ? void 0 : options.creator;
         const { coreCryptoKeyPackagesPayload: keyPackages, failedToFetchKeyPackages } = await this.getKeyPackagesPayload(users.map(user => {
             if (user.id === (creator === null || creator === void 0 ? void 0 : creator.user.id)) {
                 /**
@@ -667,7 +677,7 @@ class MLSService extends commons_1.TypedEventEmitter {
      */
     async enrollE2EI(discoveryUrl, user, client, nbPrekeys, certificateTtl, oAuthIdToken) {
         const hasActiveCertificate = await this.coreCryptoClient.e2eiIsEnabled(this.config.cipherSuite);
-        const e2eiServiceInternal = new E2EIServiceInternal_1.E2EIServiceInternal(this.coreCryptoClient, this.apiClient, certificateTtl, nbPrekeys, { user, clientId: client.id, discoveryUrl });
+        const e2eiServiceInternal = new E2EIServiceInternal_1.E2EIServiceInternal(this.coreDatabase, this.coreCryptoClient, this.apiClient, certificateTtl, nbPrekeys, { user, clientId: client.id, discoveryUrl });
         // If we don't have an OAuth id token, we need to start the certificate process with Oauth
         if (!oAuthIdToken) {
             const data = await e2eiServiceInternal.startCertificateProcess(hasActiveCertificate);

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

@@ -89,7 +89,7 @@ describe('MLSService', () => {
             const selfUser = createUserId();
             const creator = { user: selfUser, client: 'client-1' };
             const users = [createUserId(), createUserId()];
-            await mlsService.registerConversation(groupId, [...users, selfUser], creator);
+            await mlsService.registerConversation(groupId, [...users, selfUser], { creator });
             expect(apiClient.api.client.claimMLSKeyPackages).toHaveBeenCalledTimes(3);
             expect(apiClient.api.client.claimMLSKeyPackages).toHaveBeenCalledWith(selfUser.id, selfUser.domain, '0x1', creator.client);
             expect(mlsService.scheduleKeyMaterialRenewal).toHaveBeenCalledWith(groupId);

package/lib/storage/CoreDB.d.ts

@@ -1,6 +1,7 @@
 import { SUBCONVERSATION_ID } from '@wireapp/api-client/lib/conversation';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import { DBSchema, IDBPDatabase } from 'idb';
+import { EnrollmentFlowData } from '../messagingProtocols/mls/E2EIdentityService/Storage/E2EIStorage.schema';
 interface CoreDBSchema extends DBSchema {
     prekeys: {
         key: string;
@@ -45,6 +46,10 @@ interface CoreDBSchema extends DBSchema {
             url: string;
         };
     };
+    pendingEnrollmentData: {
+        key: string;
+        value: EnrollmentFlowData;
+    };
 }
 export type CoreDatabase = IDBPDatabase<CoreDBSchema>;
 export declare function openDB(dbName: string): Promise<CoreDatabase>;

package/lib/storage/CoreDB.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CoreDB.d.ts","sourceRoot":"","sources":["../../src/storage/CoreDB.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,kBAAkB,EAAC,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAC,QAAQ,EAA2B,YAAY,EAAsB,MAAM,KAAK,CAAC;AAGzF,UAAU,YAAa,SAAQ,QAAQ;IACrC,OAAO,EAAE;QACP,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,SAAS,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAC,CAAC;KAC/C,CAAC;IACF,gBAAgB,EAAE;QAChB,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,OAAO,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAA;SAAC,CAAC;KAC9C,CAAC;IACF,cAAc,EAAE;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,GAAG,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAA;SAAC,CAAC;KAC1C,CAAC;IACF,qBAAqB,EAAE;QACrB,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,EAAE,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAC,CAAC;KACrC,CAAC;IACF,gBAAgB,EAAE;QAChB,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,oBAAoB,EAAE,WAAW,CAAC;YAAC,iBAAiB,EAAE,kBAAkB,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAC,CAAC;KACpG,CAAC;IACF,IAAI,EAAE;QACJ,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,SAAS,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAC,CAAC;KACzC,CAAC;CACH;AAED,MAAM,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;AAEtD,wBAAsB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAqBlE;AAED,wBAAsB,QAAQ,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9D"}
+{"version":3,"file":"CoreDB.d.ts","sourceRoot":"","sources":["../../src/storage/CoreDB.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,kBAAkB,EAAC,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAC,QAAQ,EAA2B,YAAY,EAAsB,MAAM,KAAK,CAAC;AAEzF,OAAO,EAAC,kBAAkB,EAAC,MAAM,yEAAyE,CAAC;AAG3G,UAAU,YAAa,SAAQ,QAAQ;IACrC,OAAO,EAAE;QACP,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,SAAS,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAC,CAAC;KAC/C,CAAC;IACF,gBAAgB,EAAE;QAChB,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,OAAO,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAA;SAAC,CAAC;KAC9C,CAAC;IACF,cAAc,EAAE;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,GAAG,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAA;SAAC,CAAC;KAC1C,CAAC;IACF,qBAAqB,EAAE;QACrB,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,EAAE,EAAE,MAAM,CAAC;YAAC,MAAM,EAAE,MAAM,CAAA;SAAC,CAAC;KACrC,CAAC;IACF,gBAAgB,EAAE;QAChB,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,oBAAoB,EAAE,WAAW,CAAC;YAAC,iBAAiB,EAAE,kBAAkB,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAC,CAAC;KACpG,CAAC;IACF,IAAI,EAAE;QACJ,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE;YAAC,SAAS,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAC,CAAC;KACzC,CAAC;IACF,qBAAqB,EAAE;QACrB,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,kBAAkB,CAAC;KAC3B,CAAC;CACH;AAED,MAAM,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;AAEtD,wBAAsB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAuBlE;AAED,wBAAsB,QAAQ,CAAC,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9D"}

package/lib/storage/CoreDB.js

@@ -20,7 +20,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteDB = exports.openDB = void 0;
 const idb_1 = require("idb");
-const VERSION = 5;
+const VERSION = 6;
 async function openDB(dbName) {
     const db = await (0, idb_1.openDB)(dbName, VERSION, {
         upgrade: (db, oldVersion) => {
@@ -38,6 +38,8 @@ async function openDB(dbName) {
                     db.createObjectStore('subconversations');
                 case 5:
                     db.createObjectStore('crls');
+                case 6:
+                    db.createObjectStore('pendingEnrollmentData');
             }
         },
     });

package/package.json

@@ -60,6 +60,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "44.0.7",
-  "gitHead": "68a211bf9ec5451d5ff85dbea8ecfb7be0440d2f"
+  "version": "44.0.9",
+  "gitHead": "6b4860506c8ed1840691715fe84fffaafd7d7fe6"
 }