@wireapp/core 46.1.0-hotfix-1.5 → 46.1.0-hotfix-1.7

package/lib/Account.test.js

@@ -53,7 +53,7 @@ const ReconnectingWebsocket_1 = require("@wireapp/api-client/lib/tcp/Reconnectin
 const http_status_codes_1 = require("http-status-codes");
 const jest_websocket_mock_1 = require("jest-websocket-mock");
 const nock_1 = __importStar(require("nock"));
-const uuidjs_1 = require("uuidjs");
+const uuid_1 = require("uuid");
 const api_client_1 = require("@wireapp/api-client");
 const commons_1 = require("@wireapp/commons");
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
@@ -68,7 +68,7 @@ const MOCK_BACKEND = {
 async function createAccount() {
     const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
     const account = new Account_1.Account(apiClient);
-    await account.initServices({
+    await account['initServices']({
         clientType: client_1.ClientType.TEMPORARY,
         userId: '',
     });
@@ -173,7 +173,7 @@ describe('Account', () => {
     describe('"init"', () => {
         it('initializes the Protocol buffers', async () => {
             const account = new Account_1.Account();
-            await account.initServices({ clientType: client_1.ClientType.TEMPORARY, userId: '' });
+            await account['initServices']({ clientType: client_1.ClientType.TEMPORARY, userId: '' });
             expect(account.service.conversation).toBeDefined();
             const message = protocol_messaging_1.GenericMessage.create({
                 messageId: '2d7cb6d8-118f-11e8-b642-0ed5f89f718b',
@@ -186,7 +186,7 @@ describe('Account', () => {
         it('logs in with correct credentials', async () => {
             const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
             const account = new Account_1.Account(apiClient);
-            await account.initServices({ clientType: client_1.ClientType.TEMPORARY, userId: '' });
+            await account['initServices']({ clientType: client_1.ClientType.TEMPORARY, userId: '' });
             const { clientType, userId } = await account.login({
                 clientType: client_1.ClientType.TEMPORARY,
                 email: 'hello@example.com',
@@ -199,7 +199,7 @@ describe('Account', () => {
             const apiClient = new api_client_1.APIClient({ urls: MOCK_BACKEND });
             const account = new Account_1.Account(apiClient);
             let backendError;
-            await account.initServices({ clientType: client_1.ClientType.TEMPORARY, userId: '' });
+            await account['initServices']({ clientType: client_1.ClientType.TEMPORARY, userId: '' });
             try {
                 await account.login({
                     clientType: client_1.ClientType.TEMPORARY,
@@ -249,7 +249,7 @@ describe('Account', () => {
         let dependencies;
         const mockNotifications = (size) => {
             const notifications = Array.from(new Array(size)).map(() => ({
-                id: (0, uuidjs_1.genV4)().toString(),
+                id: (0, uuid_1.v4)(),
                 payload: [{}],
             }));
             jest.spyOn(dependencies.apiClient.api.notification, 'getAllNotifications').mockResolvedValue({ notifications });
@@ -347,7 +347,7 @@ describe('Account', () => {
                             expect(onEvent).toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.NOTIFICATION_STREAM);
                             expect(onEvent).not.toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.WEBSOCKET);
                             onEvent.mockReset();
-                            server.send(JSON.stringify({ id: (0, uuidjs_1.genV4)().toString(), payload: [{}] }));
+                            server.send(JSON.stringify({ id: (0, uuid_1.v4)(), payload: [{}] }));
                             await waitFor(() => expect(onEvent).toHaveBeenCalledTimes(1));
                             expect(onEvent).not.toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.NOTIFICATION_STREAM);
                             expect(onEvent).toHaveBeenCalledWith(expect.any(Object), notification_2.NotificationSource.WEBSOCKET);
@@ -371,7 +371,7 @@ describe('Account', () => {
                                 case Account_1.ConnectionState.PROCESSING_NOTIFICATIONS:
                                     // sending a message as soon as the notificaiton stream starts to process
                                     // This message should only be forwarded once the notification stream is fully processed
-                                    server.send(JSON.stringify({ id: (0, uuidjs_1.genV4)().toString(), payload: [{}] }));
+                                    server.send(JSON.stringify({ id: (0, uuid_1.v4)(), payload: [{}] }));
                                     break;
                                 case Account_1.ConnectionState.LIVE:
                                     expect(onNotificationStreamProgress).toHaveBeenCalledTimes(nbNotifications);
@@ -406,7 +406,7 @@ describe('Account', () => {
                                 case Account_1.ConnectionState.PROCESSING_NOTIFICATIONS:
                                     // sending a message as soon as the notificaiton stream starts to process
                                     // This message should only be forwarded once the notification stream is fully processed
-                                    server.send(JSON.stringify({ id: (0, uuidjs_1.genV4)().toString(), payload: [{}] }));
+                                    server.send(JSON.stringify({ id: (0, uuid_1.v4)(), payload: [{}] }));
                                     break;
                                 case Account_1.ConnectionState.LIVE:
                                     reject(new Error());

package/lib/conversation/AssetService/AssetService.test.js

@@ -18,7 +18,7 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-const uuidjs_1 = require("uuidjs");
+const uuid_1 = require("uuid");
 const api_client_1 = require("@wireapp/api-client");
 const AssetService_1 = require("./AssetService");
 describe('AssetService', () => {
@@ -27,8 +27,8 @@ describe('AssetService', () => {
             const apiClient = new api_client_1.APIClient();
             const assetService = new AssetService_1.AssetService(apiClient);
             const assetServerData = {
-                key: `3-2-${(0, uuidjs_1.genV4)().toString()}`,
-                token: (0, uuidjs_1.genV4)().toString(),
+                key: `3-2-${(0, uuid_1.v4)()}`,
+                token: (0, uuid_1.v4)(),
                 expires: '',
             };
             jest.spyOn(apiClient.api.asset, 'postAsset').mockReturnValue({

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

@@ -135,7 +135,7 @@ export declare class ConversationService extends TypedEventEmitter<Events> {
      * Get a MLS 1:1-conversation with a given user.
      * @param userId - qualified user id
      */
-    getMLS1to1Conversation(userId: QualifiedId): Promise<MLSConversation>;
+    getMLS1to1Conversation(userId: QualifiedId): Promise<import("@wireapp/api-client/lib/conversation").MLS1to1Conversation>;
     /**
      * Will try registering mls 1:1 conversation adding the other user.
      * If it fails and the conversation is already established, it will try joining via external commit instead.

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

@@ -75,7 +75,7 @@ class ConversationService extends commons_1.TypedEventEmitter {
             // Before trying to register a group, check if the group is already established o backend.
             // If remote epoch is higher than 0, it means that the group was already established.
             // It's possible that we've already received a welcome message.
-            const mlsConversation = await this.getMLS1to1Conversation(otherUserId);
+            const { conversation: mlsConversation, public_keys } = await this.getMLS1to1Conversation(otherUserId);
             if (mlsConversation.epoch > 0) {
                 this.logger.info(`Conversation (id ${mlsConversation.qualified_id.id}) is already established on backend, checking the local epoch...`);
                 const isMLSGroupEstablishedLocally = await this.isMLSGroupEstablishedLocally(groupId);
@@ -88,15 +88,17 @@ class ConversationService extends commons_1.TypedEventEmitter {
                 // We try joining via external commit.
                 this.logger.info(`Conversation (id ${mlsConversation.qualified_id.id}) is not yet established locally, joining via external commit...`);
                 await this.joinByExternalCommit(mlsConversation.qualified_id);
-                return this.getMLS1to1Conversation(otherUserId);
+                const { conversation: updatedMLSConversation } = await this.getMLS1to1Conversation(otherUserId);
+                return updatedMLSConversation;
             }
             // If group is not established on backend,
             // we wipe the it locally (in case it exsits in the local store) and try to register it.
             await this.mlsService.wipeConversation(groupId);
             try {
-                await this.mlsService.registerConversation(groupId, [otherUserId, selfUser.user], { creator: selfUser });
+                await this.mlsService.register1to1Conversation(groupId, otherUserId, selfUser, public_keys === null || public_keys === void 0 ? void 0 : public_keys.removal);
                 this.logger.info(`Conversation (id ${mlsConversation.qualified_id.id}) established successfully.`);
-                return this.getMLS1to1Conversation(otherUserId);
+                const { conversation: updatedMLSConversation } = await this.getMLS1to1Conversation(otherUserId);
+                return updatedMLSConversation;
             }
             catch (error) {
                 this.logger.info(`Could not register MLS group with id ${groupId}: `, error);
@@ -414,7 +416,11 @@ class ConversationService extends commons_1.TypedEventEmitter {
      * @param userId - qualified user id
      */
     async getMLS1to1Conversation(userId) {
-        return this.apiClient.api.conversation.getMLS1to1Conversation(userId);
+        const conversation = await this.apiClient.api.conversation.getMLS1to1Conversation(userId);
+        if ((0, conversation_1.isMLS1to1Conversation)(conversation)) {
+            return conversation;
+        }
+        return { conversation };
     }
     /**
      * Will try to register mls group by sending an empty commit to establish it.

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

@@ -107,6 +107,7 @@ describe('ConversationService', () => {
             getEpoch: () => Promise.resolve(),
             joinByExternalCommit: jest.fn(),
             registerConversation: jest.fn(),
+            register1to1Conversation: jest.fn(),
             wipeConversation: jest.fn(),
             handleMLSMessageAddEvent: jest.fn(),
             conversationExists: jest.fn(),
@@ -328,10 +329,8 @@ describe('ConversationService', () => {
             jest.spyOn(mlsService, 'wipeConversation');
             const establishedConversation = await conversationService.establishMLS1to1Conversation(mockGroupId, selfUser, otherUserId);
             expect(mlsService.wipeConversation).toHaveBeenCalledWith(mockGroupId);
-            expect(mlsService.registerConversation).toHaveBeenCalledTimes(1);
-            expect(mlsService.registerConversation).toHaveBeenCalledWith(mockGroupId, [otherUserId, selfUser.user], {
-                creator: selfUser,
-            });
+            expect(mlsService.register1to1Conversation).toHaveBeenCalledTimes(1);
+            expect(mlsService.register1to1Conversation).toHaveBeenCalledWith(mockGroupId, otherUserId, selfUser, undefined);
             expect(conversationService.joinByExternalCommit).not.toHaveBeenCalled();
             expect(establishedConversation.epoch).toEqual(updatedEpoch);
         });
@@ -363,14 +362,12 @@ describe('ConversationService', () => {
                 epoch: updatedEpoch,
                 group_id: mockGroupId,
             });
-            jest.spyOn(mlsService, 'registerConversation').mockRejectedValueOnce(undefined);
+            jest.spyOn(mlsService, 'register1to1Conversation').mockRejectedValueOnce(undefined);
             jest.spyOn(mlsService, 'wipeConversation');
             const establishedConversation = await conversationService.establishMLS1to1Conversation(mockGroupId, selfUser, otherUserId);
             expect(mlsService.wipeConversation).toHaveBeenCalledWith(mockGroupId);
-            expect(mlsService.registerConversation).toHaveBeenCalledTimes(2);
-            expect(mlsService.registerConversation).toHaveBeenCalledWith(mockGroupId, [otherUserId, selfUser.user], {
-                creator: selfUser,
-            });
+            expect(mlsService.register1to1Conversation).toHaveBeenCalledTimes(2);
+            expect(mlsService.register1to1Conversation).toHaveBeenCalledWith(mockGroupId, otherUserId, selfUser, undefined);
             expect(conversationService.joinByExternalCommit).not.toHaveBeenCalled();
             expect(establishedConversation.epoch).toEqual(updatedEpoch);
         });

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

@@ -10,7 +10,7 @@ type Events = {
     };
 };
 export interface SubconversationEpochInfoMember {
-    userid: `${string}@${string}`;
+    userid: string;
     clientid: string;
     in_subconv: boolean;
 }

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;;;;;;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"}
+{"version":3,"file":"SubconversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/SubconversationService/SubconversationService.ts"],"names":[],"mappings":"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"}

package/lib/conversation/SubconversationService/SubconversationService.js

@@ -213,7 +213,9 @@ class SubconversationService extends commons_1.TypedEventEmitter {
             const isSubconversationMember = subconversationMemberIds.some(({ userId, clientId, domain }) => (0, fullyQualifiedClientIdUtils_1.constructFullyQualifiedClientId)(userId, clientId, domain) ===
                 (0, fullyQualifiedClientIdUtils_1.constructFullyQualifiedClientId)(parentMember.userId, parentMember.clientId, parentMember.domain));
             return {
-                userid: `${parentMember.userId}@${parentMember.domain}`,
+                userid: this.apiClient.backendFeatures.isFederated
+                    ? `${parentMember.userId}@${parentMember.domain}`
+                    : parentMember.userId,
                 clientid: parentMember.clientId,
                 in_subconv: isSubconversationMember,
             };

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

@@ -35,8 +35,9 @@ const getSubconversationResponse = ({ epoch, epochTimestamp, parentConversationI
         epoch_timestamp: epochTimestamp,
     };
 };
-const buildSubconversationService = async () => {
+const buildSubconversationService = async (isFederated = false) => {
     const apiClient = new api_client_1.APIClient({ urls: api_client_1.APIClient.BACKEND.STAGING });
+    apiClient.backendFeatures.isFederated = isFederated;
     const mlsService = {
         conversationExists: jest.fn(),
         wipeConversation: jest.fn(),
@@ -253,8 +254,8 @@ describe('SubconversationService', () => {
             const response = await subconversationService.getSubconversationEpochInfo(parentConversationId, parentConversationGroupId);
             expect(response).toEqual(null);
         });
-        it('returns epoch info and advances epoch number', async () => {
-            const [subconversationService, { mlsService }] = await buildSubconversationService();
+        it.each([true, false])('returns epoch info and advances epoch number', async (isFederated) => {
+            const [subconversationService, { mlsService }] = await buildSubconversationService(isFederated);
             const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
             const parentConversationGroupId = 'parentConversationGroupId';
             const subconversationGroupId = 'subconversationGroupId';
@@ -280,8 +281,8 @@ describe('SubconversationService', () => {
                 epoch: mockedEpoch,
                 keyLength: 32,
                 members: [
-                    { clientid: 'clientId1', in_subconv: true, userid: 'userId1@domain' },
-                    { clientid: 'clientId2', in_subconv: false, userid: 'userId2@domain' },
+                    { clientid: 'clientId1', in_subconv: true, userid: isFederated ? 'userId1@domain' : 'userId1' },
+                    { clientid: 'clientId2', in_subconv: false, userid: isFederated ? 'userId2@domain' : 'userId2' },
                 ],
                 secretKey: mockedSecretKey,
             };

package/lib/conversation/message/MessageBuilder.js

@@ -19,13 +19,13 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.wrapInEphemeral = exports.buildTextMessage = exports.buildHideMessage = exports.buildDeleteMessage = exports.buildCallMessage = exports.buildSessionResetMessage = exports.buildReactionMessage = exports.buildPingMessage = exports.buildLocationMessage = exports.buildImageMessage = exports.buildClearedMessage = exports.buildDataTransferMessage = exports.buildLastReadMessage = exports.buildFileAbortMessage = exports.buildFileMetaDataMessage = exports.buildFileDataMessage = exports.buildEditedTextMessage = exports.buildConfirmationMessage = exports.buildCompositeMessage = exports.buildButtonActionConfirmationMessage = exports.buildButtonActionMessage = exports.createId = void 0;
-const uuidjs_1 = require("uuidjs");
+const uuid_1 = require("uuid");
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const AssetTransferState_1 = require("../AssetTransferState");
 const GenericMessageType_1 = require("../GenericMessageType");
 const MessageToProtoMapper_1 = require("../message/MessageToProtoMapper");
 function createId() {
-    return (0, uuidjs_1.genV4)().toString();
+    return (0, uuid_1.v4)();
 }
 exports.createId = createId;
 function buildButtonActionMessage(payloadBundle) {

package/lib/conversation/message/MessageService.test.js

@@ -19,7 +19,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const http_status_codes_1 = require("http-status-codes");
-const uuidjs_1 = require("uuidjs");
+const uuid_1 = require("uuid");
 const api_client_1 = require("@wireapp/api-client");
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
 const MessageService_1 = require("./MessageService");
@@ -33,12 +33,12 @@ const baseMessageSendingStatus = {
     time: new Date().toISOString(),
 };
 const user1 = {
-    id: (0, uuidjs_1.genV4)().toString(),
+    id: (0, uuid_1.v4)(),
     domain: '1.wire.test',
     clients: ['client1.1', 'client1.2', 'client1.3', 'client1.4'],
 };
 const user2 = {
-    id: (0, uuidjs_1.genV4)().toString(),
+    id: (0, uuid_1.v4)(),
     domain: '2.wire.test',
     clients: ['client2.1', 'client2.2', 'client2.3', 'client2.4'],
 };

package/lib/index.d.ts

@@ -6,4 +6,5 @@ export * as cryptography from './cryptography/';
 export * as util from './util';
 export * as MessageBuilder from './conversation/message/MessageBuilder';
 export * as errors from './errors';
+export { Ciphersuite } from '@wireapp/core-crypto';
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAC,MAAM,WAAW,CAAC;AAC1E,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAChC,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,cAAc,MAAM,uCAAuC,CAAC;AACxE,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAC,MAAM,WAAW,CAAC;AAC1E,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAChC,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAC;AAChD,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,cAAc,MAAM,uCAAuC,CAAC;AACxE,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AAEnC,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC"}

package/lib/index.js

@@ -41,7 +41,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.errors = exports.MessageBuilder = exports.util = exports.cryptography = exports.CoreError = exports.conversation = exports.auth = exports.ConnectionState = exports.Account = void 0;
+exports.Ciphersuite = exports.errors = exports.MessageBuilder = exports.util = exports.cryptography = exports.CoreError = exports.conversation = exports.auth = exports.ConnectionState = exports.Account = void 0;
 var Account_1 = require("./Account");
 Object.defineProperty(exports, "Account", { enumerable: true, get: function () { return Account_1.Account; } });
 Object.defineProperty(exports, "ConnectionState", { enumerable: true, get: function () { return Account_1.ConnectionState; } });
@@ -53,3 +53,5 @@ exports.cryptography = __importStar(require("./cryptography/"));
 exports.util = __importStar(require("./util"));
 exports.MessageBuilder = __importStar(require("./conversation/message/MessageBuilder"));
 exports.errors = __importStar(require("./errors"));
+var core_crypto_1 = require("@wireapp/core-crypto");
+Object.defineProperty(exports, "Ciphersuite", { enumerable: true, get: function () { return core_crypto_1.Ciphersuite; } });

package/lib/messagingProtocols/mls/E2EIdentityService/Connection/AcmeServer/AcmeService.d.ts

@@ -64,11 +64,11 @@ export declare class AcmeService {
         target: string;
         status: string;
         token: string;
-        validated?: string | undefined;
         error?: {
             type: string;
             detail: string;
         } | undefined;
+        validated?: string | undefined;
     }>>;
     checkStatusOfOrder(url: string, payload: Uint8Array): Promise<PostJoseRequestReturnValue<{
         id: string;

package/lib/messagingProtocols/mls/E2EIdentityService/Connection/AcmeServer/schema.d.ts

@@ -207,22 +207,22 @@ export declare const OidcChallengeResponseSchema: z.ZodObject<{
     target: string;
     status: string;
     token: string;
-    validated?: string | undefined;
     error?: {
         type: string;
         detail: string;
     } | undefined;
+    validated?: string | undefined;
 }, {
     type: string;
     url: string;
     target: string;
     status: string;
     token: string;
-    validated?: string | undefined;
     error?: {
         type: string;
         detail: string;
     } | undefined;
+    validated?: string | undefined;
 }>;
 export type OidcChallengeResponseData = z.infer<typeof OidcChallengeResponseSchema>;
 export declare const CheckStatusOfOrderResponseSchema: z.ZodObject<{

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,EAAiB,MAAM,sBAAsB,CAAC;AAMnH,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAIrD,OAAO,EAAC,sBAAsB,EAAuB,MAAM,+BAA+B,CAAC;AAC3F,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;IACnE,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,WAAW,CAAC;CAC9B,CAAC;AAEF,KAAK,MAAM,GAAG;IACZ,UAAU,EAAE;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,CAAC;CAC9B,CAAC;AAqBF,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;IAU5B,sBAAsB,IAAI,OAAO,CAAC,OAAO,CAAC;IAKhD,gBAAgB;IAIV,oBAAoB,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAKtF,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,0BAA0B,CACrC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,cAAc,EAAE,CAAC,GAAG,SAAS,CAAC;IAsBxD,kBAAkB,CAC7B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,WAAW,EAAE,GACrB,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,cAAc,EAAE,CAAC,GAAG,SAAS,CAAC;IA0DxD,oBAAoB,CAC/B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAC1C,OAAO,CAAC,cAAc,EAAE,CAAC;IAgBf,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC;YAQvC,4BAA4B;IAO1C;;;;;OAKG;IACU,UAAU,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM5D,OAAO,KAAK,WAAW,GAKtB;YAEa,+BAA+B;IAK7C;;;;;;;;;;;;OAYG;YACW,0BAA0B;IA6BxC,OAAO,CAAC,4BAA4B;YAStB,+BAA+B;YAQ/B,uBAAuB;YAKvB,0BAA0B;YAI1B,4BAA4B;YAO5B,WAAW;YAkBX,8BAA8B;CAM7C"}
+{"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,EAAiB,MAAM,sBAAsB,CAAC;AAMnH,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,yBAAyB,CAAC;AAGrD,OAAO,EAAC,sBAAsB,EAAuB,MAAM,+BAA+B,CAAC;AAC3F,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;IACnE,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,WAAW,CAAC;CAC9B,CAAC;AAEF,KAAK,MAAM,GAAG;IACZ,UAAU,EAAE;QAAC,MAAM,EAAE,MAAM,CAAA;KAAC,CAAC;CAC9B,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;IAO5B,sBAAsB,IAAI,OAAO,CAAC,OAAO,CAAC;IAKhD,gBAAgB;IAIV,oBAAoB,CAAC,cAAc,EAAE,UAAU,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAItF,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,0BAA0B,CACrC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,cAAc,EAAE,CAAC,GAAG,SAAS,CAAC;IAsBxD,kBAAkB,CAC7B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,WAAW,EAAE,GACrB,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE,cAAc,EAAE,CAAC,GAAG,SAAS,CAAC;IAyDxD,oBAAoB,CAC/B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAC1C,OAAO,CAAC,cAAc,EAAE,CAAC;IAiBf,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC;YAKvC,4BAA4B;IAO1C;;;;;OAKG;IACU,UAAU,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5D,OAAO,KAAK,WAAW,GAKtB;YAEa,+BAA+B;IAK7C;;;;;;;;;;;;OAYG;YACW,0BAA0B;IA2BxC,OAAO,CAAC,4BAA4B;YAStB,+BAA+B;YAQ/B,uBAAuB;YAKvB,0BAA0B;YAI1B,4BAA4B;YAO5B,WAAW;YAkBX,8BAA8B;CAM7C"}

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

@@ -27,25 +27,8 @@ const Connection_1 = require("./Connection");
 const Helper_1 = require("./Helper");
 const E2EIStorage_1 = require("./Storage/E2EIStorage");
 const fullyQualifiedClientIdUtils_1 = require("../../../util/fullyQualifiedClientIdUtils");
-const LocalStorageStore_1 = require("../../../util/LocalStorageStore");
 const LowPrecisionTaskScheduler_1 = require("../../../util/LowPrecisionTaskScheduler");
 const qualifiedIdUtil_1 = require("../../../util/qualifiedIdUtil");
-// TODO coreCrypto types are wrong here. They return a string (the key of the enum) instead of the enum value
-function fixDeviceStatus(value) {
-    const fixedValue = core_crypto_1.DeviceStatus[value];
-    if (!fixedValue) {
-        throw new Error(`Invalid device status: ${value}`);
-    }
-    return fixedValue;
-}
-// TODO coreCrypto types are wrong here. They return a string (the key of the enum) instead of the enum value
-function fixConversationState(value) {
-    const fixedValue = core_crypto_1.E2eiConversationState[value];
-    if (!fixedValue) {
-        throw new Error(`Invalid conversation status: ${value}`);
-    }
-    return fixedValue;
-}
 // This export is meant to be accessible from the outside (e.g the Webapp / UI)
 class E2EIServiceExternal extends commons_1.TypedEventEmitter {
     constructor(coreCryptoClient, coreDatabase, recurringTaskScheduler, clientService, mlsService) {
@@ -56,7 +39,6 @@ class E2EIServiceExternal extends commons_1.TypedEventEmitter {
         this.clientService = clientService;
         this.mlsService = mlsService;
         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)
     async isEnrollmentInProgress() {
@@ -67,11 +49,10 @@ class E2EIServiceExternal extends commons_1.TypedEventEmitter {
         return this.enrollmentStorage.deletePendingEnrollmentData();
     }
     async getConversationState(conversationId) {
-        const state = await this.coreCryptoClient.e2eiConversationState(conversationId);
-        return fixConversationState(state);
+        return this.coreCryptoClient.e2eiConversationState(conversationId);
     }
     isE2EIEnabled() {
-        return this.coreCryptoClient.e2eiIsEnabled(this.mlsService.config.cipherSuite);
+        return this.coreCryptoClient.e2eiIsEnabled(this.mlsService.config.defaultCiphersuite);
     }
     async getAllGroupUsersIdentities(groupId) {
         const conversationExists = await this.mlsService.conversationExists(groupId);
@@ -102,7 +83,7 @@ class E2EIServiceExternal extends commons_1.TypedEventEmitter {
             .map(fullyQualifiedId => (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(fullyQualifiedId));
         const mappedUserIdentities = new Map();
         for (const userId of userIds) {
-            const identities = (userIdentities.get(userId.id) || []).map(identity => (Object.assign(Object.assign({}, identity), { status: fixDeviceStatus(identity.status), deviceId: (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(identity.clientId).client, qualifiedUserId: userId })));
+            const identities = (userIdentities.get(userId.id) || []).map(identity => (Object.assign(Object.assign({}, identity), { deviceId: (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(identity.clientId).client, qualifiedUserId: userId })));
             const basicMLSDevices = allUsersMLSDevices
                 .filter(({ user }) => user === userId.id)
                 // filtering devices that have a valid identity
@@ -117,14 +98,11 @@ class E2EIServiceExternal extends commons_1.TypedEventEmitter {
     async getDevicesIdentities(groupId, userClientsMap) {
         const clientIds = Object.entries(userClientsMap).map(([clientId, userId]) => (0, Helper_1.getE2EIClientId)(clientId, userId.id, userId.domain).asBytes);
         const deviceIdentities = await this.coreCryptoClient.getDeviceIdentities(bazinga64_1.Decoder.fromBase64(groupId).asBytes, clientIds);
-        return deviceIdentities.map(identity => (Object.assign(Object.assign({}, identity), { deviceId: (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(identity.clientId).client, qualifiedUserId: userClientsMap[identity.clientId] })));
+        return deviceIdentities.map(identity => (Object.assign(Object.assign({}, identity), { deviceId: (0, fullyQualifiedClientIdUtils_1.parseFullQualifiedClientId)(identity.clientId).client, credentialType: identity.credentialType, qualifiedUserId: userClientsMap[identity.clientId] })));
     }
     async isFreshMLSSelfClient() {
         const client = await this.clientService.loadClient();
-        if (!client) {
-            return true;
-        }
-        return !(0, Helper_1.isMLSDevice)(client);
+        return !client || !this.mlsService.isInitializedMLSClient(client);
     }
     async registerLocalCertificateRoot(acmeService) {
         const localCertificateRoot = await acmeService.getLocalCertificateRoot();
@@ -139,6 +117,7 @@ class E2EIServiceExternal extends commons_1.TypedEventEmitter {
      */
     async initialize(discoveryUrl) {
         this._acmeService = new Connection_1.AcmeService(discoveryUrl);
+        this.mlsService.on('newCrlDistributionPoints', distributionPoints => this.handleNewCrlDistributionPoints(distributionPoints));
         await this.registerServerCertificates();
         await this.initialiseCrlDistributionTimers();
     }
@@ -166,12 +145,10 @@ class E2EIServiceExternal extends commons_1.TypedEventEmitter {
      * Both must be registered before the first enrollment.
      */
     async registerServerCertificates() {
-        const ROOT_CA_KEY = 'e2ei_root-registered';
-        const store = (0, LocalStorageStore_1.LocalStorageStore)(this.coreDatabase.name);
+        const isRootRegistered = await this.coreCryptoClient.e2eiIsPKIEnvSetup();
         // Register root certificate if not already registered
-        if (!store.has(ROOT_CA_KEY)) {
+        if (!isRootRegistered) {
             await this.registerLocalCertificateRoot(this.acmeService);
-            store.add(ROOT_CA_KEY, 'true');
         }
         // Register intermediate certificate and update it every 24 hours
         const INTERMEDIATE_CA_KEY = 'update-intermediate-certificates';

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

@@ -17,19 +17,28 @@
  * along with this program. If not, see http://www.gnu.org/licenses/.
  *
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const TimeUtil_1 = require("@wireapp/commons/lib/util/TimeUtil");
+const axios_1 = __importDefault(require("axios"));
+const core_crypto_1 = require("@wireapp/core-crypto");
 const E2EIServiceExternal_1 = require("./E2EIServiceExternal");
 const CoreDB_1 = require("../../../storage/CoreDB");
 const PayloadHelper_1 = require("../../../test/PayloadHelper");
 const qualifiedIdUtil_1 = require("../../../util/qualifiedIdUtil");
 const RecurringTaskScheduler_1 = require("../../../util/RecurringTaskScheduler");
-async function buildE2EIService() {
+async function buildE2EIService(dbName = 'core-test-db') {
     const coreCrypto = {
         getUserIdentities: jest.fn(),
         getClientIds: jest.fn().mockResolvedValue([]),
+        e2eiIsPKIEnvSetup: jest.fn(),
+        e2eiRegisterAcmeCA: jest.fn(),
+        e2eiRegisterIntermediateCA: jest.fn(),
     };
     const clientService = {};
-    const mockedDb = await (0, CoreDB_1.openDB)('core-test-db');
+    const mockedDb = await (0, CoreDB_1.openDB)(dbName);
     const mockedMLSService = {
         on: jest.fn(),
         getClientIds: jest.fn(),
@@ -39,12 +48,12 @@ async function buildE2EIService() {
         delete: key => mockedDb.delete('recurringTasks', key),
         get: async (key) => { var _a; return (_a = (await mockedDb.get('recurringTasks', key))) === null || _a === void 0 ? void 0 : _a.firingDate; },
         set: async (key, timestamp) => {
-            await mockedDb.put('recurringTasks', { key, firingDate: timestamp });
+            await mockedDb.put('recurringTasks', { key, firingDate: timestamp }, key);
         },
     });
     return [
         new E2EIServiceExternal_1.E2EIServiceExternal(coreCrypto, mockedDb, recurringTaskScheduler, clientService, mockedMLSService),
-        { coreCrypto, mlsService: mockedMLSService },
+        { coreCrypto, mlsService: mockedMLSService, recurringTaskScheduler },
     ];
 }
 function generateCoreCryptoIdentity({ userId, status = 'Valid', deviceId = (0, PayloadHelper_1.getUUID)(), }) {
@@ -56,6 +65,7 @@ function generateCoreCryptoIdentity({ userId, status = 'Valid', deviceId = (0, P
         certificate: '-----BEGIN CERTIFICATE-----\nMIICRTCCAeqgAwIBAgIQcpcbKbgHLM5qoB7xgxm6BTAKBggqhkjOPQQDAjAuMSww\nKgYDVQQDEyNlbG5hLndpcmUubGluayBFMkVJIEludGVybWVkaWF0ZSBDQTAeFw0y\nMzExMjIxMTIwMDVaFw0yMzExMjQxMTIwMDVaMDIxFzAVBgNVBAoTDmVsbmEud2ly\nZS5saW5rMRcwFQYDVQQDEw5BZHJpYW4gV2Vpc3MgMjAqMAUGAytlcAMhAMwP5B9X\nwanLL7JUmHEc1SJYAvHUvMnL1MS/D4CK3JaMo4IBEzCCAQ8wDgYDVR0PAQH/BAQD\nAgeAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4EFgQUrIPC\nem20zAl1ybZqXm2LkvD2U1swHwYDVR0jBBgwFoAU5bQTjX1Ps09suTYe4tzXUKgl\nN9YwdwYDVR0RBHAwboYpaW06d2lyZWFwcD0lNDBhZHJpYW5fd2lyZTJAZWxuYS53\naXJlLmxpbmuGQWltOndpcmVhcHA9U0tIRHNFc09TODJUcldUSE5Fc1ZOQS9lYjll\nMDM4NjE4MzllOWRhQGVsbmEud2lyZS5saW5rMCUGDCsGAQQBgqRkxihAAQQVMBMC\nAQYEDGRlZmF1bHR0ZWFtcwQAMAoGCCqGSM49BAMCA0kAMEYCIQCQQHVAd6wjp2A+\nVvKIXu4oVlCMZkAUATU5bXY4njvapwIhAO8rION7Mz5rSjixJsdEL8E+HHsNvCax\ndjrSL0FL9SM6\n-----END CERTIFICATE-----\n',
         status,
         thumbprint: 'mNyAo88vAF5s7v0UWBNxlQKxP3dfT91A-4PbuzEA5uQ',
+        credentialType: core_crypto_1.CredentialType.X509,
     };
 }
 const groupId = 'AAEAAhJrE+8TbFFUqiagedTYDUMAZWxuYS53aXJlLmxpbms=';
@@ -155,4 +165,46 @@ describe('E2EIServiceExternal', () => {
             expect(userIdentities === null || userIdentities === void 0 ? void 0 : userIdentities.get((0, qualifiedIdUtil_1.stringifyQualifiedId)({ id: user2.userId, domain: user2.domain }))).toHaveLength(1);
         });
     });
+    describe('initialize', () => {
+        const axiosMock = axios_1.default;
+        axiosMock.get = jest.fn();
+        axiosMock.get.mockImplementation(async (url) => {
+            if (url === `${mockDiscoveryUrl}/roots.pem`) {
+                return { data: mockedRootCA };
+            }
+            if (url === `${mockDiscoveryUrl}/federation`) {
+                return { data: { crts: federatedCerts } };
+            }
+            return { data: null };
+        });
+        axios_1.default.create = jest.fn(() => axiosMock);
+        const mockDiscoveryUrl = 'https://some.crl.discovery.url';
+        const mockedRootCA = 'cert';
+        const federatedCerts = ['federatedCert1', 'federatedCert2'];
+        afterEach(() => {
+            jest.clearAllMocks();
+            jest.useRealTimers();
+        });
+        it('registers the server certificates and shedules a timer to refresh intermediate certs every', async () => {
+            jest.useFakeTimers();
+            const [service, { coreCrypto }] = await buildE2EIService('mockedDB1');
+            jest.spyOn(coreCrypto, 'e2eiIsPKIEnvSetup').mockResolvedValueOnce(false);
+            await service.initialize('https://some.crl.discovery.url');
+            expect(coreCrypto.e2eiRegisterAcmeCA).toHaveBeenCalledWith(mockedRootCA);
+            expect(coreCrypto.e2eiRegisterIntermediateCA).toHaveBeenCalledWith(federatedCerts[0]);
+            expect(coreCrypto.e2eiRegisterIntermediateCA).toHaveBeenCalledWith(federatedCerts[1]);
+            expect(coreCrypto.e2eiRegisterIntermediateCA).toHaveBeenCalledTimes(2);
+            await jest.advanceTimersByTimeAsync(TimeUtil_1.TimeInMillis.DAY);
+            await jest.runAllTimersAsync();
+            expect(coreCrypto.e2eiRegisterIntermediateCA).toHaveBeenCalledTimes(4);
+        });
+        it('does not register the root cert if it was already registered', async () => {
+            jest.useFakeTimers();
+            const [service, { coreCrypto }] = await buildE2EIService('mockedDB2');
+            jest.spyOn(coreCrypto, 'e2eiIsPKIEnvSetup').mockResolvedValueOnce(true);
+            await service.initialize('https://some.crl.discovery.url');
+            expect(coreCrypto.e2eiRegisterAcmeCA).not.toHaveBeenCalled();
+            expect(coreCrypto.e2eiRegisterIntermediateCA).toHaveBeenCalledTimes(2);
+        });
+    });
 });

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

@@ -1,5 +1,5 @@
 import { APIClient } from '@wireapp/api-client';
-import { CoreCrypto } from './E2EIService.types';
+import { Ciphersuite, CoreCrypto } from './E2EIService.types';
 import { InitialData } from './Storage/E2EIStorage.schema';
 import { CoreDatabase } from '../../../storage/CoreDB';
 export type getTokenCallback = (challengesData?: {
@@ -24,7 +24,7 @@ export declare class E2EIServiceInternal {
      * @param getOAuthToken function called when the process needs an oauth token
      * @param refresh should the process refresh the current certificate or get a new one
      */
-    generateCertificate(getOAuthToken: getTokenCallback, refresh: boolean): Promise<import("@wireapp/core-crypto").RotateBundle>;
+    generateCertificate(getOAuthToken: getTokenCallback, refresh: boolean, ciphersuite: Ciphersuite): Promise<import("@wireapp/core-crypto").RotateBundle>;
     private continueCertificateGeneration;
     private initIdentity;
     private getDirectory;